pi-subagents 0.59.0 → 0.61.0
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 +69 -0
- package/docs/agents.md +2 -2
- package/docs/configuration.md +9 -5
- package/docs/extension-api.md +14 -7
- package/docs/models.md +1 -1
- package/docs/observability.md +1 -1
- package/docs/tool-reference.md +15 -3
- package/docs/workflows.md +15 -14
- package/install.mjs +2 -1
- package/package.json +1 -1
- package/skills/council-mode/SKILL.md +48 -243
- package/skills/council-mode/references/pass-contracts.md +150 -0
- package/skills/pi-subagents/SKILL.md +89 -37
- package/skills/pi-subagents/references/constraints-and-recipes.md +30 -234
- package/skills/pi-subagents/references/execution-controls.md +79 -7
- package/skills/pi-subagents/references/management-authoring-rpc.md +2 -2
- package/skills/pi-subagents/references/multi-lane-orchestration.md +13 -1
- package/skills/pi-subagents/references/prompting-and-roles.md +35 -28
- package/skills/pi-subagents/references/review-and-validation.md +73 -0
- package/src/agents/agent-management.ts +256 -88
- package/src/agents/agents.ts +527 -221
- package/src/api/background-work.ts +7 -2
- package/src/api/external-runs.ts +67 -4
- package/src/api/preflight.ts +13 -8
- package/src/api/shared-types.ts +3 -0
- package/src/extension/index.ts +7 -4
- package/src/extension/public-execution.ts +48 -4
- package/src/extension/rpc.ts +62 -4
- package/src/extension/schemas.ts +12 -7
- package/src/extension/tool-description.ts +16 -16
- package/src/runs/background/async-execution.ts +53 -37
- package/src/runs/background/async-job-tracker.ts +65 -3
- package/src/runs/background/async-resume.ts +3 -1
- package/src/runs/background/async-status.ts +104 -11
- package/src/runs/background/auto-drain.ts +1 -1
- package/src/runs/background/control-channel.ts +3 -2
- package/src/runs/background/fleet-view.ts +1 -1
- package/src/runs/background/result-watcher.ts +1 -1
- package/src/runs/background/resume-guidance.ts +1 -1
- package/src/runs/background/run-status.ts +15 -4
- package/src/runs/background/subagent-runner.ts +6 -3
- package/src/runs/background/subagent-wait.ts +30 -23
- package/src/runs/background/wait-completions.ts +4 -1
- package/src/runs/background/wait-tool.ts +24 -18
- package/src/runs/foreground/execution.ts +72 -4
- package/src/runs/foreground/subagent-executor.ts +276 -59
- package/src/runs/shared/acceptance.ts +43 -18
- package/src/runs/shared/async-status-projection.ts +138 -4
- package/src/runs/shared/background-process-options.ts +9 -0
- package/src/runs/shared/host-step-status.ts +1 -0
- package/src/runs/shared/mcp-direct-tool-grant.ts +2 -5
- package/src/runs/shared/model-fallback.ts +61 -17
- package/src/runs/shared/mutation-evidence.ts +52 -3
- package/src/runs/shared/permissions.ts +1 -1
- package/src/runs/shared/pi-args.ts +47 -1
- package/src/runs/shared/single-output.ts +45 -18
- package/src/runs/shared/subagent-prompt-runtime.ts +20 -2
- package/src/runs/shared/tool-timeout.ts +1 -1
- package/src/runs/shared/workflow-graph.ts +16 -0
- package/src/shared/types.ts +74 -4
- package/src/shared/workflow-child-permit.ts +91 -0
- package/src/slash/prompt-template-bridge.ts +37 -1
- package/src/slash/slash-commands.ts +18 -26
- package/src/tui/fleet-status.ts +11 -3
- package/src/tui/render-helpers.ts +31 -0
- package/src/tui/render.ts +673 -145
- package/src/watchdog/change-signature.ts +40 -1
- package/src/workflows/host-command.ts +6 -1
- package/src/workflows/scripted-workflow.ts +206 -6
- package/src/workflows/workflow-child-summary.ts +1 -1
- package/src/workflows/workflow-receipt.ts +41 -4
- package/src/workflows/workflow-resources.ts +150 -0
|
@@ -22,9 +22,14 @@ export interface BackgroundWorkReconcileContext {
|
|
|
22
22
|
nowMs: number;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
+
export interface BackgroundWorkListContext {
|
|
26
|
+
sessionId: string;
|
|
27
|
+
nowMs: number;
|
|
28
|
+
}
|
|
29
|
+
|
|
25
30
|
export interface BackgroundWorkProvider {
|
|
26
31
|
name: string;
|
|
27
|
-
listActiveWork(): readonly BackgroundWorkItem[];
|
|
32
|
+
listActiveWork(context?: BackgroundWorkListContext): readonly BackgroundWorkItem[];
|
|
28
33
|
wakeChannels?: readonly string[];
|
|
29
34
|
reconcile?(context: BackgroundWorkReconcileContext): void;
|
|
30
35
|
}
|
|
@@ -171,7 +176,7 @@ export function snapshotBackgroundWork(sessionId: string, nowMs = Date.now()): B
|
|
|
171
176
|
}
|
|
172
177
|
let active: readonly BackgroundWorkItem[];
|
|
173
178
|
try {
|
|
174
|
-
active = provider.listActiveWork();
|
|
179
|
+
active = provider.listActiveWork({ sessionId, nowMs });
|
|
175
180
|
} catch (error) {
|
|
176
181
|
throw new Error(
|
|
177
182
|
`Background-work provider '${provider.name}' listActiveWork failed: ${error instanceof Error ? error.message : String(error)}`,
|
package/src/api/external-runs.ts
CHANGED
|
@@ -48,7 +48,16 @@ interface ExternalRunRegistry {
|
|
|
48
48
|
runs: Map<string, ExternalRun>;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
|
|
51
|
+
interface TrustedExternalRunRecord {
|
|
52
|
+
value: unknown;
|
|
53
|
+
normalized: ExternalRun;
|
|
54
|
+
keys: readonly string[];
|
|
55
|
+
values: readonly unknown[];
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
const trustedRecordsByRegistry = new WeakMap<object, Map<string, TrustedExternalRunRecord>>();
|
|
59
|
+
|
|
60
|
+
const RUN_FIELD_NAMES = [
|
|
52
61
|
"id",
|
|
53
62
|
"sessionId",
|
|
54
63
|
"source",
|
|
@@ -61,7 +70,8 @@ const RUN_FIELDS = new Set([
|
|
|
61
70
|
"preview",
|
|
62
71
|
"reportPath",
|
|
63
72
|
"transcriptPath",
|
|
64
|
-
]);
|
|
73
|
+
] as const satisfies readonly (keyof ExternalRun)[];
|
|
74
|
+
const RUN_FIELDS = new Set<string>(RUN_FIELD_NAMES);
|
|
65
75
|
const UPDATE_FIELDS = new Set([...RUN_FIELDS].filter((field) => field !== "id" && field !== "sessionId" && field !== "source"));
|
|
66
76
|
|
|
67
77
|
function registry(): ExternalRunRegistry {
|
|
@@ -79,6 +89,14 @@ function registry(): ExternalRunRegistry {
|
|
|
79
89
|
return candidate as ExternalRunRegistry;
|
|
80
90
|
}
|
|
81
91
|
|
|
92
|
+
function trustedRecords(current: ExternalRunRegistry): Map<string, TrustedExternalRunRecord> {
|
|
93
|
+
const cached = trustedRecordsByRegistry.get(current);
|
|
94
|
+
if (cached) return cached;
|
|
95
|
+
const records = new Map<string, TrustedExternalRunRecord>();
|
|
96
|
+
trustedRecordsByRegistry.set(current, records);
|
|
97
|
+
return records;
|
|
98
|
+
}
|
|
99
|
+
|
|
82
100
|
function inputObject(value: unknown, field: string, allowed: Set<string>): Record<string, unknown> {
|
|
83
101
|
if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`${field} must be an object.`);
|
|
84
102
|
const input = value as Record<string, unknown>;
|
|
@@ -150,6 +168,41 @@ function clone(run: ExternalRun): ExternalRun {
|
|
|
150
168
|
return { ...run };
|
|
151
169
|
}
|
|
152
170
|
|
|
171
|
+
function trustedRecord(value: unknown, normalized: ExternalRun): TrustedExternalRunRecord {
|
|
172
|
+
const candidate = value as ExternalRun;
|
|
173
|
+
return {
|
|
174
|
+
value,
|
|
175
|
+
normalized,
|
|
176
|
+
keys: Object.keys(candidate),
|
|
177
|
+
values: RUN_FIELD_NAMES.map((field) => candidate[field]),
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
function trustedRecordValue(value: unknown, record: TrustedExternalRunRecord | undefined): ExternalRun | undefined {
|
|
182
|
+
if (!record || record.value !== value || !value || typeof value !== "object") return undefined;
|
|
183
|
+
try {
|
|
184
|
+
const candidate = value as ExternalRun;
|
|
185
|
+
const keys = Object.keys(candidate);
|
|
186
|
+
if (keys.length !== record.keys.length || keys.some((key, index) => key !== record.keys[index])) return undefined;
|
|
187
|
+
for (const [index, field] of RUN_FIELD_NAMES.entries()) {
|
|
188
|
+
if (candidate[field] !== record.values[index]) return undefined;
|
|
189
|
+
}
|
|
190
|
+
return record.normalized;
|
|
191
|
+
} catch {
|
|
192
|
+
return undefined;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
function rememberTrustedRecord(current: ExternalRunRegistry, cacheKey: string, value: unknown, normalized: ExternalRun): void {
|
|
197
|
+
trustedRecords(current).set(cacheKey, trustedRecord(value, normalized));
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
function normalizeCachedRecord(current: ExternalRunRegistry, cacheKey: string, value: unknown): ExternalRun {
|
|
201
|
+
const run = validateRun(value);
|
|
202
|
+
rememberTrustedRecord(current, cacheKey, value, run);
|
|
203
|
+
return run;
|
|
204
|
+
}
|
|
205
|
+
|
|
153
206
|
/** Register one current-session external job. pi-subagents never controls the job. */
|
|
154
207
|
export function registerExternalRun(input: ExternalRun): ExternalRun {
|
|
155
208
|
const run = validateRun(input);
|
|
@@ -158,6 +211,7 @@ export function registerExternalRun(input: ExternalRun): ExternalRun {
|
|
|
158
211
|
if (current.runs.has(runKey)) throw new Error(`External run '${run.id}' is already registered for session '${run.sessionId}'.`);
|
|
159
212
|
if (current.runs.size >= EXTERNAL_RUN_LIMITS.maxCachedRuns) throw new Error(`External-run registry supports at most ${EXTERNAL_RUN_LIMITS.maxCachedRuns} cached runs.`);
|
|
160
213
|
current.runs.set(runKey, run);
|
|
214
|
+
rememberTrustedRecord(current, runKey, run, run);
|
|
161
215
|
return clone(run);
|
|
162
216
|
}
|
|
163
217
|
|
|
@@ -172,12 +226,17 @@ export function updateExternalRun(sessionId: string, id: string, update: Externa
|
|
|
172
226
|
if (!previous) throw new Error(`External run '${safeId}' is not registered for session '${safeSessionId}'.`);
|
|
173
227
|
const next = validateRun({ ...previous, ...patch });
|
|
174
228
|
current.runs.set(runKey, next);
|
|
229
|
+
rememberTrustedRecord(current, runKey, next, next);
|
|
175
230
|
return clone(next);
|
|
176
231
|
}
|
|
177
232
|
|
|
178
233
|
/** Remove a cached external job. The caller remains responsible for its process and artifacts. */
|
|
179
234
|
export function unregisterExternalRun(sessionId: string, id: string): boolean {
|
|
180
|
-
|
|
235
|
+
const current = registry();
|
|
236
|
+
const runKey = key(identity(sessionId, "External run sessionId", EXTERNAL_RUN_LIMITS.maxSessionIdLength), identity(id, "External run id"));
|
|
237
|
+
const deleted = current.runs.delete(runKey);
|
|
238
|
+
if (deleted) trustedRecords(current).delete(runKey);
|
|
239
|
+
return deleted;
|
|
181
240
|
}
|
|
182
241
|
|
|
183
242
|
function snapshotBytes(runs: readonly ExternalRun[]): number {
|
|
@@ -192,15 +251,19 @@ function getErrorMessage(error: unknown): string {
|
|
|
192
251
|
export function snapshotExternalRuns(sessionId: string, options: ExternalRunSnapshotOptions = {}): readonly ExternalRun[] {
|
|
193
252
|
const safeSessionId = identity(sessionId, "External-run snapshot sessionId", EXTERNAL_RUN_LIMITS.maxSessionIdLength);
|
|
194
253
|
const current = registry();
|
|
254
|
+
const trusted = trustedRecords(current);
|
|
255
|
+
const sessionPrefix = `${safeSessionId}\0`;
|
|
195
256
|
const runs: ExternalRun[] = [];
|
|
196
257
|
for (const [cacheKey, value] of current.runs.entries()) {
|
|
258
|
+
if (typeof cacheKey !== "string" || !cacheKey.startsWith(sessionPrefix)) continue;
|
|
197
259
|
try {
|
|
198
|
-
const run =
|
|
260
|
+
const run = trustedRecordValue(value, trusted.get(cacheKey)) ?? normalizeCachedRecord(current, cacheKey, value);
|
|
199
261
|
if (run.sessionId === safeSessionId) runs.push(run);
|
|
200
262
|
} catch (error) {
|
|
201
263
|
const message = `Malformed cached external run '${cacheKey}': ${getErrorMessage(error)}`;
|
|
202
264
|
if (!options.ignoreMalformed) throw new Error(message, { cause: error instanceof Error ? error : undefined });
|
|
203
265
|
current.runs.delete(cacheKey);
|
|
266
|
+
trusted.delete(cacheKey);
|
|
204
267
|
options.onMalformedRecord?.(message);
|
|
205
268
|
}
|
|
206
269
|
}
|
package/src/api/preflight.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
2
|
import * as path from "node:path";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
|
-
import {
|
|
4
|
+
import { discoverAgentSnapshot, findBlockingAgentDiagnostic, formatUnknownAgentError, resolveAgentName, unknownAgentDiagnosticContext, type AgentConfig, type AgentDiscoveryAllResult, type AgentScope, type AgentSource } from "../agents/agents.ts";
|
|
5
5
|
import { resolveExecutionAgentScope } from "../agents/agent-scope.ts";
|
|
6
6
|
import { buildSkillInjection, normalizeSkillInput, resolveSkillsWithFallback } from "../agents/skills.ts";
|
|
7
7
|
import { buildAgentMemoryInjection } from "../agents/agent-memory.ts";
|
|
8
|
-
import { buildModelCandidates, inheritsParentModel, resolveEffectiveSubagentModel, type AvailableModelInfo, type ParentModel } from "../runs/shared/model-fallback.ts";
|
|
8
|
+
import { buildModelCandidates, inheritsParentModel, resolveEffectiveSubagentModel, resolveModelOrigin, type AvailableModelInfo, type ParentModel } from "../runs/shared/model-fallback.ts";
|
|
9
9
|
import { resolveModelScopesForAgent } from "../runs/shared/model-scope.ts";
|
|
10
10
|
import { applyThinkingSuffix, resolvePiLaunchToolPlan, type PiLaunchToolPlan } from "../runs/shared/pi-args.ts";
|
|
11
11
|
import { injectOutputPathSystemPrompt, normalizeSingleOutputOverride, resolveSingleOutputPath } from "../runs/shared/single-output.ts";
|
|
@@ -222,8 +222,7 @@ function taskWorkspaceScopeAuthorityDiagnostic(task: string | undefined): Subage
|
|
|
222
222
|
};
|
|
223
223
|
}
|
|
224
224
|
|
|
225
|
-
function candidateList(inputAgent: string, selected: AgentConfig | undefined,
|
|
226
|
-
const all = discoverAgentsAll(cwd, provider);
|
|
225
|
+
function candidateList(inputAgent: string, selected: AgentConfig | undefined, all: AgentDiscoveryAllResult): SubagentLaunchContractAgentCandidate[] {
|
|
227
226
|
return [...all.builtin, ...all.package, ...all.user, ...all.project]
|
|
228
227
|
.filter((agent) => Boolean(resolveAgentName(inputAgent, [agent]).agent))
|
|
229
228
|
.map((agent) => ({
|
|
@@ -258,7 +257,8 @@ export async function resolveSubagentLaunchContract(input: SubagentLaunchContrac
|
|
|
258
257
|
}
|
|
259
258
|
const scope = resolveExecutionAgentScope(input.agentScope);
|
|
260
259
|
const parentProvider = input.preferredProvider ?? input.parentModel?.provider;
|
|
261
|
-
const
|
|
260
|
+
const discovery = discoverAgentSnapshot(effectiveCwd, scope, parentProvider, { includeChains: false });
|
|
261
|
+
const discovered = discovery.effective;
|
|
262
262
|
const resolvedAgent = resolveAgentName(input.agent, discovered.agents);
|
|
263
263
|
const ambiguousCandidates = resolvedAgent.error
|
|
264
264
|
? discovered.agents.filter((agent) => resolveAgentName(input.agent, [agent]).agent)
|
|
@@ -317,9 +317,13 @@ export async function resolveSubagentLaunchContract(input: SubagentLaunchContrac
|
|
|
317
317
|
const availableModels = normalizeAvailableModels(input.availableModels);
|
|
318
318
|
const preferredProvider = agent.modelProvider ?? input.preferredProvider ?? input.parentModel?.provider;
|
|
319
319
|
const modelScopes = resolveModelScopesForAgent(discovered.modelScope, agent.name, input.parentModel);
|
|
320
|
+
const modelOrigin = resolveModelOrigin({ explicitModel: input.model, agentModel: agent.model, parentModel: input.parentModel });
|
|
320
321
|
const primaryModel = externalRunner
|
|
321
322
|
? undefined
|
|
322
|
-
: resolveEffectiveSubagentModel(input.model, agent.model, input.parentModel, availableModels, preferredProvider, {
|
|
323
|
+
: resolveEffectiveSubagentModel(input.model, agent.model, input.parentModel, availableModels, preferredProvider, {
|
|
324
|
+
scope: modelScopes,
|
|
325
|
+
source: modelOrigin === "explicit" ? "explicit" : "inherited",
|
|
326
|
+
});
|
|
323
327
|
const effectiveThinkingConfig = input.thinking !== undefined ? input.thinking : agent.thinking;
|
|
324
328
|
const thinkingCeiling = externalRunner ? undefined : intersectThinkingCeilings(
|
|
325
329
|
discovered.maxThinking,
|
|
@@ -332,7 +336,8 @@ export async function resolveSubagentLaunchContract(input: SubagentLaunchContrac
|
|
|
332
336
|
? []
|
|
333
337
|
: buildModelCandidates(primaryModel, agent.fallbackModels, availableModels, preferredProvider, {
|
|
334
338
|
scope: modelScopes,
|
|
335
|
-
primaryModelFromParent: inheritsParentModel(input.model, agent.model, input.parentModel),
|
|
339
|
+
primaryModelFromParent: modelOrigin === "inherited" || inheritsParentModel(input.model, agent.model, input.parentModel),
|
|
340
|
+
origin: modelOrigin,
|
|
336
341
|
})
|
|
337
342
|
.map((candidate) => applyThinkingSuffix(candidate, effectiveThinkingConfig, input.thinking !== undefined) ?? candidate);
|
|
338
343
|
if (!externalRunner) {
|
|
@@ -397,7 +402,7 @@ export async function resolveSubagentLaunchContract(input: SubagentLaunchContrac
|
|
|
397
402
|
const memoryInjection = buildAgentMemoryInjection(agent, effectiveCwd);
|
|
398
403
|
if (memoryInjection) effectiveSystemPrompt = effectiveSystemPrompt ? `${effectiveSystemPrompt}\n\n${memoryInjection}` : memoryInjection;
|
|
399
404
|
effectiveSystemPrompt = injectOutputPathSystemPrompt(effectiveSystemPrompt, outputPath, agent);
|
|
400
|
-
const candidates = candidateList(input.agent, agent,
|
|
405
|
+
const candidates = candidateList(input.agent, agent, discovery.all);
|
|
401
406
|
const shadowedCandidates = candidates.filter((candidate) => !candidate.selected);
|
|
402
407
|
const definitionDigest = agentDefinitionDigest(agent);
|
|
403
408
|
const contractBase: Omit<SubagentLaunchContract, "digest"> = {
|
package/src/api/shared-types.ts
CHANGED
|
@@ -5,6 +5,8 @@ export {
|
|
|
5
5
|
type AcceptanceInput,
|
|
6
6
|
type AcceptanceLedger,
|
|
7
7
|
type AcceptanceLevel,
|
|
8
|
+
type AgentCapabilitiesSnapshot,
|
|
9
|
+
type AgentCapabilityRow,
|
|
8
10
|
type AsyncStartedEvent,
|
|
9
11
|
type ControlEvent,
|
|
10
12
|
type Details,
|
|
@@ -18,4 +20,5 @@ export {
|
|
|
18
20
|
type SubagentResultStatus,
|
|
19
21
|
type SubagentRunMode,
|
|
20
22
|
type Usage,
|
|
23
|
+
type WorkflowResourceProvenanceV1,
|
|
21
24
|
} from "../shared/types.ts";
|
package/src/extension/index.ts
CHANGED
|
@@ -19,7 +19,7 @@ import * as path from "node:path";
|
|
|
19
19
|
import type { AgentToolResult } from "@earendil-works/pi-agent-core";
|
|
20
20
|
import { keyText, type ExtensionAPI, type ExtensionContext, type ToolDefinition } from "@earendil-works/pi-coding-agent";
|
|
21
21
|
import { Box, Container, Spacer, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi, type Component } from "@earendil-works/pi-tui";
|
|
22
|
-
import {
|
|
22
|
+
import { discoverAgentSnapshot, discoverAgents, type AgentConfig, type AgentScope } from "../agents/agents.ts";
|
|
23
23
|
import { clearRuntimeAgentsForPi, listRuntimeAgentConfigs, mergeRuntimeAgents } from "../agents/runtime-agent-registry.ts";
|
|
24
24
|
import { registerRuntimeAgentEventListener } from "../agents/runtime-agent-events.ts";
|
|
25
25
|
import { ensureAccessibleDir } from "../shared/accessible-dir.ts";
|
|
@@ -438,6 +438,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
|
|
|
438
438
|
const state: SubagentState = {
|
|
439
439
|
baseCwd: "",
|
|
440
440
|
currentSessionId: null,
|
|
441
|
+
statusProjectionSessionId: null,
|
|
441
442
|
completionOwnerId: currentCompletionOwnerId(),
|
|
442
443
|
artifactDirPreference: config.artifactDir ?? DEFAULT_ARTIFACT_CONFIG.dir,
|
|
443
444
|
...(config.authorityPolicy ? { authorityPolicy: config.authorityPolicy } : {}),
|
|
@@ -525,9 +526,10 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
|
|
|
525
526
|
return missionObserverResultCandidateFiles(DIRS.results).length > 0;
|
|
526
527
|
};
|
|
527
528
|
const discoverAgentsForRuntime = (cwd: string, scope: AgentScope, preferredModelProvider?: string) => {
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
const
|
|
529
|
+
if (listRuntimeAgentConfigs(pi).length === 0) return discoverAgents(cwd, scope, preferredModelProvider);
|
|
530
|
+
const snapshot = discoverAgentSnapshot(cwd, scope, preferredModelProvider, { includeChains: false });
|
|
531
|
+
const discovered = snapshot.effective;
|
|
532
|
+
const all = snapshot.all;
|
|
531
533
|
const configuredAgents: AgentConfig[] = [
|
|
532
534
|
...all.builtin,
|
|
533
535
|
...all.package,
|
|
@@ -996,6 +998,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
|
|
|
996
998
|
promptTemplateBridge.dispose();
|
|
997
999
|
state.widgetsSuspended = false;
|
|
998
1000
|
state.currentSessionId = null;
|
|
1001
|
+
state.statusProjectionSessionId = null;
|
|
999
1002
|
state.parentSessionFile = null;
|
|
1000
1003
|
parentSessionEnvValue = null;
|
|
1001
1004
|
if (shuttingDownParentSession && process.env[SUBAGENT_PARENT_SESSION_ENV] === shuttingDownParentSession) {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export interface PublicSubagentExecutionParams {
|
|
2
2
|
action?: unknown;
|
|
3
|
+
capabilities?: unknown;
|
|
3
4
|
mode?: unknown;
|
|
4
5
|
repo?: unknown;
|
|
5
6
|
planId?: unknown;
|
|
@@ -17,8 +18,12 @@ export interface PublicSubagentExecutionParams {
|
|
|
17
18
|
chainDir?: unknown;
|
|
18
19
|
chainName?: unknown;
|
|
19
20
|
config?: unknown;
|
|
21
|
+
workflow?: unknown;
|
|
22
|
+
args?: unknown;
|
|
20
23
|
workflowScript?: unknown;
|
|
21
24
|
workflowScriptPath?: unknown;
|
|
25
|
+
globalConcurrencyLimit?: unknown;
|
|
26
|
+
maxSubagentSpawnsPerRun?: unknown;
|
|
22
27
|
preflight?: unknown;
|
|
23
28
|
isolation?: unknown;
|
|
24
29
|
worktree?: unknown;
|
|
@@ -44,20 +49,56 @@ export type PublicSubagentExecutionNormalization<T> =
|
|
|
44
49
|
| { ok: true; params: T }
|
|
45
50
|
| { ok: false; error: string; mode: PublicSubagentExecutionMode };
|
|
46
51
|
|
|
52
|
+
export function validateWorkflowCapacityOverrides(params: PublicSubagentExecutionParams): string | undefined {
|
|
53
|
+
for (const [name, value] of [
|
|
54
|
+
["globalConcurrencyLimit", params.globalConcurrencyLimit],
|
|
55
|
+
["maxSubagentSpawnsPerRun", params.maxSubagentSpawnsPerRun],
|
|
56
|
+
] as const) {
|
|
57
|
+
if (value !== undefined && (typeof value !== "number" || !Number.isSafeInteger(value) || value <= 0)) return `${name} must be a positive safe integer.`;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
47
61
|
/**
|
|
48
62
|
* Enforce the public execution cutover before requests reach the executor.
|
|
49
63
|
* Internal runs.run children and structured owned delegation bypass this boundary.
|
|
50
64
|
*/
|
|
51
65
|
export function normalizePublicSubagentExecution<T extends PublicSubagentExecutionParams>(params: T): PublicSubagentExecutionNormalization<T> {
|
|
66
|
+
for (const field of ["resource", "resourceProvenance", "workflowResource", "workflowResourceProvenance", "workflowResourcePermit", "resourcePermit", "permit"] as const) {
|
|
67
|
+
if (Object.hasOwn(params, field) && (params as Record<string, unknown>)[field] !== undefined) {
|
|
68
|
+
return { ok: false, error: "Public execution does not accept workflow resource provenance or permit fields.", mode: params.action === undefined ? "workflow" : "management" };
|
|
69
|
+
}
|
|
70
|
+
}
|
|
52
71
|
if (params.workflowScript !== undefined && params.workflowScriptPath !== undefined) {
|
|
53
72
|
return { ok: false, error: "workflowScript and workflowScriptPath are mutually exclusive.", mode: "workflow" };
|
|
54
73
|
}
|
|
55
|
-
const
|
|
74
|
+
const hasNamedWorkflow = params.workflow !== undefined;
|
|
75
|
+
if (hasNamedWorkflow && (typeof params.workflow !== "string" || !params.workflow.trim())) {
|
|
76
|
+
return { ok: false, error: "workflow must be a non-empty named workflow resource.", mode: "workflow" };
|
|
77
|
+
}
|
|
78
|
+
if (hasNamedWorkflow && (params.workflowScript !== undefined || params.workflowScriptPath !== undefined)) {
|
|
79
|
+
return { ok: false, error: "workflow is mutually exclusive with workflowScript and workflowScriptPath.", mode: "workflow" };
|
|
80
|
+
}
|
|
81
|
+
if (!hasNamedWorkflow && params.args !== undefined) {
|
|
82
|
+
return { ok: false, error: "args requires a named workflow resource.", mode: "workflow" };
|
|
83
|
+
}
|
|
84
|
+
const hasWorkflowInput = params.workflowScript !== undefined || params.workflowScriptPath !== undefined || hasNamedWorkflow;
|
|
85
|
+
const hasCapacityOverride = params.globalConcurrencyLimit !== undefined || params.maxSubagentSpawnsPerRun !== undefined;
|
|
86
|
+
if (hasCapacityOverride) {
|
|
87
|
+
const capacityOverrideError = validateWorkflowCapacityOverrides(params);
|
|
88
|
+
if (capacityOverrideError) return { ok: false, error: capacityOverrideError, mode: params.action === undefined ? "workflow" : "management" };
|
|
89
|
+
if (params.action !== undefined || hasNamedWorkflow || (params.workflowScript === undefined && params.workflowScriptPath === undefined)) {
|
|
90
|
+
return { ok: false, error: "Workflow capacity overrides are only supported on top-level workflowScript or workflowScriptPath calls.", mode: params.action === undefined ? "workflow" : "management" };
|
|
91
|
+
}
|
|
92
|
+
}
|
|
56
93
|
if (params.preflight !== undefined && !hasWorkflowInput) {
|
|
57
94
|
return { ok: false, error: "preflight requires workflowScript or workflowScriptPath.", mode: params.action === undefined ? "workflow" : "management" };
|
|
58
95
|
}
|
|
96
|
+
if (params.preflight !== undefined && hasNamedWorkflow && params.workflowScript === undefined && params.workflowScriptPath === undefined) {
|
|
97
|
+
return { ok: false, error: "preflight is not supported with named workflow resources.", mode: "workflow" };
|
|
98
|
+
}
|
|
59
99
|
const hasValidWorkflowInput = (typeof params.workflowScript === "string" && Boolean(params.workflowScript.trim()))
|
|
60
|
-
|| (typeof params.workflowScriptPath === "string" && Boolean(params.workflowScriptPath.trim()))
|
|
100
|
+
|| (typeof params.workflowScriptPath === "string" && Boolean(params.workflowScriptPath.trim()))
|
|
101
|
+
|| (typeof params.workflow === "string" && Boolean(params.workflow.trim()));
|
|
61
102
|
if (params.isolation !== undefined) {
|
|
62
103
|
if (params.isolation !== "none" && params.isolation !== "worktree") {
|
|
63
104
|
return { ok: false, error: "isolation must be 'none' or 'worktree'.", mode: hasWorkflowInput ? "workflow" : "management" };
|
|
@@ -80,6 +121,9 @@ export function normalizePublicSubagentExecution<T extends PublicSubagentExecuti
|
|
|
80
121
|
return { ok: false, error: "action must be a non-empty management/control action, or omit action and use workflowScript.", mode: "management" };
|
|
81
122
|
}
|
|
82
123
|
const normalizedAction = typeof action === "string" ? action.trim() : undefined;
|
|
124
|
+
if (normalizedAction !== undefined && hasNamedWorkflow) {
|
|
125
|
+
return { ok: false, error: "Named workflow resource execution must omit action.", mode: "management" };
|
|
126
|
+
}
|
|
83
127
|
if (params.clarify !== undefined) {
|
|
84
128
|
return { ok: false, error: "Public workflowScript execution does not support clarify UI.", mode: "workflow" };
|
|
85
129
|
}
|
|
@@ -140,7 +184,7 @@ export function normalizePublicSubagentExecution<T extends PublicSubagentExecuti
|
|
|
140
184
|
return { ok: false, error: "step is not a public execution field; use workflowScript for orchestration.", mode: "workflow" };
|
|
141
185
|
}
|
|
142
186
|
if (hasWorkflowInput && (params.agent !== undefined || params.task !== undefined)) {
|
|
143
|
-
return { ok: false, error: "Structured single-child execution cannot be combined with workflowScript or workflowScriptPath.", mode: "workflow" };
|
|
187
|
+
return { ok: false, error: "Structured single-child execution cannot be combined with workflow, workflowScript, or workflowScriptPath.", mode: "workflow" };
|
|
144
188
|
}
|
|
145
189
|
if (params.agent !== undefined || params.task !== undefined) {
|
|
146
190
|
if (typeof params.agent !== "string" || !params.agent.trim()) {
|
|
@@ -159,7 +203,7 @@ export function normalizePublicSubagentExecution<T extends PublicSubagentExecuti
|
|
|
159
203
|
};
|
|
160
204
|
}
|
|
161
205
|
if (!hasValidWorkflowInput) {
|
|
162
|
-
return { ok: false, error: "Execution requires either { agent, task? } for one child or a non-empty workflowScript or workflowScriptPath for orchestration.", mode: "workflow" };
|
|
206
|
+
return { ok: false, error: "Execution requires either { agent, task? } for one child, a named workflow resource, or a non-empty workflowScript or workflowScriptPath for orchestration.", mode: "workflow" };
|
|
163
207
|
}
|
|
164
208
|
return { ok: true, params };
|
|
165
209
|
}
|
package/src/extension/rpc.ts
CHANGED
|
@@ -172,6 +172,8 @@ interface FleetCandidate {
|
|
|
172
172
|
goal?: unknown;
|
|
173
173
|
}
|
|
174
174
|
|
|
175
|
+
type StatusRpcParams = Pick<SubagentParamsLike, "id" | "runId" | "dir" | "index" | "view" | "lines">;
|
|
176
|
+
|
|
175
177
|
function buildFleetStatus(
|
|
176
178
|
state: SubagentState | undefined,
|
|
177
179
|
keyState: FleetKeyState,
|
|
@@ -380,8 +382,7 @@ function failIfToolError(result: ToolResultWithError): void {
|
|
|
380
382
|
throw new SubagentRpcError("execution_failed", textFromToolResult(result) || "Subagent RPC execution failed.");
|
|
381
383
|
}
|
|
382
384
|
|
|
383
|
-
function
|
|
384
|
-
const input = assertRecordParams(params, method);
|
|
385
|
+
function normalizeTargetParamsFromRecord(input: Record<string, unknown>): Pick<SubagentParamsLike, "id" | "runId" | "dir" | "index"> {
|
|
385
386
|
const output: Pick<SubagentParamsLike, "id" | "runId" | "dir" | "index"> = {};
|
|
386
387
|
if (input.id !== undefined) output.id = input.id as string;
|
|
387
388
|
if (input.runId !== undefined) output.runId = input.runId as string;
|
|
@@ -390,6 +391,43 @@ function normalizeTargetParams(params: unknown, method: SubagentRpcMethod): Pick
|
|
|
390
391
|
return output;
|
|
391
392
|
}
|
|
392
393
|
|
|
394
|
+
function normalizeTargetParams(params: unknown, method: SubagentRpcMethod): Pick<SubagentParamsLike, "id" | "runId" | "dir" | "index"> {
|
|
395
|
+
return normalizeTargetParamsFromRecord(assertRecordParams(params, method));
|
|
396
|
+
}
|
|
397
|
+
|
|
398
|
+
function normalizeStatusParams(params: unknown): StatusRpcParams {
|
|
399
|
+
const input = assertRecordParams(params, "status");
|
|
400
|
+
const output: StatusRpcParams = normalizeTargetParamsFromRecord(input);
|
|
401
|
+
if (input.view !== undefined) output.view = input.view as StatusRpcParams["view"];
|
|
402
|
+
if (input.lines !== undefined) output.lines = input.lines as number;
|
|
403
|
+
return output;
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
function hasStatusTarget(params: StatusRpcParams): boolean {
|
|
407
|
+
return params.id !== undefined
|
|
408
|
+
|| params.runId !== undefined
|
|
409
|
+
|| params.dir !== undefined
|
|
410
|
+
|| params.index !== undefined
|
|
411
|
+
|| params.view !== undefined
|
|
412
|
+
|| params.lines !== undefined;
|
|
413
|
+
}
|
|
414
|
+
|
|
415
|
+
function canUseInMemoryStatus(state: SubagentState | undefined, sessionId: string | undefined): state is SubagentState {
|
|
416
|
+
return Boolean(
|
|
417
|
+
state
|
|
418
|
+
&& sessionId
|
|
419
|
+
&& state.currentSessionId === sessionId
|
|
420
|
+
&& state.statusProjectionSessionId === sessionId
|
|
421
|
+
&& state.foregroundControls instanceof Map
|
|
422
|
+
&& state.asyncJobs instanceof Map,
|
|
423
|
+
);
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
function inMemoryStatusSummary(fleet: SubagentRpcFleetStatus): string {
|
|
427
|
+
const noun = fleet.totalActive === 1 ? "child" : "children";
|
|
428
|
+
return `In-memory subagent status: ${fleet.totalActive} active ${noun}.`;
|
|
429
|
+
}
|
|
430
|
+
|
|
393
431
|
function sessionData(ctx: ExtensionContext | null): { cwd?: string; sessionId?: string; sessionFile?: string | null } {
|
|
394
432
|
if (!ctx) return {};
|
|
395
433
|
return {
|
|
@@ -405,6 +443,7 @@ function pingData(ctx: ExtensionContext | null) {
|
|
|
405
443
|
methods: [...SUBAGENT_RPC_METHODS],
|
|
406
444
|
capabilities: {
|
|
407
445
|
status: true,
|
|
446
|
+
statusProjection: { version: 1, untargeted: "in-memory-when-ready", targeted: "executor" },
|
|
408
447
|
managementActions: [...SUBAGENT_RPC_MANAGEMENT_ACTIONS],
|
|
409
448
|
fleetStatus: { version: 1 },
|
|
410
449
|
asyncStatusSnapshot: { kind: ASYNC_STATUS_SNAPSHOT_KIND, version: ASYNC_STATUS_SNAPSHOT_VERSION },
|
|
@@ -689,14 +728,33 @@ async function handleRequest(
|
|
|
689
728
|
return executeChecked(options, ctx, request.requestId, request.method, spawnParams(request.params));
|
|
690
729
|
}
|
|
691
730
|
if (request.method === "status") {
|
|
731
|
+
const statusParams = normalizeStatusParams(request.params);
|
|
732
|
+
let sessionId: string | undefined;
|
|
733
|
+
if (!hasStatusTarget(statusParams)) {
|
|
734
|
+
try {
|
|
735
|
+
sessionId = resolveCurrentSessionId(ctx.sessionManager);
|
|
736
|
+
} catch {
|
|
737
|
+
// Let the executor produce the canonical error when session identity is unavailable.
|
|
738
|
+
}
|
|
739
|
+
if (canUseInMemoryStatus(options.state, sessionId)) {
|
|
740
|
+
const fleet = buildFleetStatus(options.state, fleetKeys, sessionId);
|
|
741
|
+
const asyncSnapshot = buildAsyncStatusSnapshotForState(options.state, sessionId);
|
|
742
|
+
return {
|
|
743
|
+
text: inMemoryStatusSummary(fleet),
|
|
744
|
+
details: { mode: "management", results: [] },
|
|
745
|
+
fleet,
|
|
746
|
+
asyncSnapshot,
|
|
747
|
+
};
|
|
748
|
+
}
|
|
749
|
+
}
|
|
692
750
|
const status = await executeChecked(
|
|
693
751
|
options,
|
|
694
752
|
ctx,
|
|
695
753
|
request.requestId,
|
|
696
754
|
request.method,
|
|
697
|
-
{ action: "status", ...
|
|
755
|
+
{ action: "status", ...statusParams },
|
|
698
756
|
);
|
|
699
|
-
|
|
757
|
+
sessionId ??= resolveCurrentSessionId(ctx.sessionManager);
|
|
700
758
|
return {
|
|
701
759
|
...status,
|
|
702
760
|
fleet: buildFleetStatus(
|
package/src/extension/schemas.ts
CHANGED
|
@@ -282,6 +282,7 @@ const SubagentParamProperties = {
|
|
|
282
282
|
action: Type.Optional(Type.String({ minLength: 1,
|
|
283
283
|
description: "Optional management/control action. Use action='validate' with workflowScript or workflowScriptPath for offline checks. Omit this field for structured single-child or workflow execution; otherwise, use it only for management/control actions."
|
|
284
284
|
})),
|
|
285
|
+
capabilities: Type.Optional(Type.Boolean({ description: "For action='list', return compact capability rows and structured details without system prompts." })),
|
|
285
286
|
name: Type.Optional(Type.String({ description: "Human-readable name for action='schedule.create'." })),
|
|
286
287
|
id: Type.Optional(Type.String({
|
|
287
288
|
description: "Run id/prefix for status/debug.run, interrupt, steer, or mission.attach-run."
|
|
@@ -336,8 +337,12 @@ const SubagentParamProperties = {
|
|
|
336
337
|
],
|
|
337
338
|
description: "Agent config for create/update. Object or JSON string."
|
|
338
339
|
})),
|
|
339
|
-
|
|
340
|
-
|
|
340
|
+
workflow: Type.Optional(Type.String({ minLength: 1, description: "Extension-owned workflow resource; resolves its script and authority internally." })),
|
|
341
|
+
args: Type.Optional(Type.Unsafe({ type: "object", maxProperties: 16, additionalProperties: true, description: "Bounded plain-JSON args for workflow; resource validation applies." })),
|
|
342
|
+
workflowScript: Type.Optional(Type.String({ minLength: 1, description: "Inline JavaScript statement body with unknown resource provenance. Normally async unless asyncByDefault:false; set async:true when async matters. Use async:false only when the parent must block until completion, never for reviews or gates. Use explicit return for output. Use top-level await, plain helper functions, or explicit Promise chains; nested async function, arrow, and method helpers are rejected. Use await runs.run(key, {agent, task, worktree?, gate?}) or runs.run(key, {resume, task}), where resume is a retained run id or {workflowRunId,key,latest:true} from a durable async workflow receipt. Each workflow key identifies one result lane: use a new stable workflow key for every distinct retained resume pass; same-key calls are reused only when launch parameters are identical, and incompatible parameters are rejected. Use runs.all([...]), runs.host(key,{kind:'command',command,timeoutMs,output?,role?,provider?}), await runs.steer(key, message, {mode?, index?, ackTimeoutMs?}), runs.status(id), runs.ref(s), emit(value), console, and return. For bounded parallel sequential chains, use runs.lanes([{key,stages:[{key,agent,task},{key,resume:'previous',task},...]}]); first stages run together, later stages sequence per lane, and the bounded board reports lane-local failures. Only an explicit structuredOutput.verdict === 'blocked' blocks a successful stage; reviewer prose is not parsed. For ordinary parallel fanout, use await runs.all([{key, agent, task}, ...]); it resolves to an ordered array, not a key map, so use results[0], destructuring, or results.map(...), not results.<key>. Do not read .output from unawaited runs.run launches. Stored runs.run promises are only for advanced rolling fanout, and each must later be observed with direct await, Promise.race, or Promise.all. runs.steer targets a prior stable child key, never a raw run id, and must be awaited or returned. Mission workflows also have async state.get(key) and state.set(key, JSONValue). Compose sequential and parallel phases dynamically. Set worktree:true at workflow or child level for a separate managed worktree; child fields override workflow defaults. gate is one host-run command and cannot be combined with acceptance. runs.run accepts one child only. No filesystem, shell, Pi tools, or host globals except through runs.host." })),
|
|
343
|
+
workflowScriptPath: Type.Optional(Type.String({ minLength: 1, description: "Path to a JavaScript workflow file with unknown resource provenance. Mutually exclusive with workflowScript and workflow. Relative paths resolve against the request cwd. The host reads the file before the filesystem-free workflow sandbox starts." })),
|
|
344
|
+
globalConcurrencyLimit: Type.Optional(Type.Integer({ minimum: 1 })),
|
|
345
|
+
maxSubagentSpawnsPerRun: Type.Optional(Type.Integer({ minimum: 1 })),
|
|
341
346
|
preflight: Type.Optional(WorkflowPreflightOverride),
|
|
342
347
|
chatProgress: Type.Optional(Type.String({ enum: ["auto", "off", "live-card"], description: "WorkflowScript chat progress projection. auto shows a live in-chat card only for watched foreground workflows in the same Git repository; it is off otherwise. Explicit live-card requires same-repository async:false; async workflows should omit chatProgress or use auto/off." })),
|
|
343
348
|
isolation: Type.Optional(Type.String({ enum: ["none", "worktree"], description: "Workflow child isolation. none runs in the shared cwd; worktree requires managed git worktree isolation." })),
|
|
@@ -390,20 +395,20 @@ export function createSubagentParamsSchema(): typeof SubagentParams {
|
|
|
390
395
|
|
|
391
396
|
const SubagentWaitParamsSchema = Type.Object({
|
|
392
397
|
id: Type.Optional(Type.String({
|
|
393
|
-
description: "Async run or remembered detached foreground run id/prefix to wait for one specific run. Omit to wait across every active async run started in this session.",
|
|
398
|
+
description: "Async run or remembered detached foreground run id/prefix to wait for one specific run. Ordinary async subagent runs already notify this session natively; use bg_wait for provider, detached, or other background work without native notification, or when same-turn blocking results are truly needed. Omit to wait across every active async run started in this session only when a same-turn wait is truly needed.",
|
|
394
399
|
})),
|
|
395
400
|
nonBlocking: Type.Optional(Type.Boolean({
|
|
396
|
-
description: "When true, resolve id to one exact run, persist a wake subscription, and return immediately. The originating session is woken on completion, failure, attention, reconciliation failure, or timeout. Requires id and cannot be combined with all.",
|
|
401
|
+
description: "When true, resolve id to one exact run, persist a wake subscription, and return immediately. Use this only for provider, detached, or other background work without a native completion notification; ordinary async subagent runs already notify this session natively and do not need a subscription. The originating session is woken on completion, failure, attention, reconciliation failure, or timeout. Requires id and cannot be combined with all.",
|
|
397
402
|
})),
|
|
398
403
|
all: Type.Optional(Type.Boolean({
|
|
399
|
-
description: "Wait for ALL active runs to finish.
|
|
404
|
+
description: "Wait for ALL active runs to finish. Ordinary async subagent runs already notify this session natively; use all only when a same-turn result from tracked background work is truly needed. Default false: return when the first tracked run or provider item finishes or needs attention. Ignored when id targets a single run.",
|
|
400
405
|
})),
|
|
401
406
|
timeoutMs: Type.Optional(Type.Integer({
|
|
402
407
|
minimum: 1,
|
|
403
|
-
description: "Give up waiting after this many milliseconds (the runs keep going regardless). Defaults to config waitTool.defaultTimeoutMs, then 1800000 (30 minutes). Window expiry is a non-error active-work result.",
|
|
408
|
+
description: "Give up waiting after this many milliseconds (the runs keep going regardless). Ordinary async subagent runs already notify this session natively; use a wait timeout only when same-turn results are truly needed for provider, detached, or other background work without native notification. Defaults to config waitTool.defaultTimeoutMs, then 1800000 (30 minutes). Window expiry is a non-error active-work result.",
|
|
404
409
|
})),
|
|
405
410
|
stopOnAttention: Type.Optional(Type.Boolean({
|
|
406
|
-
description: "
|
|
411
|
+
description: "For a blocking wait that is truly needed, stop when a run needs attention by default. Set false to keep waiting through idle or long-thinking attention; supervisor/contact requests still stop the wait.",
|
|
407
412
|
})),
|
|
408
413
|
});
|
|
409
414
|
|