@pasko70/pibo 2.4.2 → 2.5.0

package/dist/agent-runtime/context-build.js

@@ -1,5 +1,11 @@
+import { createPiboRuntimeResolutionManifest, } from "../core/context-build.js";
 import { InitialSessionContext } from "../core/profiles.js";
 import { PIBO_AGENT_TOOL_NAMES, listAvailableAgents } from "../subagents/tool.js";
+import { PIBO_DELEGATED_AGENT_CONTEXT_PATH } from "../subagents/context.js";
+import { PIBO_RUN_TOOL_NAMES } from "../runs/tools.js";
+import { PIBO_GOAL_TOOL_NAMES } from "../loops/tools.js";
+import { CODEX_COMPAT_TOOL_NAMES } from "../tools/codex-compat.js";
+import { isEnabledRuntimeToolProfile, materializePiboProfileTools, } from "../tools/session-tool-set.js";
 export function profileWithRuntimeInstance(profile, runtimeInstanceId) {
     if (profile.runtimeInstanceId === runtimeInstanceId)
         return profile;
@@ -41,10 +47,100 @@ export function uniqueRuntimeDiagnostics(diagnostics) {
         return true;
     });
 }
+function uniqueNames(values) {
+    return [...new Set(values)];
+}
 export function buildPortableRuntimeContextSnapshot(input) {
     const profile = input.profile;
     const nodes = [];
     const addNode = (node) => nodes.push({ ...node, order: nodes.length });
+    const availableAgents = listAvailableAgents(profile.subagents);
+    const delegatedSendAvailable = availableAgents.length > 0;
+    const toolContext = {
+        piboSessionId: input.piboSessionId,
+        piboRoomId: input.piboRoomId,
+        profileName: profile.profileName,
+        cwd: input.cwd,
+    };
+    const materializedProfileTools = materializePiboProfileTools(profile, toolContext);
+    const runtimeProfileTool = profile.tools.find(isEnabledRuntimeToolProfile);
+    const callableProfileTools = [
+        ...materializedProfileTools.map((tool) => ({ name: tool.definition.name, yieldable: tool.profile.yieldable })),
+        ...(runtimeProfileTool ? [{ name: "runtime", yieldable: runtimeProfileTool.yieldable }] : []),
+    ];
+    const profileToolNames = callableProfileTools.map((tool) => tool.name);
+    const directAgentToolNames = delegatedSendAvailable
+        ? PIBO_AGENT_TOOL_NAMES.filter((name) => name !== "pibo_agents_send_message")
+        : [];
+    const codexCompatToolNames = profile.toolPackages.codexCompat === true ? [...CODEX_COMPAT_TOOL_NAMES] : [];
+    const explicitYieldableToolNames = uniqueNames([
+        ...callableProfileTools.filter((tool) => tool.yieldable !== false).map((tool) => tool.name),
+        ...(delegatedSendAvailable ? PIBO_AGENT_TOOL_NAMES : []),
+        ...codexCompatToolNames,
+    ]);
+    const yieldableToolNames = profile.toolPackages.runControl === true
+        ? explicitYieldableToolNames
+        : delegatedSendAvailable ? ["pibo_agents_send_message"] : [];
+    const runControlAvailable = yieldableToolNames.length > 0;
+    const activeToolNames = uniqueNames([
+        ...profileToolNames,
+        ...directAgentToolNames,
+        ...codexCompatToolNames,
+        ...(profile.toolPackages.goalControl !== false ? PIBO_GOAL_TOOL_NAMES : []),
+        ...(runControlAvailable ? PIBO_RUN_TOOL_NAMES : []),
+    ]);
+    const activeToolPackages = [
+        ...(profile.toolPackages.goalControl !== false ? ["pibo-goal-control"] : []),
+        ...(profile.toolPackages.codexCompat === true ? ["codex-compat"] : []),
+        ...(runControlAvailable ? ["pibo-run-control"] : []),
+    ];
+    const managedToolDisplayNames = [
+        ...activeToolNames,
+        ...yieldableToolNames.map((name) => `yielded-target:${name}`),
+        ...availableAgents.map((agent) => `agent:${agent.name} (${agent.profile}) — ${agent.description}`),
+        ...activeToolPackages.map((name) => name === "pibo-run-control" && profile.toolPackages.runControl !== true
+            ? "package:pibo-run-control (automatic for delegation)"
+            : `package:${name}`),
+    ];
+    const manifestContextPaths = input.resources
+        ? input.resources.context.flatMap((contribution) => {
+            const path = contribution.materializedPath ?? contribution.path ?? contribution.sourcePath;
+            return path ? [path] : [];
+        })
+        : [
+            "pibo://runtime/session-context.md",
+            ...profile.contextFiles.filter((file) => file.enabled !== false).map((file) => file.key ?? file.path),
+            ...(delegatedSendAvailable ? [PIBO_DELEGATED_AGENT_CONTEXT_PATH] : []),
+        ];
+    const runtimeManifest = createPiboRuntimeResolutionManifest({
+        profile,
+        cwd: input.cwd,
+        adapterId: input.runtime.adapterId,
+        piboSessionId: input.piboSessionId,
+        piboRoomId: input.piboRoomId,
+        activeModel: input.activeModel,
+        thinkingLevel: input.thinkingLevel,
+        toolSurface: "pibo-managed-only",
+        activeToolNames,
+        yieldableToolNames,
+        activeToolPackages,
+        contextFilePaths: manifestContextPaths,
+        skillNames: input.resources
+            ? input.resources.skills.map((skill) => skill.name)
+            : profile.skills.filter((skill) => skill.enabled !== false).map((skill) => skill.name),
+        modelDefaults: input.modelDefaults,
+        subagentProfileResolver: input.subagentProfileResolver,
+    });
+    addNode({
+        id: "runtime-manifest",
+        kind: "runtime_manifest",
+        title: "Runtime Resolution Manifest",
+        source: "runtime",
+        state: "active",
+        badges: ["RESOLVED", "READ-ONLY", "PIBO-MANAGED-TOOLS"],
+        payloadJson: runtimeManifest,
+        notes: ["Resolution evidence for this inspection only. It is not a second profile configuration and is not injected into the agent prompt. Harness-native tool names may remain discoverable only at runtime."],
+    });
     addNode({
         id: "runtime",
         kind: "metadata",
@@ -62,16 +158,9 @@ export function buildPortableRuntimeContextSnapshot(input) {
         },
         payloadJson: input.runtime.capabilities,
     });
-    const availableAgents = listAvailableAgents(profile.subagents);
-    addRuntimeContributionGroup(nodes, "tools", "Pibo Tools and Delegated Agents", [
-        ...profile.tools.filter((tool) => tool.enabled !== false).map((tool) => tool.name),
-        ...(availableAgents.length > 0 ? PIBO_AGENT_TOOL_NAMES : []),
-        ...availableAgents.map((agent) => `agent:${agent.name} (${agent.profile}) — ${agent.description}`),
-        ...(profile.toolPackages.goalControl !== false ? ["package:pibo-goal-control"] : []),
-        ...(profile.toolPackages.runControl === true ? ["package:pibo-run-control"] : []),
-    ], input.runtime.capabilities.tools.piboManaged);
+    addRuntimeContributionGroup(nodes, "tools", "Pibo Tools and Delegated Agents", managedToolDisplayNames, input.runtime.capabilities.tools.piboManaged);
     addNativeToolInspectionNode(nodes, input.runtime.capabilities.tools.nativeToolInspection);
-    if (profile.toolPackages.runControl === true) {
+    if (runControlAvailable) {
         addNativeToolYieldingNode(nodes, input.runtime.capabilities.tools.nativeToolYielding);
     }
     if (input.resources) {
@@ -138,7 +227,7 @@ export function buildPortableRuntimeContextSnapshot(input) {
         source: "profile",
         state: "active",
         metadata: {
-            activeModel: input.activeModel,
+            activeModel: runtimeManifest.effectiveModel,
             mainModel: profile.mainModel,
             subagentModel: profile.subagentModel,
             mainThinkingLevel: profile.mainThinkingLevel ?? profile.thinkingLevel,
@@ -187,7 +276,7 @@ export function buildPortableRuntimeContextSnapshot(input) {
         piboSessionId: input.piboSessionId,
         piboRoomId: input.piboRoomId,
         cwd: input.cwd,
-        activeModel: input.activeModel,
+        activeModel: runtimeManifest.effectiveModel,
         runtime: input.runtime,
         summary: {
             topLevelNodes: nodes.length,

package/dist/agent-runtime/profile-validation.js

@@ -58,6 +58,9 @@ export function validateAgentRuntimeProfileCapabilities(profile, capabilities) {
     if (enabledContextFiles.length > 0) {
         pushUnsupportedDeliveryDiagnostic(diagnostics, capabilities.context, "runtime_context_unsupported", "contextFiles", `Profile "${profile.profileName}" selects managed or automatic context`);
     }
+    if (enabledSubagents.length > 0) {
+        pushUnsupportedDeliveryDiagnostic(diagnostics, capabilities.context, "runtime_delegated_agent_context_unsupported", "subagents", `Profile "${profile.profileName}" requires delegated-agent management context`);
+    }
     if (profile.nativeSubagents !== undefined && typeof profile.nativeSubagents !== "boolean") {
         diagnostics.push({
             severity: "error",

package/dist/agent-runtime/resource-service.js

@@ -9,6 +9,7 @@ import { isHttpServer, loadConfigUnresolved, } from "../mcp/config.js";
 import { redactMcpRuntimeError as redactResourceError, scopePiboMcpServerConfig, verifyPiboMcpServer, } from "../mcp/runtime-session.js";
 import { getMcpAgentContextFileFromConfig } from "../mcp/agent-context.js";
 import { getInstalledCliToolContextFile } from "../tools/registry.js";
+import { getDelegatedAgentContextFile } from "../subagents/context.js";
 import { copyAgentRuntimeSkillDirectory, createAgentRuntimeResourcePaths, } from "./resource-files.js";
 const DEFAULT_MCP_VERIFY_TIMEOUT_MS = 15_000;
 const DEFAULT_MAX_SKILL_FILES = 2_048;
@@ -550,6 +551,21 @@ class RuntimeResourceSession {
                 this.diagnostics.push({ severity: "error", code: "runtime_context_file_failed", message, contributionId: id });
             }
         }
+        const delegatedAgents = getDelegatedAgentContextFile(this.input.profile.subagents);
+        if (delegatedAgents) {
+            this.requiredContributionIds.add("context:delegated-agents");
+            this.context.push({
+                id: "context:delegated-agents",
+                kind: "generated",
+                source: "generated",
+                intent: "developer",
+                label: "Delegated Agent Management",
+                required: true,
+                order: 250,
+                path: delegatedAgents.path,
+                content: delegatedAgents.content,
+            });
+        }
         const installedTools = getInstalledCliToolContextFile();
         if (installedTools) {
             this.context.push({

package/dist/agent-runtime/routed-session.js

@@ -518,6 +518,7 @@ export class RuntimeRoutedSession {
                     cacheWriteTokens: event.usage.cacheWriteTokens,
                     reasoningTokens: event.usage.reasoningTokens,
                     totalTokens: event.usage.totalTokens,
+                    costUsd: event.usage.costUsd,
                     provenance: this.activeMessage?.provenance,
                 }));
                 this.trackRunReminderTurnGuard("usage", { totalTokens: event.usage.totalTokens });
@@ -1015,53 +1016,59 @@ export class RuntimeRoutedSession {
         this.nextThinkingIndex = 0;
     }
     withActiveMessage(event) {
-        if (this.activeMessage?.id && event.type === "assistant_delta") {
+        const activeMessage = this.activeMessage;
+        if (!activeMessage?.id)
+            return event;
+        const correlation = {
+            eventId: activeMessage.id,
+            ...(activeMessage.provenance ? { provenance: activeMessage.provenance } : {}),
+        };
+        if (event.type === "assistant_delta") {
             const assistantIndex = this.activeAssistantIndex ?? this.nextAssistantIndex;
             if (this.activeAssistantIndex === undefined) {
                 this.nextAssistantIndex += 1;
                 this.activeAssistantIndex = assistantIndex;
             }
-            return { ...event, eventId: this.activeMessage.id, assistantIndex };
+            return { ...event, ...correlation, assistantIndex };
         }
-        if (this.activeMessage?.id && event.type === "assistant_message") {
+        if (event.type === "assistant_message") {
             const assistantIndex = this.activeAssistantIndex ?? this.nextAssistantIndex;
             if (this.activeAssistantIndex === undefined)
                 this.nextAssistantIndex += 1;
             this.activeAssistantIndex = undefined;
-            return { ...event, eventId: this.activeMessage.id, assistantIndex };
+            return { ...event, ...correlation, assistantIndex };
         }
-        if (this.activeMessage?.id && event.type === "thinking_started") {
+        if (event.type === "thinking_started") {
             const thinkingIndex = this.nextThinkingIndex;
             this.nextThinkingIndex += 1;
             this.activeThinkingIndex = thinkingIndex;
-            return { ...event, eventId: this.activeMessage.id, thinkingIndex };
+            return { ...event, ...correlation, thinkingIndex };
         }
-        if (this.activeMessage?.id && (event.type === "thinking_delta" || event.type === "thinking_finished")) {
+        if (event.type === "thinking_delta" || event.type === "thinking_finished") {
             const thinkingIndex = this.activeThinkingIndex ?? this.nextThinkingIndex;
             if (this.activeThinkingIndex === undefined) {
                 this.nextThinkingIndex += 1;
                 this.activeThinkingIndex = thinkingIndex;
             }
-            const output = { ...event, eventId: this.activeMessage.id, thinkingIndex };
+            const output = { ...event, ...correlation, thinkingIndex };
             if (event.type === "thinking_finished")
                 this.activeThinkingIndex = undefined;
             return output;
         }
-        if (this.activeMessage?.id
-            && (event.type === "assistant_usage"
-                || event.type === "compaction_start"
-                || event.type === "compaction_end"
-                || event.type === "tool_call"
-                || event.type === "tool_execution_started"
-                || event.type === "tool_execution_updated"
-                || event.type === "tool_execution_finished"
-                || event.type === "approval_requested"
-                || event.type === "approval_resolved"
-                || event.type === "user_input_requested"
-                || event.type === "user_input_resolved"
-                || event.type === "session_error"
-                || event.type === "execution_result")) {
-            return { ...event, eventId: this.activeMessage.id };
+        if (event.type === "assistant_usage"
+            || event.type === "compaction_start"
+            || event.type === "compaction_end"
+            || event.type === "tool_call"
+            || event.type === "tool_execution_started"
+            || event.type === "tool_execution_updated"
+            || event.type === "tool_execution_finished"
+            || event.type === "approval_requested"
+            || event.type === "approval_resolved"
+            || event.type === "user_input_requested"
+            || event.type === "user_input_resolved"
+            || event.type === "session_error"
+            || event.type === "execution_result") {
+            return { ...event, ...correlation };
         }
         return event;
     }

package/dist/agent-runtime/testing/fake-adapter.js

@@ -12,6 +12,7 @@ export class FakeAgentRuntimeSession {
     disposed = false;
     aborted = false;
     promptIndex = 0;
+    activeScript;
     abortWaiters = [];
     prompts = [];
     disposeCalls = 0;
@@ -47,6 +48,7 @@ export class FakeAgentRuntimeSession {
         this.aborted = false;
         const turnId = `fake-turn-${this.promptIndex}`;
         const script = typeof this.script === "function" ? this.script(input, this.promptIndex) : this.script ?? {};
+        this.activeScript = script;
         this.emit({ type: "turn_started", turnId });
         try {
             if (script.waitForAbort) {
@@ -72,6 +74,7 @@ export class FakeAgentRuntimeSession {
             this.emit({ type: "turn_completed", turnId, status: "completed" });
         }
         finally {
+            this.activeScript = undefined;
             this.streaming = false;
         }
     }
@@ -84,6 +87,10 @@ export class FakeAgentRuntimeSession {
     }
     async abort() {
         this.abortCalls += 1;
+        if (this.activeScript?.abortFailWith)
+            throw new Error(this.activeScript.abortFailWith);
+        if (this.activeScript?.abortNeverSettles)
+            return;
         const wasStreaming = this.streaming;
         this.aborted = true;
         const waiters = this.abortWaiters;

package/dist/agent-runtimes/pi/adapter.js

@@ -210,7 +210,9 @@ export function semanticEventFromPibo(event) {
                     outputTokens: event.outputTokens,
                     cacheReadTokens: event.cacheReadTokens,
                     cacheWriteTokens: event.cacheWriteTokens,
+                    reasoningTokens: event.reasoningTokens,
                     totalTokens: event.totalTokens,
+                    costUsd: event.costUsd,
                 },
             };
         case "compaction_start":

package/dist/agent-runtimes/pi/routed-session.js

@@ -50,6 +50,9 @@ export function normalizeAssistantUsageEvent(piboSessionId, message) {
     const outputTokens = numberValue(usage.outputTokens) ?? numberValue(usage.output);
     const cacheReadTokens = numberValue(usage.cacheRead);
     const cacheWriteTokens = numberValue(usage.cacheWrite);
+    const reasoningTokens = numberValue(usage.reasoningTokens) ?? numberValue(usage.reasoning);
+    const cost = usage.cost && typeof usage.cost === "object" ? usage.cost : undefined;
+    const costUsd = numberValue(cost?.total) ?? numberValue(usage.cost);
     const reportedTotal = numberValue(usage.totalTokens);
     const normalizedTotal = reportedTotal ?? [inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens]
         .filter((value) => value !== undefined)
@@ -63,7 +66,9 @@ export function normalizeAssistantUsageEvent(piboSessionId, message) {
         ...(outputTokens !== undefined ? { outputTokens } : {}),
         ...(cacheReadTokens !== undefined ? { cacheReadTokens } : {}),
         ...(cacheWriteTokens !== undefined ? { cacheWriteTokens } : {}),
+        ...(reasoningTokens !== undefined ? { reasoningTokens } : {}),
         totalTokens: Math.max(0, normalizedTotal),
+        ...(costUsd !== undefined ? { costUsd } : {}),
     };
 }
 function stringValue(value) {
@@ -137,22 +142,26 @@ function messageContentIndex(candidate) {
 function promptSource(source) {
     return source === "user" || source === "ui" ? "interactive" : "rpc";
 }
-function lastTextPartFromMessage(message) {
+function textFromMessage(message) {
     if (!message || typeof message !== "object")
         return undefined;
     const content = message.content;
     if (!Array.isArray(content))
         return undefined;
-    for (let index = content.length - 1; index >= 0; index -= 1) {
+    const textParts = [];
+    for (let index = 0; index < content.length; index += 1) {
         const part = content[index];
         if (!part || typeof part !== "object")
             continue;
         const candidate = part;
         if (candidate.type === "text" && typeof candidate.text === "string" && candidate.text.length > 0) {
-            return { text: candidate.text, contentIndex: index };
+            textParts.push({ text: candidate.text, contentIndex: index });
         }
     }
-    return undefined;
+    const finalPart = textParts.at(-1);
+    if (!finalPart)
+        return undefined;
+    return { text: textParts.map((part) => part.text).join("\n"), contentIndex: finalPart.contentIndex };
 }
 function toolCallFromMessage(message, contentIndex) {
     if (!message || typeof message !== "object" || typeof contentIndex !== "number")
@@ -363,13 +372,13 @@ export function normalizePiEvent(piboSessionId, event, context) {
                     errorDetails: assistantErrorDetails(message, context),
                 };
             }
-            const textPart = lastTextPartFromMessage(candidate.message);
-            if (textPart) {
+            const messageText = textFromMessage(candidate.message);
+            if (messageText) {
                 return {
                     type: "assistant_message",
                     piboSessionId,
-                    contentIndex: textPart.contentIndex,
-                    text: textPart.text,
+                    contentIndex: messageText.contentIndex,
+                    text: messageText.text,
                 };
             }
         }
@@ -1461,50 +1470,56 @@ export class RoutedSession {
         };
     }
     withActiveMessage(event) {
-        if (this.activeMessage?.id && event.type === "assistant_delta") {
+        const activeMessage = this.activeMessage;
+        if (!activeMessage?.id)
+            return event;
+        const correlation = {
+            eventId: activeMessage.id,
+            ...(activeMessage.provenance ? { provenance: activeMessage.provenance } : {}),
+        };
+        if (event.type === "assistant_delta") {
             const assistantIndex = this.activeAssistantIndex ?? this.nextAssistantIndex;
             if (this.activeAssistantIndex === undefined) {
                 this.nextAssistantIndex += 1;
                 this.activeAssistantIndex = assistantIndex;
             }
-            return { ...event, eventId: this.activeMessage.id, assistantIndex };
+            return { ...event, ...correlation, assistantIndex };
         }
-        if (this.activeMessage?.id && event.type === "assistant_message") {
+        if (event.type === "assistant_message") {
             const assistantIndex = this.activeAssistantIndex ?? this.nextAssistantIndex;
             if (this.activeAssistantIndex === undefined) {
                 this.nextAssistantIndex += 1;
             }
             this.activeAssistantIndex = undefined;
-            return { ...event, eventId: this.activeMessage.id, assistantIndex };
+            return { ...event, ...correlation, assistantIndex };
         }
-        if (this.activeMessage?.id && event.type === "thinking_started") {
+        if (event.type === "thinking_started") {
             const thinkingIndex = this.nextThinkingIndex;
             this.nextThinkingIndex += 1;
             this.activeThinkingIndex = thinkingIndex;
-            return { ...event, eventId: this.activeMessage.id, thinkingIndex };
+            return { ...event, ...correlation, thinkingIndex };
         }
-        if (this.activeMessage?.id && (event.type === "thinking_delta" || event.type === "thinking_finished")) {
+        if (event.type === "thinking_delta" || event.type === "thinking_finished") {
             const thinkingIndex = this.activeThinkingIndex ?? this.nextThinkingIndex;
             if (this.activeThinkingIndex === undefined) {
                 this.nextThinkingIndex += 1;
                 this.activeThinkingIndex = thinkingIndex;
             }
-            const output = { ...event, eventId: this.activeMessage.id, thinkingIndex };
+            const output = { ...event, ...correlation, thinkingIndex };
             if (event.type === "thinking_finished")
                 this.activeThinkingIndex = undefined;
             return output;
         }
-        if (this.activeMessage?.id &&
-            (event.type === "assistant_usage" ||
-                event.type === "compaction_start" ||
-                event.type === "compaction_end" ||
-                event.type === "tool_call" ||
-                event.type === "tool_execution_started" ||
-                event.type === "tool_execution_updated" ||
-                event.type === "tool_execution_finished" ||
-                event.type === "session_error" ||
-                event.type === "execution_result")) {
-            return { ...event, eventId: this.activeMessage.id };
+        if (event.type === "assistant_usage" ||
+            event.type === "compaction_start" ||
+            event.type === "compaction_end" ||
+            event.type === "tool_call" ||
+            event.type === "tool_execution_started" ||
+            event.type === "tool_execution_updated" ||
+            event.type === "tool_execution_finished" ||
+            event.type === "session_error" ||
+            event.type === "execution_result") {
+            return { ...event, ...correlation };
         }
         return event;
     }

package/dist/agent-runtimes/pi/runtime.js

@@ -5,7 +5,8 @@ import { createAgentSessionFromServices, createAgentSessionRuntime, createAgentS
 import { DEFAULT_BUILTIN_TOOL_NAMES, InitialSessionContext, } from "../../core/profiles.js";
 import { loadPiboModelDefaults, selectRequestedModelProfile, selectRequestedThinkingLevel } from "../../core/model-defaults.js";
 import { createDefaultPiboProfile } from "../../core/default-profile.js";
-import { PIBO_AGENT_TOOL_NAMES, } from "../../subagents/tool.js";
+import { getDelegatedAgentContextFile } from "../../subagents/context.js";
+import { resolvePiboSubagentRuntimeSelections } from "../../subagents/runtime-selection.js";
 import { getInstalledCliToolContextFile } from "../../tools/registry.js";
 import { createCodexCompatExtension } from "../../core/codex-compat.js";
 import { createWebSearchProviderExtension, isWebSearchProviderTool } from "../../tools/web-search.js";
@@ -218,6 +219,7 @@ export async function createPiboRuntime(options = {}) {
             : createSessionContextFile({ piboSessionId: profile.sessionId, ...options.sessionContext });
         const installedToolContextFile = options.resources ? undefined : getInstalledCliToolContextFile();
         const mcpAgentContextFile = options.resources ? undefined : await getMcpAgentContextFile(profile.mcpServers);
+        const delegatedAgentContextFile = options.resources ? undefined : getDelegatedAgentContextFile(profile.subagents);
         const skillPaths = options.resources
             ? [...options.resources.getSkillPaths("source")]
             : getEnabledSkillPaths(runtimeCwd, profile);
@@ -241,6 +243,7 @@ export async function createPiboRuntime(options = {}) {
                     agentsFiles: mergeContextFiles(base.agentsFiles, [
                         ...(sessionContextFile ? [sessionContextFile] : []),
                         ...contextFiles,
+                        ...(delegatedAgentContextFile ? [delegatedAgentContextFile] : []),
                         ...(installedToolContextFile ? [installedToolContextFile] : []),
                         ...(mcpAgentContextFile ? [mcpAgentContextFile] : []),
                     ]),
@@ -400,6 +403,7 @@ function resolveProfileModel(profile, modelRegistry, cwd, modelDefaults, activeM
 export async function inspectPiboProfile(options = {}) {
     const cwd = options.cwd ?? process.cwd();
     const profile = options.profile ?? createDefaultPiboProfile();
+    const inspectionModelDefaults = options.modelDefaults ?? loadPiboModelDefaults(cwd);
     const runtimeProfile = new InitialSessionContext({
         profileName: profile.profileName,
         runtimeInstanceId: profile.runtimeInstanceId,
@@ -474,10 +478,9 @@ export async function inspectPiboProfile(options = {}) {
                 registered: registeredToolNames.has(tool.name) || tool.providerTool !== undefined || isRuntimeTool(tool) || isCodexBrowserTool(tool),
                 active: activeToolNames.has(tool.name) || tool.providerTool !== undefined,
             })).concat(generatedTools),
-            subagents: profile.subagents.map((subagent) => ({
-                name: subagent.name,
-                targetProfile: subagent.targetProfile,
-                active: subagent.enabled !== false && activeToolNames.has(PIBO_AGENT_TOOL_NAMES[0]),
+            subagents: resolvePiboSubagentRuntimeSelections(profile.subagents, options.subagentProfileResolver, inspectionModelDefaults).map(({ enabled, ...subagent }) => ({
+                ...subagent,
+                active: enabled && activeToolNames.has("pibo_run_start"),
             })),
             mcpServers: [...profile.mcpServers],
             mcpStatus: options.resources?.getInspection().mcpServers.map((server) => structuredClone(server)) ?? [],

package/dist/apps/chat/web-app.js

@@ -20,6 +20,7 @@ import { withWorkflowSessionKind } from "../../sessions/workflow-session-kind.js
 import { CustomAgentStore, createDefaultCustomAgentStore, previewCustomAgentCreate, previewCustomAgentUpdate, } from "./agent-store.js";
 import { loadPiboModelDefaults, } from "../../core/model-defaults.js";
 import { inspectPiboContextBuild } from "../../core/context-build.js";
+import { isPiboThinkingLevel } from "../../core/thinking.js";
 import { loadPiboUserSettings, updateTelemetryRetentionLastPrunedAt } from "../../core/user-settings.js";
 import { isTelemetryRetentionMaintenanceDue, maybeRunTelemetryRetentionMaintenance } from "./telemetry-retention-service.js";
 import { loadModelCatalog } from "./model-catalog.js";
@@ -2346,19 +2347,22 @@ async function buildContextBuildSnapshotForRequest(input) {
     if (!input.piboSessionId)
         throw new PiboWebHttpError("piboSessionId is required", 400);
     const selectedSession = requireSharedSession(input.context, input.piboSessionId);
-    const configuredProfile = createProfile(selectedSession.profile);
-    const runtimeInstanceId = selectedSession.runtimeBinding?.runtimeInstanceId ?? configuredProfile.runtimeInstanceId;
-    const profile = profileWithRuntimeInstance(configuredProfile, runtimeInstanceId);
+    const runtimeBinding = input.context.channelContext.getSessionRuntimeBinding?.(selectedSession.id) ?? selectedSession.runtimeBinding;
+    const configuredProfile = input.context.channelContext.getSessionRuntimeProfile?.(selectedSession.id) ?? createProfile(selectedSession.profile);
+    const runtimeInstanceId = runtimeBinding?.runtimeInstanceId ?? configuredProfile.runtimeInstanceId;
+    const profile = configuredProfile.runtimeInstanceId === runtimeInstanceId
+        ? configuredProfile
+        : profileWithRuntimeInstance(configuredProfile, runtimeInstanceId);
     const cwd = selectedSession.workspace ?? getDefaultPiboWorkspace();
     const runtime = await resolveContextBuildRuntime(input.context, runtimeInstanceId);
     const validationDiagnostics = input.context.channelContext.validateAgentRuntimeProfile
         ? await input.context.channelContext.validateAgentRuntimeProfile(profile, cwd)
         : [];
-    const bindingMismatchDiagnostic = selectedSession.runtimeBinding && selectedSession.runtimeBinding.adapterId !== runtime.adapterId
+    const bindingMismatchDiagnostic = runtimeBinding && runtimeBinding.adapterId !== runtime.adapterId
         ? [{
                 severity: "error",
                 code: "runtime_binding_adapter_mismatch",
-                message: `Session binding expects adapter "${selectedSession.runtimeBinding.adapterId}", but runtime instance "${runtime.id}" uses "${runtime.adapterId}".`,
+                message: `Session binding expects adapter "${runtimeBinding.adapterId}", but runtime instance "${runtime.id}" uses "${runtime.adapterId}".`,
             }]
         : [];
     const diagnostics = uniqueRuntimeDiagnostics([
@@ -2371,12 +2375,17 @@ async function buildContextBuildSnapshotForRequest(input) {
         adapterId: runtime.adapterId,
         available: runtime.available && !diagnostics.some((diagnostic) => diagnostic.severity === "error"),
         transport: runtime.transport,
-        bindingState: selectedSession.runtimeBinding?.state,
+        bindingState: runtimeBinding?.state,
         protocol: runtime.protocol,
         capabilities: runtime.capabilities,
         diagnostics,
     };
     const userSettings = loadPiboUserSettings();
+    const modelDefaults = loadPiboModelDefaults(cwd);
+    const storedInitialThinkingLevel = selectedSession.metadata?.initialThinkingLevel;
+    const initialThinkingLevel = typeof storedInitialThinkingLevel === "string" && isPiboThinkingLevel(storedInitialThinkingLevel)
+        ? storedInitialThinkingLevel
+        : undefined;
     const resourceService = new PiboRuntimeResourceService();
     const resources = await resourceService.createSession({
         piboSessionId: selectedSession.id,
@@ -2396,6 +2405,9 @@ async function buildContextBuildSnapshotForRequest(input) {
                 cwd,
                 profile,
                 activeModel: selectedSession.activeModel,
+                thinkingLevel: initialThinkingLevel,
+                modelDefaults,
+                subagentProfileResolver: createProfile,
                 persistSession: false,
                 resources,
                 sessionContext: {
@@ -2426,6 +2438,9 @@ async function buildContextBuildSnapshotForRequest(input) {
             piboSessionId: selectedSession.id,
             piboRoomId: chatRoomIdFromMetadata(selectedSession.metadata),
             activeModel: selectedSession.activeModel,
+            thinkingLevel: initialThinkingLevel,
+            modelDefaults,
+            subagentProfileResolver: createProfile,
             resources: resources.getInspection(),
         });
     }