Merge origin/master into codex/sandbox-policy-context

2026-07-30 15:53:48 +08:00
parent 4a72beacf2 09c217eba7
commit 96540c3242
80 changed files with 4311 additions and 437 deletions
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,7 @@ settings:

 patchedDependencies:
  '@earendil-works/pi-tui@0.80.7': 6c30c5386c0159131e1361023cddf31377f5728962524841964373312c1ed946
+  node-pty@1.1.0: 7a0c04f1f49d798a9ffe2f7f414c01064a44ca2489772d0c3e1235ab336755e6

 importers:

@@ -598,6 +599,9 @@ importers:
      '@deepseek-ai/dsh-tool-ask-user':
        specifier: workspace:*
        version: link:../packages/ui/tool-ask-user
+      '@deepseek-ai/dsh-tool-bash-persistent':
+        specifier: workspace:*
+        version: link:../packages/pty/tool-bash-persistent
      '@deepseek-ai/dsh-tool-cordis':
        specifier: workspace:*
        version: link:../packages/cordis/tool-cordis
@@ -622,6 +626,9 @@ importers:
      '@deepseek-ai/dsh-tool-session-query':
        specifier: workspace:*
        version: link:../packages/session-query/tool-session-query
+      '@deepseek-ai/dsh-tool-str-replace-editor':
+        specifier: workspace:*
+        version: link:../packages/fs/tool-str-replace-editor
      '@deepseek-ai/dsh-tool-subagent':
        specifier: workspace:*
        version: link:../packages/subagent/tool-subagent
@@ -655,7 +662,7 @@ importers:
    devDependencies:
      node-pty:
        specifier: 1.1.0
-        version: 1.1.0
+        version: 1.1.0(patch_hash=7a0c04f1f49d798a9ffe2f7f414c01064a44ca2489772d0c3e1235ab336755e6)

  packages/acp/acp:
    dependencies:
@@ -2654,6 +2661,52 @@ importers:
        specifier: ^4.0.0-rc.6
        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)

+  packages/fs/tool-str-replace-editor:
+    dependencies:
+      schemastery:
+        specifier: ^3.18.0
+        version: 3.18.0
+    devDependencies:
+      '@deepseek-ai/dsh-agent':
+        specifier: workspace:^
+        version: link:../../core/agent
+      '@deepseek-ai/dsh-fs':
+        specifier: workspace:^
+        version: link:../fs
+      '@deepseek-ai/dsh-fs-local':
+        specifier: workspace:^
+        version: link:../fs-local
+      '@deepseek-ai/dsh-fs-policy':
+        specifier: workspace:^
+        version: link:../fs-policy
+      '@deepseek-ai/dsh-fs-sandbox':
+        specifier: workspace:^
+        version: link:../fs-sandbox
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@deepseek-ai/dsh-llm':
+        specifier: workspace:^
+        version: link:../../llm/llm
+      '@deepseek-ai/dsh-sandbox':
+        specifier: workspace:^
+        version: link:../../sandbox/sandbox
+      '@deepseek-ai/dsh-sandbox-policy':
+        specifier: workspace:^
+        version: link:../../sandbox/sandbox-policy
+      '@deepseek-ai/dsh-session':
+        specifier: workspace:^
+        version: link:../../core/session
+      '@deepseek-ai/dsh-system-prompt':
+        specifier: workspace:^
+        version: link:../../core/system-prompt
+      '@deepseek-ai/dsh-tools':
+        specifier: workspace:^
+        version: link:../../core/tools
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+
  packages/goal/command-goal:
    devDependencies:
      '@cordisjs/plugin-loader':
@@ -3429,7 +3482,7 @@ importers:
    dependencies:
      node-pty:
        specifier: ^1.1.0
-        version: 1.1.0
+        version: 1.1.0(patch_hash=7a0c04f1f49d798a9ffe2f7f414c01064a44ca2489772d0c3e1235ab336755e6)
      schemastery:
        specifier: ^3.18.0
        version: 3.18.0
@@ -3459,6 +3512,55 @@ importers:
        specifier: ^4.0.0-rc.7
        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)

+  packages/pty/tool-bash-persistent:
+    dependencies:
+      schemastery:
+        specifier: ^3.18.0
+        version: 3.18.0
+    devDependencies:
+      '@cordisjs/plugin-include':
+        specifier: workspace:^
+        version: link:../../../vendor/include
+      '@cordisjs/plugin-loader':
+        specifier: workspace:^
+        version: link:../../../vendor/loader
+      '@deepseek-ai/dsh-agent':
+        specifier: workspace:^
+        version: link:../../core/agent
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@deepseek-ai/dsh-llm':
+        specifier: workspace:^
+        version: link:../../llm/llm
+      '@deepseek-ai/dsh-pty':
+        specifier: workspace:^
+        version: link:../pty
+      '@deepseek-ai/dsh-pty-local':
+        specifier: workspace:^
+        version: link:../pty-local
+      '@deepseek-ai/dsh-sandbox':
+        specifier: workspace:^
+        version: link:../../sandbox/sandbox
+      '@deepseek-ai/dsh-sandbox-policy':
+        specifier: workspace:^
+        version: link:../../sandbox/sandbox-policy
+      '@deepseek-ai/dsh-session':
+        specifier: workspace:^
+        version: link:../../core/session
+      '@deepseek-ai/dsh-system-prompt':
+        specifier: workspace:^
+        version: link:../../core/system-prompt
+      '@deepseek-ai/dsh-timeout':
+        specifier: workspace:^
+        version: link:../../util/timeout
+      '@deepseek-ai/dsh-tools':
+        specifier: workspace:^
+        version: link:../../core/tools
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: 4.0.0-rc.7(@cordisjs/plugin-include@vendor+include)(@cordisjs/plugin-loader@vendor+loader)
+
  packages/pty/tool-pty:
    dependencies:
      schemastery:
@@ -5723,6 +5825,12 @@ importers:
      '@deepseek-ai/dsh-plan-mode':
        specifier: workspace:^
        version: link:../../packages/plan/plan-mode
+      '@deepseek-ai/dsh-pty':
+        specifier: workspace:^
+        version: link:../../packages/pty/pty
+      '@deepseek-ai/dsh-pty-local':
+        specifier: workspace:^
+        version: link:../../packages/pty/pty-local
      '@deepseek-ai/dsh-repeat-tool-guard':
        specifier: workspace:^
        version: link:../../packages/guard/repeat-tool-guard
@@ -5732,6 +5840,9 @@ importers:
      '@deepseek-ai/dsh-sandbox':
        specifier: workspace:^
        version: link:../../packages/sandbox/sandbox
+      '@deepseek-ai/dsh-sandbox-local':
+        specifier: workspace:^
+        version: link:../../packages/sandbox/sandbox-local
      '@deepseek-ai/dsh-sandbox-policy':
        specifier: workspace:^
        version: link:../../packages/sandbox/sandbox-policy
@@ -5822,6 +5933,9 @@ importers:
      '@deepseek-ai/dsh-tool-bash':
        specifier: workspace:^
        version: link:../../packages/bash/tool-bash
+      '@deepseek-ai/dsh-tool-bash-persistent':
+        specifier: workspace:^
+        version: link:../../packages/pty/tool-bash-persistent
      '@deepseek-ai/dsh-tool-cordis':
        specifier: workspace:^
        version: link:../../packages/cordis/tool-cordis
@@ -5834,6 +5948,9 @@ importers:
      '@deepseek-ai/dsh-tool-skill':
        specifier: workspace:^
        version: link:../../packages/skill/tool-skill
+      '@deepseek-ai/dsh-tool-str-replace-editor':
+        specifier: workspace:^
+        version: link:../../packages/fs/tool-str-replace-editor
      '@deepseek-ai/dsh-tool-subagent':
        specifier: workspace:^
        version: link:../../packages/subagent/tool-subagent
@@ -15525,7 +15642,7 @@ snapshots:
      fetch-blob: 3.2.0
      formdata-polyfill: 4.0.10

-  node-pty@1.1.0:
+  node-pty@1.1.0(patch_hash=7a0c04f1f49d798a9ffe2f7f414c01064a44ca2489772d0c3e1235ab336755e6):
    dependencies:
      node-addon-api: 7.1.1