Просмотр исходного кода

Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue

Tianyi Cui 2 месяцев назад
Родитель
Сommit
f0e23fab13

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
examples/acp-agent/tests/snapshots/permission-switching/session.jsonl


+ 5 - 5
packages/bash/tool-bash/src/index.ts

@@ -173,15 +173,15 @@ function bashDescription(escalationModes: readonly SandboxMode[]): string {
     + 'poll it with `bash_output` and stop it with `bash_kill`.'
   if (escalationModes.length === 0) return base
   return base + ' Attempting a command the sandbox may deny is safe and expected: run it and read the '
-    + 'marker rather than assuming the denial. When a command IS denied and a wider mode would let it '
-    + 'succeed, escalate immediately in the SAME turn — the ONE sanctioned exception to a denial: retry '
+    + 'marker rather than assuming the denial. When a command is denied and a wider mode would let it '
+    + 'succeed, escalate immediately in the same turn — the one sanctioned exception to a denial: retry '
     + 'the exact same command once with `sandbox_permissions` (the narrowest wider mode that suffices) '
     + 'plus a one-sentence `justification`. Do not detour through chat to ask permission first — the '
-    + 'approval prompt raised by that retry IS how the user consents. If the session states approval '
+    + 'approval prompt raised by that retry is how the user consents. If the session states approval '
     + 'prompts are disabled, there is no exception: a denial is final — do not set `sandbox_permissions`. '
-    + 'Never escalate speculatively: ground the request in a real denial — normally the one THIS command '
+    + 'Never escalate speculatively: ground the request in a real denial — normally the one this command '
     + 'just hit; escalating up front is fine only when this session already denied the same access. '
-    + 'A rejected escalation is final for THAT command — stop and explain, never work around '
+    + 'A rejected escalation is final for that command — stop and explain, never work around '
     + 'it — but it does not forbid attempting or escalating other commands later.'
 }
 

Некоторые файлы не были показаны из-за большого количества измененных файлов