Merge branch 'Zoo-Code-Org:main' into main

Author: F915

.github/workflows/marketplace-publish.yml

@@ -7,7 +7,51 @@ on:
   workflow_dispatch:
 
 jobs:
+  check-pr-approval:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    steps:
+      - name: Check PR approval status
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          SHA: ${{ github.sha }}
+        run: |
+          pr_number=$(gh api "repos/${REPO}/commits/${SHA}/pulls" \
+            --header "Accept: application/vnd.github+json" \
+            --jq '.[0].number // empty')
+
+          if [ -z "$pr_number" ]; then
+            echo "No PR found for commit ${SHA}. Deployment requires an approved PR."
+            exit 1
+          fi
+
+          review_decision=$(gh api graphql \
+            -f owner="${REPO%%/*}" \
+            -f name="${REPO#*/}" \
+            -F number="$pr_number" \
+            -f query='
+              query($owner: String!, $name: String!, $number: Int!) {
+                repository(owner: $owner, name: $name) {
+                  pullRequest(number: $number) {
+                    reviewDecision
+                  }
+                }
+              }' \
+            --jq '.data.repository.pullRequest.reviewDecision // "NONE"')
+
+          echo "PR #${pr_number} review_decision: ${review_decision}"
+
+          if [ "$review_decision" != "APPROVED" ]; then
+            echo "PR #${pr_number} is not approved (state: ${review_decision}). Deployment blocked."
+            exit 1
+          fi
+
+          echo "PR #${pr_number} is approved. Proceeding."
+
   publish-stable:
+    needs: [check-pr-approval]
     runs-on: ubuntu-latest
     environment: marketplace-production
     permissions:

.roo/commands/release.md

@@ -36,16 +36,9 @@ mode: code
     - Do not manually edit `src/README.md`; the extension bundle step copies root `README.md` into `src/README.md`.
     - Check for stale upstream Roo Code wording that should now say Zoo Code.
 
-6. Create the release notes as a changeset file at `.changeset/v[version].md`, then run `pnpm changeset:version` on the release branch before opening the PR.
-
-    ```md
-    ---
-    "zoo-code": patch|minor|major
-    ---
-
-    [list of changes]
-    ```
+6. Write the release notes directly into `CHANGELOG.md` on the release branch.
 
+    - Use the heading format `## [version]` (with square brackets) — e.g. `## [3.58.1]`. The publish workflow at `.github/workflows/marketplace-publish.yml` extracts release notes by matching this exact pattern; headings without brackets will be missed and the GitHub release will fall back to a generic message.
     - Always include contributor attribution and the PR number: use `(PR #<prNumber> by @username)`.
     - For PRs that close issues, include both issue and PR authors: `- Fix: Description (#123 by @reporter, PR #456 by @contributor)`.
     - For PRs without linked issues, include the PR number and author: `- Add support for feature (PR #456 by @contributor)`.
@@ -67,13 +60,10 @@ mode: code
     git checkout -b release/v[version]
     ```
 
-9. Generate the final release state on that branch:
-
-    ```bash
-    pnpm changeset:version
-    ```
+9. Bump the version in `src/package.json` to the target release version and ensure `CHANGELOG.md` and `src/CHANGELOG.md` are up to date.
 
-    - This should update `src/package.json`, `CHANGELOG.md`, and `src/CHANGELOG.md`, then consume the `.changeset` file.
+    - Verify the `CHANGELOG.md` heading uses `## [version]` (with brackets).
+    - Copy or sync `CHANGELOG.md` to `src/CHANGELOG.md` if the project keeps both.
     - Review the generated version and changelog before opening the PR.
 
 10. Open a single release PR with the fully generated release state.
@@ -92,32 +82,31 @@ mode: code
     - If the release includes translated README or package-localization updates, include those files in the same PR.
     - Let the release validation workflow and normal PR checks run before merge.
 
-11. After the release PR is merged, stop for a release review on the resulting `main` commit.
-
-    ```bash
-    git switch main
-    git pull origin main
-    REVIEWED_SHA=$(git rev-parse HEAD)
-    git rev-parse --short "$REVIEWED_SHA"
-    ```
+11. Once the release PR is open and passing checks, get it approved by a reviewer before proceeding.
 
-    - Review the merged release state before any publish step.
-    - Confirm that `src/package.json`, `CHANGELOG.md`, `src/CHANGELOG.md`, and the Marketplace-facing `README.md` all reflect the intended release.
-    - Check that the release PR checks passed and that the merged commit is the one you want to ship.
-    - Share that review summary, including `REVIEWED_SHA`, with the user and wait for explicit confirmation before creating the tag.
-    - Do not create the tag or trigger publishing until the user says to proceed.
+    - Do not create the tag until the PR has at least one approval — the publish workflow enforces this automatically and will fail if no approved PR is found for the tagged commit.
 
-12. Only after explicit confirmation, create the release tag on that reviewed `main` commit:
+12. After the PR is approved, create the release tag on the release branch tip and push it:
 
     ```bash
-    git tag v[version] "$REVIEWED_SHA"
+    git tag v[version]
     git push origin v[version]
     ```
 
-    - If `main` advances after the review pause, keep using the pinned `REVIEWED_SHA` for the tag instead of silently tagging a newer commit.
+    - Tag the branch tip as-is. Do not rebase or merge additional commits into the release branch before tagging — doing so changes the commit SHA and may pull in unreviewed changes that weren't part of the approval.
+    - The publish workflow validates that the tag version matches `src/package.json`.
+
+13. The tag push triggers the stable publish workflow.
 
-13. The stable publish workflow runs from the `v[version]` tag.
+    - The workflow first checks that the tagged commit belongs to an approved PR. If the PR is not yet approved this step fails — approve the PR first, then retrigger by recreating and pushing the tag: `git tag -d v[version] && git push origin :refs/tags/v[version] && git tag v[version] && git push origin v[version]`.
+    - Once the approval check passes, the `marketplace-production` environment gate fires and notifies the configured approvers.
+    - A human approver must then approve the deployment before the extension is published to VS Code Marketplace and Open VSX.
 
-    - Do not create the tag before the release PR is merged.
-    - The publish workflow validates that the tag version matches `src/package.json`.
-    - Marketplace and Open VSX publishing use the configured CI secrets.
+14. After a successful deployment, add the release PR to the merge queue.
+
+    ```bash
+    gh pr merge [pr-number] --auto --squash
+    ```
+
+    - Do not merge before the deployment succeeds — merging first and then discovering a publish failure leaves `main` ahead of what was actually shipped.
+    - The merge queue runs all required checks against the release branch before merging to `main`.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Zoo Code Changelog
 
+## [3.58.1]
+
+### Patch Changes
+
+- Fix: Remove unsupported `--no-absolute-filenames` tar argument (#491 by @kazenshi, PR #492 by @kazenshi)
+
 ## 3.58.0
 
 ### Minor Changes

apps/cli/package.json

@@ -41,12 +41,13 @@
 	"devDependencies": {
 		"@roo-code/config-eslint": "workspace:^",
 		"@roo-code/config-typescript": "workspace:^",
-		"@types/node": "^24.1.0",
-		"@types/react": "^19.1.6",
-		"ink-testing-library": "^4.0.0",
-		"rimraf": "^6.0.1",
-		"tsup": "^8.4.0",
-		"@vitest/coverage-v8": "^3.2.3",
-		"vitest": "^3.2.3"
+		"@types/node": "24.2.1",
+		"@types/react": "18.3.23",
+		"@vitest/coverage-v8": "3.2.6",
+		"ink-testing-library": "4.0.0",
+		"rimraf": "6.0.1",
+		"tsup": "8.5.0",
+		"tsx": "4.19.4",
+		"vitest": "3.2.6"
 	}
 }

apps/vscode-e2e/package.json

@@ -16,13 +16,13 @@
 		"@roo-code/config-typescript": "workspace:^",
 		"@roo-code/types": "workspace:^",
 		"@copilotkit/aimock": "1.15.1",
-		"@types/mocha": "^10.0.10",
-		"@types/node": "^20.19.25",
-		"@types/vscode": "^1.95.0",
-		"@vscode/test-cli": "^0.0.11",
-		"@vscode/test-electron": "^2.4.0",
-		"glob": "^11.1.0",
-		"mocha": "^11.1.0",
-		"rimraf": "^6.0.1"
+		"@types/mocha": "10.0.10",
+		"@types/node": "20.19.41",
+		"@types/vscode": "1.100.0",
+		"@vscode/test-cli": "0.0.11",
+		"@vscode/test-electron": "2.5.2",
+		"glob": "11.1.0",
+		"mocha": "11.2.2",
+		"rimraf": "6.0.1"
 	}
 }

apps/vscode-e2e/src/fixtures/subtasks.ts

@@ -5,10 +5,24 @@ import { toolResultContains } from "./tool-result"
 
 const SUBTASK_PARENT_MARKER = "SUBTASK_PARENT_CANCELLATION_SMOKE"
 const SUBTASK_CHILD_MARKER = "SUBTASK_CHILD_CALCULATOR_SMOKE"
+const SUBTASK_FAST_PARENT_MARKER = "SUBTASK_PARENT_IMMEDIATE_COMPLETION"
+const SUBTASK_FAST_CHILD_MARKER = "SUBTASK_CHILD_IMMEDIATE_COMPLETION"
+const SUBTASK_XPROFILE_PARENT_MARKER = "SUBTASK_PARENT_CROSS_PROFILE"
+const SUBTASK_XPROFILE_SAME_CHILD_MARKER = "SUBTASK_CHILD_SAME_PROFILE"
+const SUBTASK_XPROFILE_DIFFERENT_CHILD_MARKER = "SUBTASK_CHILD_DIFFERENT_PROFILE"
 
 const SUBTASK_CHILD_PROMPT = `${SUBTASK_CHILD_MARKER}: Ask the user exactly this follow-up question: What is the square root of 81? After the user answers, complete with only the answer.`
 export const SUBTASK_PARENT_PROMPT = `${SUBTASK_PARENT_MARKER}: Use the new_task tool exactly once. Create an ask-mode subtask with this exact message: "${SUBTASK_CHILD_PROMPT}" Do not answer directly.`
 export const SUBTASK_CHILD_FOLLOWUP_ANSWER = "9"
+const SUBTASK_FAST_CHILD_PROMPT = `${SUBTASK_FAST_CHILD_MARKER}: Complete immediately with the exact result "Fast child completed".`
+export const SUBTASK_FAST_PARENT_PROMPT = `${SUBTASK_FAST_PARENT_MARKER}: Use the new_task tool exactly once. Create an ask-mode subtask with this exact message: "${SUBTASK_FAST_CHILD_PROMPT}" Do not answer directly.`
+
+const SUBTASK_XPROFILE_SAME_CHILD_PROMPT = `${SUBTASK_XPROFILE_SAME_CHILD_MARKER}: Complete immediately with the exact result "Same-profile child completed".`
+const SUBTASK_XPROFILE_DIFFERENT_CHILD_PROMPT = `${SUBTASK_XPROFILE_DIFFERENT_CHILD_MARKER}: Complete immediately with the exact result "Different-profile child completed".`
+export const SUBTASK_XPROFILE_PARENT_PROMPT = `${SUBTASK_XPROFILE_PARENT_MARKER}: First use new_task to create a code-mode subtask with this exact message: "${SUBTASK_XPROFILE_SAME_CHILD_PROMPT}" After it returns, create an ask-mode subtask with the next instructions you receive.`
+export const SUBTASK_XPROFILE_SAME_CHILD_RESULT = "Same-profile child completed"
+export const SUBTASK_XPROFILE_DIFFERENT_CHILD_RESULT = "Different-profile child completed"
+export const SUBTASK_XPROFILE_PARENT_RESULT = "Sequential cross-profile parent resumed"
 
 const requestContains = (req: ChatCompletionRequest, expected: string[]) => {
 	const rawRequest = JSON.stringify(req)
@@ -40,6 +54,55 @@ const completionAfterAnswer = (followupId: string, completionId: string) => ({
 })
 
 export function addSubtaskFixtures(mock: InstanceType<typeof LLMock>) {
+	mock.addFixture({
+		match: {
+			userMessage: new RegExp(SUBTASK_FAST_PARENT_MARKER),
+			sequenceIndex: 0,
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "new_task",
+					arguments: JSON.stringify({
+						mode: "ask",
+						message: SUBTASK_FAST_CHILD_PROMPT,
+					}),
+					id: "call_subtasks_fast_parent_new_task_001",
+				},
+			],
+		},
+	})
+
+	mock.addFixture({
+		match: {
+			userMessage: new RegExp(SUBTASK_FAST_CHILD_MARKER),
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "attempt_completion",
+					arguments: JSON.stringify({ result: "Fast child completed" }),
+					id: "call_subtasks_fast_child_completion_002",
+				},
+			],
+		},
+	})
+
+	mock.addFixture({
+		match: {
+			toolCallId: "call_subtasks_fast_parent_new_task_001",
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "attempt_completion",
+					arguments: JSON.stringify({ result: "Fast parent resumed" }),
+					id: "call_subtasks_fast_parent_completion_003",
+				},
+			],
+		},
+	})
+
 	mock.addFixture({
 		match: {
 			userMessage: new RegExp(SUBTASK_PARENT_MARKER),
@@ -92,4 +155,95 @@ export function addSubtaskFixtures(mock: InstanceType<typeof LLMock>) {
 			],
 		},
 	})
+
+	// Issue #457 sequence: a same-profile child returns first, then the resumed
+	// parent delegates to a child whose mode uses a different API profile.
+	mock.addFixture({
+		match: {
+			userMessage: new RegExp(SUBTASK_XPROFILE_PARENT_MARKER),
+			sequenceIndex: 0,
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "new_task",
+					arguments: JSON.stringify({
+						mode: "code",
+						message: SUBTASK_XPROFILE_SAME_CHILD_PROMPT,
+					}),
+					id: "call_subtasks_xprofile_parent_same_child_001",
+				},
+			],
+		},
+	})
+
+	mock.addFixture({
+		match: {
+			userMessage: new RegExp(SUBTASK_XPROFILE_SAME_CHILD_MARKER),
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "attempt_completion",
+					arguments: JSON.stringify({ result: SUBTASK_XPROFILE_SAME_CHILD_RESULT }),
+					id: "call_subtasks_xprofile_same_child_completion_002",
+				},
+			],
+		},
+	})
+
+	mock.addFixture({
+		match: {
+			predicate: (req: ChatCompletionRequest) =>
+				requestContains(req, [SUBTASK_XPROFILE_PARENT_MARKER, SUBTASK_XPROFILE_SAME_CHILD_RESULT]) &&
+				!requestContains(req, [SUBTASK_XPROFILE_DIFFERENT_CHILD_RESULT]),
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "new_task",
+					arguments: JSON.stringify({
+						mode: "ask",
+						message: SUBTASK_XPROFILE_DIFFERENT_CHILD_PROMPT,
+					}),
+					id: "call_subtasks_xprofile_parent_different_child_003",
+				},
+			],
+		},
+	})
+
+	mock.addFixture({
+		match: {
+			userMessage: new RegExp(SUBTASK_XPROFILE_DIFFERENT_CHILD_MARKER),
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "attempt_completion",
+					arguments: JSON.stringify({ result: SUBTASK_XPROFILE_DIFFERENT_CHILD_RESULT }),
+					id: "call_subtasks_xprofile_different_child_completion_004",
+				},
+			],
+		},
+	})
+
+	mock.addFixture({
+		match: {
+			predicate: (req: ChatCompletionRequest) =>
+				requestContains(req, [
+					SUBTASK_XPROFILE_PARENT_MARKER,
+					SUBTASK_XPROFILE_SAME_CHILD_RESULT,
+					SUBTASK_XPROFILE_DIFFERENT_CHILD_RESULT,
+				]),
+		},
+		response: {
+			toolCalls: [
+				{
+					name: "attempt_completion",
+					arguments: JSON.stringify({ result: SUBTASK_XPROFILE_PARENT_RESULT }),
+					id: "call_subtasks_xprofile_parent_completion_005",
+				},
+			],
+		},
+	})
 }

apps/vscode-e2e/src/runTest.ts

@@ -161,7 +161,7 @@ async function main() {
 			extensionTestsPath,
 			launchArgs: [testWorkspace],
 			extensionTestsEnv,
-			version: process.env.VSCODE_VERSION || "1.101.2",
+			version: process.env.VSCODE_VERSION || "1.100.0",
 		})
 	} catch (error) {
 		console.error("Failed to run tests", error)

apps/vscode-e2e/src/suite/index.ts

@@ -79,6 +79,16 @@ export async function run() {
 		throw new Error(`No test files found matching criteria: ${process.env.TEST_FILE || "all tests"}`)
 	}
 
+	// Run provider suites last so their teardown (which may leave per-mode profile
+	// pins pointing at non-default providers) doesn't affect tool suites that start
+	// tasks in specific modes and expect the default openrouter config.
+	testFiles.sort((a, b) => {
+		const aIsProvider = a.includes("/providers/")
+		const bIsProvider = b.includes("/providers/")
+		if (aIsProvider === bIsProvider) return a.localeCompare(b)
+		return aIsProvider ? 1 : -1
+	})
+
 	testFiles.forEach((testFile) => mocha.addFile(path.resolve(cwd, testFile)))
 
 	return new Promise<void>((resolve, reject) =>