Merge master and resolve integration conflicts for #5570

tsconfig.host.json

@@ -23,6 +23,8 @@
     "apps/web/tests/code-language.snapshot.ts",
     "apps/web/tests/scaffold.ts",
     "apps/web/tests/voice-input.e2e.ts",
+    "apps/web/tests/cot-translation.e2e.ts",
+    "apps/web/tests/cot-translation-paid.e2e.ts",
     "apps/web/tests/voice-setup.e2e.ts",
     "apps/web/tests/voice-download.e2e.ts",
     "apps/web/tests/prefix-proxy.ts",
@@ -50,6 +52,8 @@
     "apps/web/tests/plan-review.e2e.ts",
     "apps/web/tests/steering.e2e.ts",
     "apps/web/tests/navigation-panes.e2e.ts",
+    "apps/web/tests/shell-command-details.e2e.ts",
+    "apps/web/tests/terminal-command-browser.ts",
     "apps/web/tests/focus-rings.e2e.ts",
     "apps/web/tests/chat-scroll-fixture.ts",
     "apps/web/tests/trajectory-virtualization.e2e.ts",
@@ -64,11 +68,13 @@
     "apps/web/tests/plugin-config.e2e.ts",
     "apps/web/tests/input-plugin-extensions.e2e.ts",
     "apps/web/tests/plugin-manager.e2e.ts",
+    "apps/web/tests/worktree-opt-in.e2e.ts",
     "apps/web/tests/session-inspector.e2e.ts",
     "apps/web/tests/shared-inspector.e2e.ts",
     "apps/web/tests/layout-bottom.e2e.ts",
     "apps/web/tests/devtools-frontend.e2e.ts",
     "apps/web/tests/inspector-panels.e2e.ts",
+    "apps/web/tests/inspector-source-build.e2e.ts",
     "apps/web/tests/plugin-install-cancel.e2e.ts",
     "apps/web/tests/plugin-install-approve.e2e.ts",
     "apps/web/tests/plugin-install-registry.e2e.ts",
@@ -115,6 +121,8 @@
     "apps/web/tests/conversation-column-overflow.e2e.ts",
     "apps/web/tests/ptc-round.e2e.ts",
     "apps/web/tests/ptc-escalation.e2e.ts",
+    "apps/web/tests/standalone-string-editor.e2e.ts",
+    "apps/web/tests/official-subagent-bundle.e2e.ts",
     "apps/web/tests/present.e2e.ts",
     "apps/web/tests/present-svg.e2e.ts",
     "apps/web/tests/composer-draft-scroll.e2e.ts",
@@ -185,6 +193,7 @@
     "apps/desktop-host/tests/**/*.ts",
     "benchmarks/**/*.ts",
     "packages/*/*/tests/**/*.ts",
+    "packages/experimental/claude-code-mods/examples/*/index.ts",
     "packages/experimental/inspector/scripts/**/*.ts",
     "scripts/**/*.ts",
     "website/**/*.ts",
@@ -210,6 +219,14 @@
     "scripts/client-bundle-purity.spec.ts"
   ],
   "references": [
+    { "path": "./packages/experimental/client-ui-cot-translation/tsconfig.host.json" },
+    { "path": "./packages/experimental/cot-translation-bundle" },
+    { "path": "./packages/experimental/session-search" },
+    { "path": "./packages/experimental/ralph-bundle" },
+    { "path": "./packages/experimental/terminal-bundle" },
+    { "path": "./packages/experimental/badge-skill-bundle" },
+    { "path": "./packages/experimental/session-titles-bundle" },
+    { "path": "./packages/experimental/translator" },
     { "path": "./packages/client/product-analytics/tsconfig.host.json" },
     { "path": "./packages/telemetry/otel" },
     { "path": "./packages/experimental/speech-to-text" },
@@ -312,7 +329,7 @@
     { "path": "./packages/credentials/credentials" },
     { "path": "./packages/credentials/credentials-local" },
     { "path": "./packages/credentials/authorization" },
-    { "path": "./packages/session-query/tool-session-query" },
+    { "path": "./packages/experimental/tool-session-query" },
     { "path": "./packages/storage/storage" },
     { "path": "./packages/storage/storage-json" },
     { "path": "./packages/storage/storage-sqlite" },
@@ -320,9 +337,13 @@
     { "path": "./packages/feedback/message-feedback" },
     { "path": "./packages/workspace/workspace" },
     { "path": "./packages/session/session-title" },
+    { "path": "./packages/session/working-directory" },
+    { "path": "./packages/experimental/worktree" },
+    { "path": "./packages/experimental/tool-worktree" },
+    { "path": "./packages/session/tool-working-directory" },
     { "path": "./packages/session/session-title-llm" },
     { "path": "./packages/session/session-title-first-prompt-llm" },
-    { "path": "./packages/session/session-title-all-prompts-llm" },
+    { "path": "./packages/experimental/session-title-all-prompts-llm" },
     { "path": "./packages/session/session-turn-outline" },
     { "path": "./packages/session/session-telemetry" },
     { "path": "./packages/identity/anonymous-user-id" },
@@ -347,10 +368,11 @@
     { "path": "./packages/interaction/user-approval" },
     { "path": "./packages/interaction/permission-presets" },
     { "path": "./packages/experimental/auto-review" },
+    { "path": "./packages/experimental/claude-code-mods" },
     { "path": "./packages/core/tools" },
     { "path": "./packages/core/agent-tool-presentation" },
     { "path": "./packages/skill/skill" },
-    { "path": "./packages/skill/skill-badge" },
+    { "path": "./packages/experimental/skill-badge" },
     { "path": "./packages/skill/skill-filesystem" },
     { "path": "./packages/skill/tool-skill" },
     { "path": "./packages/interaction/tool-ask-user" },
@@ -369,7 +391,7 @@
     { "path": "./packages/terminal/terminal-bash" },
     { "path": "./packages/shell/tool-bash-persistent" },
     { "path": "./packages/shell/tool-pwsh-persistent" },
-    { "path": "./packages/terminal/tool-terminal" },
+    { "path": "./packages/experimental/tool-terminal" },
     { "path": "./packages/ptc-runtime/ptc-runtime" },
     { "path": "./packages/experimental/ptc-runtime-python" },
     { "path": "./packages/ptc-runtime/ptc-runtime-node" },
@@ -413,7 +435,6 @@
     { "path": "./packages/spill/spill-local" },
     { "path": "./packages/spill/spill-policy" },
     { "path": "./packages/guard/timeout-policy" },
-    { "path": "./packages/runtime-diagnostics/invariants" },
     { "path": "./packages/test-support/agent-loop-testkit" },
     { "path": "./packages/acp/acp" },
     { "path": "./packages/bundle/acp-app" },
@@ -435,7 +456,6 @@
     { "path": "./packages/subagent/subagent" },
     { "path": "./packages/subagent/tool-subagent" },
     { "path": "./packages/subagent/tool-subagent-control" },
-    { "path": "./packages/subagent/subagent-in-process-driver" },
     { "path": "./packages/subagent/subagent-spawn-in-process" },
     { "path": "./packages/subagent/subagent-fork-in-process" },
     { "path": "./packages/subagent/subagent-acp" },
@@ -452,9 +472,9 @@
     { "path": "./packages/workflow/workflow" },
     { "path": "./packages/workflow/workflow-ptc" },
     { "path": "./packages/workflow/tool-workflow" },
-    { "path": "./packages/workflow/tool-ralph" },
-    { "path": "./packages/webhook/webhook" },
-    { "path": "./packages/webhook/webhook-github" },
+    { "path": "./packages/experimental/tool-ralph" },
+    { "path": "./packages/experimental/webhook" },
+    { "path": "./packages/experimental/webhook-github" },
     { "path": "./packages/todo/tool-todo" },
     { "path": "./packages/plan/plan-mode" },
     { "path": "./packages/preset/agent-preset-registry" },
@@ -463,9 +483,9 @@
     { "path": "./packages/guard/repeat-tool-reminder" },
     { "path": "./packages/extensions/cordis-host-runner" },
     { "path": "./packages/extensions/tool-cordis" },
-    { "path": "./packages/hooks/hook-protocol" },
-    { "path": "./packages/hooks/hooks-claude-code" },
-    { "path": "./packages/hooks/hooks-codex" },
+    { "path": "./packages/experimental/hook-protocol" },
+    { "path": "./packages/experimental/hooks-claude-code" },
+    { "path": "./packages/experimental/hooks-codex" },
     { "path": "./packages/mcp/mcp-client" },
     { "path": "./packages/mcp/mcp-resources" },
     { "path": "./packages/host/directory-picker" },