@themoltnet/pi-extension 0.16.2 → 0.17.0

package/dist/index.d.ts

@@ -32,9 +32,11 @@ import { WriteOperations } from '@earendil-works/pi-coding-agent';
 export declare function activateAgentEnv(agentEnv: Record<string, string | undefined>, repoRoot: string): void;
 
 /**
- * Construct an in-memory `AgentSession`. The caller is responsible for
- * eventually invoking `session.prompt(...)` and for tearing down — the
- * helper does no lifecycle management beyond construction.
+ * Construct an `AgentSession`. By default it is in-memory; callers may opt
+ * parent sessions into daemon-owned file persistence via `sessionPersistence`.
+ * The caller is responsible for eventually invoking `session.prompt(...)` and
+ * for tearing down — the helper does no lifecycle management beyond
+ * construction.
  */
 export declare function buildAgentSession(args: BuildAgentSessionArgs): Promise<AgentSession>;
 
@@ -56,6 +58,13 @@ declare interface BuildAgentSessionArgs {
     otelSpanAttrs: Record<string, string | number | boolean>;
     /** Agent name for `gen_ai.agent.name` on the root span. */
     agentName: string;
+    /**
+     * Parent sessions may persist their conversation history in a daemon-owned
+     * directory. Subagents should leave this unset and stay in-memory.
+     */
+    sessionPersistence?: {
+        sessionDir: string;
+    };
 }
 
 declare interface ClaimedTask {
@@ -277,6 +286,12 @@ export declare interface ExecutePiTaskOptions {
      * after HOST_EXEC_ALLOWED; an array limits auto-approval to matching rules.
      */
     hostExecAutoApprove?: HostExecAutoApproveConfig;
+    /**
+     * Optional daemon-supplied execution plan. Keeps task semantics out of
+     * `pi-extension` while still letting callers opt into stable worktrees and
+     * file-backed Pi sessions for selected task classes.
+     */
+    makeExecutionPlan?: PiTaskExecutionPlanFactory;
 }
 
 /**
@@ -415,6 +430,42 @@ export declare interface PiOtelOptions {
     spanAttributes?: Record<string, string | number | boolean>;
 }
 
+export declare interface PiSessionPersistencePlan {
+    sessionDir: string;
+}
+
+export declare interface PiTaskExecutionPlan {
+    /**
+     * Daemon-local reuse key. When set alongside `workspaceScope: 'session'`,
+     * dedicated worktrees may be retained and reopened across related tasks.
+     */
+    sessionKey: string | null;
+    /**
+     * Workspace identity selected by the daemon. `null` means the task should
+     * run against the shared mount path.
+     */
+    workspaceId: string | null;
+    /**
+     * Branch to create or reopen for the workspace. `null` means no dedicated
+     * worktree is required.
+     */
+    worktreeBranch: string | null;
+    /**
+     * Lifetime of the task workspace from the daemon's point of view.
+     * `attempt` = disposable; `session` = keep stable for the reuse key.
+     */
+    workspaceScope: 'attempt' | 'session';
+    /**
+     * Optional location for file-backed Pi session history. When omitted,
+     * the executor keeps the conversation in memory for this attempt only.
+     */
+    sessionPersistence?: PiSessionPersistencePlan | null;
+}
+
+export declare type PiTaskExecutionPlanFactory = (claimedTask: ClaimedTask) => PiTaskExecutionPlan | null;
+
+export declare function resolveTaskWorktreePath(mainRepo: string, workspaceId: string): string;
+
 /**
  * Resume a VM from a checkpoint, inject credentials, configure egress +
  * TLS. Returns the managed VM handle.

package/dist/index.js

@@ -8633,9 +8633,11 @@ var NO_SKILLS = () => ({
 	diagnostics: []
 });
 /**
-* Construct an in-memory `AgentSession`. The caller is responsible for
-* eventually invoking `session.prompt(...)` and for tearing down — the
-* helper does no lifecycle management beyond construction.
+* Construct an `AgentSession`. By default it is in-memory; callers may opt
+* parent sessions into daemon-owned file persistence via `sessionPersistence`.
+* The caller is responsible for eventually invoking `session.prompt(...)` and
+* for tearing down — the helper does no lifecycle management beyond
+* construction.
 */
 async function buildAgentSession(args) {
 	const piOtelExtension = createPiOtelExtension({
@@ -8650,15 +8652,23 @@ async function buildAgentSession(args) {
 		skillsOverride: args.skillsOverride ?? NO_SKILLS
 	});
 	await resourceLoader.reload();
+	const sessionManager = args.sessionPersistence ? await resolvePersistentSessionManager({
+		cwd: args.mountPath,
+		sessionDir: args.sessionPersistence.sessionDir
+	}) : SessionManager.inMemory(args.mountPath);
 	return (await createAgentSession({
 		agentDir: args.piAuthDir,
 		cwd: args.mountPath,
 		model: args.modelHandle,
 		customTools: args.customTools,
-		sessionManager: SessionManager.inMemory(),
+		sessionManager,
 		resourceLoader
 	})).session;
 }
+async function resolvePersistentSessionManager(args) {
+	await SessionManager.list(args.cwd, args.sessionDir);
+	return SessionManager.continueRecent(args.cwd, args.sessionDir);
+}
 //#endregion
 //#region ../tasks/src/formats.ts
 /**
@@ -9702,7 +9712,10 @@ var BUILT_IN_TASK_TYPES = {
 		inputSchema: FulfillBriefInput,
 		outputSchema: FulfillBriefOutput,
 		outputKind: "artifact",
+		resumable: true,
 		workspaceMode: "dedicated_worktree",
+		workspaceScope: "session",
+		sessionScope: "correlation",
 		requiresReferences: false,
 		validateOutput: requireVerificationWhenCriteriaPresent
 	},
@@ -9712,6 +9725,8 @@ var BUILT_IN_TASK_TYPES = {
 		outputSchema: AssessBriefOutput,
 		outputKind: "judgment",
 		workspaceMode: "dedicated_worktree",
+		workspaceScope: "attempt",
+		sessionScope: "none",
 		requiresReferences: true,
 		validateInput: validateJudgmentInput,
 		validateInputAsync: validateAssessBriefInputAsync
@@ -9721,6 +9736,8 @@ var BUILT_IN_TASK_TYPES = {
 		inputSchema: CuratePackInput,
 		outputSchema: CuratePackOutput,
 		outputKind: "artifact",
+		workspaceScope: "attempt",
+		sessionScope: "none",
 		requiresReferences: false,
 		validateOutput: requireVerificationWhenCriteriaPresent
 	},
@@ -9729,6 +9746,8 @@ var BUILT_IN_TASK_TYPES = {
 		inputSchema: RenderPackInput,
 		outputSchema: RenderPackOutput,
 		outputKind: "artifact",
+		workspaceScope: "attempt",
+		sessionScope: "none",
 		requiresReferences: false,
 		validateOutput: requireVerificationWhenCriteriaPresent,
 		validateInputAsync: validateRenderPackInputAsync
@@ -9738,6 +9757,8 @@ var BUILT_IN_TASK_TYPES = {
 		inputSchema: JudgePackInput,
 		outputSchema: JudgePackOutput,
 		outputKind: "judgment",
+		workspaceScope: "attempt",
+		sessionScope: "none",
 		requiresReferences: true,
 		validateInput: validateJudgmentInput,
 		validateOutput: validateJudgePackOutput,
@@ -9748,6 +9769,8 @@ var BUILT_IN_TASK_TYPES = {
 		inputSchema: RunEvalInput,
 		outputSchema: RunEvalOutput,
 		outputKind: "artifact",
+		workspaceScope: "attempt",
+		sessionScope: "custom",
 		requiresReferences: false,
 		validateOutput: validateRunEvalOutput
 	},
@@ -9756,6 +9779,8 @@ var BUILT_IN_TASK_TYPES = {
 		inputSchema: JudgeEvalVariantInput,
 		outputSchema: JudgeEvalVariantOutput,
 		outputKind: "judgment",
+		workspaceScope: "attempt",
+		sessionScope: "custom",
 		requiresReferences: false,
 		validateInput: validateJudgeEvalVariantInput,
 		validateOutput: validateJudgeEvalVariantOutput,
@@ -9825,15 +9850,6 @@ function getTaskOutputSchema(taskType) {
 function taskTypeUsesSubagents(taskType) {
 	return getTaskTypeEntry(taskType)?.usesSubagents === true;
 }
-/**
-* Filesystem isolation policy requested by the task type.
-*
-* Unknown task types and task types without an explicit policy default to the
-* legacy/shared behaviour.
-*/
-function taskTypeWorkspaceMode(taskType) {
-	return getTaskTypeEntry(taskType)?.workspaceMode ?? "shared_mount";
-}
 //#endregion
 //#region ../tasks/src/wire.ts
 /**
@@ -15198,6 +15214,113 @@ function resolveSubmitTools(taskType, opts = {}) {
 	};
 }
 //#endregion
+//#region src/runtime/task-workspace.ts
+function prepareTaskWorkspace(task, requestedMountPath, executionPlan) {
+	const branch = executionPlan?.worktreeBranch ?? null;
+	if (!branch) return {
+		mountPath: requestedMountPath,
+		mode: "shared_mount",
+		branch: null,
+		cleanup: () => {}
+	};
+	const mainRepo = findMainWorktree();
+	const worktreeDir = resolveTaskWorktreePath(mainRepo, executionPlan?.workspaceId ?? `task-${task.id}`);
+	const relMount = relative(mainRepo, requestedMountPath);
+	const mountPath = relMount === "" || relMount.startsWith("..") ? worktreeDir : join(worktreeDir, relMount);
+	const keepWorkspace = executionPlan?.workspaceScope === "session" && executionPlan.sessionKey !== null;
+	if (keepWorkspace) ensureReusableTaskWorktree(mainRepo, worktreeDir, branch);
+	else {
+		removeExistingTaskWorktree(mainRepo, worktreeDir);
+		addTaskWorktree(mainRepo, worktreeDir, branch);
+	}
+	return {
+		mountPath,
+		mode: "dedicated_worktree",
+		branch,
+		cleanup: keepWorkspace ? () => {} : () => {
+			execFileSync("git", [
+				"-C",
+				mainRepo,
+				"worktree",
+				"remove",
+				"--force",
+				worktreeDir
+			], { stdio: "pipe" });
+		}
+	};
+}
+function resolveTaskWorktreePath(mainRepo, workspaceId) {
+	return join(mainRepo, ".worktrees", workspaceId);
+}
+function ensureReusableTaskWorktree(mainRepo, worktreeDir, branch) {
+	if (isRegisteredWorktree(mainRepo, worktreeDir)) return;
+	if (existsSync(worktreeDir)) throw new Error(`Expected reusable worktree ${worktreeDir} to be git-managed, but it exists outside git worktree metadata.`);
+	addTaskWorktree(mainRepo, worktreeDir, branch);
+}
+function addTaskWorktree(mainRepo, worktreeDir, branch) {
+	const baseRef = resolveWorktreeBaseRef(mainRepo);
+	execFileSync("git", gitRefExists(mainRepo, `refs/heads/${branch}`) ? [
+		"-C",
+		mainRepo,
+		"worktree",
+		"add",
+		worktreeDir,
+		branch
+	] : [
+		"-C",
+		mainRepo,
+		"worktree",
+		"add",
+		"-b",
+		branch,
+		worktreeDir,
+		baseRef
+	], { stdio: "pipe" });
+}
+function removeExistingTaskWorktree(mainRepo, worktreeDir) {
+	if (!existsSync(worktreeDir) || !isRegisteredWorktree(mainRepo, worktreeDir)) return;
+	execFileSync("git", [
+		"-C",
+		mainRepo,
+		"worktree",
+		"remove",
+		"--force",
+		worktreeDir
+	], { stdio: "pipe" });
+}
+function isRegisteredWorktree(mainRepo, worktreeDir) {
+	const list = execFileSync("git", [
+		"-C",
+		mainRepo,
+		"worktree",
+		"list",
+		"--porcelain"
+	], {
+		encoding: "utf8",
+		stdio: "pipe"
+	});
+	const marker = `worktree ${worktreeDir}\n`;
+	return list.includes(marker) || list.endsWith(`worktree ${worktreeDir}`);
+}
+function resolveWorktreeBaseRef(mainRepo) {
+	return gitRefExists(mainRepo, "refs/heads/main") ? "main" : "HEAD";
+}
+function gitRefExists(mainRepo, ref) {
+	try {
+		execFileSync("git", [
+			"-C",
+			mainRepo,
+			"show-ref",
+			"--verify",
+			"--quiet",
+			ref
+		], { stdio: "pipe" });
+		return true;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region src/runtime/execute-pi-task.ts
 /**
 * executePiTask — run a single Task attempt using pi-coding-agent inside a
@@ -15246,7 +15369,9 @@ async function executePiTask(claimedTask, reporter, opts) {
 	const task = claimedTask.task;
 	const attemptN = claimedTask.attemptN;
 	const startTime = Date.now();
-	const workspace = prepareTaskWorkspace(task, opts.mountPath ?? process.cwd());
+	const requestedMountPath = opts.mountPath ?? process.cwd();
+	const executionPlan = opts.makeExecutionPlan?.(claimedTask) ?? null;
+	const workspace = prepareTaskWorkspace(task, requestedMountPath, executionPlan);
 	const mountPath = workspace.mountPath;
 	if (reporter.cancelSignal.aborted) return {
 		taskId: task.id,
@@ -15462,7 +15587,8 @@ async function executePiTask(claimedTask, reporter, opts) {
 					"moltnet.task.id": task.id,
 					"moltnet.task.attempt": attemptN,
 					"moltnet.task.type": task.taskType
-				}
+				},
+				sessionPersistence: executionPlan?.sessionPersistence ?? void 0
 			});
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
@@ -15690,107 +15816,6 @@ async function executePiTask(claimedTask, reporter, opts) {
 		}
 	}
 }
-function resolveTaskWorktreeBranch(task) {
-	if (taskTypeWorkspaceMode(task.taskType) !== "dedicated_worktree") return null;
-	if (task.taskType === "fulfill_brief") {
-		const input = task.input;
-		const slug = slugifyBranchComponent(typeof input.title === "string" && input.title.trim().length > 0 ? input.title : typeof input.brief === "string" && input.brief.trim().length > 0 ? input.brief : task.taskType) || "task";
-		if (task.correlationId) return `moltnet/${task.correlationId}/${slug}`;
-		return `feat/${(typeof input.scopeHint === "string" && input.scopeHint.trim().length > 0 ? slugifyBranchComponent(input.scopeHint) : "task") || "task"}-${slug}`;
-	}
-	return `task/${slugifyBranchComponent(task.taskType) || "task"}-${task.id.slice(0, 8)}`;
-}
-function slugifyBranchComponent(input) {
-	return input.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60).replace(/-+$/g, "");
-}
-function prepareTaskWorkspace(task, requestedMountPath) {
-	const branch = resolveTaskWorktreeBranch(task);
-	if (!branch) return {
-		mountPath: requestedMountPath,
-		mode: "shared_mount",
-		branch: null,
-		cleanup: () => {}
-	};
-	const mainRepo = findMainWorktree();
-	const worktreeDir = join(mainRepo, ".worktrees", `task-${task.id}`);
-	removeExistingTaskWorktree(mainRepo, worktreeDir);
-	const relMount = relative(mainRepo, requestedMountPath);
-	const mountPath = relMount === "" || relMount.startsWith("..") ? worktreeDir : join(worktreeDir, relMount);
-	const baseRef = resolveWorktreeBaseRef(mainRepo);
-	execFileSync("git", gitRefExists(mainRepo, `refs/heads/${branch}`) ? [
-		"-C",
-		mainRepo,
-		"worktree",
-		"add",
-		worktreeDir,
-		branch
-	] : [
-		"-C",
-		mainRepo,
-		"worktree",
-		"add",
-		"-b",
-		branch,
-		worktreeDir,
-		baseRef
-	], { stdio: "pipe" });
-	return {
-		mountPath,
-		mode: "dedicated_worktree",
-		branch,
-		cleanup: () => {
-			execFileSync("git", [
-				"-C",
-				mainRepo,
-				"worktree",
-				"remove",
-				"--force",
-				worktreeDir
-			], { stdio: "pipe" });
-		}
-	};
-}
-function removeExistingTaskWorktree(mainRepo, worktreeDir) {
-	if (!existsSync(worktreeDir)) return;
-	const list = execFileSync("git", [
-		"-C",
-		mainRepo,
-		"worktree",
-		"list",
-		"--porcelain"
-	], {
-		encoding: "utf8",
-		stdio: "pipe"
-	});
-	const marker = `worktree ${worktreeDir}\n`;
-	if (!list.includes(marker) && !list.endsWith(`worktree ${worktreeDir}`)) return;
-	execFileSync("git", [
-		"-C",
-		mainRepo,
-		"worktree",
-		"remove",
-		"--force",
-		worktreeDir
-	], { stdio: "pipe" });
-}
-function resolveWorktreeBaseRef(mainRepo) {
-	return gitRefExists(mainRepo, "refs/heads/main") ? "main" : "HEAD";
-}
-function gitRefExists(mainRepo, ref) {
-	try {
-		execFileSync("git", [
-			"-C",
-			mainRepo,
-			"show-ref",
-			"--verify",
-			"--quiet",
-			ref
-		], { stdio: "pipe" });
-		return true;
-	} catch {
-		return false;
-	}
-}
 function emptyUsage(provider, model) {
 	return {
 		inputTokens: 0,
@@ -16170,4 +16195,4 @@ function moltnetExtension(pi) {
 	registerMoltnetReflectCommand(pi, state);
 }
 //#endregion
-export { HOST_EXEC_DEFAULT_BASE_ENV, activateAgentEnv, buildAgentSession, createGondolinBashOps, createGondolinEditOps, createGondolinReadOps, createGondolinWriteOps, createMoltNetTools, createPiOtelExtension, createPiTaskExecutor, createSubagentTool, moltnetExtension as default, ensureSnapshot, executePiTask, findMainWorktree, injectTaskContext, loadCredentials, resumeVm, toGuestPath };
+export { HOST_EXEC_DEFAULT_BASE_ENV, activateAgentEnv, buildAgentSession, createGondolinBashOps, createGondolinEditOps, createGondolinReadOps, createGondolinWriteOps, createMoltNetTools, createPiOtelExtension, createPiTaskExecutor, createSubagentTool, moltnetExtension as default, ensureSnapshot, executePiTask, findMainWorktree, injectTaskContext, loadCredentials, resolveTaskWorktreePath, resumeVm, toGuestPath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/pi-extension",
-  "version": "0.16.2",
+  "version": "0.17.0",
   "type": "module",
   "description": "MoltNet pi extension — sandboxed tool execution in Gondolin VMs with MoltNet identity and persistent memory",
   "license": "MIT",
@@ -51,7 +51,7 @@
     "@earendil-works/pi-coding-agent": "^0.74.0",
     "@opentelemetry/sdk-metrics": "^2.5.1",
     "@opentelemetry/sdk-trace-base": "^2.5.1",
-    "@types/node": "^20.11.0",
+    "@types/node": "^22.19.0",
     "typescript": "^5.3.3",
     "vite": "^8.0.0",
     "vite-plugin-dts": "^4.5.4",