Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification

# Conflicts: # examples/acp-agent/tests/snapshots/cancel-tool-calls/session.jsonl
2026-08-05 10:39:18 +08:00
parent c357f94ddc 81c63bbf4d
commit 97e7d68340
133 changed files with 5786 additions and 421 deletions
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -146,6 +146,9 @@ importers:
      '@deepseek-ai/dsh-app-boot':
        specifier: workspace:^
        version: link:../../packages/ui/app-boot
+      '@deepseek-ai/dsh-bash-env':
+        specifier: workspace:^
+        version: link:../../packages/bash/bash-env
      '@deepseek-ai/dsh-bash-local':
        specifier: workspace:^
        version: link:../../packages/bash/bash-local
@@ -305,6 +308,9 @@ importers:
      '@deepseek-ai/dsh-pty-local':
        specifier: workspace:^
        version: link:../../packages/pty/pty-local
+      '@deepseek-ai/dsh-pwsh-local':
+        specifier: workspace:^
+        version: link:../../packages/bash/pwsh-local
      '@deepseek-ai/dsh-repeat-tool-guard':
        specifier: workspace:^
        version: link:../../packages/guard/repeat-tool-guard
@@ -416,6 +422,9 @@ importers:
      '@deepseek-ai/dsh-tool-goal':
        specifier: workspace:^
        version: link:../../packages/goal/tool-goal
+      '@deepseek-ai/dsh-tool-pwsh':
+        specifier: workspace:^
+        version: link:../../packages/bash/tool-pwsh
      '@deepseek-ai/dsh-tool-ralph':
        specifier: workspace:^
        version: link:../../packages/workflow/tool-ralph
@@ -565,6 +574,9 @@ importers:
      '@deepseek-ai/dsh-bash':
        specifier: workspace:*
        version: link:../packages/bash/bash
+      '@deepseek-ai/dsh-bash-env':
+        specifier: workspace:*
+        version: link:../packages/bash/bash-env
      '@deepseek-ai/dsh-bash-local':
        specifier: workspace:*
        version: link:../packages/bash/bash-local
@@ -649,6 +661,9 @@ importers:
      '@deepseek-ai/dsh-pty-local':
        specifier: workspace:*
        version: link:../packages/pty/pty-local
+      '@deepseek-ai/dsh-pwsh-local':
+        specifier: workspace:*
+        version: link:../packages/bash/pwsh-local
      '@deepseek-ai/dsh-repeat-tool-guard':
        specifier: workspace:*
        version: link:../packages/guard/repeat-tool-guard
@@ -766,6 +781,9 @@ importers:
      '@deepseek-ai/dsh-tool-pty':
        specifier: workspace:*
        version: link:../packages/pty/tool-pty
+      '@deepseek-ai/dsh-tool-pwsh':
+        specifier: workspace:*
+        version: link:../packages/bash/tool-pwsh
      '@deepseek-ai/dsh-tool-ralph':
        specifier: workspace:*
        version: link:../packages/workflow/tool-ralph
@@ -873,6 +891,37 @@ importers:
        specifier: ^4.0.0-rc.7
        version: link:../../../vendor/cordis

+  packages/bash/bash-env:
+    dependencies:
+      schemastery:
+        specifier: ^3.18.0
+        version: link:../../../vendor/schemastery
+    devDependencies:
+      '@deepseek-ai/dsh-agent':
+        specifier: workspace:^
+        version: link:../../core/agent
+      '@deepseek-ai/dsh-bash':
+        specifier: workspace:^
+        version: link:../bash
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@deepseek-ai/dsh-llm':
+        specifier: workspace:^
+        version: link:../../llm/llm
+      '@deepseek-ai/dsh-paths':
+        specifier: workspace:^
+        version: link:../../util/paths
+      '@deepseek-ai/dsh-session-persistence':
+        specifier: workspace:^
+        version: link:../../session-persistence/session-persistence
+      '@deepseek-ai/dsh-tools':
+        specifier: workspace:^
+        version: link:../../core/tools
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: link:../../../vendor/cordis
+
  packages/bash/bash-local:
    dependencies:
      schemastery:
@@ -928,6 +977,31 @@ importers:
        specifier: 0.0.0-test.0
        version: 0.0.0-test.0

+  packages/bash/pwsh-local:
+    dependencies:
+      schemastery:
+        specifier: ^3.18.0
+        version: link:../../../vendor/schemastery
+    devDependencies:
+      '@deepseek-ai/dsh-bash':
+        specifier: workspace:^
+        version: link:../bash
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@deepseek-ai/dsh-subprocess':
+        specifier: workspace:^
+        version: link:../../subprocess/subprocess
+      '@deepseek-ai/dsh-subprocess-local':
+        specifier: workspace:^
+        version: link:../../subprocess/subprocess-local
+      '@deepseek-ai/dsh-timeout':
+        specifier: workspace:^
+        version: link:../../util/timeout
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: link:../../../vendor/cordis
+
  packages/bash/tool-bash:
    dependencies:
      schemastery:
@@ -946,6 +1020,9 @@ importers:
      '@deepseek-ai/dsh-bash':
        specifier: workspace:^
        version: link:../bash
+      '@deepseek-ai/dsh-bash-env':
+        specifier: workspace:^
+        version: link:../bash-env
      '@deepseek-ai/dsh-bash-local':
        specifier: workspace:^
        version: link:../bash-local
@@ -955,9 +1032,6 @@ importers:
      '@deepseek-ai/dsh-llm':
        specifier: workspace:^
        version: link:../../llm/llm
-      '@deepseek-ai/dsh-paths':
-        specifier: workspace:^
-        version: link:../../util/paths
      '@deepseek-ai/dsh-sandbox':
        specifier: workspace:^
        version: link:../../sandbox/sandbox
@@ -967,9 +1041,6 @@ importers:
      '@deepseek-ai/dsh-session':
        specifier: workspace:^
        version: link:../../core/session
-      '@deepseek-ai/dsh-session-persistence':
-        specifier: workspace:^
-        version: link:../../session-persistence/session-persistence
      '@deepseek-ai/dsh-session-persistence-jsonl':
        specifier: workspace:^
        version: link:../../session-persistence/session-persistence-jsonl
@@ -998,6 +1069,55 @@ importers:
        specifier: ^4.0.0-rc.7
        version: link:../../../vendor/cordis

+  packages/bash/tool-pwsh:
+    dependencies:
+      schemastery:
+        specifier: ^3.18.0
+        version: link:../../../vendor/schemastery
+    devDependencies:
+      '@deepseek-ai/dsh-agent':
+        specifier: workspace:^
+        version: link:../../core/agent
+      '@deepseek-ai/dsh-bash':
+        specifier: workspace:^
+        version: link:../bash
+      '@deepseek-ai/dsh-bash-env':
+        specifier: workspace:^
+        version: link:../bash-env
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@deepseek-ai/dsh-llm':
+        specifier: workspace:^
+        version: link:../../llm/llm
+      '@deepseek-ai/dsh-loader-smoke':
+        specifier: workspace:^
+        version: link:../../support/loader-smoke
+      '@deepseek-ai/dsh-pwsh-local':
+        specifier: workspace:^
+        version: link:../pwsh-local
+      '@deepseek-ai/dsh-subprocess-local':
+        specifier: workspace:^
+        version: link:../../subprocess/subprocess-local
+      '@deepseek-ai/dsh-system-prompt':
+        specifier: workspace:^
+        version: link:../../core/system-prompt
+      '@deepseek-ai/dsh-tasks':
+        specifier: workspace:^
+        version: link:../../tasks/tasks
+      '@deepseek-ai/dsh-tasks-local':
+        specifier: workspace:^
+        version: link:../../tasks/tasks-local
+      '@deepseek-ai/dsh-tool-tasks':
+        specifier: workspace:^
+        version: link:../../tasks/tool-tasks
+      '@deepseek-ai/dsh-tools':
+        specifier: workspace:^
+        version: link:../../core/tools
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: link:../../../vendor/cordis
+
  packages/client/connection:
    dependencies:
      '@deepseek-ai/dsh-commands':
@@ -2689,6 +2809,9 @@ importers:
      '@deepseek-ai/dsh-agent-loop':
        specifier: workspace:^
        version: link:../../core/agent-loop
+      '@deepseek-ai/dsh-bash-env':
+        specifier: workspace:^
+        version: link:../../bash/bash-env
      '@deepseek-ai/dsh-bash-local':
        specifier: workspace:^
        version: link:../../bash/bash-local
@@ -3517,6 +3640,9 @@ importers:
      '@deepseek-ai/dsh-native-command':
        specifier: workspace:^
        version: link:../../util/native-command
+      koffi:
+        specifier: ^3.1.0
+        version: 3.1.1
    devDependencies:
      '@deepseek-ai/dsh-client-runtime':
        specifier: workspace:^
@@ -3539,6 +3665,9 @@ importers:
      react:
        specifier: ^18.2.0
        version: 18.3.1
+      tsx:
+        specifier: ^4.19.2
+        version: 4.22.4

  packages/host/webserver:
    dependencies:
@@ -6274,6 +6403,9 @@ importers:
      '@deepseek-ai/dsh-bash':
        specifier: workspace:^
        version: link:../../packages/bash/bash
+      '@deepseek-ai/dsh-bash-env':
+        specifier: workspace:^
+        version: link:../../packages/bash/bash-env
      '@deepseek-ai/dsh-bash-local':
        specifier: workspace:^
        version: link:../../packages/bash/bash-local