@fitchmultz/pi-subagents 0.0.0-stage → 0.44.5
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/CHANGELOG.md +1654 -0
- package/LICENSE +21 -0
- package/README.md +1533 -2
- package/agents/context-builder.md +97 -0
- package/agents/debugger.md +51 -0
- package/agents/delegate.md +13 -0
- package/agents/fixer.md +37 -0
- package/agents/oracle.md +71 -0
- package/agents/planner.md +72 -0
- package/agents/researcher.md +51 -0
- package/agents/reviewer-claude.md +69 -0
- package/agents/reviewer-gpt.md +68 -0
- package/agents/reviewer-ponytail.md +82 -0
- package/agents/reviewer-security.md +81 -0
- package/agents/reviewer.md +69 -0
- package/agents/scout.md +66 -0
- package/agents/ui-designer.md +51 -0
- package/agents/watcher.md +26 -0
- package/agents/worker.md +46 -0
- package/agents/writer.md +36 -0
- package/dist/agents/agent-management.js +923 -0
- package/dist/agents/agent-scope.js +7 -0
- package/dist/agents/agent-selection.js +20 -0
- package/dist/agents/agent-serializer.js +100 -0
- package/dist/agents/agents.js +752 -0
- package/dist/agents/chain-serializer.js +367 -0
- package/dist/agents/frontmatter.js +21 -0
- package/dist/agents/identity.js +29 -0
- package/dist/agents/skills.js +570 -0
- package/dist/extension/build-info.js +1 -0
- package/dist/extension/compact-tools.js +112 -0
- package/dist/extension/config.js +22 -0
- package/dist/extension/control-notices.js +29 -0
- package/dist/extension/doctor.js +143 -0
- package/dist/extension/fanout-child.js +326 -0
- package/dist/extension/index.js +577 -0
- package/dist/extension/schemas.js +416 -0
- package/dist/extension/tool-input.js +20 -0
- package/dist/extension/tool-result.js +14 -0
- package/dist/history/canonical-result.js +81 -0
- package/dist/history/database.js +72 -0
- package/dist/history/index.js +199 -0
- package/dist/history/ingest.js +468 -0
- package/dist/history/queries.js +350 -0
- package/dist/history/store.js +216 -0
- package/dist/history/types.js +4 -0
- package/dist/history/worker.js +466 -0
- package/dist/intercom/intercom-bridge.js +112 -0
- package/dist/intercom/live-intercom.js +94 -0
- package/dist/intercom/result-intercom.js +373 -0
- package/dist/pi-intercom/agent-dir.js +10 -0
- package/dist/pi-intercom/bridge.js +750 -0
- package/dist/pi-intercom/broker/broker.js +426 -0
- package/dist/pi-intercom/broker/client.js +492 -0
- package/dist/pi-intercom/broker/framing.js +65 -0
- package/dist/pi-intercom/broker/paths.js +42 -0
- package/dist/pi-intercom/broker/pid.js +66 -0
- package/dist/pi-intercom/broker/spawn.js +221 -0
- package/dist/pi-intercom/config.js +102 -0
- package/dist/pi-intercom/index.js +2942 -0
- package/dist/pi-intercom/reply-tracker.js +182 -0
- package/dist/pi-intercom/session-targets.js +128 -0
- package/dist/pi-intercom/subagent-live-events.js +132 -0
- package/dist/pi-intercom/topics.js +157 -0
- package/dist/pi-intercom/types.js +163 -0
- package/dist/pi-intercom/ui/compose.js +269 -0
- package/dist/pi-intercom/ui/inline-message.js +80 -0
- package/dist/pi-intercom/ui/session-list.js +124 -0
- package/dist/runs/background/async-control.js +95 -0
- package/dist/runs/background/async-execution.js +676 -0
- package/dist/runs/background/async-job-tracker.js +383 -0
- package/dist/runs/background/async-result-file.js +58 -0
- package/dist/runs/background/async-resume.js +305 -0
- package/dist/runs/background/async-status.js +442 -0
- package/dist/runs/background/completion-dedupe.js +69 -0
- package/dist/runs/background/completion-delivery.js +245 -0
- package/dist/runs/background/notify.js +71 -0
- package/dist/runs/background/parallel-groups.js +55 -0
- package/dist/runs/background/result-watcher.js +426 -0
- package/dist/runs/background/run-id-resolver.js +64 -0
- package/dist/runs/background/run-status.js +382 -0
- package/dist/runs/background/stale-run-reconciler.js +335 -0
- package/dist/runs/background/subagent-runner-launcher.js +55 -0
- package/dist/runs/background/subagent-runner.js +1872 -0
- package/dist/runs/background/top-level-async.js +5 -0
- package/dist/runs/foreground/chain-clarify.js +1152 -0
- package/dist/runs/foreground/clarify-invocation.js +72 -0
- package/dist/runs/foreground/execution-input.js +423 -0
- package/dist/runs/foreground/foreground-control.js +817 -0
- package/dist/runs/foreground/question-control.js +88 -0
- package/dist/runs/foreground/run-async-path.js +205 -0
- package/dist/runs/foreground/subagent-executor.js +442 -0
- package/dist/runs/foreground/subagent-params.js +165 -0
- package/dist/runs/foreground/wait-run.js +141 -0
- package/dist/runs/shared/acceptance-contract.js +253 -0
- package/dist/runs/shared/acceptance-evaluation.js +256 -0
- package/dist/runs/shared/acceptance-finalization.js +280 -0
- package/dist/runs/shared/acceptance-reports.js +147 -0
- package/dist/runs/shared/acceptance.js +4 -0
- package/dist/runs/shared/chain-outputs.js +110 -0
- package/dist/runs/shared/child-attempt.js +693 -0
- package/dist/runs/shared/child-execution-cwd.js +96 -0
- package/dist/runs/shared/child-observations.js +114 -0
- package/dist/runs/shared/claude-code.js +199 -0
- package/dist/runs/shared/completion-guard.js +31 -0
- package/dist/runs/shared/dynamic-fanout.js +274 -0
- package/dist/runs/shared/history-index.js +72 -0
- package/dist/runs/shared/mcp-direct-tool-allowlist.js +334 -0
- package/dist/runs/shared/model-fallback.js +185 -0
- package/dist/runs/shared/mutating-tool-guard.js +170 -0
- package/dist/runs/shared/native-finalization.js +101 -0
- package/dist/runs/shared/native-usage.js +153 -0
- package/dist/runs/shared/nested-events.js +700 -0
- package/dist/runs/shared/nested-path.js +48 -0
- package/dist/runs/shared/nested-render.js +108 -0
- package/dist/runs/shared/parallel-utils.js +61 -0
- package/dist/runs/shared/parent-receipts.js +68 -0
- package/dist/runs/shared/parent-usage.js +121 -0
- package/dist/runs/shared/pi-args.js +310 -0
- package/dist/runs/shared/pi-spawn.js +52 -0
- package/dist/runs/shared/run-history-queries.js +45 -0
- package/dist/runs/shared/run-history.js +110 -0
- package/dist/runs/shared/run-id-ambiguity.js +4 -0
- package/dist/runs/shared/run-records.js +679 -0
- package/dist/runs/shared/session-cwd-preload.js +33 -0
- package/dist/runs/shared/single-output.js +222 -0
- package/dist/runs/shared/streaming-text.js +15 -0
- package/dist/runs/shared/structured-output.js +55 -0
- package/dist/runs/shared/subagent-control.js +179 -0
- package/dist/runs/shared/subagent-prompt-runtime.js +197 -0
- package/dist/runs/shared/subagent-tool-loop-guard.js +66 -0
- package/dist/runs/shared/supervisor-questions.js +350 -0
- package/dist/runs/shared/workflow-graph.js +214 -0
- package/dist/runs/shared/workflow-policy.js +84 -0
- package/dist/runs/shared/worktree.js +525 -0
- package/dist/shared/agent-context-policy.js +126 -0
- package/dist/shared/artifacts.js +96 -0
- package/dist/shared/atomic-json.js +13 -0
- package/dist/shared/cooperative.js +20 -0
- package/dist/shared/execution-cwd.js +14 -0
- package/dist/shared/file-coalescer.js +21 -0
- package/dist/shared/fork-context.js +49 -0
- package/dist/shared/formatters.js +85 -0
- package/dist/shared/journal-reader.js +407 -0
- package/dist/shared/lazy-tools.js +32 -0
- package/dist/shared/model-info.js +68 -0
- package/dist/shared/native-session.js +15 -0
- package/dist/shared/native-tui.js +18 -0
- package/dist/shared/native-typebox.js +20 -0
- package/dist/shared/post-exit-stdio-guard.js +197 -0
- package/dist/shared/prompt-sections.js +8 -0
- package/dist/shared/session-entries.js +52 -0
- package/dist/shared/session-identity.js +14 -0
- package/dist/shared/settings.js +254 -0
- package/dist/shared/status-format.js +111 -0
- package/dist/shared/temp-root.js +114 -0
- package/dist/shared/types.js +207 -0
- package/dist/shared/ui-mode.js +3 -0
- package/dist/shared/utils.js +334 -0
- package/dist/slash/prompt-template-bridge.js +298 -0
- package/dist/slash/slash-bridge.js +116 -0
- package/dist/slash/slash-commands.js +607 -0
- package/dist/slash/slash-live-state.js +246 -0
- package/dist/tui/action-hints.js +75 -0
- package/dist/tui/agent-history.js +197 -0
- package/dist/tui/agent-view.js +1656 -0
- package/dist/tui/render.js +1515 -0
- package/docs/intercom-bridge.md +212 -0
- package/docs/intercom.md +581 -0
- package/docs/performance.md +121 -0
- package/package.json +102 -4
- package/prompts/gather-context-and-clarify.md +14 -0
- package/prompts/parallel-cleanup.md +62 -0
- package/prompts/parallel-context-build.md +56 -0
- package/prompts/parallel-handoff-plan.md +62 -0
- package/prompts/parallel-research.md +51 -0
- package/prompts/parallel-review.md +59 -0
- package/prompts/review-loop.md +42 -0
- package/scripts/build.mjs +134 -0
- package/scripts/check-compat.mjs +48 -0
- package/scripts/compat-host.mjs +19 -0
- package/scripts/intercom-bridge-credentials.mjs +143 -0
- package/scripts/intercom-remote.mjs +103 -0
- package/scripts/linux-smoke.sh +51 -0
- package/scripts/local-install-smoke.mjs +66 -0
- package/scripts/native-package-smoke.mjs +82 -0
- package/scripts/package-smoke.mjs +209 -0
- package/scripts/prepare.mjs +67 -0
- package/scripts/real-pi-smoke.mjs +415 -0
- package/scripts/run-tests.mjs +149 -0
- package/skills/pi-intercom/SKILL.md +113 -0
- package/skills/pi-intercom/evals/evals.json +29 -0
- package/skills/pi-intercom/evals/trigger-evals.json +47 -0
- package/skills/pi-intercom/references/peer-sessions.md +69 -0
- package/skills/pi-subagents/SKILL.md +76 -0
- package/skills/pi-subagents/evals/evals.json +29 -0
- package/skills/pi-subagents/evals/trigger-evals.json +42 -0
- package/skills/pi-subagents/references/full-orchestration-guide.md +863 -0
- package/src/agents/agent-management.ts +813 -0
- package/src/agents/agent-scope.ts +7 -0
- package/src/agents/agent-selection.ts +23 -0
- package/src/agents/agent-serializer.ts +99 -0
- package/src/agents/agents.ts +916 -0
- package/src/agents/chain-serializer.ts +329 -0
- package/src/agents/frontmatter.ts +21 -0
- package/src/agents/identity.ts +30 -0
- package/src/agents/skills.ts +637 -0
- package/src/extension/build-info.ts +2 -0
- package/src/extension/compact-tools.ts +114 -0
- package/src/extension/config.ts +23 -0
- package/src/extension/control-notices.ts +47 -0
- package/src/extension/doctor.ts +171 -0
- package/src/extension/fanout-child.ts +312 -0
- package/src/extension/index.ts +649 -0
- package/src/extension/schemas.ts +444 -0
- package/src/extension/tool-input.ts +19 -0
- package/src/extension/tool-result.ts +16 -0
- package/src/history/canonical-result.ts +62 -0
- package/src/history/database.ts +59 -0
- package/src/history/index.ts +156 -0
- package/src/history/ingest.ts +349 -0
- package/src/history/queries.ts +241 -0
- package/src/history/store.ts +203 -0
- package/src/history/types.ts +166 -0
- package/src/history/worker.ts +321 -0
- package/src/intercom/intercom-bridge.ts +123 -0
- package/src/intercom/live-intercom.ts +104 -0
- package/src/intercom/result-intercom.ts +429 -0
- package/src/pi-intercom/agent-dir.ts +9 -0
- package/src/pi-intercom/bridge.ts +668 -0
- package/src/pi-intercom/broker/broker.ts +463 -0
- package/src/pi-intercom/broker/client.ts +558 -0
- package/src/pi-intercom/broker/framing.ts +77 -0
- package/src/pi-intercom/broker/paths.ts +47 -0
- package/src/pi-intercom/broker/pid.ts +59 -0
- package/src/pi-intercom/broker/spawn.ts +248 -0
- package/src/pi-intercom/config.ts +142 -0
- package/src/pi-intercom/index.ts +2929 -0
- package/src/pi-intercom/reply-tracker.ts +211 -0
- package/src/pi-intercom/session-targets.ts +172 -0
- package/src/pi-intercom/subagent-live-events.ts +133 -0
- package/src/pi-intercom/topics.ts +125 -0
- package/src/pi-intercom/types.ts +271 -0
- package/src/pi-intercom/ui/compose.ts +289 -0
- package/src/pi-intercom/ui/inline-message.ts +92 -0
- package/src/pi-intercom/ui/session-list.ts +139 -0
- package/src/runs/background/async-control.ts +89 -0
- package/src/runs/background/async-execution.ts +850 -0
- package/src/runs/background/async-job-tracker.ts +385 -0
- package/src/runs/background/async-result-file.ts +62 -0
- package/src/runs/background/async-resume.ts +333 -0
- package/src/runs/background/async-status.ts +481 -0
- package/src/runs/background/completion-dedupe.ts +79 -0
- package/src/runs/background/completion-delivery.ts +195 -0
- package/src/runs/background/notify.ts +123 -0
- package/src/runs/background/parallel-groups.ts +53 -0
- package/src/runs/background/result-watcher.ts +423 -0
- package/src/runs/background/run-id-resolver.ts +69 -0
- package/src/runs/background/run-status.ts +384 -0
- package/src/runs/background/stale-run-reconciler.ts +369 -0
- package/src/runs/background/subagent-runner-launcher.ts +56 -0
- package/src/runs/background/subagent-runner.ts +2053 -0
- package/src/runs/background/top-level-async.ts +13 -0
- package/src/runs/foreground/chain-clarify.ts +1340 -0
- package/src/runs/foreground/clarify-invocation.ts +77 -0
- package/src/runs/foreground/execution-input.ts +467 -0
- package/src/runs/foreground/foreground-control.ts +821 -0
- package/src/runs/foreground/question-control.ts +82 -0
- package/src/runs/foreground/run-async-path.ts +243 -0
- package/src/runs/foreground/subagent-executor.ts +501 -0
- package/src/runs/foreground/subagent-params.ts +320 -0
- package/src/runs/foreground/wait-run.ts +124 -0
- package/src/runs/shared/acceptance-contract.ts +257 -0
- package/src/runs/shared/acceptance-evaluation.ts +275 -0
- package/src/runs/shared/acceptance-finalization.ts +353 -0
- package/src/runs/shared/acceptance-reports.ts +152 -0
- package/src/runs/shared/acceptance.ts +33 -0
- package/src/runs/shared/chain-outputs.ts +114 -0
- package/src/runs/shared/child-attempt.ts +623 -0
- package/src/runs/shared/child-execution-cwd.ts +91 -0
- package/src/runs/shared/child-observations.ts +99 -0
- package/src/runs/shared/claude-code.ts +243 -0
- package/src/runs/shared/completion-guard.ts +35 -0
- package/src/runs/shared/dynamic-fanout.ts +295 -0
- package/src/runs/shared/history-index.ts +69 -0
- package/src/runs/shared/mcp-direct-tool-allowlist.ts +376 -0
- package/src/runs/shared/model-fallback.ts +219 -0
- package/src/runs/shared/mutating-tool-guard.ts +194 -0
- package/src/runs/shared/native-finalization.ts +128 -0
- package/src/runs/shared/native-usage.ts +113 -0
- package/src/runs/shared/nested-events.ts +752 -0
- package/src/runs/shared/nested-path.ts +52 -0
- package/src/runs/shared/nested-render.ts +119 -0
- package/src/runs/shared/parallel-utils.ts +153 -0
- package/src/runs/shared/parent-receipts.ts +59 -0
- package/src/runs/shared/parent-usage.ts +121 -0
- package/src/runs/shared/pi-args.ts +350 -0
- package/src/runs/shared/pi-spawn.ts +52 -0
- package/src/runs/shared/run-history-queries.ts +44 -0
- package/src/runs/shared/run-history.ts +100 -0
- package/src/runs/shared/run-id-ambiguity.ts +4 -0
- package/src/runs/shared/run-records.ts +607 -0
- package/src/runs/shared/session-cwd-preload.ts +27 -0
- package/src/runs/shared/single-output.ts +267 -0
- package/src/runs/shared/streaming-text.ts +18 -0
- package/src/runs/shared/structured-output.ts +68 -0
- package/src/runs/shared/subagent-control.ts +219 -0
- package/src/runs/shared/subagent-prompt-runtime.ts +201 -0
- package/src/runs/shared/subagent-tool-loop-guard.ts +89 -0
- package/src/runs/shared/supervisor-questions.ts +415 -0
- package/src/runs/shared/workflow-graph.ts +220 -0
- package/src/runs/shared/workflow-policy.ts +125 -0
- package/src/runs/shared/worktree.ts +635 -0
- package/src/shared/agent-context-policy.ts +184 -0
- package/src/shared/artifacts.ts +95 -0
- package/src/shared/atomic-json.ts +16 -0
- package/src/shared/cooperative.ts +21 -0
- package/src/shared/execution-cwd.ts +14 -0
- package/src/shared/file-coalescer.ts +29 -0
- package/src/shared/fork-context.ts +68 -0
- package/src/shared/formatters.ts +84 -0
- package/src/shared/journal-reader.ts +333 -0
- package/src/shared/lazy-tools.ts +36 -0
- package/src/shared/model-info.ts +81 -0
- package/src/shared/native-session.ts +8 -0
- package/src/shared/native-tui.ts +10 -0
- package/src/shared/native-typebox.ts +14 -0
- package/src/shared/post-exit-stdio-guard.ts +204 -0
- package/src/shared/prompt-sections.ts +10 -0
- package/src/shared/session-entries.ts +49 -0
- package/src/shared/session-identity.ts +18 -0
- package/src/shared/settings.ts +384 -0
- package/src/shared/status-format.ts +123 -0
- package/src/shared/temp-root.ts +107 -0
- package/src/shared/types.ts +1260 -0
- package/src/shared/ui-mode.ts +5 -0
- package/src/shared/utils.ts +342 -0
- package/src/slash/prompt-template-bridge.ts +408 -0
- package/src/slash/slash-bridge.ts +178 -0
- package/src/slash/slash-commands.ts +617 -0
- package/src/slash/slash-live-state.ts +292 -0
- package/src/tui/action-hints.ts +69 -0
- package/src/tui/agent-history.ts +210 -0
- package/src/tui/agent-view.ts +1323 -0
- package/src/tui/render.ts +1550 -0
- package/tsconfig.build.json +12 -0
- package/tsconfig.json +19 -0
|
@@ -0,0 +1,384 @@
|
|
|
1
|
+
import * as fs from "node:fs";
|
|
2
|
+
import { readOutputPage } from "../../shared/journal-reader.ts";
|
|
3
|
+
import * as path from "node:path";
|
|
4
|
+
import { formatActivityFacts, formatAsyncRunList, formatAsyncRunOutputPath, formatAsyncRunProgressLabel, listAsyncRuns } from "./async-status.ts";
|
|
5
|
+
import { formatNestedRunStatusLines } from "../shared/nested-render.ts";
|
|
6
|
+
import { formatModelThinking } from "../../shared/formatters.ts";
|
|
7
|
+
import { buildManagementControl, formatActivityLabel, formatLiveIntercomActionLines, formatRunAction } from "../../shared/status-format.ts";
|
|
8
|
+
import { ASYNC_DIR, RESULTS_DIR, type AsyncStatus, type NestedRunSummary, type SubagentLiveIntercomHealth, type SubagentState, type SubagentExecutionResult } from "../../shared/types.ts";
|
|
9
|
+
import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
|
|
10
|
+
import { exactAsyncRunLocation, resolveAsyncRunLocation } from "./async-resume.ts";
|
|
11
|
+
import { resolveSubagentRunId } from "./run-id-resolver.ts";
|
|
12
|
+
import { flatToLogicalStepIndex, normalizeParallelGroups } from "./parallel-groups.ts";
|
|
13
|
+
import { reconcileAsyncRun, reconcileNestedAsyncDescendants } from "./stale-run-reconciler.ts";
|
|
14
|
+
import { attachRootChildrenToSteps, findNestedRouteForRootId, findNestedRun, type NestedRunResolutionScope } from "../shared/nested-events.ts";
|
|
15
|
+
import { readAsyncResultFile } from "./async-result-file.ts";
|
|
16
|
+
import { readStatus } from "../../shared/utils.ts";
|
|
17
|
+
|
|
18
|
+
const ASYNC_COMPLETION_REMINDER = "Completion will be delivered automatically. If you are only waiting, end your turn instead of polling status again.";
|
|
19
|
+
|
|
20
|
+
interface RunStatusParams {
|
|
21
|
+
action?: "status";
|
|
22
|
+
id?: string;
|
|
23
|
+
runId?: string;
|
|
24
|
+
dir?: string;
|
|
25
|
+
full?: boolean;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
interface RunStatusDeps {
|
|
29
|
+
asyncDirRoot?: string;
|
|
30
|
+
resultsDir?: string;
|
|
31
|
+
kill?: (pid: number, signal?: NodeJS.Signals | 0) => boolean;
|
|
32
|
+
now?: () => number;
|
|
33
|
+
state?: SubagentState;
|
|
34
|
+
nested?: NestedRunResolutionScope;
|
|
35
|
+
intercomHealth?: Map<string, SubagentLiveIntercomHealth>;
|
|
36
|
+
includeRunHeader?: boolean;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
function hasExistingSessionFile(value: unknown): value is string {
|
|
40
|
+
return typeof value === "string" && fs.existsSync(value);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function completionTargetsCurrentSession(run: Pick<AsyncStatus, "sessionId" | "cwd">, state: SubagentState | undefined): boolean {
|
|
44
|
+
if (!state) return true;
|
|
45
|
+
if (run.sessionId) return run.sessionId === state.currentSessionId;
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
function nestedCompletionTargetsCurrentSession(rootRunId: string, asyncDirRoot: string, state: SubagentState | undefined): boolean {
|
|
50
|
+
if (!state || state.ownedRuns?.has(rootRunId)) return true;
|
|
51
|
+
const tracked = state.asyncJobs.get(rootRunId);
|
|
52
|
+
if (tracked) return completionTargetsCurrentSession(tracked, state);
|
|
53
|
+
try {
|
|
54
|
+
const location = exactAsyncRunLocation(rootRunId, asyncDirRoot, RESULTS_DIR);
|
|
55
|
+
const status = location.asyncDir ? readStatus(location.asyncDir) : null;
|
|
56
|
+
return status ? completionTargetsCurrentSession(status, state) : false;
|
|
57
|
+
} catch {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function formatResumeGuidance(runId: string | undefined, children: Array<{ agent?: unknown; sessionFile?: unknown }>, fallbackSessionFile?: unknown, childSafe = false): string {
|
|
63
|
+
const knownChildren = children
|
|
64
|
+
.map((child, index) => ({ child, index }))
|
|
65
|
+
.filter(({ child }) => typeof child.agent === "string");
|
|
66
|
+
if (!runId || knownChildren.length === 0) return "Resume: unavailable; no child session file was persisted.";
|
|
67
|
+
const singleSessionFile = knownChildren[0]?.child.sessionFile ?? fallbackSessionFile;
|
|
68
|
+
if (children.length === 1 && knownChildren.length === 1 && hasExistingSessionFile(singleSessionFile)) {
|
|
69
|
+
return `Continue: ${formatRunAction("resume", runId, { message: "..." }, childSafe)}`;
|
|
70
|
+
}
|
|
71
|
+
const childWithSession = knownChildren.find(({ child }) => hasExistingSessionFile(child.sessionFile));
|
|
72
|
+
if (childWithSession) {
|
|
73
|
+
return `Continue child: ${formatRunAction("resume", runId, { index: childWithSession.index, message: "..." }, childSafe)}`;
|
|
74
|
+
}
|
|
75
|
+
return "Resume: unavailable; no child session file was persisted.";
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
function formatAcceptanceFinalizationSummary(finalization: NonNullable<NonNullable<AsyncStatus["steps"]>[number]["acceptance"]>["finalization"] | undefined): string {
|
|
79
|
+
if (!finalization) return "";
|
|
80
|
+
return `, finalization: ${finalization.status} after ${finalization.turns.length}/${finalization.maxTurns} turns`;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
function formatOutputExcerpt(outputPath: string | undefined, maxBytes = 4096, maxLines = 12): string[] {
|
|
84
|
+
if (!outputPath || !fs.existsSync(outputPath)) return [];
|
|
85
|
+
try {
|
|
86
|
+
const page = readOutputPage(outputPath, { length: maxBytes });
|
|
87
|
+
const truncatedBytes = page.offset > 0;
|
|
88
|
+
const text = page.text.trim();
|
|
89
|
+
if (!text) return [];
|
|
90
|
+
const allLines = text.split(/\r?\n/);
|
|
91
|
+
const lines = allLines.slice(-maxLines);
|
|
92
|
+
const truncatedLines = allLines.length > maxLines;
|
|
93
|
+
const suffix = truncatedBytes || truncatedLines ? " (tail, truncated)" : "";
|
|
94
|
+
return [`Output excerpt${suffix}:`, ...lines.map((line) => ` ${line}`)];
|
|
95
|
+
} catch (error) {
|
|
96
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
97
|
+
return [`Output excerpt unavailable: ${message}`];
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
function stepLineLabel(status: AsyncStatus, index: number): string {
|
|
102
|
+
const steps = status.steps ?? [];
|
|
103
|
+
if (status.mode === "parallel") return `Agent ${index + 1}/${steps.length || 1}`;
|
|
104
|
+
if (status.mode === "chain") {
|
|
105
|
+
const chainStepCount = status.chainStepCount ?? (steps.length || 1);
|
|
106
|
+
const groups = normalizeParallelGroups(status.parallelGroups, steps.length, chainStepCount);
|
|
107
|
+
const group = groups.find((candidate) => index >= candidate.start && index < candidate.start + candidate.count);
|
|
108
|
+
if (group) return `Step ${group.stepIndex + 1}/${chainStepCount} Agent ${index - group.start + 1}/${group.count}`;
|
|
109
|
+
return `Step ${flatToLogicalStepIndex(index, chainStepCount, groups) + 1}/${chainStepCount}`;
|
|
110
|
+
}
|
|
111
|
+
return `Step ${index + 1}`;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
function nestedRunDisplayName(run: NestedRunSummary): string {
|
|
115
|
+
if (run.agent) return run.agent;
|
|
116
|
+
if (run.agents?.length) return run.agents.join(", ");
|
|
117
|
+
return run.id;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
function normalizedState(state: AsyncStatus["state"] | NestedRunSummary["state"]): "live" | "completed" | "paused" | "blocked" | "failed" | "unknown" {
|
|
121
|
+
if (state === "running" || state === "queued") return "live";
|
|
122
|
+
if (state === "complete") return "completed";
|
|
123
|
+
if (state === "paused" || state === "blocked" || state === "failed") return state;
|
|
124
|
+
return "unknown";
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
function formatNestedExactStatus(rootRunId: string, run: NestedRunSummary, childSafe: boolean): string {
|
|
128
|
+
const lines = [
|
|
129
|
+
`Nested run: ${run.id}`,
|
|
130
|
+
`Root: ${rootRunId}`,
|
|
131
|
+
`Parent: ${run.parentRunId}${run.parentStepIndex !== undefined ? ` step ${run.parentStepIndex + 1}` : ""}`,
|
|
132
|
+
`State: ${run.state}`,
|
|
133
|
+
run.activityState || run.lastActivityAt ? `Activity: ${formatActivityLabel(run.lastActivityAt, run.activityState)}` : undefined,
|
|
134
|
+
run.mode ? `Mode: ${run.mode}` : undefined,
|
|
135
|
+
`Agent: ${nestedRunDisplayName(run)}`,
|
|
136
|
+
run.currentStep !== undefined ? `Progress: step ${run.currentStep + 1}/${run.chainStepCount ?? run.steps?.length ?? 1}` : undefined,
|
|
137
|
+
run.asyncDir ? `Dir: ${run.asyncDir}` : undefined,
|
|
138
|
+
run.sessionFile ? `Session: ${run.sessionFile}` : undefined,
|
|
139
|
+
run.error ? `Error: ${run.error}` : undefined,
|
|
140
|
+
].filter((line): line is string => Boolean(line));
|
|
141
|
+
if (run.path.length) {
|
|
142
|
+
lines.push(`Path: ${run.path.map((part) => `${part.runId}${part.stepIndex !== undefined ? `:${part.stepIndex + 1}` : ""}${part.agent ? `:${part.agent}` : ""}`).join(" > ")} > ${run.id}`);
|
|
143
|
+
}
|
|
144
|
+
if (run.steps?.length) {
|
|
145
|
+
lines.push("Steps:");
|
|
146
|
+
for (const [index, step] of run.steps.entries()) {
|
|
147
|
+
const activity = step.status === "running" ? formatActivityLabel(step.lastActivityAt, step.activityState) : undefined;
|
|
148
|
+
lines.push(` ${index + 1}. ${step.agent} ${step.status}${activity ? `, ${activity}` : ""}${step.error ? `, error: ${step.error}` : ""}`);
|
|
149
|
+
lines.push(...formatNestedRunStatusLines(step.children, { indent: " ", commandHints: true, childSafe }));
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
lines.push(...formatNestedRunStatusLines(run.children, { indent: " ", commandHints: true, childSafe }));
|
|
153
|
+
const state = normalizedState(run.state);
|
|
154
|
+
lines.push("Commands:", ` Status: ${formatRunAction("status", run.id, {}, childSafe)}`);
|
|
155
|
+
if (state === "live") lines.push(` ${childSafe ? "Interrupt" : "Stop"}: ${formatRunAction("interrupt", run.id, {}, childSafe)}`);
|
|
156
|
+
if (state === "live" || run.sessionFile) lines.push(` ${childSafe ? "Resume" : "Continue"}: ${formatRunAction("resume", run.id, { message: "..." }, childSafe)}`);
|
|
157
|
+
lines.push(` Root status: ${formatRunAction("status", rootRunId, {}, childSafe)}`);
|
|
158
|
+
return lines.join("\n");
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDeps = {}): SubagentExecutionResult {
|
|
162
|
+
const childSafe = Boolean(deps.nested);
|
|
163
|
+
const asyncDirRoot = deps.asyncDirRoot ?? ASYNC_DIR;
|
|
164
|
+
const resultsDir = deps.resultsDir ?? RESULTS_DIR;
|
|
165
|
+
if (!params.id && !params.runId && !params.dir) {
|
|
166
|
+
if (deps.nested) {
|
|
167
|
+
return {
|
|
168
|
+
content: [{ type: "text", text: "Child-safe subagent status requires a run id." }],
|
|
169
|
+
isError: true,
|
|
170
|
+
details: { mode: "single", results: [] },
|
|
171
|
+
};
|
|
172
|
+
}
|
|
173
|
+
try {
|
|
174
|
+
const runs = listAsyncRuns(asyncDirRoot, {
|
|
175
|
+
resultsDir,
|
|
176
|
+
kill: deps.kill,
|
|
177
|
+
now: deps.now,
|
|
178
|
+
}).filter((run) => completionTargetsCurrentSession(run, deps.state));
|
|
179
|
+
const text = formatAsyncRunList(runs, "Async runs");
|
|
180
|
+
const reminder = runs.some((run) => run.state === "running" || run.state === "queued");
|
|
181
|
+
return {
|
|
182
|
+
content: [{ type: "text", text: reminder ? `${text}\n${ASYNC_COMPLETION_REMINDER}` : text }],
|
|
183
|
+
details: {
|
|
184
|
+
mode: "single", results: [],
|
|
185
|
+
managementControls: runs.map((run) => {
|
|
186
|
+
const running = run.steps.find((step) => step.status === "running");
|
|
187
|
+
const target = running ? resolveSubagentIntercomTarget(run.id, running.agent, running.index) : undefined;
|
|
188
|
+
const resumable = run.steps.find((step) => hasExistingSessionFile(step.sessionFile));
|
|
189
|
+
return buildManagementControl({ state: normalizedState(run.state), runId: run.id, index: running?.index ?? resumable?.index, intercomTarget: target, canNudge: Boolean(running), canResume: Boolean(running || resumable || (run.steps.length <= 1 && hasExistingSessionFile(run.sessionFile))), canInterrupt: run.state === "running" });
|
|
190
|
+
}),
|
|
191
|
+
},
|
|
192
|
+
};
|
|
193
|
+
} catch (error) {
|
|
194
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
195
|
+
return {
|
|
196
|
+
content: [{ type: "text", text: message }],
|
|
197
|
+
isError: true,
|
|
198
|
+
details: { mode: "single", results: [] },
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
let location;
|
|
204
|
+
try {
|
|
205
|
+
const requestedId = params.id ?? params.runId;
|
|
206
|
+
if (!params.dir && requestedId) {
|
|
207
|
+
const resolved = resolveSubagentRunId(requestedId, { asyncDirRoot, resultsDir, state: deps.state, nested: deps.nested });
|
|
208
|
+
if (resolved?.kind === "nested") {
|
|
209
|
+
const children = reconcileNestedAsyncDescendants(resolved.match.route, { resultsDir, kill: deps.kill, now: deps.now });
|
|
210
|
+
const nested = resolved;
|
|
211
|
+
const run = findNestedRun(children, nested.id) ?? nested.match.run;
|
|
212
|
+
const state = normalizedState(run.state);
|
|
213
|
+
const intercomTarget = run.intercomTarget ?? run.leafIntercomTarget;
|
|
214
|
+
const text = formatNestedExactStatus(nested.match.rootRunId, run, childSafe);
|
|
215
|
+
const reminder = state === "live" && nestedCompletionTargetsCurrentSession(nested.match.rootRunId, asyncDirRoot, deps.state);
|
|
216
|
+
return {
|
|
217
|
+
content: [{ type: "text", text: reminder ? `${text}\n${ASYNC_COMPLETION_REMINDER}` : text }],
|
|
218
|
+
details: {
|
|
219
|
+
mode: "single", results: [],
|
|
220
|
+
managementControl: buildManagementControl({ state, runId: run.id, intercomTarget, canNudge: false, canResume: state === "live" || Boolean(run.sessionFile), canInterrupt: state === "live" }),
|
|
221
|
+
},
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
if (resolved?.kind === "async") location = resolved.location;
|
|
225
|
+
else location = { asyncDir: null, resultPath: null, resolvedId: requestedId };
|
|
226
|
+
} else {
|
|
227
|
+
location = resolveAsyncRunLocation(params, asyncDirRoot, resultsDir);
|
|
228
|
+
}
|
|
229
|
+
} catch (error) {
|
|
230
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
231
|
+
return {
|
|
232
|
+
content: [{ type: "text", text: message }],
|
|
233
|
+
isError: true,
|
|
234
|
+
details: { mode: "single", results: [] },
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
const { asyncDir, resultPath, resolvedId } = location;
|
|
238
|
+
|
|
239
|
+
if (!asyncDir && !resultPath) {
|
|
240
|
+
return {
|
|
241
|
+
content: [{ type: "text", text: "Async run not found. Provide id or dir." }],
|
|
242
|
+
isError: true,
|
|
243
|
+
details: { mode: "single", results: [] },
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
if (asyncDir) {
|
|
248
|
+
let reconciliation;
|
|
249
|
+
try {
|
|
250
|
+
reconciliation = reconcileAsyncRun(asyncDir, { resultsDir, kill: deps.kill, now: deps.now });
|
|
251
|
+
} catch (error) {
|
|
252
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
253
|
+
return {
|
|
254
|
+
content: [{ type: "text", text: message }],
|
|
255
|
+
isError: true,
|
|
256
|
+
details: { mode: "single", results: [] },
|
|
257
|
+
};
|
|
258
|
+
}
|
|
259
|
+
const status = reconciliation.status;
|
|
260
|
+
const effectiveRunId = status?.runId ?? resolvedId ?? "unknown";
|
|
261
|
+
const logPath = path.join(asyncDir, `subagent-log-${effectiveRunId}.md`);
|
|
262
|
+
const eventsPath = path.join(asyncDir, "events.jsonl");
|
|
263
|
+
if (status) {
|
|
264
|
+
const intercomTargets: string[] = [];
|
|
265
|
+
let nestedChildren: NestedRunSummary[] = [];
|
|
266
|
+
let nestedWarning: string | undefined;
|
|
267
|
+
try {
|
|
268
|
+
const nestedRoute = findNestedRouteForRootId(status.runId);
|
|
269
|
+
if (nestedRoute) nestedChildren = reconcileNestedAsyncDescendants(nestedRoute, { resultsDir, kill: deps.kill, now: deps.now });
|
|
270
|
+
attachRootChildrenToSteps(status.runId, status.steps, nestedChildren);
|
|
271
|
+
} catch (error) {
|
|
272
|
+
nestedWarning = `Nested status unavailable: ${error instanceof Error ? error.message : String(error)}`;
|
|
273
|
+
}
|
|
274
|
+
const outputPath = formatAsyncRunOutputPath({ asyncDir, outputFile: status.outputFile });
|
|
275
|
+
const progressLabel = formatAsyncRunProgressLabel({
|
|
276
|
+
mode: status.mode,
|
|
277
|
+
state: status.state,
|
|
278
|
+
currentStep: status.currentStep,
|
|
279
|
+
chainStepCount: status.chainStepCount,
|
|
280
|
+
parallelGroups: status.parallelGroups,
|
|
281
|
+
steps: (status.steps ?? []).map((step, index) => ({ index, agent: step.agent, status: step.status })),
|
|
282
|
+
});
|
|
283
|
+
const started = new Date(status.startedAt).toISOString();
|
|
284
|
+
const updated = status.lastUpdate ? new Date(status.lastUpdate).toISOString() : "n/a";
|
|
285
|
+
const statusActivityText = status.state === "running" ? formatActivityFacts(status) : undefined;
|
|
286
|
+
const canExtend = status.runtimeVersion === 2 && status.state === "running" && !status.timedOut && Boolean(status.timeoutAt);
|
|
287
|
+
|
|
288
|
+
const lines = [
|
|
289
|
+
...(deps.includeRunHeader !== false ? [`Run: ${status.runId}`, `State: ${status.state}`, `Mode: ${status.mode}`] : []),
|
|
290
|
+
statusActivityText ? `Activity: ${statusActivityText}` : undefined,
|
|
291
|
+
`Progress: ${progressLabel}`,
|
|
292
|
+
`Started: ${started}`,
|
|
293
|
+
`Updated: ${updated}`,
|
|
294
|
+
status.timeoutAt ? `Timeout: ${new Date(status.timeoutAt).toISOString()}` : undefined,
|
|
295
|
+
canExtend ? `Extend: ${formatRunAction("extend", status.runId, { extendMs: 300000 }, childSafe)}` : undefined,
|
|
296
|
+
`Dir: ${asyncDir}`,
|
|
297
|
+
`Status: ${formatRunAction("status", status.runId, {}, childSafe)}`,
|
|
298
|
+
outputPath ? `Output: ${outputPath}` : undefined,
|
|
299
|
+
reconciliation.message ? `Diagnosis: ${reconciliation.message}` : undefined,
|
|
300
|
+
reconciliation.resultPath && fs.existsSync(reconciliation.resultPath) ? `${deps.includeRunHeader === false ? "Runtime result" : "Result"}: ${reconciliation.resultPath}` : undefined,
|
|
301
|
+
].filter((line): line is string => Boolean(line));
|
|
302
|
+
if (status.state !== "running") lines.push(...formatOutputExcerpt(outputPath));
|
|
303
|
+
|
|
304
|
+
for (const [index, step] of (status.steps ?? []).entries()) {
|
|
305
|
+
const stepActivityText = step.status === "running" ? formatActivityFacts(step) : undefined;
|
|
306
|
+
const modelThinking = formatModelThinking(step.model, step.thinking);
|
|
307
|
+
const modelText = modelThinking ? ` (${modelThinking})` : "";
|
|
308
|
+
const errorText = step.error ? `, error: ${step.error}` : "";
|
|
309
|
+
const finalizationText = formatAcceptanceFinalizationSummary(step.acceptance?.finalization);
|
|
310
|
+
const acceptanceText = step.acceptance?.status ? `, acceptance: ${step.acceptance.status}${finalizationText}` : "";
|
|
311
|
+
const display = step.label ? `${step.label} (${step.agent})` : step.agent;
|
|
312
|
+
const phase = step.phase ? `[${step.phase}] ` : "";
|
|
313
|
+
lines.push(`${stepLineLabel(status, index)}: ${phase}${display} ${step.status}${modelText}${stepActivityText ? `, ${stepActivityText}` : ""}${acceptanceText}${errorText}`);
|
|
314
|
+
if (step.tokens) lines.push(` ${step.tokens.total} tokens`);
|
|
315
|
+
lines.push(...formatNestedRunStatusLines(step.children, { indent: " ", commandHints: true, maxLines: 20, childSafe }));
|
|
316
|
+
const stepOutputPath = path.join(asyncDir, `output-${index}.log`);
|
|
317
|
+
if (stepOutputPath !== outputPath && fs.existsSync(stepOutputPath)) lines.push(` Output: ${stepOutputPath}`);
|
|
318
|
+
if (step.status === "running") {
|
|
319
|
+
const target = resolveSubagentIntercomTarget(status.runId, step.agent, index);
|
|
320
|
+
intercomTargets.push(target);
|
|
321
|
+
lines.push(...formatLiveIntercomActionLines({ runId: status.runId, index, target, health: deps.intercomHealth?.get(target), indent: " ", childSafe }));
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
const attached = new Set((status.steps ?? []).flatMap((step) => step.children?.map((child) => child.id) ?? []));
|
|
325
|
+
const unattached = nestedChildren.filter((child) => !attached.has(child.id));
|
|
326
|
+
lines.push(...formatNestedRunStatusLines(unattached, { indent: "", commandHints: true, maxLines: 20, childSafe }));
|
|
327
|
+
if (nestedWarning) lines.push(`Warning: ${nestedWarning}`);
|
|
328
|
+
if (status.sessionFile) lines.push(`Session: ${status.sessionFile}`);
|
|
329
|
+
if (status.state !== "running") {
|
|
330
|
+
lines.push(formatResumeGuidance(status.runId, status.steps ?? [], status.sessionFile, childSafe));
|
|
331
|
+
}
|
|
332
|
+
if (fs.existsSync(logPath)) lines.push(`Log: ${logPath}`);
|
|
333
|
+
if (fs.existsSync(eventsPath)) lines.push(`Events: ${eventsPath}`);
|
|
334
|
+
if ((status.state === "running" || status.state === "queued") && completionTargetsCurrentSession(status, deps.state)) lines.push(ASYNC_COMPLETION_REMINDER);
|
|
335
|
+
|
|
336
|
+
const state = normalizedState(status.state);
|
|
337
|
+
const runningStep = (status.steps ?? []).map((step, index) => ({ step, index })).find(({ step }) => step.status === "running");
|
|
338
|
+
const target = runningStep ? resolveSubagentIntercomTarget(status.runId, runningStep.step.agent, runningStep.index) : undefined;
|
|
339
|
+
const resumableStep = (status.steps ?? []).map((step, index) => ({ step, index })).find(({ step }) => hasExistingSessionFile(step.sessionFile));
|
|
340
|
+
const canResume = state !== "live" && Boolean(resumableStep || ((status.steps?.length ?? 0) <= 1 && hasExistingSessionFile(status.sessionFile)));
|
|
341
|
+
return {
|
|
342
|
+
content: [{ type: "text", text: lines.join("\n") }],
|
|
343
|
+
details: {
|
|
344
|
+
mode: "single", results: [], intercomTargets,
|
|
345
|
+
managementControl: buildManagementControl({ state, runId: status.runId, index: runningStep?.index ?? resumableStep?.index, intercomTarget: target, canNudge: Boolean(runningStep), canResume: state === "live" ? Boolean(runningStep) : canResume, canInterrupt: status.state === "running", canExtend }),
|
|
346
|
+
},
|
|
347
|
+
};
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
if (resultPath) {
|
|
352
|
+
try {
|
|
353
|
+
const data = readAsyncResultFile(resultPath);
|
|
354
|
+
const status = data.terminalState;
|
|
355
|
+
const runId = data.runId ?? data.id ?? resolvedId;
|
|
356
|
+
const lines = [...(deps.includeRunHeader !== false ? [`Run: ${runId}`, `State: ${status}`] : []), `${deps.includeRunHeader === false ? "Runtime result" : "Result"}: ${resultPath}`, `Status: ${formatRunAction("status", runId ?? "unknown", {}, childSafe)}`];
|
|
357
|
+
const children = Array.isArray(data.results) ? data.results : data.agent ? [{ agent: data.agent, sessionFile: data.sessionFile }] : [];
|
|
358
|
+
lines.push(formatResumeGuidance(runId, children, data.sessionFile, childSafe));
|
|
359
|
+
if (data.summary) lines.push("", params.full ? data.summary : data.summary.length > 600 ? `${data.summary.slice(0, 599)}…` : data.summary);
|
|
360
|
+
const state = normalizedState(status);
|
|
361
|
+
const resumableChild = children.map((child, index) => ({ child, index })).find(({ child }) => hasExistingSessionFile(child.sessionFile));
|
|
362
|
+
return {
|
|
363
|
+
content: [{ type: "text", text: lines.join("\n") }],
|
|
364
|
+
details: {
|
|
365
|
+
mode: "single", results: [],
|
|
366
|
+
managementControl: buildManagementControl({ state, runId: runId ?? "unknown", index: resumableChild?.index, canResume: state !== "live" && Boolean(resumableChild) }),
|
|
367
|
+
},
|
|
368
|
+
};
|
|
369
|
+
} catch (error) {
|
|
370
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
371
|
+
return {
|
|
372
|
+
content: [{ type: "text", text: `Failed to read async result file: ${message}` }],
|
|
373
|
+
isError: true,
|
|
374
|
+
details: { mode: "single", results: [] },
|
|
375
|
+
};
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
return {
|
|
380
|
+
content: [{ type: "text", text: "Status file not found." }],
|
|
381
|
+
isError: true,
|
|
382
|
+
details: { mode: "single", results: [] },
|
|
383
|
+
};
|
|
384
|
+
}
|