@themoltnet/agent-daemon 0.25.1 → 0.26.0

package/dist/main.js

@@ -5613,6 +5613,7 @@ var FreeformArtifact = _Object_({
 });
 var FreeformOutput = _Object_({
 	summary: String$1({ minLength: 1 }),
+	branch: Optional(String$1({ minLength: 1 })),
 	artifacts: Optional(_Array_(FreeformArtifact, { maxItems: 20 })),
 	proposedTaskType: Optional(FreeformTaskTypeProposal),
 	diaryEntryIds: Optional(_Array_(String$1({ format: "uuid" }))),
@@ -5625,7 +5626,7 @@ var FreeformOutput = _Object_({
 * Server-side preflight for `freeform` task-create. Runs after the
 * sync TypeBox check passes and only kicks in when
 * `input.continueFrom` is set — i.e. the proposer is asking to
-* resume a prior freeform attempt's warm slot (#1287).
+* continue from a prior freeform attempt (#1287).
 *
 * Failure modes, in evaluation order:
 *  1. `freeform.sourceTaskNotFound` — source task id does not resolve
@@ -5633,23 +5634,17 @@ var FreeformOutput = _Object_({
 *  2. `freeform.sourceTaskTypeNotSupported` — source isn't `freeform`.
 *     v1 only supports freeform → freeform continuation.
 *  3. `freeform.sourceAttemptNotCompleted` — named attempt is missing
-*     or not in `completed` state; warm continuation only makes sense
+*     or not in `completed` state; continuation only makes sense
 *     once the parent has produced a terminal output.
 *  4. `freeform.executionWorkspaceNotInheritable` — caller set
 *     `execution.workspace` together with `continueFrom`. Workspace
-*     mode for a continuation is inherited from the parent slot
-*     (`maybeAttachWarmSlotContext` forces `dedicated_worktree` +
-*     the parent's worktreeBranch), so any caller-supplied override
-*     is silently dropped at the daemon plan stage. Reject explicitly
-*     so misconfiguration surfaces at create time.
-*  5. `freeform.sourceNotResumeEligible` — `daemonState` is null or
-*     `slotResumableUntil` is null. Older completions (pre-#1287) and
-*     daemons that opt out fall here.
-*  6. `freeform.sourceResumeExpired` — `slotResumableUntil` is in the
-*     past; the warm slot's TTL has elapsed and no daemon is
-*     guaranteed to still hold it.
+*     mode for a continuation is derived by the daemon from parent runtime
+*     context (local slot first, durable session + source attempt branch
+*     second), so any caller-supplied override is silently dropped at the
+*     daemon plan stage. Reject explicitly so misconfiguration surfaces at
+*     create time.
 *
-* Returns on the first failure (no "report all six") — the checks
+* Returns on the first failure — the checks
 * are sequential preconditions, later ones presume earlier ones hold.
 */
 async function validateFreeformInputAsync(input, ctx) {
@@ -5668,7 +5663,7 @@ async function validateFreeformInputAsync(input, ctx) {
 	}];
 	if (input.execution?.workspace) return [{
 		field: "input/execution/workspace",
-		message: "execution.workspace is inherited from the parent slot when continueFrom is set; omit it",
+		message: "execution.workspace is derived from parent runtime context when continueFrom is set; omit it",
 		code: "freeform.executionWorkspaceNotInheritable"
 	}];
 	if (ctx.deferReadinessChecks) return [];
@@ -5678,17 +5673,6 @@ async function validateFreeformInputAsync(input, ctx) {
 		message: `Source attempt ${cf.attemptN} on task ${cf.taskId} is not in 'completed' state`,
 		code: "freeform.sourceAttemptNotCompleted"
 	}];
-	if (!attempt.daemonState || attempt.daemonState.slotResumableUntil === null) return [{
-		field: "input/continueFrom",
-		message: "Source attempt did not report continuation eligibility (older completion or daemon opted out)",
-		code: "freeform.sourceNotResumeEligible"
-	}];
-	const expiresAt = new Date(attempt.daemonState.slotResumableUntil).getTime();
-	if (Number.isNaN(expiresAt) || expiresAt <= Date.now()) return [{
-		field: "input/continueFrom",
-		message: `Source attempt's warm slot expired at ${attempt.daemonState.slotResumableUntil} (reported at ${attempt.daemonState.reportedAt})`,
-		code: "freeform.sourceResumeExpired"
-	}];
 	return [];
 }
 //#endregion
@@ -8982,11 +8966,12 @@ var MAX_CLAIM_CONDITION_STATUSES = 8;
 /**
 * Daemon-asserted runtime state stamped onto a `TaskAttemptSummary` at
 * attempt-completion time. The server persists this block verbatim and
-* reads `slotResumableUntil` for `tasks_continue` create-time
-* eligibility; the daemon-side claim-affinity filter is the runtime
-* truth. The block carries its own `reportedAt` so consumers can reason
-* about staleness without reading documentation. All daemon-asserted
-* state lives here — top-level attempt fields stay server-authoritative.
+* exposes `slotResumableUntil` as a legacy/local warm-slot hint; task
+* continuation eligibility is based on the completed source attempt and
+* daemon-side claim-affinity/runtime-session recovery. The block carries
+* its own `reportedAt` so consumers can reason about staleness without
+* reading documentation. All daemon-asserted state lives here —
+* top-level attempt fields stay server-authoritative.
 *
 * Adding new fields requires explicit design review (intentional
 * boundary; see docs/superpowers/specs/2026-06-04-tasks-continue-design.md).
@@ -9633,12 +9618,13 @@ var ProducerContextResolutionError = class extends Error {
 function createExecutionPlanCache(args) {
 	const cache = /* @__PURE__ */ new Map();
 	const runtimeSessionStore = args.runtimeSessionStore ?? createNullRuntimeSessionStore();
+	const sourceAttemptResolver = args.sourceAttemptResolver ?? createNullSourceAttemptResolver();
 	return {
 		async getOrCreate(claimedTask) {
 			const key = buildClaimedTaskKey(claimedTask);
 			const existing = cache.get(key);
 			if (existing) return existing;
-			const plan = await maybeAttachWarmSlotContext(claimedTask, buildDaemonTaskExecutionPlan(claimedTask.task, args.stateDirs, args.slotIdentity, args.warmSessionTtlSec, args.workspacePolicy), args.stateDirs, args.slotRegistry, runtimeSessionStore);
+			const plan = await maybeAttachWarmSlotContext(claimedTask, buildDaemonTaskExecutionPlan(claimedTask.task, args.stateDirs, args.slotIdentity, args.warmSessionTtlSec, args.workspacePolicy), args.stateDirs, args.slotRegistry, runtimeSessionStore, sourceAttemptResolver);
 			assertPlanAllowedByWorkspacePolicy(plan, args.workspacePolicy);
 			cache.set(key, plan);
 			return plan;
@@ -9648,13 +9634,18 @@ function createExecutionPlanCache(args) {
 		}
 	};
 }
+function createNullSourceAttemptResolver() {
+	return { findOutputBranch() {
+		return Promise.resolve(null);
+	} };
+}
 function createNullRuntimeSessionStore() {
 	return {
-		async findRuntimeSessionByTaskAttempt() {
-			return null;
+		findRuntimeSessionByTaskAttempt() {
+			return Promise.resolve(null);
 		},
-		async hydrateSession() {
-			throw new ProducerContextResolutionError("Cannot hydrate runtime session: no runtime session store configured");
+		hydrateSession() {
+			return Promise.reject(new ProducerContextResolutionError("Cannot hydrate runtime session: no runtime session store configured"));
 		},
 		async uploadAttemptFinal() {}
 	};
@@ -9676,17 +9667,26 @@ function planToRuntimeProfileWorkspaceMode(plan) {
 function buildClaimedTaskKey(task) {
 	return `${task.task.id}:${task.attemptN}`;
 }
-async function resolveWarmSlot(slotRegistry, runtimeSessionStore, teamId, sourceTaskId, sourceAttemptN, stateDirs) {
-	const producerContext = await slotRegistry.findLatestSlotByTaskAttempt(teamId, sourceTaskId, sourceAttemptN);
-	if (!producerContext) return { kind: "missing" };
-	const localSessionPath = resolveProducerSessionPath(producerContext);
-	const remoteSession = localSessionPath ? null : await runtimeSessionStore.findRuntimeSessionByTaskAttempt(teamId, sourceTaskId, sourceAttemptN);
-	const sourceSessionPath = localSessionPath ? localSessionPath : remoteSession ? await runtimeSessionStore.hydrateSession({
+async function hydrateRemoteRuntimeSession(runtimeSessionStore, teamId, sourceTaskId, sourceAttemptN, stateDirs) {
+	if (!await runtimeSessionStore.findRuntimeSessionByTaskAttempt(teamId, sourceTaskId, sourceAttemptN)) return null;
+	return runtimeSessionStore.hydrateSession({
 		attemptN: sourceAttemptN,
 		destinationDir: `${stateDirs.piSessionsDir}/remote-${sourceTaskId}-attempt-${sourceAttemptN}`,
 		taskId: sourceTaskId,
 		teamId
-	}) : null;
+	});
+}
+async function resolveWarmSlot(slotRegistry, runtimeSessionStore, teamId, sourceTaskId, sourceAttemptN, stateDirs) {
+	const producerContext = await slotRegistry.findLatestSlotByTaskAttempt(teamId, sourceTaskId, sourceAttemptN);
+	if (!producerContext) {
+		const remoteSessionPath = await hydrateRemoteRuntimeSession(runtimeSessionStore, teamId, sourceTaskId, sourceAttemptN, stateDirs);
+		return remoteSessionPath ? {
+			kind: "remote-session",
+			sessionPath: remoteSessionPath
+		} : { kind: "missing" };
+	}
+	const localSessionPath = resolveProducerSessionPath(producerContext);
+	const sourceSessionPath = localSessionPath ? localSessionPath : await hydrateRemoteRuntimeSession(runtimeSessionStore, teamId, sourceTaskId, sourceAttemptN, stateDirs);
 	if (!sourceSessionPath) return { kind: "no-session-path" };
 	return {
 		kind: "found",
@@ -9695,19 +9695,54 @@ async function resolveWarmSlot(slotRegistry, runtimeSessionStore, teamId, source
 		workspacePath: resolveProducerWorkspaceCopySource(producerContext, stateDirs)
 	};
 }
-async function maybeAttachWarmSlotContext(claimedTask, basePlan, stateDirs, slotRegistry, runtimeSessionStore) {
+async function maybeAttachWarmSlotContext(claimedTask, basePlan, stateDirs, slotRegistry, runtimeSessionStore, sourceAttemptResolver) {
 	if (claimedTask.task.taskType === "freeform") {
 		const continueFrom = claimedTask.task.input.continueFrom;
 		if (!continueFrom) return basePlan;
 		const resolution = await resolveWarmSlot(slotRegistry, runtimeSessionStore, claimedTask.task.teamId, continueFrom.taskId, continueFrom.attemptN, stateDirs);
-		if (resolution.kind === "missing") throw new ProducerContextResolutionError(`Continuation source task ${continueFrom.taskId} attempt ${continueFrom.attemptN} has no live runtime slot on this daemon — claim affinity filter should have prevented this claim`);
+		if (resolution.kind === "missing") throw new ProducerContextResolutionError(`Continuation source task ${continueFrom.taskId} attempt ${continueFrom.attemptN} has no local runtime slot or durable runtime session — claim affinity filter should have prevented this claim`);
 		if (resolution.kind === "no-session-path") throw new ProducerContextResolutionError(`Continuation source attempt ${continueFrom.taskId}/${continueFrom.attemptN} has no persisted Pi session path`);
 		const sessionDir = `${stateDirs.piSessionsDir}/continue-${claimedTask.task.id}-attempt-${claimedTask.attemptN}`;
+		if (resolution.kind === "remote-session") {
+			const recoveredBranch = await sourceAttemptResolver.findOutputBranch({
+				attemptN: continueFrom.attemptN,
+				taskId: continueFrom.taskId
+			});
+			if (continueFrom.mode === "fork") {
+				if (recoveredBranch) {
+					const forkWorkspaceId = `fork-${claimedTask.task.id}-attempt-${claimedTask.attemptN}`;
+					const forkBranch = buildForkBranch(recoveredBranch, claimedTask.task.id, claimedTask.attemptN);
+					return {
+						...basePlan,
+						workspaceMode: "dedicated_worktree",
+						workspaceId: forkWorkspaceId,
+						worktreeBranch: forkBranch,
+						worktreeBaseRef: recoveredBranch,
+						workspaceKind: "fork",
+						sessionPersistence: {
+							sessionDir,
+							forkFromSessionPath: resolution.sessionPath
+						}
+					};
+				}
+				throw new ProducerContextResolutionError(`Cannot fork continuation of ${continueFrom.taskId}/${continueFrom.attemptN}: durable runtime session is available but the source attempt output did not report a branch`);
+			}
+			return {
+				...basePlan,
+				workspaceMode: "dedicated_worktree",
+				workspaceId: recoveredBranch ? `extend-${continueFrom.taskId}-attempt-${continueFrom.attemptN}` : null,
+				worktreeBranch: recoveredBranch,
+				sessionPersistence: {
+					sessionDir,
+					forkFromSessionPath: resolution.sessionPath
+				}
+			};
+		}
 		const parentBranch = resolution.producerSlot.workspace?.worktreeBranch ?? null;
 		if (continueFrom.mode === "fork") {
 			if (!parentBranch) throw new ProducerContextResolutionError(`Cannot fork continuation of ${continueFrom.taskId}/${continueFrom.attemptN}: producer slot has no worktree branch to fork from`);
 			const forkWorkspaceId = `fork-${claimedTask.task.id}-attempt-${claimedTask.attemptN}`;
-			const forkBranch = `${parentBranch}-fork-${claimedTask.task.id.slice(0, 8)}-${claimedTask.attemptN}`;
+			const forkBranch = buildForkBranch(parentBranch, claimedTask.task.id, claimedTask.attemptN);
 			return {
 				...basePlan,
 				workspaceMode: "dedicated_worktree",
@@ -9739,6 +9774,7 @@ async function maybeAttachWarmSlotContext(claimedTask, basePlan, stateDirs, slot
 	const resolution = await resolveWarmSlot(slotRegistry, runtimeSessionStore, claimedTask.task.teamId, targetTaskId, targetAttemptN, stateDirs);
 	if (resolution.kind === "missing") throw new ProducerContextResolutionError(`No live producer runtime slot found for task ${targetTaskId} attempt ${targetAttemptN}`);
 	if (resolution.kind === "no-session-path") throw new ProducerContextResolutionError(`Producer task ${targetTaskId} attempt ${targetAttemptN} has no persisted Pi session path`);
+	if (resolution.kind === "remote-session") throw new ProducerContextResolutionError(`Producer task ${targetTaskId} attempt ${targetAttemptN} has a durable runtime session but no workspace metadata to copy`);
 	return {
 		...basePlan,
 		workspaceMode: "scratch_mount",
@@ -9754,6 +9790,9 @@ async function maybeAttachWarmSlotContext(claimedTask, basePlan, stateDirs, slot
 		}
 	};
 }
+function buildForkBranch(parentBranch, childTaskId, childAttemptN) {
+	return `${parentBranch}-fork-${childTaskId.slice(0, 8)}-${childAttemptN}`;
+}
 function resolveProducerSessionPath(producer) {
 	const explicit = producer.session?.sessionPath ?? null;
 	if (explicit && existsSync(explicit)) return explicit;
@@ -9783,12 +9822,11 @@ function recoverScratchWorkspacePath(producer, stateDirs) {
 //#endregion
 //#region src/lib/finalize.ts
 /**
-* Build the `daemonState` payload for a `/complete` call. Only freeform
-* attempts that ran with a runtime slot are eligible for continuation
-* (`tasks_continue`, see issue #1287). Other task types and slot-less
-* freeform completions report `null` for `slotResumableUntil`, which
-* the server persists verbatim — continuations against such attempts
-* fail validation with `freeform.sourceNotResumeEligible`.
+* Build the `daemonState` payload for a `/complete` call. Freeform
+* attempts report the local warm-slot hint when one exists; slot-less
+* freeform completions report `null` for `slotResumableUntil`. The server
+* persists this verbatim as diagnostic/runtime metadata, not as the
+* continuation eligibility gate.
 *
 * Returns `null` for non-freeform task types so the field is omitted
 * from the request body (the server treats null and absent the same).
@@ -10304,6 +10342,21 @@ function signalExitCode(signal) {
 	return signal === "SIGINT" ? 130 : 143;
 }
 //#endregion
+//#region src/lib/source-attempts.ts
+function createApiSourceAttemptResolver(args) {
+	const { agent } = args;
+	return { async findOutputBranch(input) {
+		const attempt = (await agent.tasks.listAttempts(input.taskId)).find((candidate) => candidate.attemptN === input.attemptN);
+		if (!attempt || attempt.status !== "completed") return null;
+		return resolveOutputBranch(attempt.output);
+	} };
+}
+function resolveOutputBranch(output) {
+	if (!output || typeof output !== "object") return null;
+	const branch = output.branch;
+	return typeof branch === "string" && branch.length > 0 ? branch : null;
+}
+//#endregion
 //#region src/lib/state-dir.ts
 function ensureDaemonStateDirs(mountPath) {
 	const rootDir = join(mountPath, ".moltnet", "d");
@@ -10411,6 +10464,7 @@ async function runPolling(opts) {
 	for (const profile of profiles) validateRuntimeProfilePrerequisites(profile, cfg.profilePrerequisiteEnv, cfg.profilePrerequisitePath);
 	const slotRegistry = createApiRuntimeSlotStore({ agent: ctx.agent });
 	const runtimeSessionStore = createApiRuntimeSessionStore({ agent: ctx.agent });
+	const sourceAttemptResolver = createApiSourceAttemptResolver({ agent: ctx.agent });
 	const runtimes = /* @__PURE__ */ new Map();
 	for (const profile of profiles) {
 		const common = parseCommonOptions(values, { runtimeDefaults: {
@@ -10441,7 +10495,8 @@ async function runPolling(opts) {
 				allowedWorkspaceModes: profile.allowedWorkspaceModes
 			},
 			slotRegistry,
-			runtimeSessionStore
+			runtimeSessionStore,
+			sourceAttemptResolver
 		});
 		runtimes.set(profile.id, {
 			common,
@@ -10551,7 +10606,8 @@ async function runPolling(opts) {
 				debug: baseCommon.debug,
 				logger: rootLogger,
 				slotRegistry,
-				sessionRegistry: runtimeSessionStore
+				sessionRegistry: runtimeSessionStore,
+				sourceAttemptResolver
 			}),
 			makeReporter: (claimedTask) => {
 				const selected = runtimeForClaimedTask(runtimes, claimedTask);
@@ -10853,6 +10909,7 @@ async function runOnce(argv) {
 	const stateDirs = ensureDaemonStateDirs(sandbox.rootDir);
 	const slotRegistry = createApiRuntimeSlotStore({ agent: ctx.agent });
 	const runtimeSessionStore = createApiRuntimeSessionStore({ agent: ctx.agent });
+	const sourceAttemptResolver = createApiSourceAttemptResolver({ agent: ctx.agent });
 	const slotIdentity = {
 		agentName: opts.agent,
 		runtimeProfileId: profile.id
@@ -10866,7 +10923,8 @@ async function runOnce(argv) {
 			allowedWorkspaceModes: profile.allowedWorkspaceModes
 		},
 		slotRegistry,
-		runtimeSessionStore
+		runtimeSessionStore,
+		sourceAttemptResolver
 	});
 	const otelShutdown = await initWorkerOtel({
 		serviceName: "moltnet.agent-daemon.once",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/agent-daemon",
-  "version": "0.25.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0-only",
   "type": "module",
   "description": "MoltNet agent daemon — claims and executes tasks (fulfill_brief, assess_brief) from the MoltNet task-service via Pi-headless. CLI: moltnet-agent.",
@@ -45,19 +45,19 @@
     "@opentelemetry/semantic-conventions": "^1.39.0",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
-    "@themoltnet/pi-extension": "0.27.2",
+    "@themoltnet/pi-extension": "0.27.3",
     "@themoltnet/sdk": "0.113.1",
-    "@themoltnet/agent-runtime": "0.30.1"
+    "@themoltnet/agent-runtime": "0.31.0"
   },
   "devDependencies": {
     "tsx": "^4.7.0",
     "typescript": "~5.9.2",
     "vite": "^8.0.0",
     "vitest": "^3.0.0",
-    "@moltnet/bootstrap": "0.1.0",
-    "@moltnet/crypto-service": "0.1.0",
     "@moltnet/observability": "0.1.0",
-    "@moltnet/tasks": "0.1.0"
+    "@moltnet/tasks": "0.1.0",
+    "@moltnet/crypto-service": "0.1.0",
+    "@moltnet/bootstrap": "0.1.0"
   },
   "nx": {
     "tags": [