strands-darwin 0.0.34 → 0.0.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +22 -3
- package/README.zh-CN.md +22 -3
- package/dist/patches/@strands-agents+sdk+1.16.0.patch +29 -15
- package/dist/patches/ink+7.1.1.patch +58 -0
- package/dist/src/agent/background-delegation.d.ts +3 -3
- package/dist/src/agent/background-delegation.js +2 -2
- package/dist/src/agent/background-delegation.js.map +1 -1
- package/dist/src/agent/context-breakdown.d.ts +2 -1
- package/dist/src/agent/context-breakdown.js +2 -1
- package/dist/src/agent/context-breakdown.js.map +1 -1
- package/dist/src/agent/instructions.d.ts +22 -3
- package/dist/src/agent/instructions.js +67 -34
- package/dist/src/agent/instructions.js.map +1 -1
- package/dist/src/agent/prompt-cache.js +15 -2
- package/dist/src/agent/prompt-cache.js.map +1 -1
- package/dist/src/agent/refusal.d.ts +44 -7
- package/dist/src/agent/refusal.js +54 -8
- package/dist/src/agent/refusal.js.map +1 -1
- package/dist/src/agent/rewind.d.ts +2 -0
- package/dist/src/agent/rewind.js +4 -1
- package/dist/src/agent/rewind.js.map +1 -1
- package/dist/src/agent/runtime.d.ts +86 -13
- package/dist/src/agent/runtime.js +250 -43
- package/dist/src/agent/runtime.js.map +1 -1
- package/dist/src/agent/session.d.ts +96 -4
- package/dist/src/agent/session.js +249 -9
- package/dist/src/agent/session.js.map +1 -1
- package/dist/src/agent/stream-idle.d.ts +16 -0
- package/dist/src/agent/stream-idle.js +127 -0
- package/dist/src/agent/stream-idle.js.map +1 -0
- package/dist/src/agent/stream-resumption.d.ts +5 -2
- package/dist/src/agent/stream-resumption.js +5 -2
- package/dist/src/agent/stream-resumption.js.map +1 -1
- package/dist/src/agent/system-prompt.d.ts +1 -1
- package/dist/src/agent/system-prompt.js +4 -1
- package/dist/src/agent/system-prompt.js.map +1 -1
- package/dist/src/agent/thinking.js +4 -2
- package/dist/src/agent/thinking.js.map +1 -1
- package/dist/src/agent/working-context.d.ts +21 -1
- package/dist/src/agent/working-context.js +28 -1
- package/dist/src/agent/working-context.js.map +1 -1
- package/dist/src/agent/workspace-trust.d.ts +112 -0
- package/dist/src/agent/workspace-trust.js +207 -0
- package/dist/src/agent/workspace-trust.js.map +1 -0
- package/dist/src/agentcore/auto-policy.d.ts +7 -0
- package/dist/src/agentcore/auto-policy.js +50 -0
- package/dist/src/agentcore/auto-policy.js.map +1 -0
- package/dist/src/agentcore/auto-state.d.ts +43 -0
- package/dist/src/agentcore/auto-state.js +73 -0
- package/dist/src/agentcore/auto-state.js.map +1 -0
- package/dist/src/agentcore/cli.d.ts +2 -0
- package/dist/src/agentcore/cli.js +38 -0
- package/dist/src/agentcore/cli.js.map +1 -0
- package/dist/src/agentcore/config.d.ts +48 -0
- package/dist/src/agentcore/config.js +44 -0
- package/dist/src/agentcore/config.js.map +1 -0
- package/dist/src/agentcore/controller.d.ts +105 -0
- package/dist/src/agentcore/controller.js +979 -0
- package/dist/src/agentcore/controller.js.map +1 -0
- package/dist/src/agentcore/projection.d.ts +2 -0
- package/dist/src/agentcore/projection.js +8 -0
- package/dist/src/agentcore/projection.js.map +1 -0
- package/dist/src/agentcore/records.d.ts +41 -0
- package/dist/src/agentcore/records.js +149 -0
- package/dist/src/agentcore/records.js.map +1 -0
- package/dist/src/agentcore/state.d.ts +16 -0
- package/dist/src/agentcore/state.js +149 -0
- package/dist/src/agentcore/state.js.map +1 -0
- package/dist/src/agentcore/tools.d.ts +3 -0
- package/dist/src/agentcore/tools.js +11 -0
- package/dist/src/agentcore/tools.js.map +1 -0
- package/dist/src/agentcore/transport.d.ts +37 -0
- package/dist/src/agentcore/transport.js +242 -0
- package/dist/src/agentcore/transport.js.map +1 -0
- package/dist/src/agentcore/upload-projection.d.ts +208 -0
- package/dist/src/agentcore/upload-projection.js +823 -0
- package/dist/src/agentcore/upload-projection.js.map +1 -0
- package/dist/src/agents/child-recipe.js +4 -1
- package/dist/src/agents/child-recipe.js.map +1 -1
- package/dist/src/agents/loader.d.ts +12 -0
- package/dist/src/agents/loader.js +15 -1
- package/dist/src/agents/loader.js.map +1 -1
- package/dist/src/agents/subagent-tool.js +6 -7
- package/dist/src/agents/subagent-tool.js.map +1 -1
- package/dist/src/agents/workflow-tool.js +4 -6
- package/dist/src/agents/workflow-tool.js.map +1 -1
- package/dist/src/cli-doctor.js +14 -5
- package/dist/src/cli-doctor.js.map +1 -1
- package/dist/src/cli-import.d.ts +1 -0
- package/dist/src/cli-import.js +26 -0
- package/dist/src/cli-import.js.map +1 -0
- package/dist/src/cli-main.js +60 -10
- package/dist/src/cli-main.js.map +1 -1
- package/dist/src/cli-permissions.d.ts +2 -0
- package/dist/src/cli-permissions.js +20 -0
- package/dist/src/cli-permissions.js.map +1 -0
- package/dist/src/cli-sessions.js +6 -2
- package/dist/src/cli-sessions.js.map +1 -1
- package/dist/src/cli-usage.d.ts +9 -1
- package/dist/src/cli-usage.js +13 -0
- package/dist/src/cli-usage.js.map +1 -1
- package/dist/src/cli.js +19 -2
- package/dist/src/cli.js.map +1 -1
- package/dist/src/commands/custom-commands.d.ts +1 -1
- package/dist/src/commands/custom-commands.js +20 -6
- package/dist/src/commands/custom-commands.js.map +1 -1
- package/dist/src/commands/init-command.d.ts +47 -0
- package/dist/src/commands/init-command.js +110 -0
- package/dist/src/commands/init-command.js.map +1 -0
- package/dist/src/commands/review-command.d.ts +10 -0
- package/dist/src/commands/review-command.js +28 -0
- package/dist/src/commands/review-command.js.map +1 -0
- package/dist/src/config-file.d.ts +9 -0
- package/dist/src/config-file.js +82 -0
- package/dist/src/config-file.js.map +1 -0
- package/dist/src/config.d.ts +100 -7
- package/dist/src/config.js +253 -46
- package/dist/src/config.js.map +1 -1
- package/dist/src/dev-repl.js +33 -2
- package/dist/src/dev-repl.js.map +1 -1
- package/dist/src/headless-protocol.d.ts +24 -1
- package/dist/src/headless-protocol.js +24 -5
- package/dist/src/headless-protocol.js.map +1 -1
- package/dist/src/headless-runner.d.ts +8 -0
- package/dist/src/headless-runner.js +42 -2
- package/dist/src/headless-runner.js.map +1 -1
- package/dist/src/headless.d.ts +11 -0
- package/dist/src/headless.js +33 -7
- package/dist/src/headless.js.map +1 -1
- package/dist/src/hooks/hook-process.js +7 -2
- package/dist/src/hooks/hook-process.js.map +1 -1
- package/dist/src/hooks/lifecycle-hooks.js +3 -1
- package/dist/src/hooks/lifecycle-hooks.js.map +1 -1
- package/dist/src/hooks/tool-hooks.js +3 -1
- package/dist/src/hooks/tool-hooks.js.map +1 -1
- package/dist/src/import-claude-files.d.ts +28 -0
- package/dist/src/import-claude-files.js +227 -0
- package/dist/src/import-claude-files.js.map +1 -0
- package/dist/src/import-claude-snippets.d.ts +2 -0
- package/dist/src/import-claude-snippets.js +105 -0
- package/dist/src/import-claude-snippets.js.map +1 -0
- package/dist/src/import-claude.d.ts +13 -0
- package/dist/src/import-claude.js +287 -0
- package/dist/src/import-claude.js.map +1 -0
- package/dist/src/mcp/registry.d.ts +57 -1
- package/dist/src/mcp/registry.js +78 -6
- package/dist/src/mcp/registry.js.map +1 -1
- package/dist/src/memory/command.d.ts +1 -1
- package/dist/src/memory/command.js +89 -4
- package/dist/src/memory/command.js.map +1 -1
- package/dist/src/memory/controller.d.ts +32 -0
- package/dist/src/memory/controller.js +39 -3
- package/dist/src/memory/controller.js.map +1 -1
- package/dist/src/memory/state.d.ts +6 -0
- package/dist/src/memory/state.js +6 -1
- package/dist/src/memory/state.js.map +1 -1
- package/dist/src/memory/store.d.ts +13 -0
- package/dist/src/memory/store.js +38 -2
- package/dist/src/memory/store.js.map +1 -1
- package/dist/src/memory/tools.d.ts +7 -0
- package/dist/src/memory/tools.js +12 -1
- package/dist/src/memory/tools.js.map +1 -1
- package/dist/src/paths.js +3 -0
- package/dist/src/paths.js.map +1 -1
- package/dist/src/permissions-test.d.ts +18 -0
- package/dist/src/permissions-test.js +207 -0
- package/dist/src/permissions-test.js.map +1 -0
- package/dist/src/pricing/model-prices.d.ts +11 -6
- package/dist/src/pricing/model-prices.js +37 -16
- package/dist/src/pricing/model-prices.js.map +1 -1
- package/dist/src/project-identity.d.ts +3 -0
- package/dist/src/project-identity.js +8 -0
- package/dist/src/project-identity.js.map +1 -0
- package/dist/src/project-overrides.d.ts +57 -0
- package/dist/src/project-overrides.js +79 -0
- package/dist/src/project-overrides.js.map +1 -0
- package/dist/src/skills/builtin/setup-agentcore-memory/SKILL.md +158 -0
- package/dist/src/skills/loader.d.ts +1 -1
- package/dist/src/skills/loader.js +4 -1
- package/dist/src/skills/loader.js.map +1 -1
- package/dist/src/tools/background-bash.d.ts +21 -3
- package/dist/src/tools/background-bash.js +44 -8
- package/dist/src/tools/background-bash.js.map +1 -1
- package/dist/src/tools/file-editor-serial.d.ts +14 -0
- package/dist/src/tools/file-editor-serial.js +15 -0
- package/dist/src/tools/file-editor-serial.js.map +1 -1
- package/dist/src/tools/shell-env.d.ts +101 -0
- package/dist/src/tools/shell-env.js +173 -0
- package/dist/src/tools/shell-env.js.map +1 -0
- package/dist/src/trajectory/reader.d.ts +1 -1
- package/dist/src/trajectory/reader.js +23 -3
- package/dist/src/trajectory/reader.js.map +1 -1
- package/dist/src/trajectory/replay.js +23 -0
- package/dist/src/trajectory/replay.js.map +1 -1
- package/dist/src/trajectory/resume-recap.d.ts +11 -1
- package/dist/src/trajectory/resume-recap.js +10 -1
- package/dist/src/trajectory/resume-recap.js.map +1 -1
- package/dist/src/trajectory/rewind-history.d.ts +8 -0
- package/dist/src/trajectory/rewind-history.js +81 -0
- package/dist/src/trajectory/rewind-history.js.map +1 -0
- package/dist/src/trajectory/writer.d.ts +44 -3
- package/dist/src/trajectory/writer.js +80 -14
- package/dist/src/trajectory/writer.js.map +1 -1
- package/dist/src/tui/App.d.ts +8 -1
- package/dist/src/tui/App.js +453 -75
- package/dist/src/tui/App.js.map +1 -1
- package/dist/src/tui/InputBox.d.ts +1 -1
- package/dist/src/tui/InputBox.js +1 -1
- package/dist/src/tui/MessageList.js +1 -1
- package/dist/src/tui/MessageList.js.map +1 -1
- package/dist/src/tui/PermissionPrompt.js +5 -3
- package/dist/src/tui/PermissionPrompt.js.map +1 -1
- package/dist/src/tui/QueuedMessages.js +14 -8
- package/dist/src/tui/QueuedMessages.js.map +1 -1
- package/dist/src/tui/ToolCallPanel.js +2 -2
- package/dist/src/tui/ToolCallPanel.js.map +1 -1
- package/dist/src/tui/WorkspaceTrustPrompt.d.ts +8 -0
- package/dist/src/tui/WorkspaceTrustPrompt.js +37 -0
- package/dist/src/tui/WorkspaceTrustPrompt.js.map +1 -0
- package/dist/src/tui/draft-stash.d.ts +25 -0
- package/dist/src/tui/draft-stash.js +49 -0
- package/dist/src/tui/draft-stash.js.map +1 -0
- package/dist/src/tui/frame-budget.d.ts +2 -2
- package/dist/src/tui/frame-budget.js +3 -3
- package/dist/src/tui/frame-budget.js.map +1 -1
- package/dist/src/tui/help-format.d.ts +2 -2
- package/dist/src/tui/help-format.js +3 -3
- package/dist/src/tui/help-format.js.map +1 -1
- package/dist/src/tui/instructions-format.d.ts +14 -0
- package/dist/src/tui/instructions-format.js +24 -0
- package/dist/src/tui/instructions-format.js.map +1 -0
- package/dist/src/tui/mcp-format.d.ts +9 -0
- package/dist/src/tui/mcp-format.js +5 -3
- package/dist/src/tui/mcp-format.js.map +1 -1
- package/dist/src/tui/permission-rule-preview.d.ts +23 -0
- package/dist/src/tui/permission-rule-preview.js +38 -0
- package/dist/src/tui/permission-rule-preview.js.map +1 -0
- package/dist/src/tui/prompt-editor.d.ts +12 -0
- package/dist/src/tui/prompt-editor.js +38 -28
- package/dist/src/tui/prompt-editor.js.map +1 -1
- package/dist/src/tui/prompt-history-search.js +3 -2
- package/dist/src/tui/prompt-history-search.js.map +1 -1
- package/dist/src/tui/prompt-queue.d.ts +4 -2
- package/dist/src/tui/prompt-queue.js +22 -5
- package/dist/src/tui/prompt-queue.js.map +1 -1
- package/dist/src/tui/rewind-search.js +4 -3
- package/dist/src/tui/rewind-search.js.map +1 -1
- package/dist/src/tui/search-preview.d.ts +2 -0
- package/dist/src/tui/search-preview.js +9 -0
- package/dist/src/tui/search-preview.js.map +1 -0
- package/dist/src/tui/shell-command.js +4 -1
- package/dist/src/tui/shell-command.js.map +1 -1
- package/dist/src/tui/spinner.d.ts +1 -0
- package/dist/src/tui/spinner.js +6 -0
- package/dist/src/tui/spinner.js.map +1 -0
- package/dist/src/tui/status-format.d.ts +24 -0
- package/dist/src/tui/status-format.js +62 -2
- package/dist/src/tui/status-format.js.map +1 -1
- package/dist/src/tui/subagent-format.js +6 -0
- package/dist/src/tui/subagent-format.js.map +1 -1
- package/dist/src/tui/tangent.d.ts +122 -0
- package/dist/src/tui/tangent.js +153 -0
- package/dist/src/tui/tangent.js.map +1 -0
- package/dist/src/tui/task-format.d.ts +5 -0
- package/dist/src/tui/task-format.js +15 -0
- package/dist/src/tui/task-format.js.map +1 -1
- package/dist/src/tui/trust-format.d.ts +31 -0
- package/dist/src/tui/trust-format.js +102 -0
- package/dist/src/tui/trust-format.js.map +1 -0
- package/dist/src/tui/turn-state.d.ts +13 -1
- package/dist/src/tui/turn-state.js +13 -0
- package/dist/src/tui/turn-state.js.map +1 -1
- package/package.json +4 -3
|
@@ -1,14 +1,29 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Project instructions preloaded from AGENTS.md.
|
|
2
|
+
* Project instructions preloaded from AGENTS.md — or, when there is none, CLAUDE.md.
|
|
3
3
|
*
|
|
4
|
-
* Only the run directory's own
|
|
5
|
-
*
|
|
6
|
-
*
|
|
4
|
+
* Only the run directory's own file is read: no walking up to parent directories
|
|
5
|
+
* and no merging of several files, so what reaches the model is exactly one file
|
|
6
|
+
* sitting next to the repository the user is working in. There is exactly one
|
|
7
|
+
* fallback name and it is fixed: `CLAUDE.md` (Claude Code's convention) is tried
|
|
8
|
+
* only when `AGENTS.md` does not exist at all. An `AGENTS.md` that is present but
|
|
9
|
+
* unusable decides the outcome by itself; when both files exist, `CLAUDE.md` is
|
|
10
|
+
* never opened.
|
|
7
11
|
*/
|
|
8
12
|
import { readFile } from 'node:fs/promises';
|
|
9
13
|
import path from 'node:path';
|
|
10
14
|
import { StringDecoder } from 'node:string_decoder';
|
|
11
15
|
export const AGENTS_FILENAME = 'AGENTS.md';
|
|
16
|
+
/** Read only when {@link AGENTS_FILENAME} does not exist. */
|
|
17
|
+
export const CLAUDE_FILENAME = 'CLAUDE.md';
|
|
18
|
+
/** Lookup order — the first file that exists decides, whether or not it can be read. */
|
|
19
|
+
const INSTRUCTIONS_FILENAMES = [AGENTS_FILENAME, CLAUDE_FILENAME];
|
|
20
|
+
/**
|
|
21
|
+
* One fixed line for the CLAUDE.md case only. Claude Code expands `@path` lines
|
|
22
|
+
* into the referenced files; darwin does not, so without this the model would
|
|
23
|
+
* take an import line for content it has already been given.
|
|
24
|
+
*/
|
|
25
|
+
export const CLAUDE_IMPORT_NOTICE = `(Loaded from ${CLAUDE_FILENAME} because there is no ${AGENTS_FILENAME}. ` +
|
|
26
|
+
'`@path` import lines are not expanded by darwin: they are literal text here, not loaded content.)';
|
|
12
27
|
/**
|
|
13
28
|
* Instructions past this size are truncated rather than sent whole.
|
|
14
29
|
*
|
|
@@ -18,7 +33,8 @@ export const AGENTS_FILENAME = 'AGENTS.md';
|
|
|
18
33
|
*/
|
|
19
34
|
export const MAX_INSTRUCTIONS_BYTES = 32 * 1024;
|
|
20
35
|
/**
|
|
21
|
-
* Reads `<projectRoot>/AGENTS.md
|
|
36
|
+
* Reads `<projectRoot>/AGENTS.md`, or `<projectRoot>/CLAUDE.md` when the former
|
|
37
|
+
* does not exist.
|
|
22
38
|
*
|
|
23
39
|
* A broken file never blocks startup — the agent works without project
|
|
24
40
|
* instructions — but the two ways of ending up without them are not the same. No
|
|
@@ -27,34 +43,46 @@ export const MAX_INSTRUCTIONS_BYTES = 32 * 1024;
|
|
|
27
43
|
* user has rules they believe are in effect and nothing on screen contradicts
|
|
28
44
|
* that. Same isolation rule as a broken skill directory: skip it, say why.
|
|
29
45
|
*
|
|
46
|
+
* Only a truly missing `AGENTS.md` moves on to `CLAUDE.md`: an unreadable one is
|
|
47
|
+
* reported as such and never falls through, because the file the user wrote
|
|
48
|
+
* rules into is the one that must decide. Whichever file is found first is the
|
|
49
|
+
* only one opened.
|
|
50
|
+
*
|
|
30
51
|
* An empty or whitespace-only file is silently skipped: injecting the delimiters
|
|
31
52
|
* with nothing between them would only point the model at emptiness.
|
|
32
53
|
*/
|
|
33
54
|
export async function loadProjectInstructions(projectRoot) {
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
55
|
+
for (const filename of INSTRUCTIONS_FILENAMES) {
|
|
56
|
+
const filePath = path.join(projectRoot, filename);
|
|
57
|
+
let raw;
|
|
58
|
+
try {
|
|
59
|
+
raw = await readFile(filePath);
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
if (isMissingFile(error))
|
|
63
|
+
continue;
|
|
64
|
+
return { instructions: undefined, problem: describe(error), problemFile: filename };
|
|
65
|
+
}
|
|
66
|
+
const bytes = raw.byteLength;
|
|
67
|
+
const truncated = bytes > MAX_INSTRUCTIONS_BYTES;
|
|
68
|
+
const text = truncated
|
|
69
|
+
? clipToLastLine(raw.subarray(0, MAX_INSTRUCTIONS_BYTES))
|
|
70
|
+
: raw.toString('utf8');
|
|
71
|
+
if (text.trim() === '')
|
|
72
|
+
return { instructions: undefined, problem: undefined, problemFile: undefined };
|
|
73
|
+
return {
|
|
74
|
+
instructions: {
|
|
75
|
+
filename,
|
|
76
|
+
path: filePath,
|
|
77
|
+
bytes,
|
|
78
|
+
truncated,
|
|
79
|
+
fragment: renderFragment(text.trimEnd(), truncated, filename),
|
|
80
|
+
},
|
|
81
|
+
problem: undefined,
|
|
82
|
+
problemFile: undefined,
|
|
83
|
+
};
|
|
41
84
|
}
|
|
42
|
-
|
|
43
|
-
const truncated = bytes > MAX_INSTRUCTIONS_BYTES;
|
|
44
|
-
const text = truncated
|
|
45
|
-
? clipToLastLine(raw.subarray(0, MAX_INSTRUCTIONS_BYTES))
|
|
46
|
-
: raw.toString('utf8');
|
|
47
|
-
if (text.trim() === '')
|
|
48
|
-
return { instructions: undefined, problem: undefined };
|
|
49
|
-
return {
|
|
50
|
-
instructions: {
|
|
51
|
-
path: filePath,
|
|
52
|
-
bytes,
|
|
53
|
-
truncated,
|
|
54
|
-
fragment: renderFragment(text.trimEnd(), truncated),
|
|
55
|
-
},
|
|
56
|
-
problem: undefined,
|
|
57
|
-
};
|
|
85
|
+
return { instructions: undefined, problem: undefined, problemFile: undefined };
|
|
58
86
|
}
|
|
59
87
|
/**
|
|
60
88
|
* Places project instructions directly after the base prompt.
|
|
@@ -71,10 +99,11 @@ export function composeSystemPrompt(basePrompt, instructions) {
|
|
|
71
99
|
return `${basePrompt}\n\n${instructions.fragment}`;
|
|
72
100
|
}
|
|
73
101
|
/**
|
|
74
|
-
* True when the file is simply not there
|
|
102
|
+
* True when the file is simply not there — the only case that moves on to the
|
|
103
|
+
* fallback name.
|
|
75
104
|
*
|
|
76
105
|
* `ENOTDIR` counts: a path component that is a file rather than a directory means
|
|
77
|
-
* there is no
|
|
106
|
+
* there is no such file at that location either.
|
|
78
107
|
*/
|
|
79
108
|
function isMissingFile(error) {
|
|
80
109
|
const code = typeof error === 'object' && error !== null ? error.code : undefined;
|
|
@@ -100,14 +129,18 @@ function clipToLastLine(slice) {
|
|
|
100
129
|
/**
|
|
101
130
|
* Wraps the text in a labelled block. The source attribute matters: the model has
|
|
102
131
|
* to be able to tell these instructions came from the project's own file rather
|
|
103
|
-
* than from darwin itself, since only one of the two is something the user can edit
|
|
132
|
+
* than from darwin itself, since only one of the two is something the user can edit
|
|
133
|
+
* — and which file, since a CLAUDE.md may lean on Claude Code features (its
|
|
134
|
+
* `@path` imports) that darwin does not provide; {@link CLAUDE_IMPORT_NOTICE} says
|
|
135
|
+
* so once, in that case only.
|
|
104
136
|
*/
|
|
105
|
-
function renderFragment(text, truncated) {
|
|
137
|
+
function renderFragment(text, truncated, filename) {
|
|
106
138
|
const attributes = truncated
|
|
107
|
-
? `source="${
|
|
108
|
-
: `source="${
|
|
139
|
+
? `source="${filename}" truncated="true"`
|
|
140
|
+
: `source="${filename}"`;
|
|
109
141
|
return [
|
|
110
142
|
`<project-instructions ${attributes}>`,
|
|
143
|
+
...(filename === CLAUDE_FILENAME ? [CLAUDE_IMPORT_NOTICE] : []),
|
|
111
144
|
text,
|
|
112
145
|
...(truncated
|
|
113
146
|
? [`(This file is larger than ${MAX_INSTRUCTIONS_BYTES / 1024} KB and was cut off here.)`]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../../src/agent/instructions.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../../src/agent/instructions.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,8 +107,21 @@ export function bedrockCacheConfig(plan) {
|
|
|
107
107
|
return {
|
|
108
108
|
strategy: 'auto',
|
|
109
109
|
// One TTL everywhere: Bedrock requires TTLs to be non-increasing across
|
|
110
|
-
// tools → system → messages, and equal values satisfy that trivially.
|
|
111
|
-
|
|
110
|
+
// tools → system → messages, and equal values satisfy that trivially. The
|
|
111
|
+
// shared `ttl` matters as much as the per-section values: whenever a request
|
|
112
|
+
// carries a *string* system prompt — the SDK summarizer behind `/compact`,
|
|
113
|
+
// recipe children — the SDK auto-injects a system cache point of its own and
|
|
114
|
+
// fills its TTL from `systemPromptTTL`/`ttl`. Without these, that point stays
|
|
115
|
+
// at Bedrock's `5m` default between a `1h` tools point and a `1h` messages
|
|
116
|
+
// point, and Bedrock rejects the request (`a ttl='1h' cache_control block
|
|
117
|
+
// must not come after a ttl='5m' cache_control block`). Darwin's hand-placed
|
|
118
|
+
// system point already carries the TTL, so it is left as written.
|
|
119
|
+
...(plan.ttl !== undefined && {
|
|
120
|
+
ttl: plan.ttl,
|
|
121
|
+
toolsTTL: plan.ttl,
|
|
122
|
+
systemPromptTTL: plan.ttl,
|
|
123
|
+
messagesTTL: plan.ttl,
|
|
124
|
+
}),
|
|
112
125
|
};
|
|
113
126
|
}
|
|
114
127
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-cache.js","sourceRoot":"","sources":["../../../src/agent/prompt-cache.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAMjE;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,CAAU,CAAC;AAGvD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAmB,IAAI,CAAC;AAsB7D;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAErD,MAAM,QAAQ,GAAoB;IAChC,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE,EAAE;IACT,GAAG,EAAE,SAAS;IACd,OAAO,EAAE,SAAS;CACnB,CAAC;AACF,MAAM,SAAS,GAAoB,EAAE,GAAG,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAEpE;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,MAAiB;IAC/C,IAAI,CAAC,MAAM,CAAC,WAAW;QAAE,OAAO,QAAQ,CAAC;IAEzC,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,IAAI,wBAAwB,CAAC;IAE9D,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,SAAS;YACZ,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjC,OAAO,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,cAAc,CAAC;gBACjD,GAAG;gBACH,OAAO,EAAE,SAAS;aACnB,CAAC;QACJ,KAAK,WAAW;YACd,0EAA0E;YAC1E,qEAAqE;YACrE,qEAAqE;YACrE,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,cAAc,CAAC;gBACjD,GAAG;gBACH,OAAO,EAAE,SAAS;aACnB,CAAC;QACJ,KAAK,QAAQ;YACX,wEAAwE;YACxE,4EAA4E;YAC5E,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAqB;IACtD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC;QAAE,OAAO,SAAS,CAAC;IAE5F,OAAO;QACL,QAAQ,EAAE,MAAM;QAChB,wEAAwE;QACxE,
|
|
1
|
+
{"version":3,"file":"prompt-cache.js","sourceRoot":"","sources":["../../../src/agent/prompt-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Refusal-class stop reasons — the provider or its classifiers declined the request.
|
|
3
3
|
*
|
|
4
4
|
* Claude Fable 5.1 (and the Mythos line) end such a turn *successfully* from the
|
|
5
5
|
* SDK's point of view: the agent loop sees a non-`toolUse` stop and returns an
|
|
@@ -8,13 +8,50 @@
|
|
|
8
8
|
* reported as `succeeded`. The drivers and delegation tools ask here and state the
|
|
9
9
|
* outcome; the loop itself is never touched (the SDK owns the stop, darwin only
|
|
10
10
|
* names it).
|
|
11
|
+
*
|
|
12
|
+
* The stop-reason vocabulary differs per provider, so the class is a fixed set of
|
|
13
|
+
* exactly three SDK words, not one provider's string (SRF-029 — a Bedrock session
|
|
14
|
+
* lost three turns to `contentFiltered` while only `refusal` was recognised):
|
|
15
|
+
*
|
|
16
|
+
* - `refusal` — the direct Anthropic provider (`models/anthropic.js`) passes the
|
|
17
|
+
* API's `stop_reason: "refusal"` through unchanged: the model's own classifiers
|
|
18
|
+
* blocked the response.
|
|
19
|
+
* - `contentFiltered` — the Bedrock provider's `STOP_REASON_MAP` (`models/bedrock.js`)
|
|
20
|
+
* for Converse's `content_filtered`: the same classifier block, reached through
|
|
21
|
+
* Bedrock, which spells it differently.
|
|
22
|
+
* - `guardrailIntervened` — the same map's `guardrail_intervened`: a configured
|
|
23
|
+
* Bedrock Guardrail, not the model, stopped the turn. Kept distinguishable from the
|
|
24
|
+
* classifier block because the remedy differs (the guardrail is the account's).
|
|
25
|
+
*
|
|
26
|
+
* Nothing else qualifies. `maxTokens`, `stopSequence`, `endTurn` and `toolUse` are
|
|
27
|
+
* the model finishing on its own terms; `cancelled`, `interrupt` and `checkpoint`
|
|
28
|
+
* are darwin's or the SDK's own stops. Every user-facing string names the reason
|
|
29
|
+
* actually received, so a reader can tell the three apart.
|
|
11
30
|
*/
|
|
12
|
-
/** The SDK
|
|
13
|
-
export declare const
|
|
31
|
+
/** The SDK stop reasons that mean "the provider or its classifiers declined". */
|
|
32
|
+
export declare const REFUSAL_STOP_REASONS: readonly ["refusal", "contentFiltered", "guardrailIntervened"];
|
|
33
|
+
export type RefusalStopReason = (typeof REFUSAL_STOP_REASONS)[number];
|
|
34
|
+
export declare function isRefusalStop(stopReason: string): stopReason is RefusalStopReason;
|
|
14
35
|
/** One bounded user-facing line for the transcript or stderr. */
|
|
15
|
-
export declare
|
|
36
|
+
export declare function refusalNotice(stopReason: string): string;
|
|
37
|
+
/**
|
|
38
|
+
* The TUI's variant of {@link refusalNotice}: the same line plus the remedy only the
|
|
39
|
+
* TUI can offer (SRF-030). A refused turn still appended the prompt and the declined
|
|
40
|
+
* reply to the SDK conversation, and `AgentRuntime.send` now catalogues its pre-prompt
|
|
41
|
+
* checkpoint, so `/rewind` to that prompt is the one user-chosen way to cut the
|
|
42
|
+
* exchange out before rephrasing — darwin never removes it on its own. Headless
|
|
43
|
+
* drivers have no `/rewind` and keep printing the base line.
|
|
44
|
+
*/
|
|
45
|
+
export declare function refusalNoticeWithRewind(stopReason: string): string;
|
|
16
46
|
/** The error a headless run ends with when a refusal left no reply at all. */
|
|
17
|
-
export declare
|
|
47
|
+
export declare function refusalEmptyReplyError(stopReason: string): string;
|
|
18
48
|
/** The fixed note a refused child's failure carries back to the parent. */
|
|
19
|
-
export declare
|
|
20
|
-
|
|
49
|
+
export declare function childRefusalError(stopReason: string): string;
|
|
50
|
+
/**
|
|
51
|
+
* The one line replay (and therefore `/export` and the resume recap) prints in the
|
|
52
|
+
* answer slot of a refusal-class turn, after whatever partial text it streamed. The
|
|
53
|
+
* live session showed {@link refusalNotice} instead — its remedy is advice for the
|
|
54
|
+
* moment, meaningless in a transcript read later — so the transcript states only
|
|
55
|
+
* the fact and the reason, parenthesised because it is not the model's text.
|
|
56
|
+
*/
|
|
57
|
+
export declare function refusalTranscriptLine(stopReason: string): string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Refusal-class stop reasons — the provider or its classifiers declined the request.
|
|
3
3
|
*
|
|
4
4
|
* Claude Fable 5.1 (and the Mythos line) end such a turn *successfully* from the
|
|
5
5
|
* SDK's point of view: the agent loop sees a non-`toolUse` stop and returns an
|
|
@@ -8,16 +8,62 @@
|
|
|
8
8
|
* reported as `succeeded`. The drivers and delegation tools ask here and state the
|
|
9
9
|
* outcome; the loop itself is never touched (the SDK owns the stop, darwin only
|
|
10
10
|
* names it).
|
|
11
|
+
*
|
|
12
|
+
* The stop-reason vocabulary differs per provider, so the class is a fixed set of
|
|
13
|
+
* exactly three SDK words, not one provider's string (SRF-029 — a Bedrock session
|
|
14
|
+
* lost three turns to `contentFiltered` while only `refusal` was recognised):
|
|
15
|
+
*
|
|
16
|
+
* - `refusal` — the direct Anthropic provider (`models/anthropic.js`) passes the
|
|
17
|
+
* API's `stop_reason: "refusal"` through unchanged: the model's own classifiers
|
|
18
|
+
* blocked the response.
|
|
19
|
+
* - `contentFiltered` — the Bedrock provider's `STOP_REASON_MAP` (`models/bedrock.js`)
|
|
20
|
+
* for Converse's `content_filtered`: the same classifier block, reached through
|
|
21
|
+
* Bedrock, which spells it differently.
|
|
22
|
+
* - `guardrailIntervened` — the same map's `guardrail_intervened`: a configured
|
|
23
|
+
* Bedrock Guardrail, not the model, stopped the turn. Kept distinguishable from the
|
|
24
|
+
* classifier block because the remedy differs (the guardrail is the account's).
|
|
25
|
+
*
|
|
26
|
+
* Nothing else qualifies. `maxTokens`, `stopSequence`, `endTurn` and `toolUse` are
|
|
27
|
+
* the model finishing on its own terms; `cancelled`, `interrupt` and `checkpoint`
|
|
28
|
+
* are darwin's or the SDK's own stops. Every user-facing string names the reason
|
|
29
|
+
* actually received, so a reader can tell the three apart.
|
|
11
30
|
*/
|
|
12
|
-
/** The SDK
|
|
13
|
-
export const
|
|
31
|
+
/** The SDK stop reasons that mean "the provider or its classifiers declined". */
|
|
32
|
+
export const REFUSAL_STOP_REASONS = Object.freeze(['refusal', 'contentFiltered', 'guardrailIntervened']);
|
|
33
|
+
export function isRefusalStop(stopReason) {
|
|
34
|
+
return REFUSAL_STOP_REASONS.includes(stopReason);
|
|
35
|
+
}
|
|
14
36
|
/** One bounded user-facing line for the transcript or stderr. */
|
|
15
|
-
export
|
|
37
|
+
export function refusalNotice(stopReason) {
|
|
38
|
+
return `model declined this request (stop_reason: ${stopReason}) — rephrase it or start a new turn`;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* The TUI's variant of {@link refusalNotice}: the same line plus the remedy only the
|
|
42
|
+
* TUI can offer (SRF-030). A refused turn still appended the prompt and the declined
|
|
43
|
+
* reply to the SDK conversation, and `AgentRuntime.send` now catalogues its pre-prompt
|
|
44
|
+
* checkpoint, so `/rewind` to that prompt is the one user-chosen way to cut the
|
|
45
|
+
* exchange out before rephrasing — darwin never removes it on its own. Headless
|
|
46
|
+
* drivers have no `/rewind` and keep printing the base line.
|
|
47
|
+
*/
|
|
48
|
+
export function refusalNoticeWithRewind(stopReason) {
|
|
49
|
+
return `${refusalNotice(stopReason)} — the declined reply stays in the conversation; /rewind to this prompt removes it before you rephrase`;
|
|
50
|
+
}
|
|
16
51
|
/** The error a headless run ends with when a refusal left no reply at all. */
|
|
17
|
-
export
|
|
52
|
+
export function refusalEmptyReplyError(stopReason) {
|
|
53
|
+
return `The model declined this request (stop_reason: ${stopReason}) and produced no reply.`;
|
|
54
|
+
}
|
|
18
55
|
/** The fixed note a refused child's failure carries back to the parent. */
|
|
19
|
-
export
|
|
20
|
-
|
|
21
|
-
|
|
56
|
+
export function childRefusalError(stopReason) {
|
|
57
|
+
return `child model declined the delegated task (stop_reason: ${stopReason})`;
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* The one line replay (and therefore `/export` and the resume recap) prints in the
|
|
61
|
+
* answer slot of a refusal-class turn, after whatever partial text it streamed. The
|
|
62
|
+
* live session showed {@link refusalNotice} instead — its remedy is advice for the
|
|
63
|
+
* moment, meaningless in a transcript read later — so the transcript states only
|
|
64
|
+
* the fact and the reason, parenthesised because it is not the model's text.
|
|
65
|
+
*/
|
|
66
|
+
export function refusalTranscriptLine(stopReason) {
|
|
67
|
+
return `(model declined this request — stop_reason: ${stopReason})`;
|
|
22
68
|
}
|
|
23
69
|
//# sourceMappingURL=refusal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refusal.js","sourceRoot":"","sources":["../../../src/agent/refusal.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"refusal.js","sourceRoot":"","sources":["../../../src/agent/refusal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,iFAAiF;AACjF,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,iBAAiB,EAAE,qBAAqB,CAAU,CAAC,CAAC;AAIlH,MAAM,UAAU,aAAa,CAAC,UAAkB;IAC9C,OAAQ,oBAA0C,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC1E,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,aAAa,CAAC,UAAkB;IAC9C,OAAO,6CAA6C,UAAU,qCAAqC,CAAC;AACtG,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,UAAkB;IACxD,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,wGAAwG,CAAC;AAC9I,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,sBAAsB,CAAC,UAAkB;IACvD,OAAO,iDAAiD,UAAU,0BAA0B,CAAC;AAC/F,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,iBAAiB,CAAC,UAAkB;IAClD,OAAO,yDAAyD,UAAU,GAAG,CAAC;AAChF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,UAAkB;IACtD,OAAO,+CAA+C,UAAU,GAAG,CAAC;AACtE,CAAC"}
|
|
@@ -6,6 +6,8 @@ export interface RewindCheckpoint {
|
|
|
6
6
|
readonly snapshotId: string;
|
|
7
7
|
readonly prompt: string;
|
|
8
8
|
readonly completedAt: string;
|
|
9
|
+
/** Optional display-only trajectory boundary; the SDK snapshot remains authoritative. */
|
|
10
|
+
readonly trajectoryTurn?: number;
|
|
9
11
|
}
|
|
10
12
|
export interface RewindCatalogue {
|
|
11
13
|
readonly checkpoints: readonly RewindCheckpoint[];
|
package/dist/src/agent/rewind.js
CHANGED
|
@@ -53,7 +53,9 @@ export async function readRewindCatalogue(projectRoot, sessionId) {
|
|
|
53
53
|
if (!isRecord(value) || typeof value.snapshotId !== 'string' || typeof value.prompt !== 'string' ||
|
|
54
54
|
typeof value.completedAt !== 'string' || [...value.snapshotId].length === 0 ||
|
|
55
55
|
[...value.snapshotId].length > MAX_SNAPSHOT_ID_CODE_POINTS || !rewindPromptEligible(value.prompt) ||
|
|
56
|
-
!Number.isFinite(Date.parse(value.completedAt)) || ids.has(value.snapshotId)
|
|
56
|
+
!Number.isFinite(Date.parse(value.completedAt)) || ids.has(value.snapshotId) ||
|
|
57
|
+
(value.trajectoryTurn !== undefined &&
|
|
58
|
+
(!Number.isSafeInteger(value.trajectoryTurn) || value.trajectoryTurn < 1))) {
|
|
57
59
|
return { checkpoints: [], capped: false, problem: 'rewind checkpoint catalogue has an invalid entry' };
|
|
58
60
|
}
|
|
59
61
|
ids.add(value.snapshotId);
|
|
@@ -61,6 +63,7 @@ export async function readRewindCatalogue(projectRoot, sessionId) {
|
|
|
61
63
|
snapshotId: value.snapshotId,
|
|
62
64
|
prompt: value.prompt,
|
|
63
65
|
completedAt: value.completedAt,
|
|
66
|
+
...(value.trajectoryTurn === undefined ? {} : { trajectoryTurn: value.trajectoryTurn }),
|
|
64
67
|
});
|
|
65
68
|
}
|
|
66
69
|
return { checkpoints, capped: checkpoints.length >= MAX_REWIND_CHECKPOINTS };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewind.js","sourceRoot":"","sources":["../../../src/agent/rewind.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,yBAAyB,GAAG,yBAAyB,CAAC;AACnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAC1C,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,CAAC;AACnD,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,GAAG,IAAI,CAAC;AACrD,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,2BAA2B,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"rewind.js","sourceRoot":"","sources":["../../../src/agent/rewind.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,16 +13,18 @@ import { type McpLoadResult, type McpServerStatus } from '../mcp/registry.js';
|
|
|
13
13
|
import { type ExpandedSkillCommand } from '../skills/plugin.js';
|
|
14
14
|
import { type MemoryCommandResult } from '../memory/command.js';
|
|
15
15
|
import { MemoryToolController } from '../memory/controller.js';
|
|
16
|
+
import { CloudMemory } from '../agentcore/controller.js';
|
|
16
17
|
import type { MemoryStatus } from '../memory/store.js';
|
|
17
18
|
import type { ContextCompactedEntry, TaskNotificationFields } from '../trajectory/record.js';
|
|
18
19
|
import { type RecorderOptions, type TrajectoryStatus } from '../trajectory/writer.js';
|
|
19
20
|
import { type ContextBreakdown } from './context-breakdown.js';
|
|
20
|
-
import { type ProjectInstructionsSummary } from './instructions.js';
|
|
21
|
+
import { type InstructionsFilename, type ProjectInstructionsSummary } from './instructions.js';
|
|
21
22
|
import { type AllowRuleEntry, type ApprovalMode, type PermissionBridge, type PermissionModeChange } from './permission.js';
|
|
22
23
|
import { type PromptCachePlan } from './prompt-cache.js';
|
|
23
24
|
import { type SessionSelector } from './session.js';
|
|
24
25
|
import { type SystemPromptSource } from './system-prompt.js';
|
|
25
26
|
import { type ThinkingEffort, type ThinkingPlan } from './thinking.js';
|
|
27
|
+
import { type WorkspaceTrust, type WorkspaceTrustReport } from './workspace-trust.js';
|
|
26
28
|
import { type RewindCatalogue, type RewindCheckpoint } from './rewind.js';
|
|
27
29
|
import { type UsageTotals } from './usage.js';
|
|
28
30
|
import { type SessionCallStats } from './call-stats.js';
|
|
@@ -62,6 +64,18 @@ export interface RuntimeOptions {
|
|
|
62
64
|
backgroundCompletionWakes?: boolean;
|
|
63
65
|
/** Refuses the next parent-Agent SDK model call after this many in the process. */
|
|
64
66
|
maxModelCalls?: number;
|
|
67
|
+
/**
|
|
68
|
+
* The workspace-trust decision the driver resolved *before* asking for a runtime
|
|
69
|
+
* (SER-090, `workspace-trust.ts`). Anything but `trusted` holds the repository-
|
|
70
|
+
* supplied layers back: `loadProjectPolicy` skips the project hook roots and the
|
|
71
|
+
* legacy `.darwin/config.json` rule fallback, `loadMcpClients` leaves the project MCP
|
|
72
|
+
* file unread — skipped, never an error — and the held items are reported on
|
|
73
|
+
* `info.workspaceTrust`. Absent means the caller vouches for the checkout (the
|
|
74
|
+
* pre-trust behaviour; programmatic embedding and the spike fixtures). The three
|
|
75
|
+
* drivers always pass it, and a `/clear` or `/rewind` successor inherits it with the
|
|
76
|
+
* rest of these options.
|
|
77
|
+
*/
|
|
78
|
+
workspaceTrust?: WorkspaceTrust;
|
|
65
79
|
/**
|
|
66
80
|
* One driver-owned section appended to the base prompt, before project instructions.
|
|
67
81
|
* Headless runs pass `HEADLESS_AUTONOMY_SECTION` (system-prompt.ts); the interactive TUI passes
|
|
@@ -147,6 +161,12 @@ export type ExpandedSlashCommand = ({
|
|
|
147
161
|
} & ExpandedCustomCommand) | {
|
|
148
162
|
kind: 'workflow';
|
|
149
163
|
message: string;
|
|
164
|
+
} | {
|
|
165
|
+
kind: 'init';
|
|
166
|
+
message: string;
|
|
167
|
+
} | {
|
|
168
|
+
kind: 'review';
|
|
169
|
+
message: string;
|
|
150
170
|
};
|
|
151
171
|
/** Estimated size of the next request's context, plus the model's window. */
|
|
152
172
|
export interface ContextEstimate {
|
|
@@ -181,6 +201,14 @@ export interface RuntimeInfo {
|
|
|
181
201
|
permissionMode: ApprovalMode;
|
|
182
202
|
sessionId: string;
|
|
183
203
|
resumed: boolean;
|
|
204
|
+
/**
|
|
205
|
+
* SER-091: one bounded sentence about this session's lease when the acquisition was
|
|
206
|
+
* not the ordinary uncontested one — a stale lease taken over, or a bare `--resume`
|
|
207
|
+
* that found its session open in another live process and started fresh. Absent
|
|
208
|
+
* otherwise; the drivers state it once in the transcript/stderr and nothing else
|
|
209
|
+
* reads it.
|
|
210
|
+
*/
|
|
211
|
+
leaseNotice?: string;
|
|
184
212
|
/** Names of skills discovered under `.darwin/skills/`. */
|
|
185
213
|
skillNames: string[];
|
|
186
214
|
/** Skill directories that were skipped, with the reason. */
|
|
@@ -202,10 +230,12 @@ export interface RuntimeInfo {
|
|
|
202
230
|
file: string;
|
|
203
231
|
reason: string;
|
|
204
232
|
}[];
|
|
205
|
-
/** AGENTS.md preloaded from the run directory, or undefined when there is none. */
|
|
233
|
+
/** AGENTS.md (or the CLAUDE.md fallback) preloaded from the run directory, or undefined when there is none. */
|
|
206
234
|
projectInstructions: ProjectInstructionsSummary | undefined;
|
|
207
|
-
/** Why a present
|
|
235
|
+
/** Why a present instructions file was skipped; undefined when there is no such file. */
|
|
208
236
|
projectInstructionsProblem: string | undefined;
|
|
237
|
+
/** Which file `projectInstructionsProblem` is about; undefined exactly when it is. */
|
|
238
|
+
projectInstructionsProblemFile: InstructionsFilename | undefined;
|
|
209
239
|
/** Where the base system prompt came from: built-in, config, or override file. */
|
|
210
240
|
systemPromptSource: SystemPromptSource;
|
|
211
241
|
/** Path of the system prompt override file, when one is in effect. */
|
|
@@ -253,6 +283,24 @@ export interface RuntimeInfo {
|
|
|
253
283
|
directory: string;
|
|
254
284
|
shadowed: string[];
|
|
255
285
|
}[];
|
|
286
|
+
/**
|
|
287
|
+
* What model-spawned shells were denied at startup (SER-082): the sorted names
|
|
288
|
+
* withheld from the persistent shell and background jobs, plus the configured
|
|
289
|
+
* passthrough entries. Names only — no value is ever stored or shown. Read by the
|
|
290
|
+
* startup notice and `/status`; the map itself lives in the bash tools.
|
|
291
|
+
*/
|
|
292
|
+
shellEnv: {
|
|
293
|
+
withheld: string[];
|
|
294
|
+
passthrough: string[];
|
|
295
|
+
};
|
|
296
|
+
/**
|
|
297
|
+
* The workspace-trust decision this runtime applied (SER-090) and exactly what it
|
|
298
|
+
* held back when the project is not trusted: hook files never loaded, MCP servers
|
|
299
|
+
* never spawned, the legacy rule fallback never granted. Empty held lists for a
|
|
300
|
+
* trusted project or an empty inventory. Read by the transcript notice, `/status`,
|
|
301
|
+
* `/mcp` and the headless `trust:` line / `run.started.trust`.
|
|
302
|
+
*/
|
|
303
|
+
workspaceTrust: WorkspaceTrustReport;
|
|
256
304
|
mcpIgnoredConfigPath: string | undefined;
|
|
257
305
|
/** Number of MCP servers configured (some may have failed to connect). */
|
|
258
306
|
mcpServerCount: number;
|
|
@@ -303,6 +351,13 @@ export declare class AgentRuntime {
|
|
|
303
351
|
private readonly diagnosticsLog;
|
|
304
352
|
/** Undefined only when effective config disables derived project context. */
|
|
305
353
|
private readonly memoryController;
|
|
354
|
+
private readonly cloudMemory;
|
|
355
|
+
/**
|
|
356
|
+
* This process's hold on `info.sessionId` (SER-091). Released by {@link shutdown}
|
|
357
|
+
* and by {@link retire} — the `/clear` and `/rewind` successor takes its own lease
|
|
358
|
+
* on its own id through `create()` — and only while the file still names this pid.
|
|
359
|
+
*/
|
|
360
|
+
private readonly lease;
|
|
306
361
|
readonly info: RuntimeInfo;
|
|
307
362
|
/**
|
|
308
363
|
* What this runtime was created with, so {@link startNewSession} can assemble its
|
|
@@ -391,7 +446,7 @@ export declare class AgentRuntime {
|
|
|
391
446
|
* Releases startup-owned observers and external clients when construction fails.
|
|
392
447
|
* Successful creation transfers the same resources to `shutdown()` instead.
|
|
393
448
|
*/
|
|
394
|
-
static unwindCreate(diagnosticsLog: DiagnosticsLog | undefined, mcpClients?: readonly McpClient[], backgroundBash?: BackgroundBashManager, memoryController?: MemoryToolController, lifecycleHooks?: LifecycleHookRunner, codexHooks?: CodexHookRunner): Promise<void>;
|
|
449
|
+
static unwindCreate(diagnosticsLog: DiagnosticsLog | undefined, mcpClients?: readonly McpClient[], backgroundBash?: BackgroundBashManager, memoryController?: MemoryToolController, lifecycleHooks?: LifecycleHookRunner, codexHooks?: CodexHookRunner, cloudMemory?: CloudMemory): Promise<void>;
|
|
395
450
|
static create(options: RuntimeOptions): Promise<AgentRuntime>;
|
|
396
451
|
/**
|
|
397
452
|
* Runs one turn, yielding SDK stream events untouched so callers can render
|
|
@@ -486,10 +541,13 @@ export declare class AgentRuntime {
|
|
|
486
541
|
get diagnosticsStatus(): DiagnosticsStatus | undefined;
|
|
487
542
|
/** Best-effort status of enabled derived project memory. */
|
|
488
543
|
get memoryStatus(): MemoryStatus | undefined;
|
|
489
|
-
/**
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
544
|
+
/** Cloud status is a projection, never an implicit retrieval. */
|
|
545
|
+
get cloudMemoryStatus(): string;
|
|
546
|
+
private checkCloudPreparation;
|
|
547
|
+
refreshCloudPolicy(): Promise<void>;
|
|
548
|
+
private prepareCloudPreferences;
|
|
549
|
+
manageCloudMemory(input: string): Promise<string>;
|
|
550
|
+
private applyCloudPreferences;
|
|
493
551
|
manageMemory(input: string): Promise<MemoryCommandResult>;
|
|
494
552
|
/**
|
|
495
553
|
* Replaces old conversation history with rolling summaries, keeping the recent
|
|
@@ -554,6 +612,13 @@ export declare class AgentRuntime {
|
|
|
554
612
|
* of swallowing: the caller reports it to the user.
|
|
555
613
|
*/
|
|
556
614
|
saveAllowRule(rule: string): Promise<void>;
|
|
615
|
+
/**
|
|
616
|
+
* The `loadProjectPolicy` layer option this runtime was created with (SER-090), so
|
|
617
|
+
* the two rule writers below promote legacy rules only from a layer that was in
|
|
618
|
+
* force — an untrusted project's committed `.darwin/config.json` never reaches the
|
|
619
|
+
* user-owned file through an "always allow" answer.
|
|
620
|
+
*/
|
|
621
|
+
private projectLayerOptions;
|
|
557
622
|
/**
|
|
558
623
|
* The live allow-rules with their provenance — config-loaded vs granted this
|
|
559
624
|
* session — for the `/permissions` report. Read live from the gate, like
|
|
@@ -787,6 +852,9 @@ export declare class AgentRuntime {
|
|
|
787
852
|
get sessionUsage(): UsageTotals;
|
|
788
853
|
/** Current-process background tasks, without creating an agent tool call. */
|
|
789
854
|
listBackgroundTasks(): Promise<BackgroundTaskStatus[]>;
|
|
855
|
+
/** Live in-memory activity for the TUI; no log reads or tool invocation. */
|
|
856
|
+
get runningBackgroundTaskCount(): number;
|
|
857
|
+
subscribeToBackgroundTaskActivity(listener: () => void): () => void;
|
|
790
858
|
/** Publishes future terminal task snapshots until the returned closure is called. */
|
|
791
859
|
subscribeToBackgroundTasks(listener: BackgroundTaskListener): () => void;
|
|
792
860
|
/**
|
|
@@ -884,8 +952,8 @@ export declare class AgentRuntime {
|
|
|
884
952
|
* the user the conversation they just set aside. The successor claims the pointer on
|
|
885
953
|
* its first finished turn, through the ordinary path.
|
|
886
954
|
*
|
|
887
|
-
* If assembling the successor fails,
|
|
888
|
-
*
|
|
955
|
+
* If assembling the successor fails, conversation/tools stay usable; predecessor auto
|
|
956
|
+
* uploads remain conservatively stopped (cloud status states it). The diagnostics tap is put back
|
|
889
957
|
* (the failed successor's unwind clears the process-global sink).
|
|
890
958
|
*
|
|
891
959
|
* Refused while a background delegation is tracked (SER-070): `retire()` would cancel
|
|
@@ -919,10 +987,15 @@ export declare class AgentRuntime {
|
|
|
919
987
|
private captureRewindCheckpoint;
|
|
920
988
|
/**
|
|
921
989
|
* Expands a built-in prompt command, a skill, or a project command into the
|
|
922
|
-
* prompt sent to the model. `/workflow`
|
|
990
|
+
* prompt sent to the model. `/workflow`, `/init` and `/review` come first: built-in
|
|
923
991
|
* reservation precedes skills and custom commands, so no extension can
|
|
924
|
-
* shadow
|
|
925
|
-
* notice, and the runtime never fabricates a turn
|
|
992
|
+
* shadow them. Bare `/workflow` returns null — the drivers own that local usage
|
|
993
|
+
* notice, and the runtime never fabricates a turn — while bare `/init` is the
|
|
994
|
+
* trigger itself, as is bare `/review`. `/review` is guidance only, with no mode
|
|
995
|
+
* change or executor. `/init` decides create-versus-improve from the instructions
|
|
996
|
+
* summary this runtime captured at startup (the header's own data), never from
|
|
997
|
+
* a fresh filesystem read, so TUI, dev-repl and both headless drivers get the
|
|
998
|
+
* same branch through this one seam. Skills are checked before
|
|
926
999
|
* custom commands as a defensive backstop to the loader's collision
|
|
927
1000
|
* filtering. Unknown slash input remains ordinary user input.
|
|
928
1001
|
*/
|