@themoltnet/pi-runtime 0.6.1 → 0.7.0

package/dist/index.d.ts

@@ -5,6 +5,7 @@ import { BashOperations } from '@earendil-works/pi-coding-agent';
 import { ClaimedTask } from '@themoltnet/agent-runtime';
 import { CommandAnalysis } from '@themoltnet/shell-command-analyzer';
 import { connect } from '@themoltnet/sdk';
+import { Context } from '@opentelemetry/api';
 import { ContextRef } from '@themoltnet/agent-runtime';
 import { EditOperations } from '@earendil-works/pi-coding-agent';
 import { ExtensionAPI } from '@earendil-works/pi-coding-agent';
@@ -97,6 +98,12 @@ declare interface BuildAgentSessionArgs {
     skillsOverride?: () => LoadSkillsResult;
     /** Span attributes merged onto every OTel span the session emits. */
     otelSpanAttrs: Record<string, string | number | boolean>;
+    /** Parent context for the Pi session span, normally the task execute span. */
+    otelSessionParentContext?: Context;
+    /** Resolves the provider-request context used to parent each Pi turn. */
+    getOtelTurnParentContext?: () => Context | undefined;
+    /** Receives the live Pi session context for provider-span parenting. */
+    onOtelSessionContextChange?: (context: Context | undefined) => void;
     /** Agent name for `gen_ai.agent.name` on the root span. */
     agentName: string;
     /**
@@ -617,6 +624,9 @@ export declare interface GateInput {
     analyze: (command: string) => CommandAnalysis;
 }
 
+/** Commands guaranteed by the base Gondolin snapshot. */
+export declare const GONDOLIN_BASE_EXECUTABLES: readonly string[];
+
 export declare const GONDOLIN_TOOL_NAMES: readonly ["read", "write", "edit", "bash", "ls", "find", "grep"];
 
 export declare interface GondolinTemplateDefinition {
@@ -882,6 +892,12 @@ export declare interface PiOtelOptions {
      * since the extension is authoritative for those.
      */
     spanAttributes?: Record<string, string | number | boolean>;
+    /** Explicit parent for the session-level `invoke_agent` span. */
+    sessionParentContext?: Context;
+    /** Parent context for the next Pi turn, normally a provider-request span. */
+    getTurnParentContext?: () => Context | undefined;
+    /** Publishes the live session span context to the embedding runtime. */
+    onSessionContextChange?: (context: Context | undefined) => void;
 }
 
 export declare type PiRetryTriage = (input: PiRetryTriageInput) => Promise<PiRetryTriageResult>;

package/dist/index.js

@@ -18,12 +18,11 @@ import { createHash } from "crypto";
 import { createHash as createHash$1 } from "node:crypto";
 import * as json from "multiformats/codecs/json";
 import "@ipld/dag-cbor";
-import { FREEFORM_TYPE, SUBMIT_OUTPUT_GATE_ID, TaskContext, buildTaskUserPrompt, getSubmitOutputContract, materializeTaskOutput, mergeRuntimeProfileContext, resolveTaskContext, taskTypeUsesSubagents, validateTaskOutput, validateTaskSubmission } from "@themoltnet/agent-runtime";
+import { FREEFORM_TYPE, SUBMIT_OUTPUT_GATE_ID, TaskContext, buildTaskUserPrompt, getSubmitOutputContract, materializeTaskOutput, mergeRuntimeProfileContext, resolveTaskContext, taskTypeUsesSubagents, traceRuntimePhase, validateTaskOutput, validateTaskSubmission } from "@themoltnet/agent-runtime";
 import { connect } from "@themoltnet/sdk";
 import { ShellCommandAnalyzer } from "@themoltnet/shell-command-analyzer";
 import { homedir } from "node:os";
 import { MemoryProvider, RealFSProvider, ShadowProvider, VM, VmCheckpoint, createHttpHooks, createShadowPathPredicate, ensureImageSelector, isWriteFlag, loadGuestAssets } from "@earendil-works/gondolin";
-import * as Format from "typebox/format";
 import { Type as Type$1 } from "typebox";
 import { Value } from "typebox/value";
 import { parseEnv } from "node:util";
@@ -1057,20 +1056,23 @@ function createPiOtelExtension(options = {}) {
 				sessionSpan.end();
 				sessionSpan = void 0;
 				sessionCtx = context.active();
+				options.onSessionContextChange?.(void 0);
 			}
 			currentModel = void 0;
 		}
 		pi.on("session_start", (event, ctx) => {
 			endSessionSpan();
 			const agentName = options.agentName ?? "pi";
+			const parentContext = options.sessionParentContext ?? context.active();
 			sessionSpan = tracer.startSpan(`invoke_agent ${agentName}`, { attributes: {
 				...extraAttrs,
 				"gen_ai.operation.name": "invoke_agent",
 				"gen_ai.agent.name": agentName,
 				"session.reason": event.reason,
 				"session.cwd": ctx.cwd
-			} }, context.active());
-			sessionCtx = trace.setSpan(context.active(), sessionSpan);
+			} }, parentContext);
+			sessionCtx = trace.setSpan(parentContext, sessionSpan);
+			options.onSessionContextChange?.(sessionCtx);
 			turnCtx = sessionCtx;
 		});
 		pi.on("session_shutdown", () => {
@@ -1089,14 +1091,15 @@ function createPiOtelExtension(options = {}) {
 		pi.on("turn_start", (event) => {
 			if (!sessionSpan) return;
 			const modelLabel = currentModel?.id ?? "unknown";
+			const turnParentContext = options.getTurnParentContext?.() ?? sessionCtx;
 			turnSpan = tracer.startSpan(`chat ${modelLabel}`, { attributes: {
 				...extraAttrs,
 				"gen_ai.operation.name": "chat",
 				"gen_ai.request.model": currentModel?.id ?? "unknown",
 				"gen_ai.provider.name": currentModel?.provider ?? "unknown",
 				"turn.index": event.turnIndex
-			} }, sessionCtx);
-			turnCtx = trace.setSpan(sessionCtx, turnSpan);
+			} }, turnParentContext);
+			turnCtx = trace.setSpan(turnParentContext, turnSpan);
 		});
 		pi.on("turn_end", (event) => {
 			if (!turnSpan) return;
@@ -1247,7 +1250,10 @@ var NO_SKILLS = () => ({
 async function buildAgentSession(args) {
 	const piOtelExtension = createPiOtelExtension({
 		agentName: args.agentName,
-		spanAttributes: args.otelSpanAttrs
+		spanAttributes: args.otelSpanAttrs,
+		sessionParentContext: args.otelSessionParentContext,
+		getTurnParentContext: args.getOtelTurnParentContext,
+		onSessionContextChange: args.onOtelSessionContextChange
 	});
 	const modelOptions = {
 		temperature: args.temperature,
@@ -1339,19 +1345,6 @@ function resolvePiCodingAgentDir() {
 	return process.env["PI_CODING_AGENT_DIR"] ?? path.join(homedir(), ".pi", "agent");
 }
 //#endregion
-//#region ../tasks/src/formats.ts
-/**
-* Register TypeBox string formats used across Task / TaskOutput / task-type
-* schemas. Import this module for its side effect (the package index does so
-* automatically) before compiling or Check()ing any schema that references
-* `format: 'uuid'` or `format: 'date-time'`.
-*
-* Idempotent: registration is guarded by `Format.Has(...)`.
-*/
-var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-if (!Format.Has("uuid")) Format.Set("uuid", (v) => UUID_RE.test(v));
-if (!Format.Has("date-time")) Format.Set("date-time", (v) => !Number.isNaN(Date.parse(v)));
-//#endregion
 //#region ../tasks/src/context.ts
 /**
 * How an executor delivers a context entry to its underlying LLM.
@@ -3898,7 +3891,7 @@ Type$1.Object({
 	daemonState: Type$1.Union([DaemonState, Type$1.Null()])
 }, {
 	$id: "TaskAttempt",
-	additionalProperties: false
+	additionalProperties: true
 });
 Type$1.Object({
 	taskId: Uuid,
@@ -3967,17 +3960,24 @@ Type$1.Object({
 * The cache key is a hash of the full config. When any input changes,
 * a new snapshot is built automatically.
 */
+/** Alpine packages whose commands are guaranteed in every snapshot. */
+var BASE_ALPINE_PACKAGE_EXECUTABLES = {
+	curl: "curl",
+	file: "file",
+	git: "git",
+	jq: "jq",
+	ripgrep: "rg",
+	tar: "tar",
+	xz: "xz"
+};
 /** Alpine packages required by every snapshot. */
-var BASE_ALPINE_PACKAGES = [
-	"ca-certificates",
-	"curl",
-	"file",
-	"git",
-	"jq",
-	"ripgrep",
-	"tar",
-	"xz"
-];
+var BASE_ALPINE_PACKAGES = ["ca-certificates", ...Object.keys(BASE_ALPINE_PACKAGE_EXECUTABLES)];
+/** Commands guaranteed by the base Gondolin snapshot. */
+var GONDOLIN_BASE_EXECUTABLES = Object.freeze([
+	...Object.values(BASE_ALPINE_PACKAGE_EXECUTABLES),
+	"gh",
+	"moltnet"
+].sort());
 /** gh CLI version installed in every snapshot. */
 var GH_VERSION = "2.74.0";
 /** MoltNet CLI version — downloaded as a binary, no Node needed. */
@@ -7187,6 +7187,7 @@ async function executePiTask(claimedTask, reporter, opts) {
 	const task = claimedTask.task;
 	const attemptN = claimedTask.attemptN;
 	const startTime = Date.now();
+	const taskOtelContext = context.active();
 	const requestedMountPath = opts.mountPath ?? process.cwd();
 	const agentRootDir = opts.agentRootDir ?? requestedMountPath;
 	const executionPlan = await opts.makeExecutionPlan?.(claimedTask) ?? null;
@@ -7210,6 +7211,8 @@ async function executePiTask(claimedTask, reporter, opts) {
 	let reporterOpen = opts.reporterAlreadyOpened ?? false;
 	let managed = null;
 	let session = null;
+	let piSessionContext;
+	let providerRequestContext;
 	let subagentHandle = null;
 	const finalUsage = emptyUsage(opts.provider, opts.model);
 	let cancelListener = null;
@@ -7280,19 +7283,22 @@ async function executePiTask(claimedTask, reporter, opts) {
 		let effectiveSandboxConfig;
 		try {
 			if (!resolvedVmTemplate && opts.runtimeDefinition) resolvedVmTemplate = opts.resolveVmTemplate ? await opts.resolveVmTemplate() : await opts.runtimeDefinition.vm.resolve({ onProgress: opts.onSnapshotProgress });
-			checkpointPath = resolvedVmTemplate?.checkpointPath ?? opts.checkpointPath ?? (opts.resolveCheckpointPath ? await opts.resolveCheckpointPath() : await ensureSnapshot({
+			checkpointPath = await traceRuntimePhase("moltnet.execution.snapshot.prepare", { "moltnet.snapshot.source": resolvedVmTemplate ? "resolved_template" : opts.checkpointPath ? "configured_checkpoint" : opts.resolveCheckpointPath ? "resolver" : "build_or_cache" }, async () => resolvedVmTemplate?.checkpointPath ?? opts.checkpointPath ?? (opts.resolveCheckpointPath ? await opts.resolveCheckpointPath() : await ensureSnapshot({
 				config: opts.sandboxConfig?.snapshot,
 				onProgress: opts.onSnapshotProgress ?? ((m) => {
 					process.stderr.write(`[snapshot] ${m}\n`);
 				})
-			}));
+			})));
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			await emitError("snapshot", message);
 			return makeFailedOutput("snapshot_failed", message);
 		}
 		try {
-			workspace = prepareTaskWorkspace(task, requestedMountPath, executionPlan);
+			workspace = await traceRuntimePhase("moltnet.execution.workspace.prepare", {
+				"moltnet.workspace.mode": executionPlan?.workspaceMode ?? "shared_mount",
+				"moltnet.workspace.scope": executionPlan?.workspaceScope ?? "attempt"
+			}, async () => prepareTaskWorkspace(task, requestedMountPath, executionPlan));
 			mountPath = workspace.mountPath;
 			cwdPath = workspace.cwdPath;
 		} catch (err) {
@@ -7300,23 +7306,25 @@ async function executePiTask(claimedTask, reporter, opts) {
 			await emitError("worktree_setup", message);
 			return makeFailedOutput("worktree_setup_failed", message);
 		}
+		if (!workspace) throw new Error("task workspace not prepared");
+		const preparedWorkspace = workspace;
 		try {
 			effectiveSandboxConfig = applyExecutionPlanSandboxOverrides(resolvedVmTemplate ? {
 				...opts.sandboxConfig,
 				snapshot: void 0,
 				resumeCommands: [...resolvedVmTemplate.resumeCommands]
 			} : opts.sandboxConfig, executionPlan);
-			managed = await resumeVm({
+			managed = await traceRuntimePhase("moltnet.execution.vm.resume", { "moltnet.workspace.mode": preparedWorkspace.mode }, () => resumeVm({
 				checkpointPath,
 				agentName: opts.agentName,
 				agentRootDir,
 				mountPath,
-				workspaceMode: workspace.mode,
+				workspaceMode: preparedWorkspace.mode,
 				extraAllowedHosts: opts.extraAllowedHosts,
 				sandboxConfig: effectiveSandboxConfig,
 				forwardEnv: opts.forwardEnv,
 				signal: reporter.cancelSignal
-			});
+			}));
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			if (reporter.cancelSignal.aborted) {
@@ -7329,9 +7337,8 @@ async function executePiTask(claimedTask, reporter, opts) {
 		const diaryId = task.diaryId ?? "";
 		const taskTeamId = task.teamId ?? "";
 		activateAgentEnv(managed.credentials.agentEnv, agentRootDir);
-		const activeWorkspace = workspace;
+		const activeWorkspace = preparedWorkspace;
 		const activeManaged = managed;
-		if (!activeWorkspace) throw new Error("task workspace not prepared");
 		await emit("info", {
 			event: "execute_start",
 			correlationId: task.correlationId ?? null,
@@ -7374,10 +7381,10 @@ async function executePiTask(claimedTask, reporter, opts) {
 		const rawContext = task.input.context;
 		let effectiveRuntimeContext;
 		try {
-			effectiveRuntimeContext = resolveEffectiveRuntimeContext({
+			effectiveRuntimeContext = await traceRuntimePhase("moltnet.execution.context.resolve", {}, async () => resolveEffectiveRuntimeContext({
 				rawTaskContext: rawContext,
 				runtimeProfileContext: opts.runtimeProfileContext
-			});
+			}));
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			await emit("error", {
@@ -7419,11 +7426,11 @@ async function executePiTask(claimedTask, reporter, opts) {
 		}
 		let injectedContext;
 		try {
-			injectedContext = await injectRuntimeContext({
+			injectedContext = await traceRuntimePhase("moltnet.execution.context.inject", { "moltnet.context.ref_count": effectiveRuntimeContext.length }, () => injectRuntimeContext({
 				context: effectiveRuntimeContext,
-				fs: managed.vm.fs,
-				guestWorkspace: managed.guestWorkspace
-			});
+				fs: activeManaged.vm.fs,
+				guestWorkspace: activeManaged.guestWorkspace
+			}));
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			await emit("error", {
@@ -7651,7 +7658,10 @@ async function executePiTask(claimedTask, reporter, opts) {
 				...submitTools,
 				...parentSubagentTools
 			];
-			session = await buildAgentSession({
+			session = await traceRuntimePhase("moltnet.execution.session.create", {
+				"gen_ai.provider.name": opts.provider,
+				"gen_ai.request.model": opts.model
+			}, () => buildAgentSession({
 				mountPath,
 				cwdPath,
 				piAuthDir,
@@ -7679,13 +7689,18 @@ async function executePiTask(claimedTask, reporter, opts) {
 					"moltnet.task.attempt": attemptN,
 					"moltnet.task.type": task.taskType
 				},
+				otelSessionParentContext: taskOtelContext,
+				getOtelTurnParentContext: () => providerRequestContext,
+				onOtelSessionContextChange: (context) => {
+					piSessionContext = context;
+				},
 				sessionPersistence: executionPlan?.sessionPersistence ?? void 0,
 				extraExtensionFactories: [
 					...runtimeParentExtensions,
 					...toolPolicyExtensions,
 					submitCompletion.extension
 				]
-			});
+			}));
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			await emit("error", {
@@ -7767,7 +7782,11 @@ async function executePiTask(claimedTask, reporter, opts) {
 			onPromptError: (message) => emit("error", {
 				message,
 				phase: "session_prompt"
-			})
+			}),
+			parentContext: piSessionContext,
+			onRequestContextChange: (context) => {
+				providerRequestContext = context;
+			}
 		});
 		const submitMissingConfig = resolveSubmitMissingConfig({
 			submitToolHandle,
@@ -8323,7 +8342,15 @@ async function promptWithProviderErrorRetries(args) {
 	let promptText = args.initialPrompt;
 	while (true) {
 		try {
-			await args.session.prompt(promptText);
+			await traceRuntimePhase("moltnet.execution.provider.request", { "moltnet.provider.retry": retryCount }, async (span) => {
+				const requestContext = trace.setSpan(args.parentContext ?? context.active(), span);
+				args.onRequestContextChange?.(requestContext);
+				try {
+					await args.session.prompt(promptText);
+				} finally {
+					args.onRequestContextChange?.(void 0);
+				}
+			}, args.parentContext);
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
 			await args.onPromptError?.(message);
@@ -8537,4 +8564,4 @@ function describeToolErrorMessage(result) {
 	}
 }
 //#endregion
-export { GONDOLIN_TOOL_NAMES, HOST_EXEC_DEFAULT_BASE_ENV, MOLTNET_TOOL_NAMES, PI_EXECUTOR_MANIFEST_VERSION, PI_RUNTIME_DEFINITION_VERSION, activateAgentEnv, buildAgentSession, buildPiExecutorManifest, buildRuntimeKernel, buildWorkspaceMountInstructions, createGondolinBashOps, createGondolinEditOps, createGondolinFindOps, createGondolinLsOps, createGondolinReadOps, createGondolinToolDefinitions, createGondolinWriteOps, createMoltNetTools, createPiOtelExtension, createPiRetryTriage, createPiTaskExecutor, createSubagentTool, createToolPolicyExtension, decideForEvent, decideToolCall, defineGondolinTemplate, definePiExtension, definePiRuntime, definePiTool, enabledPiToolNames, ensureSnapshot, executeGondolinGrep, executePiTask, filterModelVisibleTools, findMainWorktree, injectRuntimeContext as injectTaskContext, isKernelTool, isResolvedPathInsideRoot, isToolVisible, loadCredentials, materializePiExtensions, materializePiTools, normalizeRetryTriageResult, redactRetryTriageSecrets, resolveSessionToolPolicy, resolveTaskWorktreePath, resumeVm, toGuestPath };
+export { GONDOLIN_BASE_EXECUTABLES, GONDOLIN_TOOL_NAMES, HOST_EXEC_DEFAULT_BASE_ENV, MOLTNET_TOOL_NAMES, PI_EXECUTOR_MANIFEST_VERSION, PI_RUNTIME_DEFINITION_VERSION, activateAgentEnv, buildAgentSession, buildPiExecutorManifest, buildRuntimeKernel, buildWorkspaceMountInstructions, createGondolinBashOps, createGondolinEditOps, createGondolinFindOps, createGondolinLsOps, createGondolinReadOps, createGondolinToolDefinitions, createGondolinWriteOps, createMoltNetTools, createPiOtelExtension, createPiRetryTriage, createPiTaskExecutor, createSubagentTool, createToolPolicyExtension, decideForEvent, decideToolCall, defineGondolinTemplate, definePiExtension, definePiRuntime, definePiTool, enabledPiToolNames, ensureSnapshot, executeGondolinGrep, executePiTask, filterModelVisibleTools, findMainWorktree, injectRuntimeContext as injectTaskContext, isKernelTool, isResolvedPathInsideRoot, isToolVisible, loadCredentials, materializePiExtensions, materializePiTools, normalizeRetryTriageResult, redactRetryTriageSecrets, resolveSessionToolPolicy, resolveTaskWorktreePath, resumeVm, toGuestPath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/pi-runtime",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "license": "MIT",
   "type": "module",
   "description": "Composable MoltNet runtime kernel for Pi agents in Gondolin VMs",
@@ -31,7 +31,7 @@
     "@opentelemetry/api": "^1.9.0",
     "multiformats": "^13.3.0",
     "typebox": "^1.2.8",
-    "@themoltnet/agent-runtime": "0.40.1",
+    "@themoltnet/agent-runtime": "0.41.0",
     "@themoltnet/shell-command-analyzer": "0.3.0",
     "@themoltnet/sdk": "0.129.0"
   },
@@ -50,9 +50,9 @@
     "vite": "^8.0.0",
     "vite-plugin-dts": "^4.5.4",
     "vitest": "^3.0.0",
+    "@moltnet/tasks": "0.1.0",
     "@moltnet/crypto-service": "0.1.0",
-    "@moltnet/models": "0.1.0",
-    "@moltnet/tasks": "0.1.0"
+    "@moltnet/models": "0.1.0"
   },
   "engines": {
     "node": ">=22"