Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 54 additions & 7 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:
echo "IDEA_263_BUILD=$build" >> "$GITHUB_ENV"
echo "IDEA_263_SHA256=$digest" >> "$GITHUB_ENV"

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"
java-version: "21"
cache: gradle

- name: Restore the cached 2026.3 verification IDE
Expand Down Expand Up @@ -120,11 +120,16 @@ jobs:
./gradlew test
--tests "org.zoocode.jetbrains.terminal.RawOutputTtyConnectorTest"
--tests "org.zoocode.jetbrains.util.JcefSupportTest"
--tests "org.zoocode.jetbrains.util.ExecutablePathTest"
--tests "org.zoocode.jetbrains.ipc.proxy.LazyPromiseTest"
--tests "org.zoocode.jetbrains.descriptor.PluginDescriptorTest"
--tests "org.zoocode.jetbrains.terminal.TerminalPtyBuilderTest"
--tests "org.zoocode.jetbrains.terminal.ShellIntegrationOutputStateTest"
--tests "org.zoocode.jetbrains.terminal.TerminalShellReadinessTest"
--tests "org.zoocode.jetbrains.editor.EditorFocusIntentTest"
--tests "org.zoocode.jetbrains.editor.WorkspaceEditTest"
--tests "org.zoocode.jetbrains.editor.EditorOpenQueueTest"
--tests "org.zoocode.jetbrains.editor.EditorRoutingContractTest"
--tests "org.zoocode.jetbrains.terminal.TerminalWidgetVisibilityTest"
--tests "org.zoocode.jetbrains.ui.WebViewMountPlanTest"
--tests "org.zoocode.jetbrains.util.FocusRequestEpochTest"
Expand All @@ -143,14 +148,42 @@ jobs:
shell: bash
run: ./gradlew verifyPackagedBytecode --no-configuration-cache

- name: Record the plugin artifact checksum
working-directory: jetbrains_plugin
run: sha256sum build/distributions/*.zip > build/plugin-sha256.txt

- name: Verify plugin compatibility with the minimum IDEA 2026.1.5.1
working-directory: jetbrains_plugin
run: >
./gradlew verifyPlugin smoke263Dispatch
-PsmokeVerifiedIde=true
-PverifierReportsDir=build/reports/pluginVerifier/261
--no-configuration-cache

- name: Verify plugin compatibility with WebStorm 2026.2.1
working-directory: jetbrains_plugin
run: >
./gradlew verifyPlugin smoke263Dispatch
-PsmokeVerifiedIde=true
-PverifierType=WS
-PverifierVersion=2026.2.1
-PverifierReportsDir=build/reports/pluginVerifier/262
--no-configuration-cache

- name: Verify plugin compatibility with the exact IDEA 2026.3 build
working-directory: jetbrains_plugin
shell: bash
run: >
./gradlew runPluginVerifier
./gradlew verifyPlugin smoke263Dispatch
-PsmokeVerifiedIde=true
-PverifierLocalIde="build/ideaIC-${IDEA_263_BUILD}"
-PverifierReportsDir=build/reports/pluginVerifier/263
--no-configuration-cache

- name: Confirm verification used the recorded artifact
working-directory: jetbrains_plugin
run: sha256sum --check build/plugin-sha256.txt

- name: Smoke check the 2026.3 createTtyConnector dispatch
working-directory: jetbrains_plugin
shell: bash
Expand All @@ -159,6 +192,16 @@ jobs:
-PsmokeLocalIde="build/ideaIC-${IDEA_263_BUILD}"
--no-configuration-cache

- name: Store compatibility reports and artifact identity
if: always()
uses: actions/upload-artifact@v4
with:
name: plugin-verifier-${{ github.sha }}
path: |
jetbrains_plugin/build/reports/pluginVerifier/**
jetbrains_plugin/build/plugin-sha256.txt
if-no-files-found: warn

windows-verify:
name: Windows terminal tests and PowerShell 5.1 smoke
runs-on: windows-latest
Expand All @@ -181,17 +224,17 @@ jobs:
Checkout: $env:GITHUB_WORKSPACE
Tested commit: $(git rev-parse HEAD)
OS: windows-latest
JDK: temurin 17
JDK: temurin 21
Run: $env:GITHUB_SERVER_URL/$env:GITHUB_REPOSITORY/actions/runs/$env:GITHUB_RUN_ID
"@
Write-Output $identity
Set-Content -Path windows-run-identity.txt -Value $identity

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"
java-version: "21"
cache: gradle

# The same build-only fixtures the Linux job creates: the Gradle build
Expand Down Expand Up @@ -228,6 +271,10 @@ jobs:
'--tests org.zoocode.jetbrains.terminal.ShellIntegrationOutputStateTest'
'--tests org.zoocode.jetbrains.terminal.TerminalShellReadinessTest'
'--tests org.zoocode.jetbrains.terminal.WindowsConPtyProcessTest'
'--tests org.zoocode.jetbrains.editor.WorkspaceEditTest'
'--tests org.zoocode.jetbrains.editor.EditorOpenQueueTest'
'--tests org.zoocode.jetbrains.editor.EditorRoutingContractTest'
'--tests org.zoocode.jetbrains.util.ExecutablePathTest'
'--no-configuration-cache'
)
cmd /c "gradlew.bat $($taskList -join ' ') 2>&1" | Tee-Object -FilePath ..\windows-test-log.txt
Expand Down Expand Up @@ -263,7 +310,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: windows-pr-results-${{ github.sha }}-windows-latest-jdk17
name: windows-pr-results-${{ github.sha }}-windows-latest-jdk21
path: |
jetbrains_plugin/build/test-results/test/*.xml
jetbrains_plugin/build/reports/tests/test/**
Expand Down
58 changes: 51 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ jobs:
fi
echo "IDEA_263_SHA256=$digest" >> "$GITHUB_ENV"

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"
java-version: "21"
cache: gradle

- name: Set up Node.js
Expand Down Expand Up @@ -223,10 +223,9 @@ jobs:
-PpluginVersion="$VERSION"
--no-configuration-cache

# gradle-intellij 1.x resolves verification targets from release feeds only, so the
# 2026.3 EAP build is fetched from the IntelliJ snapshots repository, checked
# against the pinned SHA-256, cached, and handed to runPluginVerifier through
# -PverifierLocalIde. The build number lives in jetbrains_plugin/gradle.properties.
# The upper-bound verification SDK is downloaded once, checksum-checked,
# cached, and supplied through -PverifierLocalIde. Compilation still uses
# the minimum SDK configured in jetbrains_plugin/gradle.properties.
- name: Restore the cached 2026.3 verification IDE
id: idea263-cache
uses: actions/cache@v4
Expand All @@ -253,20 +252,55 @@ jobs:
}
unzip -q "$ide_zip" -d "$ide_dir"

- name: Record the plugin artifact checksum
working-directory: jetbrains_plugin
run: sha256sum build/distributions/*.zip > build/plugin-sha256.txt

- name: Verify plugin compatibility with the minimum IDEA 2026.1.5.1
working-directory: jetbrains_plugin
env:
VERSION: ${{ needs.prepare.outputs.version }}
run: >
./gradlew verifyPlugin smoke263Dispatch
-PsmokeVerifiedIde=true
-PdebugMode=release
-PvscodePlugin=zoo-code
-PpluginVersion="$VERSION"
-PverifierReportsDir=build/reports/pluginVerifier/261
--no-configuration-cache

- name: Verify plugin compatibility with WebStorm 2026.2.1
working-directory: jetbrains_plugin
run: >
./gradlew verifyPlugin smoke263Dispatch
-PsmokeVerifiedIde=true
-PdebugMode=release
-PvscodePlugin=zoo-code
-PpluginVersion="${{ needs.prepare.outputs.version }}"
-PverifierType=WS
-PverifierVersion=2026.2.1
-PverifierReportsDir=build/reports/pluginVerifier/262
--no-configuration-cache

- name: Verify plugin compatibility with IDEA 2026.3
working-directory: jetbrains_plugin
env:
VERSION: ${{ needs.prepare.outputs.version }}
shell: bash
run: |
verifier_build="$(sed -n 's/^idea263Build=//p' gradle.properties)"
./gradlew runPluginVerifier \
./gradlew verifyPlugin \
-PdebugMode=release \
-PvscodePlugin=zoo-code \
-PpluginVersion="$VERSION" \
-PverifierLocalIde="build/ideaIC-${verifier_build}" \
-PverifierReportsDir=build/reports/pluginVerifier/263 \
--no-configuration-cache

- name: Confirm verification used the recorded artifact
working-directory: jetbrains_plugin
run: sha256sum --check build/plugin-sha256.txt

# The verifier cannot see a silently non-overriding createTtyConnector
# signature; this step proves the dispatch binds on the exact downloaded build.
- name: Smoke check the 2026.3 createTtyConnector dispatch
Expand All @@ -283,6 +317,16 @@ jobs:
-PsmokeLocalIde="build/ideaIC-${verifier_build}" \
--no-configuration-cache

- name: Store compatibility reports and artifact identity
if: always()
uses: actions/upload-artifact@v4
with:
name: release-plugin-verifier-${{ github.sha }}
path: |
jetbrains_plugin/build/reports/pluginVerifier/**
jetbrains_plugin/build/plugin-sha256.txt
if-no-files-found: warn

- name: Publish to JetBrains Marketplace
if: needs.prepare.outputs.marketplace-published != 'true'
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows-chat-focus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"
java-version: "21"
cache: gradle
- uses: actions/setup-node@v6
with:
Expand Down Expand Up @@ -90,8 +90,8 @@ jobs:
fail-fast: false
matrix:
include:
- ide: "2025.3"
sha256: "6f7234b57444371c3af02ab31a15f76dd1d6e5e32eaabc96722777a9addcd023"
- ide: "2026.1.5.1"
sha256: "997dcdaddde05e31d3428e4385fd178f720dfa6dbaebc4203b2ba27c0fca3153"
- ide: "2026.2.1"
sha256: "8aa16db629952300ab74d2d5e095150d1a534593e65bbbbd795b859759c00cbc"
defaults:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,7 @@ plans/

# Generated test reports
test-results/

# IntelliJ Platform Gradle plugin local artifacts and sandbox
jetbrains_plugin/.intellijPlatform/
jetbrains_plugin/.kotlin/
19 changes: 19 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Repository working rules

## Complete the requested scope

- Treat the linked issue's acceptance criteria and the user's reported findings as the task scope. Account for every item before describing the issue as resolved.
- Do not substitute documentation of limitations, a successful build, passing UI tests, or a Plugin Verifier `Compatible` verdict for the requested API migration.
- If only part of the work is complete, report it as partial. Identify the remaining symbols, evidence, and concrete next steps. Do not close the issue or use closing PR keywords until its acceptance criteria are met.
- Preserve regression coverage tied to specific reported issues, including the product under test. A baseline change does not justify silently replacing WebStorm coverage with IDEA coverage. Flag any supported-range conflict explicitly.
- Investigate practical compatibility implementations and version-specific builds before concluding that the oldest supported SDK prevents a fix. Do not silently raise the minimum IDE or Java version.

## IntelliJ API and publication checks

- Published plugin code must not reference IntelliJ APIs annotated `ApiStatus.Internal` or `IntellijInternalApi`. Do not hide such dependencies through reflection, suppression, verifier exclusions, or copied implementation code that still depends on internal APIs.
- For migrations, consult current JetBrains documentation and source, then confirm API availability, annotations, and JVM signatures in the actual supported SDKs. Upstream master alone does not establish release compatibility.
- Prioritize internal and scheduled-for-removal usages. Preserve the existing chat typing/focus behavior when replacing editor-opening APIs; switching back to synchronous opening requires regression evidence.
- Release verification must fail on internal API usages. If the gate is missing, implement it as part of publication-related API work. Report scheduled-for-removal, deprecated, and experimental findings separately; do not describe a report containing findings as clean.
- Verify the exact distributable ZIP against the declared supported IDE range, including the reported failing target when available. Record plugin version, artifact SHA-256, IDE builds, verifier version, and results. Clearly distinguish saved reports from new runs.
- Run behavior checks appropriate to the migration, including native typing/file/diff/terminal regressions for focus-sensitive changes. Honor explicit environment approval requirements for opt-in live suites.
- If no suitable public API exists, prepare a concrete upstream replacement request and track the unresolved release constraint. Do not send it externally without user authorization. Documentation alone does not complete the migration.
11 changes: 11 additions & 0 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

This directory contains the build and maintenance scripts for the Zoo Code JetBrains project. These scripts follow open source conventions and provide a unified interface for project operations.

## Supported build environment

This release line targets IntelliJ Platform **261.27258.136 through 263.***
(2026.1.5.1 through the 2026.3 branch) and requires **JDK 21**. Use the committed
Gradle 9.2.1 wrapper. Older IDEs must use an earlier Zoo Code release.

The default SDK is pinned in `jetbrains_plugin/gradle.properties`. For a local
unpacked copy of the same SDK, pass `-PplatformLocalIde=/path/to/idea`.
Run `./gradlew verifyPlugin -PverifierLocalIde=/path/to/idea` from
`jetbrains_plugin` to check the distributable; internal API findings fail the task.

## Quick Start

### Linux/macOS
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Before you begin, ensure you have the following installed:
- **npm**: Version 8.0.0 or later (comes with Node.js)
- **Git**: Any recent version
- **JDK**: Version 17 or later (for JetBrains plugin development)
- **JetBrains IDE**: IntelliJ IDEA 2023.1+ (for testing)
- **JetBrains IDE**: IntelliJ IDEA 2026.1.5.1+ within the supported platform range (for testing)

### Optional Tools

Expand Down Expand Up @@ -100,7 +100,7 @@ cd jetbrains_plugin

1. Open the project root directory in IntelliJ IDEA
2. Import the Gradle project from `jetbrains_plugin/`
3. Configure JDK 17+ in Project Settings
3. Configure JDK 21 in Project Settings
4. Install recommended plugins:
- Kotlin
- Gradle
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ Zoo Code supports JetBrains IDEs based on the IntelliJ Platform, including:
- GoLand
- DataGrip
- Rider
- Android Studio **2026.1.4 or newer** (currently available as a preview)
- Android Studio builds meeting the platform range below, with JCEF

The plugin targets IntelliJ Platform build **233** (JetBrains 2023.3) or newer. Android Studio requires version **2026.1.4 or newer** because that release includes the JCEF support required by Zoo Code. At present, Android Studio 2026.1.4 is available through the preview channel.
The plugin targets IntelliJ Platform build **261.27258.136** (JetBrains 2026.1.5.1) through **263.***. Android Studio must also meet this platform build range and include JCEF; older Android Studio builds cannot install this release.

## Requirements

### Using the plugin

- A supported JetBrains IDE based on IntelliJ Platform build 233 or newer
- Android Studio 2026.1.4 or newer when using Android Studio; install a preview build until this version reaches the stable channel
- A supported JetBrains IDE based on IntelliJ Platform build 261.27258.136 through 263.*
- Android Studio must use IntelliJ Platform build 261.27258.136 through 263.* and include JCEF
- A JCEF-enabled IDE runtime, which Zoo Code requires to render its interface

Where JCEF support comes from depends on the IDE version. From IntelliJ Platform 2026.2 (build 262), JCEF ships as a separate bundled plugin. If that plugin is missing or disabled, Zoo Code shows a warning notification and the Zoo Code tool window cannot render. Enable the bundled JCEF plugin under **Settings → Plugins → Installed** and restart the IDE. On IDEs older than 2026.2, JCEF comes from the IDE runtime; see [Known Issues](docs/KNOWN_ISSUES.md).
Expand All @@ -89,7 +89,7 @@ On first launch the plugin automatically downloads a pinned, platform-specific N
### Building from source

- Node.js 20.6.0 or newer and npm
- JDK 17 or newer
- JDK 21
- Git
- Bash
- `curl` or `wget`
Expand Down
8 changes: 4 additions & 4 deletions README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Zoo Code JetBrains 目前支持以下 JetBrains IDE 系列:
- **Rider** - .NET 开发
- **Android Studio** - Android 开发

> **注意**:为了获得最佳兼容性,需要 JetBrains IDE 版本 2023.1 或更高版本。
> **注意**:为了获得最佳兼容性,需要 IntelliJ Platform 261.27258.136 至 263.*(2026.1.5.1 起)。


## 🏗️ 架构
Expand Down Expand Up @@ -114,9 +114,9 @@ graph TB

#### 前置条件
- Node.js 18.0+
- JetBrains IDE 2023.1+
- JetBrains IDE:IntelliJ Platform 261.27258.136 至 263.*(2026.1.5.1)
- Git
- JDK 17+
- JDK 21

#### 构建步骤

Expand Down Expand Up @@ -176,7 +176,7 @@ Zoo Code JetBrains/
### 技术栈

- **扩展宿主**:Node.js 18+、TypeScript 5.0+
- **JetBrains 插件**:Kotlin 1.8+、IntelliJ Platform 2023.1+
- **JetBrains 插件**:Kotlin 2.2、IntelliJ Platform 261.27258.136 至 263.*
- **通信**:基于 Unix Domain Sockets/Named Pipes 的 RPC
- **构建工具**:npm/pnpm、Gradle、Shell 脚本

Expand Down
Loading
Loading