@duckmind/dm-darwin-x64 0.43.2 → 0.43.8
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/dm +0 -0
- package/extensions/.dm-extensions.json +242 -49
- package/extensions/dm-9router-ext/package.json +2 -19
- package/extensions/dm-9router-ext/src/index.js +5 -0
- package/extensions/dm-ask-user/index.js +10 -0
- package/extensions/dm-ask-user/package.json +1 -21
- package/extensions/dm-cli-anything/package.json +0 -6
- package/extensions/dm-context/package.json +2 -12
- package/extensions/dm-context/src/context.js +1 -0
- package/extensions/dm-context/src/index.js +7 -0
- package/extensions/dm-context/src/utils.js +1 -0
- package/extensions/dm-cua/package.json +0 -7
- package/extensions/dm-fff/package.json +1 -28
- package/extensions/dm-fff/src/index.js +15 -0
- package/extensions/dm-fff/src/query.js +1 -0
- package/extensions/dm-goal/package.json +2 -31
- package/extensions/dm-goal/src/goal.js +43 -0
- package/extensions/dm-grill-me/index.js +174 -0
- package/extensions/dm-grill-me/package.json +1 -26
- package/extensions/dm-image2/package.json +0 -7
- package/extensions/dm-subagents/package.json +1 -32
- package/extensions/dm-subagents/src/agents/agent-management.js +37 -0
- package/extensions/dm-subagents/src/agents/agent-memory.js +6 -0
- package/extensions/dm-subagents/src/agents/agent-scope.js +1 -0
- package/extensions/dm-subagents/src/agents/agent-selection.js +1 -0
- package/extensions/dm-subagents/src/agents/agent-serializer.js +7 -0
- package/extensions/dm-subagents/src/agents/agents.js +11 -0
- package/extensions/dm-subagents/src/agents/chain-serializer.js +12 -0
- package/extensions/dm-subagents/src/agents/frontmatter.js +6 -0
- package/extensions/dm-subagents/src/agents/identity.js +1 -0
- package/extensions/dm-subagents/src/agents/proactive-skills.js +1 -0
- package/extensions/dm-subagents/src/agents/skills.js +6 -0
- package/extensions/dm-subagents/src/extension/config.js +2 -0
- package/extensions/dm-subagents/src/extension/control-notices.js +4 -0
- package/extensions/dm-subagents/src/extension/doctor.js +16 -0
- package/extensions/dm-subagents/src/extension/fanout-child.js +231 -0
- package/extensions/dm-subagents/src/extension/index.js +367 -0
- package/extensions/dm-subagents/src/extension/rpc.js +8 -0
- package/extensions/dm-subagents/src/extension/schemas.js +1 -0
- package/extensions/dm-subagents/src/extension/{tool-description.ts → tool-description.js} +6 -126
- package/extensions/dm-subagents/src/intercom/intercom-bridge.js +13 -0
- package/extensions/dm-subagents/src/intercom/native-supervisor-channel.js +5 -0
- package/extensions/dm-subagents/src/intercom/result-intercom.js +3 -0
- package/extensions/dm-subagents/src/profiles/profiles.js +3 -0
- package/extensions/dm-subagents/src/runs/background/async-execution.js +46 -0
- package/extensions/dm-subagents/src/runs/background/async-job-tracker.js +14 -0
- package/extensions/dm-subagents/src/runs/background/async-resume.js +8 -0
- package/extensions/dm-subagents/src/runs/background/async-status.js +12 -0
- package/extensions/dm-subagents/src/runs/background/chain-append.js +2 -0
- package/extensions/dm-subagents/src/runs/background/chain-root-attachment.js +1 -0
- package/extensions/dm-subagents/src/runs/background/completion-batcher.js +1 -0
- package/extensions/dm-subagents/src/runs/background/completion-dedupe.js +1 -0
- package/extensions/dm-subagents/src/runs/background/control-channel.js +1 -0
- package/extensions/dm-subagents/src/runs/background/fleet-view.js +17 -0
- package/extensions/dm-subagents/src/runs/background/notify.js +3 -0
- package/extensions/dm-subagents/src/runs/background/parallel-groups.js +1 -0
- package/extensions/dm-subagents/src/runs/background/result-watcher.js +8 -0
- package/extensions/dm-subagents/src/runs/background/run-id-resolver.js +4 -0
- package/extensions/dm-subagents/src/runs/background/run-status.js +23 -0
- package/extensions/dm-subagents/src/runs/background/scheduled-runs.js +4 -0
- package/extensions/dm-subagents/src/runs/background/stale-run-reconciler.js +11 -0
- package/extensions/dm-subagents/src/runs/background/subagent-runner.js +78 -0
- package/extensions/dm-subagents/src/runs/background/top-level-async.js +1 -0
- package/extensions/dm-subagents/src/runs/background/wait.js +11 -0
- package/extensions/dm-subagents/src/runs/foreground/chain-clarify.js +12 -0
- package/extensions/dm-subagents/src/runs/foreground/chain-execution.js +102 -0
- package/extensions/dm-subagents/src/runs/foreground/execution.js +51 -0
- package/extensions/dm-subagents/src/runs/foreground/subagent-executor.js +228 -0
- package/extensions/dm-subagents/src/runs/shared/acceptance.js +3 -0
- package/extensions/dm-subagents/src/runs/shared/chain-outputs.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/completion-guard.js +3 -0
- package/extensions/dm-subagents/src/runs/shared/dm-args.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/dm-spawn.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/dynamic-fanout.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/long-running-guard.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/mcp-direct-tool-allowlist.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/model-fallback.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/model-scope.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/nested-events.js +8 -0
- package/extensions/dm-subagents/src/runs/shared/nested-path.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/nested-render.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/parallel-utils.js +5 -0
- package/extensions/dm-subagents/src/runs/shared/run-history.js +5 -0
- package/extensions/dm-subagents/src/runs/shared/single-output.js +14 -0
- package/extensions/dm-subagents/src/runs/shared/structured-output.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/subagent-control.js +5 -0
- package/extensions/dm-subagents/src/runs/shared/subagent-prompt-runtime.js +22 -0
- package/extensions/dm-subagents/src/runs/shared/tool-budget.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/turn-budget.js +7 -0
- package/extensions/dm-subagents/src/runs/shared/workflow-graph.js +1 -0
- package/extensions/dm-subagents/src/runs/shared/worktree.js +3 -0
- package/extensions/dm-subagents/src/shared/artifacts.js +2 -0
- package/extensions/dm-subagents/src/shared/atomic-json.js +1 -0
- package/extensions/dm-subagents/src/shared/child-transcript.js +5 -0
- package/extensions/dm-subagents/src/shared/file-coalescer.js +1 -0
- package/extensions/dm-subagents/src/shared/fork-context.js +6 -0
- package/extensions/dm-subagents/src/shared/formatters.js +9 -0
- package/extensions/dm-subagents/src/shared/jsonl-writer.js +2 -0
- package/extensions/dm-subagents/src/shared/model-info.js +1 -0
- package/extensions/dm-subagents/src/shared/post-exit-stdio-guard.js +1 -0
- package/extensions/dm-subagents/src/shared/session-identity.js +1 -0
- package/extensions/dm-subagents/src/shared/session-tokens.js +2 -0
- package/extensions/dm-subagents/src/shared/settings.js +23 -0
- package/extensions/dm-subagents/src/shared/status-format.js +1 -0
- package/extensions/dm-subagents/src/shared/types.js +8 -0
- package/extensions/dm-subagents/src/shared/utils.js +2 -0
- package/extensions/dm-subagents/src/slash/prompt-template-bridge.js +1 -0
- package/extensions/dm-subagents/src/slash/prompt-workflows.js +7 -0
- package/extensions/dm-subagents/src/slash/slash-bridge.js +1 -0
- package/extensions/dm-subagents/src/slash/slash-commands.js +38 -0
- package/extensions/dm-subagents/src/slash/slash-live-state.js +6 -0
- package/extensions/dm-subagents/src/tui/render-helpers.js +1 -0
- package/extensions/dm-subagents/src/tui/render.js +4 -0
- package/extensions/dm-tasks/package.json +1 -30
- package/extensions/dm-tasks/src/auto-clear.js +1 -0
- package/extensions/dm-tasks/src/index.js +212 -0
- package/extensions/dm-tasks/src/process-tracker.js +1 -0
- package/extensions/dm-tasks/src/task-store.js +1 -0
- package/extensions/dm-tasks/src/tasks-config.js +1 -0
- package/extensions/dm-tasks/src/types.js +0 -0
- package/extensions/dm-tasks/src/ui/settings-menu.js +1 -0
- package/extensions/dm-tasks/src/ui/task-widget.js +1 -0
- package/extensions/dm-usage/index.js +9 -0
- package/extensions/dm-usage/package.json +1 -18
- package/extensions/greedysearch-dm/bin/search.mjs +135 -135
- package/extensions/greedysearch-dm/index.js +20 -0
- package/extensions/greedysearch-dm/package.json +1 -22
- package/extensions/greedysearch-dm/src/formatters/results.js +8 -0
- package/extensions/greedysearch-dm/src/formatters/sources.js +1 -0
- package/extensions/greedysearch-dm/src/formatters/synthesis.js +1 -0
- package/extensions/greedysearch-dm/src/search/engines.mjs +9 -9
- package/extensions/greedysearch-dm/src/search/paths.mjs +1 -0
- package/extensions/greedysearch-dm/src/search/research.mjs +100 -100
- package/extensions/greedysearch-dm/src/search/synthesis-runner.mjs +10 -10
- package/extensions/greedysearch-dm/src/tools/greedy-search-handler.js +20 -0
- package/extensions/greedysearch-dm/src/tools/shared.js +9 -0
- package/extensions/greedysearch-dm/src/types.js +0 -0
- package/extensions/greedysearch-dm/src/utils/helpers.js +1 -0
- package/package.json +1 -1
- package/extensions/dm-9router-ext/src/index.ts +0 -541
- package/extensions/dm-ask-user/index.ts +0 -857
- package/extensions/dm-context/src/context.ts +0 -158
- package/extensions/dm-context/src/index.ts +0 -439
- package/extensions/dm-context/src/utils.ts +0 -6
- package/extensions/dm-fff/src/index.ts +0 -1023
- package/extensions/dm-fff/src/query.ts +0 -87
- package/extensions/dm-goal/src/goal.ts +0 -1073
- package/extensions/dm-grill-me/index.ts +0 -1085
- package/extensions/dm-subagents/src/agents/agent-management.ts +0 -1052
- package/extensions/dm-subagents/src/agents/agent-memory.ts +0 -254
- package/extensions/dm-subagents/src/agents/agent-scope.ts +0 -6
- package/extensions/dm-subagents/src/agents/agent-selection.ts +0 -25
- package/extensions/dm-subagents/src/agents/agent-serializer.ts +0 -121
- package/extensions/dm-subagents/src/agents/agents.ts +0 -1553
- package/extensions/dm-subagents/src/agents/chain-serializer.ts +0 -277
- package/extensions/dm-subagents/src/agents/frontmatter.ts +0 -93
- package/extensions/dm-subagents/src/agents/identity.ts +0 -30
- package/extensions/dm-subagents/src/agents/proactive-skills.ts +0 -191
- package/extensions/dm-subagents/src/agents/skills.ts +0 -729
- package/extensions/dm-subagents/src/extension/config.ts +0 -39
- package/extensions/dm-subagents/src/extension/control-notices.ts +0 -92
- package/extensions/dm-subagents/src/extension/doctor.ts +0 -214
- package/extensions/dm-subagents/src/extension/fanout-child.ts +0 -172
- package/extensions/dm-subagents/src/extension/index.ts +0 -656
- package/extensions/dm-subagents/src/extension/rpc.ts +0 -369
- package/extensions/dm-subagents/src/extension/schemas.ts +0 -309
- package/extensions/dm-subagents/src/intercom/intercom-bridge.ts +0 -180
- package/extensions/dm-subagents/src/intercom/native-supervisor-channel.ts +0 -519
- package/extensions/dm-subagents/src/intercom/result-intercom.ts +0 -377
- package/extensions/dm-subagents/src/profiles/profiles.ts +0 -637
- package/extensions/dm-subagents/src/runs/background/async-execution.ts +0 -1065
- package/extensions/dm-subagents/src/runs/background/async-job-tracker.ts +0 -441
- package/extensions/dm-subagents/src/runs/background/async-resume.ts +0 -391
- package/extensions/dm-subagents/src/runs/background/async-status.ts +0 -395
- package/extensions/dm-subagents/src/runs/background/chain-append.ts +0 -282
- package/extensions/dm-subagents/src/runs/background/chain-root-attachment.ts +0 -191
- package/extensions/dm-subagents/src/runs/background/completion-batcher.ts +0 -166
- package/extensions/dm-subagents/src/runs/background/completion-dedupe.ts +0 -63
- package/extensions/dm-subagents/src/runs/background/control-channel.ts +0 -332
- package/extensions/dm-subagents/src/runs/background/fleet-view.ts +0 -515
- package/extensions/dm-subagents/src/runs/background/notify.ts +0 -225
- package/extensions/dm-subagents/src/runs/background/parallel-groups.ts +0 -45
- package/extensions/dm-subagents/src/runs/background/result-watcher.ts +0 -315
- package/extensions/dm-subagents/src/runs/background/run-id-resolver.ts +0 -84
- package/extensions/dm-subagents/src/runs/background/run-status.ts +0 -434
- package/extensions/dm-subagents/src/runs/background/scheduled-runs.ts +0 -514
- package/extensions/dm-subagents/src/runs/background/stale-run-reconciler.ts +0 -368
- package/extensions/dm-subagents/src/runs/background/subagent-runner.ts +0 -3171
- package/extensions/dm-subagents/src/runs/background/top-level-async.ts +0 -13
- package/extensions/dm-subagents/src/runs/background/wait.ts +0 -353
- package/extensions/dm-subagents/src/runs/foreground/chain-clarify.ts +0 -1333
- package/extensions/dm-subagents/src/runs/foreground/chain-execution.ts +0 -1313
- package/extensions/dm-subagents/src/runs/foreground/execution.ts +0 -1239
- package/extensions/dm-subagents/src/runs/foreground/subagent-executor.ts +0 -3613
- package/extensions/dm-subagents/src/runs/shared/acceptance.ts +0 -879
- package/extensions/dm-subagents/src/runs/shared/chain-outputs.ts +0 -116
- package/extensions/dm-subagents/src/runs/shared/completion-guard.ts +0 -147
- package/extensions/dm-subagents/src/runs/shared/dm-args.ts +0 -271
- package/extensions/dm-subagents/src/runs/shared/dm-spawn.ts +0 -147
- package/extensions/dm-subagents/src/runs/shared/dynamic-fanout.ts +0 -295
- package/extensions/dm-subagents/src/runs/shared/long-running-guard.ts +0 -175
- package/extensions/dm-subagents/src/runs/shared/mcp-direct-tool-allowlist.ts +0 -365
- package/extensions/dm-subagents/src/runs/shared/model-fallback.ts +0 -292
- package/extensions/dm-subagents/src/runs/shared/model-scope.ts +0 -128
- package/extensions/dm-subagents/src/runs/shared/nested-events.ts +0 -908
- package/extensions/dm-subagents/src/runs/shared/nested-path.ts +0 -52
- package/extensions/dm-subagents/src/runs/shared/nested-render.ts +0 -115
- package/extensions/dm-subagents/src/runs/shared/parallel-utils.ts +0 -198
- package/extensions/dm-subagents/src/runs/shared/run-history.ts +0 -60
- package/extensions/dm-subagents/src/runs/shared/single-output.ts +0 -180
- package/extensions/dm-subagents/src/runs/shared/structured-output.ts +0 -77
- package/extensions/dm-subagents/src/runs/shared/subagent-control.ts +0 -223
- package/extensions/dm-subagents/src/runs/shared/subagent-prompt-runtime.ts +0 -342
- package/extensions/dm-subagents/src/runs/shared/tool-budget.ts +0 -74
- package/extensions/dm-subagents/src/runs/shared/turn-budget.ts +0 -52
- package/extensions/dm-subagents/src/runs/shared/workflow-graph.ts +0 -206
- package/extensions/dm-subagents/src/runs/shared/worktree.ts +0 -600
- package/extensions/dm-subagents/src/shared/artifacts.ts +0 -113
- package/extensions/dm-subagents/src/shared/atomic-json.ts +0 -86
- package/extensions/dm-subagents/src/shared/child-transcript.ts +0 -212
- package/extensions/dm-subagents/src/shared/file-coalescer.ts +0 -40
- package/extensions/dm-subagents/src/shared/fork-context.ts +0 -194
- package/extensions/dm-subagents/src/shared/formatters.ts +0 -133
- package/extensions/dm-subagents/src/shared/jsonl-writer.ts +0 -81
- package/extensions/dm-subagents/src/shared/model-info.ts +0 -78
- package/extensions/dm-subagents/src/shared/post-exit-stdio-guard.ts +0 -85
- package/extensions/dm-subagents/src/shared/session-identity.ts +0 -10
- package/extensions/dm-subagents/src/shared/session-tokens.ts +0 -44
- package/extensions/dm-subagents/src/shared/settings.ts +0 -450
- package/extensions/dm-subagents/src/shared/status-format.ts +0 -49
- package/extensions/dm-subagents/src/shared/types.ts +0 -1257
- package/extensions/dm-subagents/src/shared/utils.ts +0 -554
- package/extensions/dm-subagents/src/slash/prompt-template-bridge.ts +0 -420
- package/extensions/dm-subagents/src/slash/prompt-workflows.ts +0 -330
- package/extensions/dm-subagents/src/slash/slash-bridge.ts +0 -176
- package/extensions/dm-subagents/src/slash/slash-commands.ts +0 -1296
- package/extensions/dm-subagents/src/slash/slash-live-state.ts +0 -292
- package/extensions/dm-subagents/src/tui/render-helpers.ts +0 -80
- package/extensions/dm-subagents/src/tui/render.ts +0 -1748
- package/extensions/dm-tasks/src/auto-clear.ts +0 -91
- package/extensions/dm-tasks/src/index.ts +0 -1145
- package/extensions/dm-tasks/src/process-tracker.ts +0 -140
- package/extensions/dm-tasks/src/task-store.ts +0 -305
- package/extensions/dm-tasks/src/tasks-config.ts +0 -23
- package/extensions/dm-tasks/src/types.ts +0 -40
- package/extensions/dm-tasks/src/ui/settings-menu.ts +0 -100
- package/extensions/dm-tasks/src/ui/task-widget.ts +0 -265
- package/extensions/dm-usage/index.ts +0 -1718
- package/extensions/greedysearch-dm/index.ts +0 -177
- package/extensions/greedysearch-dm/src/formatters/results.ts +0 -163
- package/extensions/greedysearch-dm/src/formatters/sources.ts +0 -116
- package/extensions/greedysearch-dm/src/formatters/synthesis.ts +0 -87
- package/extensions/greedysearch-dm/src/tools/greedy-search-handler.ts +0 -370
- package/extensions/greedysearch-dm/src/tools/shared.ts +0 -187
- package/extensions/greedysearch-dm/src/types.ts +0 -110
- package/extensions/greedysearch-dm/src/utils/helpers.ts +0 -40
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
import * as path from "node:path";
|
|
2
|
-
|
|
3
|
-
const MAX_NESTED_ID_LENGTH = 128;
|
|
4
|
-
export const MAX_NESTED_PATH_ENTRIES = 4;
|
|
5
|
-
|
|
6
|
-
export type NestedPathEntry = { runId: string; stepIndex?: number; agent?: string };
|
|
7
|
-
|
|
8
|
-
export function isSafeNestedPathId(value: unknown): value is string {
|
|
9
|
-
return typeof value === "string"
|
|
10
|
-
&& value.length > 0
|
|
11
|
-
&& value.length <= MAX_NESTED_ID_LENGTH
|
|
12
|
-
&& !path.isAbsolute(value)
|
|
13
|
-
&& !value.includes("/")
|
|
14
|
-
&& !value.includes("\\")
|
|
15
|
-
&& !value.includes("..");
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
function finiteNumber(value: unknown): number | undefined {
|
|
19
|
-
return typeof value === "number" && Number.isFinite(value) ? value : undefined;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
function nonEmptyString(value: unknown, max: number): string | undefined {
|
|
23
|
-
return typeof value === "string" && value.length > 0 ? value.slice(0, max) : undefined;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export function sanitizeNestedPath(value: unknown): NestedPathEntry[] {
|
|
27
|
-
if (!Array.isArray(value)) return [];
|
|
28
|
-
return value.map((part) => {
|
|
29
|
-
if (!part || typeof part !== "object") return undefined;
|
|
30
|
-
const record = part as Record<string, unknown>;
|
|
31
|
-
if (!isSafeNestedPathId(record.runId)) return undefined;
|
|
32
|
-
return {
|
|
33
|
-
runId: record.runId,
|
|
34
|
-
...(finiteNumber(record.stepIndex) !== undefined ? { stepIndex: finiteNumber(record.stepIndex) } : {}),
|
|
35
|
-
...(nonEmptyString(record.agent, 128) ? { agent: nonEmptyString(record.agent, 128) } : {}),
|
|
36
|
-
};
|
|
37
|
-
}).filter((part): part is NestedPathEntry => Boolean(part)).slice(0, MAX_NESTED_PATH_ENTRIES);
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export function parseNestedPathEnv(value: string | undefined): NestedPathEntry[] {
|
|
41
|
-
if (!value) return [];
|
|
42
|
-
try {
|
|
43
|
-
return sanitizeNestedPath(JSON.parse(value) as unknown);
|
|
44
|
-
} catch {
|
|
45
|
-
return [];
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
export function encodeNestedPathEnv(value: NestedPathEntry[]): string {
|
|
50
|
-
const sanitized = sanitizeNestedPath(value);
|
|
51
|
-
return sanitized.length ? JSON.stringify(sanitized) : "";
|
|
52
|
-
}
|
|
@@ -1,115 +0,0 @@
|
|
|
1
|
-
import { formatDuration, formatTokens, shortenPath } from "../../shared/formatters.ts";
|
|
2
|
-
import { formatActivityLabel } from "../../shared/status-format.ts";
|
|
3
|
-
import type { ActivityState, NestedRunSummary, NestedStepSummary } from "../../shared/types.ts";
|
|
4
|
-
|
|
5
|
-
export interface NestedRunCounts {
|
|
6
|
-
total: number;
|
|
7
|
-
running: number;
|
|
8
|
-
paused: number;
|
|
9
|
-
complete: number;
|
|
10
|
-
failed: number;
|
|
11
|
-
queued: number;
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
export function countNestedRuns(children: NestedRunSummary[] | undefined): NestedRunCounts {
|
|
15
|
-
const counts: NestedRunCounts = { total: 0, running: 0, paused: 0, complete: 0, failed: 0, queued: 0 };
|
|
16
|
-
for (const child of children ?? []) {
|
|
17
|
-
counts.total++;
|
|
18
|
-
counts[child.state]++;
|
|
19
|
-
const nested = countNestedRuns([...(child.children ?? []), ...(child.steps?.flatMap((step) => step.children ?? []) ?? [])]);
|
|
20
|
-
counts.total += nested.total;
|
|
21
|
-
counts.running += nested.running;
|
|
22
|
-
counts.paused += nested.paused;
|
|
23
|
-
counts.complete += nested.complete;
|
|
24
|
-
counts.failed += nested.failed;
|
|
25
|
-
counts.queued += nested.queued;
|
|
26
|
-
}
|
|
27
|
-
return counts;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
export function formatNestedAggregate(children: NestedRunSummary[] | undefined): string | undefined {
|
|
31
|
-
const counts = countNestedRuns(children);
|
|
32
|
-
if (counts.total === 0) return undefined;
|
|
33
|
-
const parts = [
|
|
34
|
-
counts.running > 0 ? `${counts.running} running` : "",
|
|
35
|
-
counts.paused > 0 ? `${counts.paused} paused` : "",
|
|
36
|
-
counts.failed > 0 ? `${counts.failed} failed` : "",
|
|
37
|
-
counts.complete > 0 ? `${counts.complete} complete` : "",
|
|
38
|
-
counts.queued > 0 ? `${counts.queued} queued` : "",
|
|
39
|
-
].filter(Boolean);
|
|
40
|
-
return `+${counts.total} nested run${counts.total === 1 ? "" : "s"}${parts.length ? ` (${parts.join(", ")})` : ""}`;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
function nestedRunLabel(run: NestedRunSummary): string {
|
|
44
|
-
if (run.agent) return run.agent;
|
|
45
|
-
if (run.agents?.length) return run.agents.length === 1 ? run.agents[0]! : `${run.agents.slice(0, 2).join(", ")}${run.agents.length > 2 ? ` +${run.agents.length - 2}` : ""}`;
|
|
46
|
-
return run.id;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
function formatNestedActivity(input: {
|
|
50
|
-
activityState?: ActivityState;
|
|
51
|
-
lastActivityAt?: number;
|
|
52
|
-
currentTool?: string;
|
|
53
|
-
currentToolStartedAt?: number;
|
|
54
|
-
currentPath?: string;
|
|
55
|
-
turnCount?: number;
|
|
56
|
-
toolCount?: number;
|
|
57
|
-
totalTokens?: NestedRunSummary["totalTokens"];
|
|
58
|
-
}): string | undefined {
|
|
59
|
-
const facts: string[] = [];
|
|
60
|
-
if (input.currentTool && input.currentToolStartedAt !== undefined) facts.push(`tool ${input.currentTool} ${formatDuration(Math.max(0, Date.now() - input.currentToolStartedAt))}`);
|
|
61
|
-
else if (input.currentTool) facts.push(`tool ${input.currentTool}`);
|
|
62
|
-
if (input.currentPath) facts.push(shortenPath(input.currentPath));
|
|
63
|
-
if (input.turnCount !== undefined) facts.push(`${input.turnCount} turns`);
|
|
64
|
-
if (input.toolCount !== undefined) facts.push(`${input.toolCount} tools`);
|
|
65
|
-
if (input.totalTokens) facts.push(`${formatTokens(input.totalTokens.total)} tok`);
|
|
66
|
-
const activity = formatActivityLabel(input.lastActivityAt, input.activityState as ActivityState | undefined);
|
|
67
|
-
return activity || facts.length ? [activity, ...facts].filter(Boolean).join(" | ") : undefined;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
function formatNestedRunLines(children: NestedRunSummary[] | undefined, options: { indent: string; maxDepth: number; maxLines: number; commandHints?: boolean }): string[] {
|
|
71
|
-
const lines: string[] = [];
|
|
72
|
-
const append = (items: NestedRunSummary[] | undefined, depth: number, indent: string): void => {
|
|
73
|
-
if (!items?.length || lines.length >= options.maxLines) return;
|
|
74
|
-
if (depth > options.maxDepth) {
|
|
75
|
-
const aggregate = formatNestedAggregate(items);
|
|
76
|
-
if (aggregate && lines.length < options.maxLines) lines.push(`${indent}↳ ${aggregate}`);
|
|
77
|
-
return;
|
|
78
|
-
}
|
|
79
|
-
for (let index = 0; index < items.length; index++) {
|
|
80
|
-
const child = items[index]!;
|
|
81
|
-
if (lines.length >= options.maxLines) {
|
|
82
|
-
const aggregate = formatNestedAggregate(items.slice(index));
|
|
83
|
-
if (aggregate) lines[lines.length - 1] = `${indent}↳ ${aggregate}`;
|
|
84
|
-
return;
|
|
85
|
-
}
|
|
86
|
-
const activity = child.state === "running" ? formatNestedActivity(child) : undefined;
|
|
87
|
-
const error = child.error ? ` | error: ${child.error}` : "";
|
|
88
|
-
lines.push(`${indent}↳ ${nestedRunLabel(child)} [${child.id}] ${child.state}${activity ? ` | ${activity}` : ""}${error}`);
|
|
89
|
-
if (options.commandHints && lines.length < options.maxLines) lines.push(`${indent} Status: subagent({ action: "status", id: "${child.id}" })`);
|
|
90
|
-
if (depth === options.maxDepth) {
|
|
91
|
-
const aggregate = formatNestedAggregate([...(child.steps?.flatMap((step) => step.children ?? []) ?? []), ...(child.children ?? [])]);
|
|
92
|
-
if (aggregate && lines.length < options.maxLines) lines.push(`${indent} ↳ ${aggregate}`);
|
|
93
|
-
continue;
|
|
94
|
-
}
|
|
95
|
-
for (const [stepIndex, step] of (child.steps ?? []).entries()) {
|
|
96
|
-
if (lines.length >= options.maxLines) return;
|
|
97
|
-
const stepActivity = step.status === "running" ? formatNestedActivity(step) : undefined;
|
|
98
|
-
lines.push(`${indent} ${stepIndex + 1}. ${step.agent} ${step.status}${stepActivity ? ` | ${stepActivity}` : ""}${step.error ? ` | error: ${step.error}` : ""}`);
|
|
99
|
-
append(step.children, depth + 1, `${indent} `);
|
|
100
|
-
}
|
|
101
|
-
append(child.children, depth + 1, `${indent} `);
|
|
102
|
-
}
|
|
103
|
-
};
|
|
104
|
-
append(children, 0, options.indent);
|
|
105
|
-
return lines;
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
export function formatNestedRunStatusLines(children: NestedRunSummary[] | undefined, options: { indent?: string; maxDepth?: number; maxLines?: number; commandHints?: boolean } = {}): string[] {
|
|
109
|
-
return formatNestedRunLines(children, {
|
|
110
|
-
indent: options.indent ?? " ",
|
|
111
|
-
maxDepth: options.maxDepth ?? 2,
|
|
112
|
-
maxLines: options.maxLines ?? 40,
|
|
113
|
-
commandHints: options.commandHints ?? false,
|
|
114
|
-
});
|
|
115
|
-
}
|
|
@@ -1,198 +0,0 @@
|
|
|
1
|
-
export interface RunnerSubagentStep {
|
|
2
|
-
/** Session id of the direct parent session for permission-system ask forwarding. */
|
|
3
|
-
parentSessionId?: string;
|
|
4
|
-
agent: string;
|
|
5
|
-
task: string;
|
|
6
|
-
importAsyncRoot?: {
|
|
7
|
-
runId: string;
|
|
8
|
-
asyncDir: string;
|
|
9
|
-
resultPath: string;
|
|
10
|
-
index: number;
|
|
11
|
-
};
|
|
12
|
-
phase?: string;
|
|
13
|
-
label?: string;
|
|
14
|
-
outputName?: string;
|
|
15
|
-
structured?: boolean;
|
|
16
|
-
cwd?: string;
|
|
17
|
-
model?: string;
|
|
18
|
-
thinking?: string;
|
|
19
|
-
modelCandidates?: string[];
|
|
20
|
-
tools?: string[];
|
|
21
|
-
extensions?: string[];
|
|
22
|
-
subagentOnlyExtensions?: string[];
|
|
23
|
-
mcpDirectTools?: string[];
|
|
24
|
-
completionGuard?: boolean;
|
|
25
|
-
systemPrompt?: string | null;
|
|
26
|
-
systemPromptMode?: "append" | "replace";
|
|
27
|
-
inheritProjectContext: boolean;
|
|
28
|
-
inheritSkills: boolean;
|
|
29
|
-
skills?: string[];
|
|
30
|
-
outputPath?: string;
|
|
31
|
-
outputMode?: "inline" | "file-only";
|
|
32
|
-
sessionFile?: string;
|
|
33
|
-
maxSubagentDepth?: number;
|
|
34
|
-
structuredOutput?: {
|
|
35
|
-
schema: import("../../shared/types.ts").JsonSchemaObject;
|
|
36
|
-
schemaPath: string;
|
|
37
|
-
outputPath: string;
|
|
38
|
-
};
|
|
39
|
-
structuredOutputSchema?: import("../../shared/types.ts").JsonSchemaObject;
|
|
40
|
-
effectiveAcceptance?: import("../../shared/types.ts").ResolvedAcceptanceConfig;
|
|
41
|
-
toolBudget?: import("../../shared/types.ts").ResolvedToolBudget;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
export interface ParallelStepGroup {
|
|
45
|
-
parallel: RunnerSubagentStep[];
|
|
46
|
-
concurrency?: number;
|
|
47
|
-
failFast?: boolean;
|
|
48
|
-
worktree?: boolean;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
export interface DynamicRunnerGroup {
|
|
52
|
-
expand: import("../../shared/settings.ts").DynamicExpandSpec;
|
|
53
|
-
parallel: RunnerSubagentStep;
|
|
54
|
-
collect: import("../../shared/settings.ts").DynamicCollectSpec;
|
|
55
|
-
concurrency?: number;
|
|
56
|
-
failFast?: boolean;
|
|
57
|
-
phase?: string;
|
|
58
|
-
label?: string;
|
|
59
|
-
sessionFiles?: (string | undefined)[];
|
|
60
|
-
thinkingOverrides?: (string | undefined)[];
|
|
61
|
-
effectiveAcceptance?: import("../../shared/types.ts").ResolvedAcceptanceConfig;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
export type RunnerStep = RunnerSubagentStep | ParallelStepGroup | DynamicRunnerGroup;
|
|
65
|
-
|
|
66
|
-
export function isParallelGroup(step: RunnerStep): step is ParallelStepGroup {
|
|
67
|
-
return "parallel" in step && Array.isArray(step.parallel);
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
export function isDynamicRunnerGroup(step: RunnerStep): step is DynamicRunnerGroup {
|
|
71
|
-
return "expand" in step && "collect" in step && "parallel" in step && !Array.isArray((step as { parallel?: unknown }).parallel);
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
export function flattenSteps(steps: RunnerStep[]): RunnerSubagentStep[] {
|
|
75
|
-
const flat: RunnerSubagentStep[] = [];
|
|
76
|
-
for (const step of steps) {
|
|
77
|
-
if (isParallelGroup(step)) {
|
|
78
|
-
for (const task of step.parallel) flat.push(task);
|
|
79
|
-
} else if (isDynamicRunnerGroup(step)) {
|
|
80
|
-
continue;
|
|
81
|
-
} else {
|
|
82
|
-
flat.push(step);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
return flat;
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
export const DEFAULT_GLOBAL_CONCURRENCY_LIMIT = 20;
|
|
89
|
-
|
|
90
|
-
/**
|
|
91
|
-
* A promise-based semaphore for limiting concurrent access across multiple
|
|
92
|
-
* mapConcurrent calls within a single run. Enforces a global cap on the total
|
|
93
|
-
* number of subagent tasks executing simultaneously, regardless of each step's
|
|
94
|
-
* per-step concurrency limit.
|
|
95
|
-
*/
|
|
96
|
-
export class Semaphore {
|
|
97
|
-
private available: number;
|
|
98
|
-
private readonly queue: Array<() => void> = [];
|
|
99
|
-
|
|
100
|
-
constructor(limit: number) {
|
|
101
|
-
this.available = Math.max(1, Math.floor(limit) || 1);
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
acquire(): Promise<void> {
|
|
105
|
-
if (this.available > 0) {
|
|
106
|
-
this.available--;
|
|
107
|
-
return Promise.resolve();
|
|
108
|
-
}
|
|
109
|
-
return new Promise<void>((resolve) => {
|
|
110
|
-
this.queue.push(resolve);
|
|
111
|
-
});
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
release(): void {
|
|
115
|
-
const next = this.queue.shift();
|
|
116
|
-
if (next) {
|
|
117
|
-
next();
|
|
118
|
-
} else {
|
|
119
|
-
this.available++;
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
export async function mapConcurrent<T, R>(
|
|
125
|
-
items: T[],
|
|
126
|
-
limit: number,
|
|
127
|
-
fn: (item: T, i: number) => Promise<R>,
|
|
128
|
-
globalSemaphore?: Semaphore,
|
|
129
|
-
): Promise<R[]> {
|
|
130
|
-
const safeLimit = Math.max(1, Math.floor(limit) || 1);
|
|
131
|
-
const results: R[] = new Array(items.length);
|
|
132
|
-
let next = 0;
|
|
133
|
-
|
|
134
|
-
async function worker(_workerIndex: number): Promise<void> {
|
|
135
|
-
while (next < items.length) {
|
|
136
|
-
const i = next++;
|
|
137
|
-
if (globalSemaphore) {
|
|
138
|
-
await globalSemaphore.acquire();
|
|
139
|
-
try {
|
|
140
|
-
results[i] = await fn(items[i], i);
|
|
141
|
-
} finally {
|
|
142
|
-
globalSemaphore.release();
|
|
143
|
-
}
|
|
144
|
-
} else {
|
|
145
|
-
results[i] = await fn(items[i], i);
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
await Promise.all(
|
|
151
|
-
Array.from({ length: Math.min(safeLimit, items.length) }, (_, wi) => worker(wi)),
|
|
152
|
-
);
|
|
153
|
-
return results;
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
export interface ParallelTaskResult {
|
|
157
|
-
agent: string;
|
|
158
|
-
taskIndex?: number;
|
|
159
|
-
output: string;
|
|
160
|
-
exitCode: number | null;
|
|
161
|
-
error?: string;
|
|
162
|
-
timedOut?: boolean;
|
|
163
|
-
model?: string;
|
|
164
|
-
attemptedModels?: string[];
|
|
165
|
-
outputTargetPath?: string;
|
|
166
|
-
outputTargetExists?: boolean;
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
export function aggregateParallelOutputs(
|
|
170
|
-
results: ParallelTaskResult[],
|
|
171
|
-
headerFormat: (index: number, agent: string) => string = (i, agent) =>
|
|
172
|
-
`=== Parallel Task ${i + 1} (${agent}) ===`,
|
|
173
|
-
): string {
|
|
174
|
-
return results
|
|
175
|
-
.map((r, i) => {
|
|
176
|
-
const header = headerFormat(r.taskIndex ?? i, r.agent);
|
|
177
|
-
const hasOutput = Boolean(r.output?.trim());
|
|
178
|
-
const status =
|
|
179
|
-
r.timedOut
|
|
180
|
-
? `TIMED OUT${r.error ? `: ${r.error}` : ""}`
|
|
181
|
-
: r.exitCode === -1
|
|
182
|
-
? "SKIPPED"
|
|
183
|
-
: r.exitCode !== 0 && r.exitCode !== null
|
|
184
|
-
? `FAILED (exit code ${r.exitCode})${r.error ? `: ${r.error}` : ""}`
|
|
185
|
-
: r.error
|
|
186
|
-
? `WARNING: ${r.error}`
|
|
187
|
-
: !hasOutput && r.outputTargetPath && r.outputTargetExists === false
|
|
188
|
-
? `EMPTY OUTPUT (expected output file missing: ${r.outputTargetPath})`
|
|
189
|
-
: !hasOutput && !r.outputTargetPath
|
|
190
|
-
? "EMPTY OUTPUT (no textual response returned)"
|
|
191
|
-
: "";
|
|
192
|
-
const body = status ? (hasOutput ? `${status}\n${r.output}` : status) : r.output;
|
|
193
|
-
return `${header}\n${body}`;
|
|
194
|
-
})
|
|
195
|
-
.join("\n\n");
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
export const MAX_PARALLEL_CONCURRENCY = 4;
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
import * as fs from "node:fs";
|
|
2
|
-
import * as path from "node:path";
|
|
3
|
-
import { getAgentDir } from "../../shared/utils.ts";
|
|
4
|
-
|
|
5
|
-
export interface RunEntry {
|
|
6
|
-
agent: string;
|
|
7
|
-
task: string;
|
|
8
|
-
ts: number;
|
|
9
|
-
status: "ok" | "error";
|
|
10
|
-
duration: number;
|
|
11
|
-
exit?: number;
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
const ROTATE_READ_THRESHOLD = 1200;
|
|
15
|
-
const ROTATE_KEEP = 1000;
|
|
16
|
-
|
|
17
|
-
function getHistoryPath(): string {
|
|
18
|
-
return path.join(getAgentDir(), "run-history.jsonl");
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export function recordRun(agent: string, task: string, exitCode: number, durationMs: number): void {
|
|
22
|
-
try {
|
|
23
|
-
const entry: RunEntry = {
|
|
24
|
-
agent,
|
|
25
|
-
task: task.slice(0, 200),
|
|
26
|
-
ts: Math.floor(Date.now() / 1000),
|
|
27
|
-
status: exitCode === 0 ? "ok" : "error",
|
|
28
|
-
duration: durationMs,
|
|
29
|
-
...(exitCode !== 0 ? { exit: exitCode } : {}),
|
|
30
|
-
};
|
|
31
|
-
const historyPath = getHistoryPath();
|
|
32
|
-
fs.mkdirSync(path.dirname(historyPath), { recursive: true });
|
|
33
|
-
fs.appendFileSync(historyPath, `${JSON.stringify(entry)}\n`);
|
|
34
|
-
} catch {
|
|
35
|
-
// Best-effort — never crash the execution flow for history recording
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
export function loadRunsForAgent(agent: string): RunEntry[] {
|
|
40
|
-
const historyPath = getHistoryPath();
|
|
41
|
-
if (!fs.existsSync(historyPath)) return [];
|
|
42
|
-
let raw: string;
|
|
43
|
-
try {
|
|
44
|
-
raw = fs.readFileSync(historyPath, "utf-8");
|
|
45
|
-
} catch {
|
|
46
|
-
return [];
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
let lines = raw.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
|
|
50
|
-
|
|
51
|
-
if (lines.length > ROTATE_READ_THRESHOLD) {
|
|
52
|
-
lines = lines.slice(-ROTATE_KEEP);
|
|
53
|
-
try { fs.writeFileSync(historyPath, `${lines.join("\n")}\n`, "utf-8"); } catch {}
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
return lines
|
|
57
|
-
.map((line) => { try { return JSON.parse(line) as RunEntry; } catch { return undefined; } })
|
|
58
|
-
.filter((entry): entry is RunEntry => Boolean(entry) && entry.agent === agent)
|
|
59
|
-
.reverse();
|
|
60
|
-
}
|
|
@@ -1,180 +0,0 @@
|
|
|
1
|
-
import * as fs from "node:fs";
|
|
2
|
-
import * as path from "node:path";
|
|
3
|
-
import type { OutputMode, SavedOutputReference } from "../../shared/types.ts";
|
|
4
|
-
|
|
5
|
-
export interface SingleOutputSnapshot {
|
|
6
|
-
exists: boolean;
|
|
7
|
-
mtimeMs?: number;
|
|
8
|
-
size?: number;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
export function normalizeSingleOutputOverride(
|
|
12
|
-
output: string | boolean | undefined,
|
|
13
|
-
defaultOutput: string | undefined,
|
|
14
|
-
): string | false | undefined {
|
|
15
|
-
if (output === false || output === "false") return false;
|
|
16
|
-
if (output === true || output === "true") return defaultOutput;
|
|
17
|
-
if (typeof output === "string" && output.length > 0) return output;
|
|
18
|
-
return undefined;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export function resolveSingleOutputPath(
|
|
22
|
-
output: string | boolean | undefined,
|
|
23
|
-
runtimeCwd: string,
|
|
24
|
-
requestedCwd?: string,
|
|
25
|
-
relativeBaseDir?: string,
|
|
26
|
-
): string | undefined {
|
|
27
|
-
if (typeof output !== "string" || !output || output === "false" || output === "true") return undefined;
|
|
28
|
-
if (path.isAbsolute(output)) return output;
|
|
29
|
-
if (relativeBaseDir) return path.resolve(relativeBaseDir, output);
|
|
30
|
-
const baseCwd = requestedCwd
|
|
31
|
-
? (path.isAbsolute(requestedCwd) ? requestedCwd : path.resolve(runtimeCwd, requestedCwd))
|
|
32
|
-
: runtimeCwd;
|
|
33
|
-
return path.resolve(baseCwd, output);
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
function formatOutputPathInstruction(outputPath: string): string {
|
|
37
|
-
return [
|
|
38
|
-
`Write your findings to exactly this path: ${outputPath}`,
|
|
39
|
-
"This path is authoritative for this run.",
|
|
40
|
-
"Ignore any other output filename or output path mentioned elsewhere, including output destinations in the base agent prompt, system prompt, or task instructions.",
|
|
41
|
-
].join("\n");
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
export function injectSingleOutputInstruction(task: string, outputPath: string | undefined): string {
|
|
45
|
-
if (!outputPath) return task;
|
|
46
|
-
return `${task}\n\n---\n**Output:**\n${formatOutputPathInstruction(outputPath)}`;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
export function injectOutputPathSystemPrompt(systemPrompt: string, outputPath: string | undefined): string {
|
|
50
|
-
if (!outputPath) return systemPrompt;
|
|
51
|
-
const instruction = `Runtime output path override:\n${formatOutputPathInstruction(outputPath)}`;
|
|
52
|
-
return systemPrompt ? `${systemPrompt}\n\n${instruction}` : instruction;
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
function countLines(text: string): number {
|
|
56
|
-
if (!text) return 0;
|
|
57
|
-
const newlineMatches = text.match(/\r\n|\r|\n/g);
|
|
58
|
-
return (newlineMatches?.length ?? 0) + (/[\r\n]$/.test(text) ? 0 : 1);
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
function formatByteSize(bytes: number): string {
|
|
62
|
-
if (bytes < 1024) return `${bytes} B`;
|
|
63
|
-
const units = ["KB", "MB", "GB", "TB"];
|
|
64
|
-
let value = bytes / 1024;
|
|
65
|
-
let unitIndex = 0;
|
|
66
|
-
while (value >= 1024 && unitIndex < units.length - 1) {
|
|
67
|
-
value /= 1024;
|
|
68
|
-
unitIndex++;
|
|
69
|
-
}
|
|
70
|
-
return `${value.toFixed(1)} ${units[unitIndex]}`;
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
export function formatSavedOutputReference(savedPath: string, fullOutput: string): SavedOutputReference {
|
|
74
|
-
const absolutePath = path.resolve(savedPath);
|
|
75
|
-
const bytes = Buffer.byteLength(fullOutput, "utf-8");
|
|
76
|
-
const lines = countLines(fullOutput);
|
|
77
|
-
return {
|
|
78
|
-
path: absolutePath,
|
|
79
|
-
bytes,
|
|
80
|
-
lines,
|
|
81
|
-
message: `Output saved to: ${absolutePath} (${formatByteSize(bytes)}, ${lines} ${lines === 1 ? "line" : "lines"}). Read this file if needed.`,
|
|
82
|
-
};
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
export function validateFileOnlyOutputMode(outputMode: OutputMode | undefined, outputPath: string | undefined, context: string): string | undefined {
|
|
86
|
-
if (outputMode === "file-only" && !outputPath) {
|
|
87
|
-
return `${context} sets outputMode: "file-only" but does not configure an output file. Set output to a path or use outputMode: "inline".`;
|
|
88
|
-
}
|
|
89
|
-
return undefined;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
export function captureSingleOutputSnapshot(outputPath: string | undefined): SingleOutputSnapshot | undefined {
|
|
93
|
-
if (!outputPath) return undefined;
|
|
94
|
-
try {
|
|
95
|
-
const stat = fs.statSync(outputPath);
|
|
96
|
-
return { exists: true, mtimeMs: stat.mtimeMs, size: stat.size };
|
|
97
|
-
} catch {
|
|
98
|
-
// The snapshot is advisory; resolveSingleOutput reports concrete read/write failures.
|
|
99
|
-
return { exists: false };
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
function persistSingleOutput(
|
|
104
|
-
outputPath: string | undefined,
|
|
105
|
-
fullOutput: string,
|
|
106
|
-
): { savedPath?: string; error?: string } {
|
|
107
|
-
if (!outputPath) return {};
|
|
108
|
-
try {
|
|
109
|
-
fs.mkdirSync(path.dirname(outputPath), { recursive: true });
|
|
110
|
-
fs.writeFileSync(outputPath, fullOutput, "utf-8");
|
|
111
|
-
return { savedPath: outputPath };
|
|
112
|
-
} catch (err) {
|
|
113
|
-
return { error: err instanceof Error ? err.message : String(err) };
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
export function resolveSingleOutput(
|
|
118
|
-
outputPath: string | undefined,
|
|
119
|
-
fallbackOutput: string,
|
|
120
|
-
beforeRun: SingleOutputSnapshot | undefined,
|
|
121
|
-
): { fullOutput: string; savedPath?: string; saveError?: string } {
|
|
122
|
-
if (!outputPath) return { fullOutput: fallbackOutput };
|
|
123
|
-
|
|
124
|
-
let changedSinceStart = false;
|
|
125
|
-
try {
|
|
126
|
-
const stat = fs.statSync(outputPath);
|
|
127
|
-
changedSinceStart = !beforeRun?.exists
|
|
128
|
-
|| stat.mtimeMs !== beforeRun.mtimeMs
|
|
129
|
-
|| stat.size !== beforeRun.size;
|
|
130
|
-
} catch (error) {
|
|
131
|
-
const code = error && typeof error === "object" && "code" in error ? (error as { code?: unknown }).code : undefined;
|
|
132
|
-
if (code !== "ENOENT" && code !== "ENOTDIR") {
|
|
133
|
-
return {
|
|
134
|
-
fullOutput: fallbackOutput,
|
|
135
|
-
saveError: `Failed to inspect output file: ${error instanceof Error ? error.message : String(error)}`,
|
|
136
|
-
};
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
if (changedSinceStart) {
|
|
141
|
-
try {
|
|
142
|
-
return { fullOutput: fs.readFileSync(outputPath, "utf-8"), savedPath: outputPath };
|
|
143
|
-
} catch (error) {
|
|
144
|
-
return {
|
|
145
|
-
fullOutput: fallbackOutput,
|
|
146
|
-
saveError: `Failed to read changed output file: ${error instanceof Error ? error.message : String(error)}`,
|
|
147
|
-
};
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
const save = persistSingleOutput(outputPath, fallbackOutput);
|
|
152
|
-
if (save.savedPath) return { fullOutput: fallbackOutput, savedPath: save.savedPath };
|
|
153
|
-
return { fullOutput: fallbackOutput, saveError: save.error };
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
export function finalizeSingleOutput(params: {
|
|
157
|
-
fullOutput: string;
|
|
158
|
-
truncatedOutput?: string;
|
|
159
|
-
outputPath?: string;
|
|
160
|
-
outputMode?: OutputMode;
|
|
161
|
-
exitCode: number;
|
|
162
|
-
savedPath?: string;
|
|
163
|
-
outputReference?: SavedOutputReference;
|
|
164
|
-
saveError?: string;
|
|
165
|
-
}): { displayOutput: string; savedPath?: string; outputReference?: SavedOutputReference; saveError?: string } {
|
|
166
|
-
let displayOutput = params.truncatedOutput || params.fullOutput;
|
|
167
|
-
if (params.exitCode === 0 && params.savedPath) {
|
|
168
|
-
const outputReference = params.outputReference ?? formatSavedOutputReference(params.savedPath, params.fullOutput);
|
|
169
|
-
if (params.outputMode === "file-only") {
|
|
170
|
-
return { displayOutput: outputReference.message, savedPath: params.savedPath, outputReference };
|
|
171
|
-
}
|
|
172
|
-
displayOutput += `\n\n${outputReference.message}`;
|
|
173
|
-
return { displayOutput, savedPath: params.savedPath, outputReference };
|
|
174
|
-
}
|
|
175
|
-
if (params.exitCode === 0 && params.saveError && params.outputPath) {
|
|
176
|
-
displayOutput += `\n\nOutput file error: ${params.outputPath}\n${params.saveError}`;
|
|
177
|
-
return { displayOutput, saveError: params.saveError };
|
|
178
|
-
}
|
|
179
|
-
return { displayOutput };
|
|
180
|
-
}
|
|
@@ -1,77 +0,0 @@
|
|
|
1
|
-
import * as fs from "node:fs";
|
|
2
|
-
import * as os from "node:os";
|
|
3
|
-
import * as path from "node:path";
|
|
4
|
-
import { Compile } from "typebox/compile";
|
|
5
|
-
import type { JsonSchemaObject } from "../../shared/types.ts";
|
|
6
|
-
|
|
7
|
-
export const STRUCTURED_OUTPUT_SCHEMA_ENV = "DM_SUBAGENT_STRUCTURED_OUTPUT_SCHEMA";
|
|
8
|
-
export const STRUCTURED_OUTPUT_CAPTURE_ENV = "DM_SUBAGENT_STRUCTURED_OUTPUT_CAPTURE";
|
|
9
|
-
|
|
10
|
-
export interface StructuredOutputRuntime {
|
|
11
|
-
schema: JsonSchemaObject;
|
|
12
|
-
schemaPath: string;
|
|
13
|
-
outputPath: string;
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
interface CompiledJsonSchema {
|
|
17
|
-
Check(value: unknown): boolean;
|
|
18
|
-
Errors(value: unknown): Iterable<{ instancePath?: string; message?: string }>;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export function assertJsonSchemaObject(schema: unknown, label = "outputSchema"): asserts schema is JsonSchemaObject {
|
|
22
|
-
if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
|
|
23
|
-
throw new Error(`${label} must be a JSON Schema object.`);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
export function createStructuredOutputRuntime(schema: JsonSchemaObject, baseDir?: string): StructuredOutputRuntime {
|
|
28
|
-
assertJsonSchemaObject(schema);
|
|
29
|
-
const rootDir = baseDir ?? os.tmpdir();
|
|
30
|
-
fs.mkdirSync(rootDir, { recursive: true });
|
|
31
|
-
const dir = fs.mkdtempSync(path.join(rootDir, "dm-subagent-structured-"));
|
|
32
|
-
const schemaPath = path.join(dir, "schema.json");
|
|
33
|
-
const outputPath = path.join(dir, "output.json");
|
|
34
|
-
fs.writeFileSync(schemaPath, JSON.stringify(schema), { mode: 0o600 });
|
|
35
|
-
return { schema, schemaPath, outputPath };
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
export function validateStructuredOutputValue(schema: JsonSchemaObject, value: unknown): { status: "valid" } | { status: "invalid"; message: string } {
|
|
39
|
-
let validator: CompiledJsonSchema;
|
|
40
|
-
try {
|
|
41
|
-
validator = (Compile as (schema: unknown) => CompiledJsonSchema)(schema);
|
|
42
|
-
} catch (error) {
|
|
43
|
-
return { status: "invalid", message: `invalid outputSchema: ${error instanceof Error ? error.message : String(error)}` };
|
|
44
|
-
}
|
|
45
|
-
if (validator.Check(value)) return { status: "valid" };
|
|
46
|
-
const errors = [...validator.Errors(value)]
|
|
47
|
-
.slice(0, 8)
|
|
48
|
-
.map((error) => {
|
|
49
|
-
const pathText = error.instancePath ? error.instancePath.replace(/^\//, "").replace(/\//g, ".") : "root";
|
|
50
|
-
return `${pathText}: ${error.message}`;
|
|
51
|
-
});
|
|
52
|
-
return { status: "invalid", message: errors.join("; ") || "schema validation failed" };
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
export function readStructuredOutput(runtime: StructuredOutputRuntime): { value?: unknown; error?: string } {
|
|
56
|
-
if (!fs.existsSync(runtime.outputPath)) {
|
|
57
|
-
return { error: "Missing structured_output call; this step has outputSchema and must finish by calling structured_output." };
|
|
58
|
-
}
|
|
59
|
-
let value: unknown;
|
|
60
|
-
try {
|
|
61
|
-
value = JSON.parse(fs.readFileSync(runtime.outputPath, "utf-8"));
|
|
62
|
-
} catch (error) {
|
|
63
|
-
return { error: `Failed to read structured output: ${error instanceof Error ? error.message : String(error)}` };
|
|
64
|
-
}
|
|
65
|
-
const validation = validateStructuredOutputValue(runtime.schema, value);
|
|
66
|
-
if (validation.status === "invalid") return { error: `Structured output validation failed: ${validation.message}` };
|
|
67
|
-
return { value };
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
export function cleanupStructuredOutputRuntime(runtime: StructuredOutputRuntime | undefined): void {
|
|
71
|
-
if (!runtime) return;
|
|
72
|
-
try {
|
|
73
|
-
fs.rmSync(path.dirname(runtime.schemaPath), { recursive: true, force: true });
|
|
74
|
-
} catch {
|
|
75
|
-
// Best-effort temp cleanup.
|
|
76
|
-
}
|
|
77
|
-
}
|