pi-subagents 0.73.0 → 0.74.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 +65 -0
- package/README.md +1 -1
- package/docs/agents.md +18 -12
- package/docs/configuration.md +66 -9
- package/docs/extension-api.md +5 -4
- package/docs/missions.md +13 -13
- package/docs/models.md +2 -2
- package/docs/observability.md +2 -2
- package/docs/tool-reference.md +63 -86
- package/docs/workflows.md +165 -171
- package/package.json +2 -2
- package/prompts/review-loop.md +1 -1
- package/skills/council-mode/SKILL.md +1 -1
- package/skills/pi-subagents/SKILL.md +12 -5
- package/skills/pi-subagents/references/constraints-and-recipes.md +3 -3
- package/skills/pi-subagents/references/execution-controls.md +68 -67
- package/skills/pi-subagents/references/management-authoring-rpc.md +2 -2
- package/skills/pi-subagents/references/multi-lane-orchestration.md +1 -1
- package/skills/pi-subagents/references/prompting-and-roles.md +45 -48
- package/src/agents/advertised-agent-prompt.d.ts +6 -4
- package/src/agents/advertised-agent-prompt.d.ts.map +1 -1
- package/src/agents/advertised-agent-prompt.js +16 -30
- package/src/agents/advertised-agent-prompt.js.map +1 -1
- package/src/agents/agent-management.js +2 -2
- package/src/agents/agent-management.js.map +1 -1
- package/src/agents/agents.d.ts +1 -0
- package/src/agents/agents.d.ts.map +1 -1
- package/src/agents/agents.js +8 -0
- package/src/agents/agents.js.map +1 -1
- package/src/api/preflight.d.ts +5 -1
- package/src/api/preflight.d.ts.map +1 -1
- package/src/api/preflight.js +2 -1
- package/src/api/preflight.js.map +1 -1
- package/src/extension/config.d.ts.map +1 -1
- package/src/extension/config.js +12 -4
- package/src/extension/config.js.map +1 -1
- package/src/extension/control-notices.d.ts +2 -0
- package/src/extension/control-notices.d.ts.map +1 -1
- package/src/extension/control-notices.js +2 -0
- package/src/extension/control-notices.js.map +1 -1
- package/src/extension/doctor.d.ts.map +1 -1
- package/src/extension/doctor.js +1 -0
- package/src/extension/doctor.js.map +1 -1
- package/src/extension/fanout-child.d.ts.map +1 -1
- package/src/extension/fanout-child.js +13 -3
- package/src/extension/fanout-child.js.map +1 -1
- package/src/extension/herdr-pi-bridge.d.ts.map +1 -1
- package/src/extension/herdr-pi-bridge.js +2 -0
- package/src/extension/herdr-pi-bridge.js.map +1 -1
- package/src/extension/index.d.ts +1 -1
- package/src/extension/index.d.ts.map +1 -1
- package/src/extension/index.js +71 -169
- package/src/extension/index.js.map +1 -1
- package/src/extension/public-execution.d.ts +10 -1
- package/src/extension/public-execution.d.ts.map +1 -1
- package/src/extension/public-execution.js +69 -35
- package/src/extension/public-execution.js.map +1 -1
- package/src/extension/reply-workflow-script.d.ts +12 -0
- package/src/extension/reply-workflow-script.d.ts.map +1 -0
- package/src/extension/reply-workflow-script.js +61 -0
- package/src/extension/reply-workflow-script.js.map +1 -0
- package/src/extension/rpc.d.ts +2 -0
- package/src/extension/rpc.d.ts.map +1 -1
- package/src/extension/rpc.js +33 -10
- package/src/extension/rpc.js.map +1 -1
- package/src/extension/schemas.d.ts +3 -117
- package/src/extension/schemas.d.ts.map +1 -1
- package/src/extension/schemas.js +38 -125
- package/src/extension/schemas.js.map +1 -1
- package/src/extension/tool-activation.d.ts +2 -4
- package/src/extension/tool-activation.d.ts.map +1 -1
- package/src/extension/tool-activation.js +54 -104
- package/src/extension/tool-activation.js.map +1 -1
- package/src/extension/tool-description.d.ts +8 -5
- package/src/extension/tool-description.d.ts.map +1 -1
- package/src/extension/tool-description.js +51 -27
- package/src/extension/tool-description.js.map +1 -1
- package/src/extension/upgrade-notice.d.ts +7 -0
- package/src/extension/upgrade-notice.d.ts.map +1 -0
- package/src/extension/upgrade-notice.js +37 -0
- package/src/extension/upgrade-notice.js.map +1 -0
- package/src/integrations/herdr-status.d.ts +3 -0
- package/src/integrations/herdr-status.d.ts.map +1 -1
- package/src/integrations/herdr-status.js +17 -3
- package/src/integrations/herdr-status.js.map +1 -1
- package/src/intercom/native-supervisor-channel.d.ts.map +1 -1
- package/src/intercom/native-supervisor-channel.js +4 -1
- package/src/intercom/native-supervisor-channel.js.map +1 -1
- package/src/runs/background/async-execution.d.ts +3 -0
- package/src/runs/background/async-execution.d.ts.map +1 -1
- package/src/runs/background/async-execution.js +6 -2
- package/src/runs/background/async-execution.js.map +1 -1
- package/src/runs/background/async-job-tracker.d.ts.map +1 -1
- package/src/runs/background/async-job-tracker.js +65 -22
- package/src/runs/background/async-job-tracker.js.map +1 -1
- package/src/runs/background/async-retention.d.ts +1 -1
- package/src/runs/background/async-retention.d.ts.map +1 -1
- package/src/runs/background/async-retention.js +47 -15
- package/src/runs/background/async-retention.js.map +1 -1
- package/src/runs/background/await-async-run.d.ts +23 -0
- package/src/runs/background/await-async-run.d.ts.map +1 -0
- package/src/runs/background/await-async-run.js +80 -0
- package/src/runs/background/await-async-run.js.map +1 -0
- package/src/runs/background/chain-root-attachment.d.ts +1 -0
- package/src/runs/background/chain-root-attachment.d.ts.map +1 -1
- package/src/runs/background/chain-root-attachment.js +3 -3
- package/src/runs/background/chain-root-attachment.js.map +1 -1
- package/src/runs/background/control-channel.d.ts +4 -0
- package/src/runs/background/control-channel.d.ts.map +1 -1
- package/src/runs/background/control-channel.js +16 -1
- package/src/runs/background/control-channel.js.map +1 -1
- package/src/runs/background/notify.d.ts +3 -0
- package/src/runs/background/notify.d.ts.map +1 -1
- package/src/runs/background/notify.js +3 -0
- package/src/runs/background/notify.js.map +1 -1
- package/src/runs/background/run-child-session.d.ts.map +1 -1
- package/src/runs/background/run-child-session.js +4 -1
- package/src/runs/background/run-child-session.js.map +1 -1
- package/src/runs/background/run-status.d.ts.map +1 -1
- package/src/runs/background/run-status.js +6 -0
- package/src/runs/background/run-status.js.map +1 -1
- package/src/runs/background/runner-child-launch.d.ts +1 -0
- package/src/runs/background/runner-child-launch.d.ts.map +1 -1
- package/src/runs/background/runner-child-launch.js +2 -0
- package/src/runs/background/runner-child-launch.js.map +1 -1
- package/src/runs/background/scheduled-runs.js +5 -5
- package/src/runs/background/scheduled-runs.js.map +1 -1
- package/src/runs/background/subagent-runner.d.ts +3 -0
- package/src/runs/background/subagent-runner.d.ts.map +1 -1
- package/src/runs/background/subagent-runner.js +13 -1
- package/src/runs/background/subagent-runner.js.map +1 -1
- package/src/runs/foreground/async-stop-action.d.ts.map +1 -1
- package/src/runs/foreground/async-stop-action.js +19 -3
- package/src/runs/foreground/async-stop-action.js.map +1 -1
- package/src/runs/foreground/execution.d.ts.map +1 -1
- package/src/runs/foreground/execution.js +8 -1
- package/src/runs/foreground/execution.js.map +1 -1
- package/src/runs/foreground/subagent-executor.d.ts +6 -5
- package/src/runs/foreground/subagent-executor.d.ts.map +1 -1
- package/src/runs/foreground/subagent-executor.js +293 -182
- package/src/runs/foreground/subagent-executor.js.map +1 -1
- package/src/runs/shared/child-launch.d.ts +5 -1
- package/src/runs/shared/child-launch.d.ts.map +1 -1
- package/src/runs/shared/child-launch.js +15 -1
- package/src/runs/shared/child-launch.js.map +1 -1
- package/src/runs/shared/child-session.d.ts +9 -0
- package/src/runs/shared/child-session.d.ts.map +1 -1
- package/src/runs/shared/child-session.js +90 -4
- package/src/runs/shared/child-session.js.map +1 -1
- package/src/runs/shared/child-tool-plan.d.ts +4 -0
- package/src/runs/shared/child-tool-plan.d.ts.map +1 -1
- package/src/runs/shared/child-tool-plan.js +11 -4
- package/src/runs/shared/child-tool-plan.js.map +1 -1
- package/src/runs/shared/dynamic-fanout.js +1 -1
- package/src/runs/shared/dynamic-fanout.js.map +1 -1
- package/src/runs/shared/mcp-config-sources.d.ts +1 -0
- package/src/runs/shared/mcp-config-sources.d.ts.map +1 -1
- package/src/runs/shared/mcp-config-sources.js +1 -1
- package/src/runs/shared/mcp-config-sources.js.map +1 -1
- package/src/runs/shared/mcp-direct-tool-allowlist.d.ts +28 -0
- package/src/runs/shared/mcp-direct-tool-allowlist.d.ts.map +1 -1
- package/src/runs/shared/mcp-direct-tool-allowlist.js +78 -2
- package/src/runs/shared/mcp-direct-tool-allowlist.js.map +1 -1
- package/src/runs/shared/model-resolution.d.ts +10 -0
- package/src/runs/shared/model-resolution.d.ts.map +1 -1
- package/src/runs/shared/model-resolution.js +30 -9
- package/src/runs/shared/model-resolution.js.map +1 -1
- package/src/runs/shared/model-scope.d.ts +2 -1
- package/src/runs/shared/model-scope.d.ts.map +1 -1
- package/src/runs/shared/model-scope.js +26 -10
- package/src/runs/shared/model-scope.js.map +1 -1
- package/src/runs/shared/parallel-utils.d.ts +2 -0
- package/src/runs/shared/parallel-utils.d.ts.map +1 -1
- package/src/runs/shared/parallel-utils.js.map +1 -1
- package/src/runs/shared/pi-spawn.d.ts +1 -10
- package/src/runs/shared/pi-spawn.d.ts.map +1 -1
- package/src/runs/shared/pi-spawn.js +7 -86
- package/src/runs/shared/pi-spawn.js.map +1 -1
- package/src/runs/shared/subagent-prompt-runtime.d.ts.map +1 -1
- package/src/runs/shared/subagent-prompt-runtime.js +2 -0
- package/src/runs/shared/subagent-prompt-runtime.js.map +1 -1
- package/src/runs/shared/worktree.d.ts +1 -1
- package/src/runs/shared/worktree.d.ts.map +1 -1
- package/src/runs/shared/worktree.js +1 -1
- package/src/runs/shared/worktree.js.map +1 -1
- package/src/shared/disabled-features.d.ts +92 -0
- package/src/shared/disabled-features.d.ts.map +1 -0
- package/src/shared/disabled-features.js +113 -0
- package/src/shared/disabled-features.js.map +1 -0
- package/src/shared/extension-context.d.ts +9 -0
- package/src/shared/extension-context.d.ts.map +1 -1
- package/src/shared/extension-context.js +7 -0
- package/src/shared/extension-context.js.map +1 -1
- package/src/shared/settings.d.ts +1 -1
- package/src/shared/types.d.ts +20 -0
- package/src/shared/types.d.ts.map +1 -1
- package/src/shared/types.js.map +1 -1
- package/src/slash/prompt-template-bridge.js +2 -2
- package/src/slash/prompt-template-bridge.js.map +1 -1
- package/src/slash/slash-commands.d.ts +2 -0
- package/src/slash/slash-commands.d.ts.map +1 -1
- package/src/slash/slash-commands.js +2 -2
- package/src/slash/slash-commands.js.map +1 -1
- package/src/tui/render.d.ts.map +1 -1
- package/src/tui/render.js +55 -17
- package/src/tui/render.js.map +1 -1
- package/src/watchdog/diff-tool.d.ts +3 -1
- package/src/watchdog/diff-tool.d.ts.map +1 -1
- package/src/watchdog/diff-tool.js +20 -11
- package/src/watchdog/diff-tool.js.map +1 -1
- package/src/watchdog/register-child.js +2 -2
- package/src/watchdog/register-child.js.map +1 -1
- package/src/watchdog/register-main.js +2 -2
- package/src/watchdog/register-main.js.map +1 -1
- package/src/watchdog/review.d.ts +1 -1
- package/src/watchdog/review.d.ts.map +1 -1
- package/src/watchdog/review.js +1 -1
- package/src/watchdog/review.js.map +1 -1
- package/src/watchdog/turn-delta.js +1 -1
- package/src/watchdog/turn-delta.js.map +1 -1
- package/src/workflows/chat-progress.js +2 -2
- package/src/workflows/chat-progress.js.map +1 -1
- package/src/workflows/scripted-workflow.d.ts +8 -0
- package/src/workflows/scripted-workflow.d.ts.map +1 -1
- package/src/workflows/scripted-workflow.js +10 -2
- package/src/workflows/scripted-workflow.js.map +1 -1
- package/src/workflows/structured-workflow-scripts.d.ts +10 -0
- package/src/workflows/structured-workflow-scripts.d.ts.map +1 -0
- package/src/workflows/structured-workflow-scripts.js +166 -0
- package/src/workflows/structured-workflow-scripts.js.map +1 -0
- package/src/workflows/workflow-receipt.d.ts.map +1 -1
- package/src/workflows/workflow-receipt.js +8 -2
- package/src/workflows/workflow-receipt.js.map +1 -1
- package/src/workflows/workflow-resources.d.ts +9 -0
- package/src/workflows/workflow-resources.d.ts.map +1 -1
- package/src/workflows/workflow-resources.js +39 -12
- package/src/workflows/workflow-resources.js.map +1 -1
- package/src/workflows/workflow-reuse.d.ts +51 -0
- package/src/workflows/workflow-reuse.d.ts.map +1 -0
- package/src/workflows/workflow-reuse.js +103 -0
- package/src/workflows/workflow-reuse.js.map +1 -0
- package/src/workflows/workflow-revival.d.ts +32 -0
- package/src/workflows/workflow-revival.d.ts.map +1 -0
- package/src/workflows/workflow-revival.js +111 -0
- package/src/workflows/workflow-revival.js.map +1 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ChildWatchdogConfig, ChildWatchdogStatusEvent } from "../../watchdog/child-status.ts";
|
|
2
2
|
import type { ThinkingLevel } from "../../shared/model-info.ts";
|
|
3
3
|
import { type LaunchResolvedChildExtensions, type ResolvedToolBudget, type RunFanoutBudgetDescriptor, type HerdrMachineReference } from "../../shared/types.ts";
|
|
4
|
-
import type
|
|
4
|
+
import { type McpRuntimeSnapshotHost, type ResolvedMcpDirectToolSelection } from "./mcp-direct-tool-allowlist.ts";
|
|
5
5
|
import type { PermissionRules } from "./permissions.ts";
|
|
6
6
|
import type { StructuredOutputRuntime } from "./structured-output.ts";
|
|
7
7
|
import type { ChildToolDiagnostic } from "./tool-availability.ts";
|
|
@@ -46,9 +46,13 @@ export interface BuildInProcessChildLaunchInput {
|
|
|
46
46
|
requiredExtensions?: RequiredChildExtensionSnapshot;
|
|
47
47
|
systemPrompt?: string | null;
|
|
48
48
|
mcpDirectTools?: string[];
|
|
49
|
+
/** Selections the parent resolved against Pi's built-in MCP, carried to the runner. */
|
|
50
|
+
builtinMcpTools?: ResolvedMcpDirectToolSelection[];
|
|
49
51
|
extensionBindings?: ExtensionBindings;
|
|
50
52
|
cwd: string;
|
|
51
53
|
intercomSessionName?: string;
|
|
54
|
+
/** The launching session's project trust; undefined when the host has no trust concept. */
|
|
55
|
+
projectTrusted?: boolean;
|
|
52
56
|
sessionName?: string;
|
|
53
57
|
orchestratorIntercomTarget?: string;
|
|
54
58
|
runId?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-launch.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-launch.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AACpG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAEN,KAAK,6BAA6B,EAClC,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC1B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"child-launch.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import * as fs from "node:fs";
|
|
|
8
8
|
import * as path from "node:path";
|
|
9
9
|
import { intersectThinkingCeilings } from "../../shared/thinking-ceiling.js";
|
|
10
10
|
import { resolveChildDepth, } from "../../shared/types.js";
|
|
11
|
+
import { extensionOnlyMcpServers } from "./mcp-direct-tool-allowlist.js";
|
|
11
12
|
import { encodeExtensionBindings, PI_SUBAGENT_EXTENSION_BINDINGS_ENV } from "./extension-bindings.js";
|
|
12
13
|
import { intersectSubagentCapabilityCeilings } from "./capability-ceiling.js";
|
|
13
14
|
import { isSubagentRuntimeExtensionPath, projectLaunchResolvedChildExtensions, resolvePiLaunchToolPlan, supervisorChannelDir, } from "./child-tool-plan.js";
|
|
@@ -48,7 +49,10 @@ function inheritedCapabilityCeiling(inherited) {
|
|
|
48
49
|
function childProcessEnv(input, toolPlan) {
|
|
49
50
|
const env = {};
|
|
50
51
|
env[PI_SUBAGENT_EXTENSION_BINDINGS_ENV] = encodeExtensionBindings(input.extensionBindings);
|
|
51
|
-
|
|
52
|
+
// Selectors resolved against Pi's built-in MCP never reach an adapter.
|
|
53
|
+
if (toolPlan.builtinMcpTools)
|
|
54
|
+
env[MCP_DIRECT_TOOLS_ENV] = "__none__";
|
|
55
|
+
else if (!toolPlan.capabilityCeiling && input.mcpDirectTools?.length)
|
|
52
56
|
env[MCP_DIRECT_TOOLS_ENV] = input.mcpDirectTools.join(",");
|
|
53
57
|
else if (toolPlan.capabilityCeiling && toolPlan.effectiveMcpSelections.length && !toolPlan.capabilityCeiling.denyExtensions) {
|
|
54
58
|
env[MCP_DIRECT_TOOLS_ENV] = toolPlan.effectiveMcpSelections.map((selection) => selection.selector).join(",");
|
|
@@ -87,6 +91,7 @@ export function buildInProcessChildLaunch(input) {
|
|
|
87
91
|
subagentOnlyExtensions: input.subagentOnlyExtensions,
|
|
88
92
|
requiredExtensions,
|
|
89
93
|
mcpDirectTools: input.mcpDirectTools,
|
|
94
|
+
builtinMcpTools: input.builtinMcpTools,
|
|
90
95
|
cwd: input.cwd,
|
|
91
96
|
requireReadTool: input.requireReadTool,
|
|
92
97
|
structuredOutput: Boolean(input.structuredOutput),
|
|
@@ -98,6 +103,13 @@ export function buildInProcessChildLaunch(input) {
|
|
|
98
103
|
permissionRules: input.permissionRules,
|
|
99
104
|
runtimeSnapshotHost: input.runtimeSnapshotHost,
|
|
100
105
|
});
|
|
106
|
+
// Foreground children load no ambient extensions, so an extension's registerMcpServer() never runs in them.
|
|
107
|
+
if (input.host === "parent" && input.runtimeSnapshotHost && toolPlan.builtinMcpTools?.length) {
|
|
108
|
+
// Pi treats a session without a trust decision as trusted.
|
|
109
|
+
const servers = extensionOnlyMcpServers(toolPlan.effectiveMcpSelections, input.runtimeSnapshotHost, input.cwd, input.projectTrusted !== false);
|
|
110
|
+
if (servers.length)
|
|
111
|
+
throw new Error(`Agent '${input.childAgentName}' selects MCP tools from servers that extensions registered (${servers.join(", ")}). Only background children (async: true) load those extensions; run the agent in the background or add the server to the global mcp.json or a trusted project's .pi/mcp.json.`);
|
|
112
|
+
}
|
|
101
113
|
toolPlan.capabilityCeiling = intersectSubagentCapabilityCeilings(toolPlan.capabilityCeiling, agentCapabilityCeiling);
|
|
102
114
|
if (toolPlan.capabilityAudit && toolPlan.capabilityCeiling) {
|
|
103
115
|
toolPlan.capabilityAudit = { ...toolPlan.capabilityAudit, ceiling: toolPlan.capabilityCeiling };
|
|
@@ -198,10 +210,12 @@ export function buildInProcessChildLaunch(input) {
|
|
|
198
210
|
const session = {
|
|
199
211
|
cwd: input.cwd,
|
|
200
212
|
...(input.machine ? { machine: input.machine } : {}),
|
|
213
|
+
...(input.projectTrusted !== undefined ? { projectTrusted: input.projectTrusted } : {}),
|
|
201
214
|
...(input.machine ? { remoteResources: { agent: input.childAgentName, ...(input.remoteSkillNames ? { skills: input.remoteSkillNames } : {}), ...(input.remoteReads !== undefined ? { reads: input.remoteReads } : {}), ...(toolPlan.explicitToolAllowlist ? { toolCeiling: [...toolPlan.effectiveToolAllowlist] } : toolPlan.capabilityCeiling?.allowedTools ? { toolCeiling: [...toolPlan.capabilityCeiling.allowedTools] } : {}) } } : {}),
|
|
202
215
|
storage: childStorage(input),
|
|
203
216
|
...(input.model ? { model: input.model } : {}),
|
|
204
217
|
...(toolPlan.explicitToolAllowlist ? { tools: toolPlan.effectiveToolAllowlist } : {}),
|
|
218
|
+
...(toolPlan.builtinMcpTools?.length ? { builtinMcpTools: toolPlan.builtinMcpTools } : {}),
|
|
205
219
|
...(!toolPlan.explicitToolAllowlist && toolPlan.excludeTools.length > 0 ? { excludeTools: toolPlan.excludeTools } : {}),
|
|
206
220
|
extensionPaths,
|
|
207
221
|
requiredExtensions: toolPlan.requiredExtensions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-launch.js","sourceRoot":"","sources":["../../../../src/runs/shared/child-launch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"child-launch.js","sourceRoot":"","sources":["../../../../src/runs/shared/child-launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,8 @@ export interface ChildSessionLaunch {
|
|
|
33
33
|
cwd: string;
|
|
34
34
|
/** Resolved pane-native placement. Local launches omit this field. */
|
|
35
35
|
machine?: HerdrMachineReference;
|
|
36
|
+
/** The launching session's project trust; undefined keeps Pi's default for hosts without trust. */
|
|
37
|
+
projectTrusted?: boolean;
|
|
36
38
|
/** Process-local provider source owned by the invoking foreground parent. */
|
|
37
39
|
parentProviderRegistry?: ParentProviderRegistry;
|
|
38
40
|
/** Logical names resolved only by the remote ambient package. */
|
|
@@ -47,6 +49,11 @@ export interface ChildSessionLaunch {
|
|
|
47
49
|
model?: string;
|
|
48
50
|
/** Explicit tool allowlist; undefined keeps pi's defaults. */
|
|
49
51
|
tools?: string[];
|
|
52
|
+
/** Tools of Pi's built-in MCP extension the child must declare to its model directly, with the `mcp:` selector that granted each; `tools` names them too. */
|
|
53
|
+
builtinMcpTools?: Array<{
|
|
54
|
+
name: string;
|
|
55
|
+
selector: string;
|
|
56
|
+
}>;
|
|
50
57
|
excludeTools?: string[];
|
|
51
58
|
/** Extension files loaded for this child in addition to the inline hooks. */
|
|
52
59
|
extensionPaths: string[];
|
|
@@ -117,6 +124,8 @@ export interface DefaultChildSessionFactoryOptions {
|
|
|
117
124
|
loadPiCodingAgent?: () => Promise<PiCodingAgentModule>;
|
|
118
125
|
/** Upper bound on a disposed child's `session_shutdown` handlers before the session is dropped anyway. */
|
|
119
126
|
shutdownTimeoutMs?: number;
|
|
127
|
+
/** Upper bound on the wait for selected built-in MCP tools to register after the session starts. */
|
|
128
|
+
builtinMcpToolWaitMs?: number;
|
|
120
129
|
}
|
|
121
130
|
type ModelRuntimeInstance = Awaited<ReturnType<PiCodingAgentModule["ModelRuntime"]["create"]>>;
|
|
122
131
|
export type ParentProviderRegistry = Pick<ModelRuntimeInstance, "getRegisteredProviderIds" | "getRegisteredProviderConfig" | "getRegisteredNativeProvider">;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-session.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"child-session.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,6 +111,53 @@ function applyProcessEnv(values) {
|
|
|
111
111
|
process.env[name] = value;
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
* Pi's built-in MCP extension registers server tools with the configured exposure, `codemode` by
|
|
116
|
+
* default, which the child's `tools` allowlist cannot declare. Registering the selected names as
|
|
117
|
+
* `direct` makes them model-declared and callable; `hidden` stays hidden. A name counts only when
|
|
118
|
+
* the tool's raw identity, its `<server>/<tool>` label, matches the granting selector: Pi can give
|
|
119
|
+
* the sanitized name of `srv/a.b` to `srv/a_b`. Every other tool the extension registers becomes
|
|
120
|
+
* `hidden`, so neither codemode nor `ctx.executeTool()` can call it, independent of the `tools`
|
|
121
|
+
* allowlist. The `builtin` entry loads
|
|
122
|
+
* through the explicit `builtin:mcp` path even with `noExtensions`, and `replaceable` lets an
|
|
123
|
+
* ambient MCP extension that registers `/mcp` replace it, as in the parent.
|
|
124
|
+
*/
|
|
125
|
+
function selectedBuiltinMcpExtension(pi, selections) {
|
|
126
|
+
// Pi 0.99 export; the pinned SDK types predate it.
|
|
127
|
+
const createMcpExtension = pi.createMcpExtension;
|
|
128
|
+
if (typeof createMcpExtension !== "function")
|
|
129
|
+
throw new Error(`Selected built-in MCP tools (${selections.map(({ name }) => name).join(", ")}) need a Pi version with built-in MCP.`);
|
|
130
|
+
const selectors = new Map(selections.map(({ name, selector }) => [name, selector]));
|
|
131
|
+
const granted = (tool) => {
|
|
132
|
+
const selector = selectors.get(tool.name);
|
|
133
|
+
if (selector === undefined || tool.exposure === "hidden" || tool.label === undefined)
|
|
134
|
+
return false;
|
|
135
|
+
return selector.includes("/") ? tool.label === selector : tool.label.startsWith(`${selector}/`);
|
|
136
|
+
};
|
|
137
|
+
const mcp = createMcpExtension();
|
|
138
|
+
const factory = (api) => mcp(new Proxy(api, {
|
|
139
|
+
get(target, prop) {
|
|
140
|
+
if (prop === "registerTool") {
|
|
141
|
+
return (tool) => target.registerTool({ ...tool, exposure: granted(tool) ? "direct" : "hidden" });
|
|
142
|
+
}
|
|
143
|
+
const value = Reflect.get(target, prop, target);
|
|
144
|
+
return typeof value === "function" ? value.bind(target) : value;
|
|
145
|
+
},
|
|
146
|
+
}));
|
|
147
|
+
return { name: "mcp", factory, builtin: true, replaceable: true };
|
|
148
|
+
}
|
|
149
|
+
/** MCP connects after `session_start`, so the selected tools register some time after the session binds. */
|
|
150
|
+
async function missingBuiltinMcpTools(session, names, timeoutMs, stopped) {
|
|
151
|
+
const deadline = Date.now() + timeoutMs;
|
|
152
|
+
for (;;) {
|
|
153
|
+
const active = new Set(session.getActiveToolNames());
|
|
154
|
+
const direct = new Set(session.getAllTools().filter((tool) => tool.exposure === "direct").map(({ name }) => name));
|
|
155
|
+
const missing = names.filter((name) => !active.has(name) || !direct.has(name));
|
|
156
|
+
if (missing.length === 0 || stopped() || Date.now() >= deadline)
|
|
157
|
+
return missing;
|
|
158
|
+
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
159
|
+
}
|
|
160
|
+
}
|
|
114
161
|
function flushQueuedProviderRegistrations(loader, modelRuntime, onError, requiredPaths) {
|
|
115
162
|
const claimedProviderIds = new Set();
|
|
116
163
|
if (!("getExtensions" in loader) || typeof loader.getExtensions !== "function")
|
|
@@ -197,10 +244,14 @@ function isUnknownRecord(value) {
|
|
|
197
244
|
export function createDefaultChildSessionFactory(options = {}) {
|
|
198
245
|
const loadPiCodingAgent = options.loadPiCodingAgent ?? loadHostPiCodingAgent;
|
|
199
246
|
const shutdownTimeoutMs = options.shutdownTimeoutMs ?? 5_000;
|
|
247
|
+
const builtinMcpToolWaitMs = options.builtinMcpToolWaitMs ?? 10_000;
|
|
200
248
|
let runtime;
|
|
201
249
|
const live = new Set();
|
|
202
250
|
/** Extension shutdowns still running for disposed children; `dispose()` waits for them. */
|
|
203
251
|
const shutdowns = new Set();
|
|
252
|
+
/** Launches still waiting for their MCP tools; `dispose()` ends the wait and waits for their shutdown. */
|
|
253
|
+
const mcpWaits = new Set();
|
|
254
|
+
let disposals = 0;
|
|
204
255
|
const sharedRuntime = async (pi) => {
|
|
205
256
|
runtime ??= pi.ModelRuntime.create().catch((error) => {
|
|
206
257
|
runtime = undefined;
|
|
@@ -210,12 +261,15 @@ export function createDefaultChildSessionFactory(options = {}) {
|
|
|
210
261
|
};
|
|
211
262
|
return {
|
|
212
263
|
async create(launch) {
|
|
264
|
+
const disposalsAtStart = disposals;
|
|
213
265
|
const pi = await loadPiCodingAgent();
|
|
266
|
+
const builtinMcpTools = launch.builtinMcpTools ?? [];
|
|
267
|
+
const builtinMcp = builtinMcpTools.length ? selectedBuiltinMcpExtension(pi, builtinMcpTools) : undefined;
|
|
214
268
|
const modelRuntime = launch.parentProviderRegistry
|
|
215
269
|
? await pi.ModelRuntime.create()
|
|
216
270
|
: await sharedRuntime(pi);
|
|
217
271
|
const agentDir = getAgentDir();
|
|
218
|
-
const settingsManager = pi.SettingsManager.create(launch.cwd, agentDir);
|
|
272
|
+
const settingsManager = pi.SettingsManager.create(launch.cwd, agentDir, { projectTrusted: launch.projectTrusted });
|
|
219
273
|
// Foreground children share Pi's global theme with the parent, so reinitializing it
|
|
220
274
|
// would overwrite the parent's active light/dark appearance. Detached runners have
|
|
221
275
|
// no initialized theme and must initialize one for headless extension renderers.
|
|
@@ -223,17 +277,29 @@ export function createDefaultChildSessionFactory(options = {}) {
|
|
|
223
277
|
const themeInitialized = Boolean(globalThis[themeKey]);
|
|
224
278
|
if (!themeInitialized && typeof pi.initTheme === "function")
|
|
225
279
|
pi.initTheme(settingsManager.getTheme());
|
|
280
|
+
// SDK sessions do not install Pi's CLI built-ins. Use the host's own
|
|
281
|
+
// codemode factory only when this child can select it; older Pi hosts
|
|
282
|
+
// without that factory retain the strict missing-tool diagnostic.
|
|
283
|
+
const createCodemodeExtension = pi.createCodemodeExtension;
|
|
284
|
+
const codemode = typeof createCodemodeExtension === "function" &&
|
|
285
|
+
!launch.runtime.capabilityCeiling?.denyExtensions &&
|
|
286
|
+
(launch.tools === undefined || launch.tools.includes("codemode")) &&
|
|
287
|
+
!launch.excludeTools?.includes("codemode")
|
|
288
|
+
? [{ name: "codemode", factory: createCodemodeExtension(), replaceable: true }]
|
|
289
|
+
: [];
|
|
226
290
|
const loader = new pi.DefaultResourceLoader({
|
|
227
291
|
cwd: launch.cwd,
|
|
228
292
|
agentDir,
|
|
229
293
|
settingsManager,
|
|
230
294
|
noExtensions: !launch.ambientExtensions,
|
|
231
295
|
noSkills: launch.noSkills,
|
|
296
|
+
// Pi merges skills from extensions' resources_discover without checking noSkills.
|
|
297
|
+
skillsOverride: launch.noSkills ? (base) => ({ ...base, skills: [] }) : undefined,
|
|
232
298
|
noPromptTemplates: true,
|
|
233
299
|
noThemes: true,
|
|
234
300
|
noContextFiles: launch.noContextFiles,
|
|
235
|
-
additionalExtensionPaths: launch.extensionPaths,
|
|
236
|
-
extensionFactories: launch.hooks,
|
|
301
|
+
additionalExtensionPaths: builtinMcp ? [...launch.extensionPaths, "builtin:mcp"] : launch.extensionPaths,
|
|
302
|
+
extensionFactories: [...launch.hooks, ...codemode, ...(builtinMcp ? [builtinMcp] : [])],
|
|
237
303
|
extensionsOverride: prioritizeChildPromptRuntime,
|
|
238
304
|
...(launch.systemPrompt !== undefined ? { systemPrompt: launch.systemPrompt } : {}),
|
|
239
305
|
...(launch.appendSystemPrompt !== undefined ? { appendSystemPrompt: [launch.appendSystemPrompt] } : {}),
|
|
@@ -320,6 +386,25 @@ export function createDefaultChildSessionFactory(options = {}) {
|
|
|
320
386
|
session.dispose();
|
|
321
387
|
}
|
|
322
388
|
};
|
|
389
|
+
// Outside the launch lock: MCP servers connect after `session_start` without reading the per-launch env.
|
|
390
|
+
if (builtinMcpTools.length) {
|
|
391
|
+
const disposed = () => disposals !== disposalsAtStart;
|
|
392
|
+
const ready = missingBuiltinMcpTools(session, builtinMcpTools.map(({ name }) => name), builtinMcpToolWaitMs, disposed).then(async (missing) => {
|
|
393
|
+
if (!missing.length && !disposed())
|
|
394
|
+
return;
|
|
395
|
+
await shutdown();
|
|
396
|
+
throw new Error(disposed()
|
|
397
|
+
? "The child session factory was disposed while the child waited for its MCP tools."
|
|
398
|
+
: `Selected built-in MCP tools did not register in the child session: ${missing.join(", ")}. The MCP server may have failed to connect, or the name belongs to a different tool than the selector names; check it with /mcp.`);
|
|
399
|
+
});
|
|
400
|
+
mcpWaits.add(ready);
|
|
401
|
+
try {
|
|
402
|
+
await ready;
|
|
403
|
+
}
|
|
404
|
+
finally {
|
|
405
|
+
mcpWaits.delete(ready);
|
|
406
|
+
}
|
|
407
|
+
}
|
|
323
408
|
const child = {
|
|
324
409
|
subscribe: (listener) => session.subscribe((event) => listener(event)),
|
|
325
410
|
prompt: (text) => session.prompt(text),
|
|
@@ -347,6 +432,7 @@ export function createDefaultChildSessionFactory(options = {}) {
|
|
|
347
432
|
return child;
|
|
348
433
|
},
|
|
349
434
|
async dispose() {
|
|
435
|
+
disposals += 1;
|
|
350
436
|
const children = [...live].filter((child) => !child.detached);
|
|
351
437
|
for (const child of children)
|
|
352
438
|
child.shutDown = true;
|
|
@@ -357,7 +443,7 @@ export function createDefaultChildSessionFactory(options = {}) {
|
|
|
357
443
|
}
|
|
358
444
|
catch { /* best effort */ }
|
|
359
445
|
}
|
|
360
|
-
await Promise.allSettled([...shutdowns]);
|
|
446
|
+
await Promise.allSettled([...shutdowns, ...mcpWaits]);
|
|
361
447
|
if (live.size === 0)
|
|
362
448
|
runtime = undefined;
|
|
363
449
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-session.js","sourceRoot":"","sources":["../../../../src/runs/shared/child-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"child-session.js","sourceRoot":"","sources":["../../../../src/runs/shared/child-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,8 @@ export interface ResolvePiLaunchToolPlanInput {
|
|
|
30
30
|
agentName?: string;
|
|
31
31
|
permissionRules?: PermissionRules;
|
|
32
32
|
runtimeSnapshotHost?: McpRuntimeSnapshotHost;
|
|
33
|
+
/** The parent's built-in MCP selections; the background runner has no host to resolve selectors against. */
|
|
34
|
+
builtinMcpTools?: ResolvedMcpDirectToolSelection[];
|
|
33
35
|
}
|
|
34
36
|
export interface PiLaunchToolPlan {
|
|
35
37
|
capabilityCeiling?: ResolvedSubagentCapabilityCeiling;
|
|
@@ -40,6 +42,8 @@ export interface PiLaunchToolPlan {
|
|
|
40
42
|
resolvedMcpSelections: ResolvedMcpDirectToolSelection[];
|
|
41
43
|
effectiveMcpSelections: ResolvedMcpDirectToolSelection[];
|
|
42
44
|
effectiveMcpTools: string[];
|
|
45
|
+
/** Effective selections granted from Pi's built-in MCP; undefined when the selectors did not resolve against it. */
|
|
46
|
+
builtinMcpTools?: ResolvedMcpDirectToolSelection[];
|
|
43
47
|
explicitToolAllowlist: boolean;
|
|
44
48
|
internalTools: string[];
|
|
45
49
|
effectiveToolAllowlist: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-tool-plan.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-tool-plan.ts"],"names":[],"mappings":"AAUA,OAAO,
|
|
1
|
+
{"version":3,"file":"child-tool-plan.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-tool-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { createHash } from "node:crypto";
|
|
|
7
7
|
import * as fs from "node:fs";
|
|
8
8
|
import * as path from "node:path";
|
|
9
9
|
import { fileURLToPath } from "node:url";
|
|
10
|
-
import { formatUnresolvedMcpDirectToolSelectors, resolveMcpDirectToolResolution, } from "./mcp-direct-tool-allowlist.js";
|
|
10
|
+
import { formatUnresolvedBuiltinMcpSelectors, formatUnresolvedMcpDirectToolSelectors, resolveMcpDirectToolResolution, } from "./mcp-direct-tool-allowlist.js";
|
|
11
11
|
import { TEMP_ROOT_DIR, } from "../../shared/types.js";
|
|
12
12
|
import { THINKING_LEVELS } from "../../shared/model-info.js";
|
|
13
13
|
import { getAgentDir } from "../../shared/utils.js";
|
|
@@ -208,20 +208,26 @@ export function resolvePiLaunchToolPlan(input) {
|
|
|
208
208
|
(tool.includes("/") || tool.endsWith(".ts") || tool.endsWith(".js")));
|
|
209
209
|
const mcpResolution = capabilityCeiling?.denyExtensions
|
|
210
210
|
? { selections: [], unresolvedSelectors: [] }
|
|
211
|
-
:
|
|
211
|
+
: input.builtinMcpTools
|
|
212
|
+
// The runner applies the same ceilings again; filtering is idempotent.
|
|
213
|
+
? { selections: input.builtinMcpTools, unresolvedSelectors: [], builtin: true }
|
|
214
|
+
: resolveMcpDirectToolResolution(input.mcpDirectTools, input.cwd, input.runtimeSnapshotHost);
|
|
212
215
|
if (mcpResolution.runtimeServerNames?.length) {
|
|
213
216
|
throw new Error(formatRuntimeSnapshotMcpServersError(input.agentName, mcpResolution.runtimeServerNames));
|
|
214
217
|
}
|
|
215
218
|
if (mcpResolution.unresolvedSelectors.length > 0) {
|
|
216
|
-
throw new Error(
|
|
219
|
+
throw new Error(mcpResolution.builtin
|
|
220
|
+
? formatUnresolvedBuiltinMcpSelectors(input.agentName, mcpResolution.unresolvedSelectors)
|
|
221
|
+
: formatUnresolvedMcpDirectToolSelectors(mcpResolution.unresolvedSelectors));
|
|
217
222
|
}
|
|
218
223
|
const resolvedMcpSelections = mcpResolution.selections;
|
|
219
224
|
const resolvedMcpNames = new Set(resolvedMcpSelections.map((selection) => selection.name));
|
|
220
|
-
const legacyMcpNameCounts = countLegacyUnderscoreMcpToolNames(resolvedMcpSelections);
|
|
225
|
+
const legacyMcpNameCounts = mcpResolution.builtin ? new Map() : countLegacyUnderscoreMcpToolNames(resolvedMcpSelections);
|
|
221
226
|
const effectiveMcpSelections = resolvedMcpSelections.filter((selection) => !allowedToolSet ||
|
|
222
227
|
allowedToolSet.has(selection.name) ||
|
|
223
228
|
isLegacyUnderscoreMcpToolAllowed(selection, allowedToolSet, resolvedMcpNames, legacyMcpNameCounts)).filter((selection) => !excludedToolSet.has(selection.name));
|
|
224
229
|
const effectiveMcpTools = effectiveMcpSelections.map((selection) => selection.name);
|
|
230
|
+
const builtinMcpTools = mcpResolution.builtin ? effectiveMcpSelections : undefined;
|
|
225
231
|
const explicitToolAllowlist = input.tools !== undefined ||
|
|
226
232
|
(input.mcpDirectTools?.length ?? 0) > 0 ||
|
|
227
233
|
allowedToolSet !== undefined;
|
|
@@ -336,6 +342,7 @@ export function resolvePiLaunchToolPlan(input) {
|
|
|
336
342
|
resolvedMcpSelections,
|
|
337
343
|
effectiveMcpSelections,
|
|
338
344
|
effectiveMcpTools,
|
|
345
|
+
builtinMcpTools,
|
|
339
346
|
explicitToolAllowlist,
|
|
340
347
|
internalTools,
|
|
341
348
|
effectiveToolAllowlist,
|