@themoltnet/agent-daemon 0.23.0 → 0.24.0

package/dist/main.js

@@ -4399,6 +4399,16 @@ var RuntimeProfileToolName = String$1({
 	maxLength: 128,
 	pattern: "^[a-zA-Z0-9._/-]+$"
 });
+var RuntimeProfileWorkspaceMode = Union([
+	Literal("none"),
+	Literal("shared_mount"),
+	Literal("dedicated_worktree")
+]);
+var RuntimeProfileAllowedWorkspaceModes = _Array_(RuntimeProfileWorkspaceMode, {
+	minItems: 1,
+	maxItems: 3,
+	uniqueItems: true
+});
 var SandboxResumeCommandWhenSchema = _Object_({ workspaceMode: Optional(_Array_(Union([
 	Literal("shared_mount"),
 	Literal("dedicated_worktree"),
@@ -4502,6 +4512,14 @@ var RuntimeProfileMaxBatchSize = Integer({
 	minimum: 1,
 	maximum: 1e3
 });
+var RuntimeProfileMaxTurns = Integer({
+	minimum: 0,
+	maximum: 1e4
+});
+var RuntimeProfileMaxBashTimeouts = Integer({
+	minimum: 0,
+	maximum: 1e3
+});
 _Object_({
 	id: String$1({ format: "uuid" }),
 	teamId: String$1({ format: "uuid" }),
@@ -4519,6 +4537,8 @@ _Object_({
 	sandbox: RuntimeProfileSandbox,
 	sessionStorageMode: Literal("local"),
 	workspaceStorageMode: Literal("local"),
+	defaultWorkspaceMode: Union([RuntimeProfileWorkspaceMode, Null()]),
+	allowedWorkspaceModes: RuntimeProfileAllowedWorkspaceModes,
 	sessionTtlSec: Integer({
 		minimum: 1,
 		maximum: 86400
@@ -4530,6 +4550,8 @@ _Object_({
 	leaseTtlSec: RuntimeProfileLeaseTtlSec,
 	heartbeatIntervalMs: RuntimeProfileHeartbeatIntervalMs,
 	maxBatchSize: RuntimeProfileMaxBatchSize,
+	maxTurns: RuntimeProfileMaxTurns,
+	maxBashTimeouts: RuntimeProfileMaxBashTimeouts,
 	requiredEnv: _Array_(RuntimeProfileEnvName, { maxItems: 100 }),
 	requiredTools: _Array_(RuntimeProfileToolName, { maxItems: 100 }),
 	context: _Array_(RuntimeProfileContext, { maxItems: 5 }),
@@ -9449,9 +9471,9 @@ function slugifySessionComponent(input) {
 }
 //#endregion
 //#region src/lib/task-execution-plan.ts
-function buildDaemonTaskExecutionPlan(task, stateDirs, identity, warmSessionTtlSec) {
+function buildDaemonTaskExecutionPlan(task, stateDirs, identity, warmSessionTtlSec, runtimeProfileWorkspacePolicy = {}) {
 	const descriptor = deriveTaskSessionDescriptor(task);
-	const workspaceMode = resolveTaskWorkspaceMode(task, descriptor.policy);
+	const workspaceMode = resolveTaskWorkspaceMode(task, descriptor.policy, runtimeProfileWorkspacePolicy);
 	const slotKey = warmSessionTtlSec > 0 ? descriptor.sessionKey : null;
 	const workspaceScope = slotKey !== null ? descriptor.policy.workspaceScope : "attempt";
 	const slotId = slotKey ? buildDaemonSlotId(identity, slotKey) : null;
@@ -9501,14 +9523,40 @@ function resolveTaskWorktreeBranch(task, workspaceMode) {
 	}
 	return `task/${slugifyAsciiLower(task.taskType, 60) || "task"}-${task.id.slice(0, 8)}`;
 }
-function resolveTaskWorkspaceMode(task, policy) {
-	if (!policy.acceptsInputWorkspaceOverride) return policy.workspaceMode;
-	switch (typeof task.input.execution?.workspace === "string" ? task.input.execution.workspace : null) {
-		case "none": return "scratch_mount";
-		case "shared_mount": return "shared_mount";
-		case "dedicated_worktree": return "dedicated_worktree";
-		default: return policy.workspaceMode;
-	}
+function resolveTaskWorkspaceMode(task, policy, runtimeProfileWorkspacePolicy) {
+	const allowed = resolveAllowedWorkspaceModes(runtimeProfileWorkspacePolicy);
+	const profileDefault = runtimeProfileWorkspacePolicy.defaultWorkspaceMode ?? null;
+	const requestedWorkspace = policy.acceptsInputWorkspaceOverride && typeof task.input.execution?.workspace === "string" ? task.input.execution.workspace : null;
+	if (isRuntimeProfileWorkspaceMode(requestedWorkspace)) {
+		if (allowed.has(requestedWorkspace)) return toDaemonWorkspaceMode(requestedWorkspace);
+	}
+	if (profileDefault && allowed.has(profileDefault)) return toDaemonWorkspaceMode(profileDefault);
+	if (allowed.has(policy.workspaceMode)) return policy.workspaceMode;
+	return toDaemonWorkspaceMode(firstAllowedWorkspaceMode(allowed));
+}
+var ALL_WORKSPACE_MODES = [
+	"none",
+	"shared_mount",
+	"dedicated_worktree"
+];
+var WORKSPACE_MODE_FALLBACK_ORDER = [
+	"none",
+	"dedicated_worktree",
+	"shared_mount"
+];
+function resolveAllowedWorkspaceModes(policy) {
+	const modes = policy.allowedWorkspaceModes && policy.allowedWorkspaceModes.length > 0 ? policy.allowedWorkspaceModes : ALL_WORKSPACE_MODES;
+	return new Set(modes.filter((mode) => isRuntimeProfileWorkspaceMode(mode)));
+}
+function firstAllowedWorkspaceMode(allowed) {
+	for (const mode of WORKSPACE_MODE_FALLBACK_ORDER) if (allowed.has(mode)) return mode;
+	return "none";
+}
+function isRuntimeProfileWorkspaceMode(value) {
+	return value === "none" || value === "shared_mount" || value === "dedicated_worktree";
+}
+function toDaemonWorkspaceMode(mode) {
+	return mode === "none" ? "scratch_mount" : mode;
 }
 function resolveTaskWorkspaceId(task, executionPlan) {
 	if (executionPlan.workspaceScope === "session" && executionPlan.sessionKey !== null) return `session-${encodeURIComponent(executionPlan.sessionKey)}`;
@@ -9529,7 +9577,8 @@ function createExecutionPlanCache(args) {
 			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.stateDirs, args.slotRegistry);
+			const plan = await maybeAttachWarmSlotContext(claimedTask, buildDaemonTaskExecutionPlan(claimedTask.task, args.stateDirs, args.slotIdentity, args.warmSessionTtlSec, args.workspacePolicy), args.stateDirs, args.slotRegistry);
+			assertPlanAllowedByWorkspacePolicy(plan, args.workspacePolicy);
 			cache.set(key, plan);
 			return plan;
 		},
@@ -9538,6 +9587,20 @@ function createExecutionPlanCache(args) {
 		}
 	};
 }
+function assertPlanAllowedByWorkspacePolicy(plan, policy) {
+	const allowed = new Set(policy?.allowedWorkspaceModes && policy.allowedWorkspaceModes.length > 0 ? policy.allowedWorkspaceModes : [
+		"none",
+		"shared_mount",
+		"dedicated_worktree"
+	]);
+	const effectiveMode = planToRuntimeProfileWorkspaceMode(plan);
+	if (!allowed.has(effectiveMode)) throw new Error(`Runtime profile forbids final workspace mode "${effectiveMode}" for this task`);
+}
+function planToRuntimeProfileWorkspaceMode(plan) {
+	if (plan.workspaceMode === "scratch_mount") return "none";
+	if (plan.workspaceMode === "dedicated_worktree" && !plan.worktreeBranch) return "shared_mount";
+	return plan.workspaceMode;
+}
 function buildClaimedTaskKey(task) {
 	return `${task.task.id}:${task.attemptN}`;
 }
@@ -9798,6 +9861,8 @@ function parseCommonOptions(args, options = {}) {
 		leaseTtlSec: options.runtimeDefaults?.leaseTtlSec ?? DEFAULTS.leaseTtlSec,
 		heartbeatIntervalMs: options.runtimeDefaults?.heartbeatIntervalMs ?? DEFAULTS.heartbeatIntervalMs,
 		maxBatchSize: options.runtimeDefaults?.maxBatchSize ?? DEFAULTS.maxBatchSize,
+		maxTurns: options.runtimeDefaults?.maxTurns ?? DEFAULTS.maxTurns,
+		maxBashTimeouts: options.runtimeDefaults?.maxBashTimeouts ?? DEFAULTS.maxBashTimeouts,
 		warmSessionTtlSec: options.runtimeDefaults?.warmSessionTtlSec ?? DEFAULTS.warmSessionTtlSec
 	};
 	if (!args.agent) throw new MissingRequiredOptionError("agent");
@@ -9808,8 +9873,8 @@ function parseCommonOptions(args, options = {}) {
 		heartbeatIntervalMs: parseNonNegativeInt(args["heartbeat-interval-ms"], "heartbeat-interval-ms", runtimeDefaults.heartbeatIntervalMs),
 		maxBatchSize: parsePositiveInt(args["max-batch-size"], "max-batch-size", runtimeDefaults.maxBatchSize),
 		flushIntervalMs: parseNonNegativeInt(args["flush-interval-ms"], "flush-interval-ms", DEFAULTS.flushIntervalMs),
-		maxTurns: parseNonNegativeInt(args["max-turns"], "max-turns", DEFAULTS.maxTurns),
-		maxBashTimeouts: parseNonNegativeInt(args["max-bash-timeouts"], "max-bash-timeouts", DEFAULTS.maxBashTimeouts),
+		maxTurns: parseNonNegativeInt(args["max-turns"], "max-turns", runtimeDefaults.maxTurns),
+		maxBashTimeouts: parseNonNegativeInt(args["max-bash-timeouts"], "max-bash-timeouts", runtimeDefaults.maxBashTimeouts),
 		warmSessionTtlSec: parseNonNegativeInt(args["warm-session-ttl-sec"], "warm-session-ttl-sec", runtimeDefaults.warmSessionTtlSec),
 		debug: args.debug === true
 	};
@@ -9941,8 +10006,12 @@ async function resolveRuntimeProfile(options) {
 		leaseTtlSec: profile.leaseTtlSec,
 		heartbeatIntervalMs: profile.heartbeatIntervalMs,
 		maxBatchSize: profile.maxBatchSize,
+		maxTurns: profile.maxTurns,
+		maxBashTimeouts: profile.maxBashTimeouts,
 		sessionTtlSec: profile.sessionTtlSec,
 		workspaceTtlSec: profile.workspaceTtlSec,
+		defaultWorkspaceMode: profile.defaultWorkspaceMode ?? null,
+		allowedWorkspaceModes: profile.allowedWorkspaceModes,
 		requiredEnv: profile.requiredEnv,
 		requiredTools: profile.requiredTools,
 		sandboxConfig: profile.sandbox,
@@ -10200,6 +10269,8 @@ async function runPolling(opts) {
 			leaseTtlSec: profile.leaseTtlSec,
 			heartbeatIntervalMs: profile.heartbeatIntervalMs,
 			maxBatchSize: profile.maxBatchSize,
+			maxTurns: profile.maxTurns,
+			maxBashTimeouts: profile.maxBashTimeouts,
 			warmSessionTtlSec: resolveProfileWarmSessionTtlSec(profile)
 		} });
 		const sandbox = {
@@ -10217,6 +10288,10 @@ async function runPolling(opts) {
 			stateDirs,
 			slotIdentity,
 			warmSessionTtlSec: common.warmSessionTtlSec,
+			workspacePolicy: {
+				defaultWorkspaceMode: profile.defaultWorkspaceMode,
+				allowedWorkspaceModes: profile.allowedWorkspaceModes
+			},
 			slotRegistry
 		});
 		runtimes.set(profile.id, {
@@ -10293,9 +10368,13 @@ async function runPolling(opts) {
 				sandbox: runtime.sandbox.path,
 				leaseTtlSec: runtime.common.leaseTtlSec,
 				heartbeatIntervalMs: runtime.common.heartbeatIntervalMs,
+				maxTurns: runtime.common.maxTurns,
+				maxBashTimeouts: runtime.common.maxBashTimeouts,
 				warmSessionTtlSec: runtime.common.warmSessionTtlSec,
 				profileSessionTtlSec: profile.sessionTtlSec,
-				profileWorkspaceTtlSec: profile.workspaceTtlSec
+				profileWorkspaceTtlSec: profile.workspaceTtlSec,
+				defaultWorkspaceMode: profile.defaultWorkspaceMode,
+				allowedWorkspaceModes: profile.allowedWorkspaceModes
 			};
 		}),
 		piAgentDir: piAgentDir.path,
@@ -10589,6 +10668,8 @@ async function runOnce(argv) {
 		leaseTtlSec: profile.leaseTtlSec,
 		heartbeatIntervalMs: profile.heartbeatIntervalMs,
 		maxBatchSize: profile.maxBatchSize,
+		maxTurns: profile.maxTurns,
+		maxBashTimeouts: profile.maxBashTimeouts,
 		warmSessionTtlSec: resolveProfileWarmSessionTtlSec(profile)
 	} });
 	const sandbox = {
@@ -10608,6 +10689,10 @@ async function runOnce(argv) {
 		stateDirs,
 		slotIdentity,
 		warmSessionTtlSec: opts.warmSessionTtlSec,
+		workspacePolicy: {
+			defaultWorkspaceMode: profile.defaultWorkspaceMode,
+			allowedWorkspaceModes: profile.allowedWorkspaceModes
+		},
 		slotRegistry
 	});
 	const otelShutdown = await initWorkerOtel({
@@ -10639,6 +10724,8 @@ async function runOnce(argv) {
 		taskId,
 		leaseTtlSec: opts.leaseTtlSec,
 		heartbeatIntervalMs: opts.heartbeatIntervalMs,
+		maxTurns: opts.maxTurns,
+		maxBashTimeouts: opts.maxBashTimeouts,
 		warmSessionTtlSec: opts.warmSessionTtlSec,
 		profileId: profile.id,
 		profileSessionTtlSec: profile.sessionTtlSec,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/agent-daemon",
-  "version": "0.23.0",
+  "version": "0.24.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/agent-runtime": "0.29.0",
     "@themoltnet/pi-extension": "0.27.0",
-    "@themoltnet/sdk": "0.112.0",
-    "@themoltnet/agent-runtime": "0.29.0"
+    "@themoltnet/sdk": "0.112.0"
   },
   "devDependencies": {
     "tsx": "^4.7.0",
     "typescript": "~5.9.2",
     "vite": "^8.0.0",
     "vitest": "^3.0.0",
-    "@moltnet/bootstrap": "0.1.0",
     "@moltnet/observability": "0.1.0",
-    "@moltnet/tasks": "0.1.0",
-    "@moltnet/crypto-service": "0.1.0"
+    "@moltnet/bootstrap": "0.1.0",
+    "@moltnet/crypto-service": "0.1.0",
+    "@moltnet/tasks": "0.1.0"
   },
   "nx": {
     "tags": [