@vimhead.dev/norn-cli 0.1.0-tip.35390859630.1 → 0.1.0-tip.35568631545.1

package/assets/packages/cli/src/internal/engine.ts

@@ -7,23 +7,22 @@ import {
 	type NornRunNext,
 	type NornRunResult,
 	type NornRunStartOptions,
+	type NornWorkflowPaths,
 } from "@vimhead.dev/norn";
-import { createRunFileCoordinator } from "@vimhead.dev/norn/files";
+import { createRunFileCoordinator } from "./file-coordinator.ts";
 import { randomUUID } from "node:crypto";
 import { mkdir } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { Value } from "typebox/value";
 import { NornAgentResponseCollector } from "./agent-response-tool.ts";
-import { NornArtifacts } from "./artifacts.ts";
 import { errorMessage, NornRunStoppedError } from "./errors.ts";
 import { clearRunResumeRequest, matchesRunResumeRequest, readOptionalRunResumeRequest, RESUME_START_GRACE_MS, type NornRunResumeRequest } from "./launch-request.ts";
 import { NornRunLogs } from "./logs.ts";
 import { NornRunLease } from "./run-lease.ts";
 import { NornRunLogger } from "./run-log.ts";
-import { NornRunResources } from "../resources.ts";
 import { assertRunVersion, getRunInfo, mergeInterruptedWorkflowArgs, NornRunStateStore, resolveRunRoot, type NornRunState } from "./run-state.ts";
 import { NornRunStore, runCurrentRoot } from "./run-store.ts";
-import { NornRunContext } from "./run.ts";
+import { NornExecutionContext } from "./execution-context.ts";
 import { NornWorkflowRegistry, type NornRegisteredWorkflow, type NornWorkflowStepResult } from "./workflow-registry.ts";
 
 const RUNS_DIR_NAME = ".norn";
@@ -40,7 +39,9 @@ export type NornEngineInput = {
 
 type RunSession = {
 	readonly runRoot: string;
-	readonly run: NornRunContext;
+	readonly cwd: string;
+	readonly execution: NornExecutionContext;
+	readonly paths: NornWorkflowPaths;
 	readonly state: NornRunStateStore;
 	readonly lease: NornRunLease;
 	readonly runStore: NornRunStore;
@@ -157,14 +158,14 @@ export class NornEngine {
 				const rawArgs = mergeInterruptedWorkflowArgs(current.args, args, current.interruption?.fields);
 				Value.Decode(workflow.args, rawArgs);
 				await session.state.replaceCurrentArgs(rawArgs);
-				await recordRunEvent(session, { type: "run.resumed", workflowId: workflow.id, cwd: session.run.cwd });
+				await recordRunEvent(session, { type: "run.resumed", workflowId: workflow.id, cwd: session.cwd });
 				const resumedCurrent = session.state.currentState().current;
 				if (!resumedCurrent) throw new Error(`Run is not resumable: ${runRoot}`);
 				isLeaseOwnedByScheduler = true;
 				return this.runScheduler(session, toWorkflowStep(workflow, resumedCurrent));
 			}
 			if (state.status !== "pendingResume") throw new Error(`Run must be rolled back before resuming: ${runRoot}`);
-			await recordRunEvent(session, { type: "run.resumed", workflowId: workflow.id, cwd: session.run.cwd });
+			await recordRunEvent(session, { type: "run.resumed", workflowId: workflow.id, cwd: session.cwd });
 			isLeaseOwnedByScheduler = true;
 			return this.runScheduler(session, toWorkflowStep(workflow, current));
 		} finally {
@@ -183,28 +184,27 @@ export class NornEngine {
 		try {
 			for (let step = 1; step <= 1_000; step++) {
 				throwIfRunAborted(session.activeRun);
-				const stepRuntime = session.run.forWorkflow(currentStep.workflow);
 				if (shouldPauseForGate(currentStep)) {
-					const description = await this.registry.describeGate(currentStep.workflow, stepRuntime, currentStep.args, session.state.currentState().configOverride);
+					const description = await this.registry.describeGate({ workflow: currentStep.workflow, execution: session.execution, paths: session.paths, args: currentStep.args, configOverride: session.state.currentState().configOverride });
 					const interruption = { description, fields: currentStep.workflow.gate?.fields };
 					await session.state.interruptCurrent(currentStep.args, interruption);
 					await recordRunEvent(session, { type: "run.interrupted", workflowId: currentStep.workflow.id });
 					await commitRunBoundary(session, `run interrupted: ${currentStep.workflow.id}`);
-					return interruptedLaunchResult({ id: stepRuntime.id, name: session.state.currentState().name, workspace: stepRuntime.workspace, cwd: stepRuntime.cwd }, currentStep.workflow, currentStep.args, interruption);
+					return interruptedLaunchResult({ id: session.execution.run.id, name: session.state.currentState().name, workspace: session.paths.workspace, cwd: session.cwd }, currentStep.workflow, currentStep.args, interruption);
 				}
 				await session.state.startStep(toRunStateStep(currentStep));
-				const stepResult = await this.executeWorkflowStep(session, currentStep, stepRuntime);
+				const stepResult = await this.executeWorkflowStep(session, currentStep);
 				throwIfRunAborted(session.activeRun);
 				if (stepResult.type === "complete") {
 					await session.state.completeRun(stepResult.workflow.id, stepResult.metadata);
 					await recordRunEvent(session, { type: "run.completed", workflowId: stepResult.workflow.id, metadata: stepResult.metadata });
 					await commitRunBoundary(session, `run completed: ${stepResult.workflow.id}`);
-					return { status: "completed", id: stepRuntime.id, name: session.state.currentState().name, workspace: stepRuntime.workspace, cwd: stepRuntime.cwd, workflowId: stepResult.workflow.id, metadata: stepResult.metadata };
+					return { status: "completed", id: session.execution.run.id, name: session.state.currentState().name, workspace: session.paths.workspace, cwd: session.cwd, workflowId: stepResult.workflow.id, metadata: stepResult.metadata };
 				}
 				if (stepResult.type === "fail") {
 					await session.state.failRun(stepResult.workflow.id, stepResult.metadata);
 					await recordRunEvent(session, { type: "run.failed", workflowId: stepResult.workflow.id, metadata: stepResult.metadata });
-					return { status: "failed", id: stepRuntime.id, name: session.state.currentState().name, workspace: stepRuntime.workspace, cwd: stepRuntime.cwd, workflowId: stepResult.workflow.id, metadata: stepResult.metadata };
+					return { status: "failed", id: session.execution.run.id, name: session.state.currentState().name, workspace: session.paths.workspace, cwd: session.cwd, workflowId: stepResult.workflow.id, metadata: stepResult.metadata };
 				}
 				const nextStep = this.nextWorkflowStep(stepResult);
 				await session.state.completeWithNext(currentStep.workflow.id, toRunStateStep(nextStep));
@@ -217,7 +217,7 @@ export class NornEngine {
 			if (isRunStopped(session, error)) {
 				await session.state.stopCurrent();
 				await recordRunEvent(session, { type: "run.stopped", workflowId: currentStep.workflow.id });
-				return { status: "stopped", id: session.run.id, name: session.state.currentState().name, workspace: session.run.workspace, cwd: session.run.cwd, workflowId: currentStep.workflow.id };
+				return { status: "stopped", id: session.execution.run.id, name: session.state.currentState().name, workspace: session.paths.workspace, cwd: session.cwd, workflowId: currentStep.workflow.id };
 			}
 			await session.state.failCurrent(errorMessage(error));
 			await recordRunEvent(session, { type: "run.failed", workflowId: currentStep.workflow.id, error: errorMessage(error) });
@@ -228,13 +228,13 @@ export class NornEngine {
 		}
 	}
 
-	private async executeWorkflowStep(session: RunSession, step: WorkflowStep, run: NornRunContext): Promise<NornWorkflowStepResult> {
+	private async executeWorkflowStep(session: RunSession, step: WorkflowStep): Promise<NornWorkflowStepResult> {
 		const startedAtMs = Date.now();
 		try {
-			await assertWorkspaceBoundary(session, run.workspace);
+			await assertWorkspaceBoundary(session, session.paths.workspace);
 			await recordRunEvent(session, { type: "workflow.started", workflowId: step.workflow.id });
-			const result = await this.registry.execute(step.workflow, run, step.args, session.state.currentState().configOverride);
-			await assertWorkspaceBoundary(session, run.workspace);
+			const result = await this.registry.execute({ workflow: step.workflow, execution: session.execution, paths: session.paths, args: step.args, configOverride: session.state.currentState().configOverride });
+			await assertWorkspaceBoundary(session, session.paths.workspace);
 			const durationMs = Date.now() - startedAtMs;
 			if (result.type === "complete") await recordRunEvent(session, { type: "workflow.completed", workflowId: result.workflow.id, durationMs, metadata: result.metadata });
 			else if (result.type === "fail") await recordRunEvent(session, { type: "workflow.failed", workflowId: result.workflow.id, durationMs, metadata: result.metadata });
@@ -271,7 +271,8 @@ export class NornEngine {
 		const runRoot = defaultRunRoot(this.input.cwd, id);
 		const currentRoot = runCurrentRoot(runRoot);
 		const workspace = join(currentRoot, "workspace");
-		const cwd = workflowDefaultCwd(this.input.cwd, workspace, workflow);
+		const paths: NornWorkflowPaths = { project: resolve(this.input.cwd), workspace: workspace };
+		const cwd = process.cwd();
 		const startedAt = new Date().toISOString();
 		await mkdir(runRoot, { recursive: true });
 		const lease = await NornRunLease.acquire(runRoot);
@@ -288,8 +289,9 @@ export class NornEngine {
 				initialCwd: cwd,
 				startedAt,
 			} });
-			const run = await this.buildRun({ id, currentRoot, workspace, cwd, isolationMode: workflow.isolation.mode, signal: activeRun.controller.signal, logger });
+			const execution = await this.buildExecutionContext({ id, currentRoot, paths, signal: activeRun.controller.signal, logger });
 			const state = await NornRunStateStore.create(runRoot, {
+				projectRoot: paths.project,
 				id,
 				name,
 				entrypointWorkflowId: workflow.id,
@@ -301,7 +303,7 @@ export class NornEngine {
 				},
 				startedAt,
 			});
-			const session = { runRoot, run, state, lease, runStore, logger, activeRun };
+			const session = { runRoot, cwd, execution, paths, state, lease, runStore, logger, activeRun };
 			await logger.record({ type: "run.started", workflowId: workflow.id, cwd, workspace });
 			await commitRunBoundary(session, `run started: ${workflow.id}`);
 			return session;
@@ -321,46 +323,34 @@ export class NornEngine {
 			const runStore = await NornRunStore.open(runRoot);
 			const currentRoot = runCurrentRoot(runRoot);
 			const logger = await NornRunLogger.load(join(currentRoot, MANIFEST_FILE_NAME), createRunFileCoordinator(runRoot));
-			const workflow = currentState.current ? this.registry.workflowById(currentState.current.workflowId) : undefined;
-			const isolationMode = workflow?.isolation.mode ?? "runWorkspace";
-			const cwd = workflowDefaultCwd(this.input.cwd, currentState.workspace, workflow);
-			const run = await this.buildRun({ id: currentState.id, currentRoot, workspace: currentState.workspace, cwd, isolationMode, signal: activeRun.controller.signal, logger });
-			return { runRoot, run, state, lease, runStore, logger, activeRun };
+			const paths: NornWorkflowPaths = { project: currentState.projectRoot ?? resolve(runRoot, "../../.."), workspace: currentState.workspace };
+			const execution = await this.buildExecutionContext({ id: currentState.id, currentRoot, paths, signal: activeRun.controller.signal, logger });
+			return { runRoot, cwd: process.cwd(), execution, paths, state, lease, runStore, logger, activeRun };
 		} catch (error) {
 			this.failActiveRun(runRoot, activeRun);
 			throw error;
 		}
 	}
 
-	private async buildRun(input: {
+	private async buildExecutionContext(input: {
 		readonly id: string;
 		readonly currentRoot: string;
-		readonly workspace: string;
-		readonly cwd: string;
-		readonly isolationMode: "runWorkspace" | "project";
+		readonly paths: NornWorkflowPaths;
 		readonly signal: AbortSignal;
 		readonly logger: NornRunLogger;
-	}): Promise<NornRunContext> {
-		const artifactsRoot = join(input.currentRoot, "artifacts");
+	}): Promise<NornExecutionContext> {
 		const logsRoot = join(input.currentRoot, "logs");
-		await mkdir(input.workspace, { recursive: true });
-		await mkdir(artifactsRoot, { recursive: true });
+		await mkdir(input.paths.workspace, { recursive: true });
 		await mkdir(logsRoot, { recursive: true });
-		const resources = await NornRunResources.initialize(dirname(input.currentRoot));
-		return new NornRunContext({
+		const files = createRunFileCoordinator(dirname(input.currentRoot));
+		return new NornExecutionContext({
 			id: input.id,
 			runRoot: input.currentRoot,
-			workspace: input.workspace,
-			projectRoot: this.input.cwd,
-			cwd: input.cwd,
-			isolationMode: input.isolationMode,
 			signal: input.signal,
 			agentDir: this.input.agentDir,
 			responseCollector: this.responseCollector,
-			resources,
 			logger: input.logger,
-			artifacts: new NornArtifacts(artifactsRoot, resources.files),
-			logs: new NornRunLogs(logsRoot, resources.files),
+			logs: new NornRunLogs(logsRoot, files),
 		});
 	}
 
@@ -400,11 +390,7 @@ export class NornEngine {
 }
 
 function defaultRunRoot(cwd: string, id: string): string {
-	return join(cwd, RUNS_DIR_NAME, "runs", id);
-}
-
-function workflowDefaultCwd(projectRoot: string, workspace: string, workflow: NornAnyWorkflowDeclaration | undefined): string {
-	return workflow?.isolation.mode === "project" ? projectRoot : workspace;
+	return join(resolve(cwd), RUNS_DIR_NAME, "runs", id);
 }
 
 function toWorkflowStep(workflow: NornAnyWorkflowDeclaration, step: NonNullable<NornRunState["current"]>): WorkflowStep {

package/assets/packages/cli/src/internal/execution-context.ts

@@ -0,0 +1,64 @@
+import type { CreateAgentSessionOptions } from "@earendil-works/pi-coding-agent";
+import type { NornAgents, NornCommands, NornLogs, NornRun } from "@vimhead.dev/norn";
+import { createWorkflowTransition } from "@vimhead.dev/norn-core/workflow-transition";
+import type { NornAgentResponseCollector } from "./agent-response-tool.ts";
+import { NornAgentRunner } from "./agents.ts";
+import { NornCommandRunner } from "./commands.ts";
+import type { NornRunLogs } from "./logs.ts";
+import type { NornRunLogger } from "./run-log.ts";
+
+type NornExecutionContextInput = {
+	readonly id: string;
+	readonly runRoot: string;
+	readonly signal?: AbortSignal;
+	readonly model?: CreateAgentSessionOptions["model"];
+	readonly thinkingLevel?: CreateAgentSessionOptions["thinkingLevel"];
+	readonly agentDir?: string;
+	readonly responseCollector: NornAgentResponseCollector;
+	readonly logger: NornRunLogger;
+	readonly logs: NornRunLogs;
+};
+
+export class NornExecutionContext {
+	readonly run: NornRun;
+	readonly logs: NornLogs;
+	readonly commands: NornCommands;
+	readonly agents: NornAgents;
+
+	constructor(private readonly input: NornExecutionContextInput) {
+		this.run = {
+			id: input.id,
+			next: (workflowId, args) => createWorkflowTransition({ workflowId, args }),
+			complete: metadata => ({ type: "complete", metadata }),
+			fail: metadata => ({ type: "fail", metadata }),
+		};
+		this.logs = {
+			read: log => this.input.logs.read(log),
+		};
+		this.commands = {
+			run: commandInput => new NornCommandRunner({
+				signal: this.input.signal,
+				logs: this.input.logs,
+				logger: this.input.logger,
+			}).run(commandInput),
+		};
+		this.agents = {
+			createSession: agentInput => this.createAgentRunner().createSession(agentInput),
+			prompt: agentInput => this.createAgentRunner().prompt(agentInput),
+		};
+	}
+
+	private createAgentRunner(): NornAgentRunner {
+		return new NornAgentRunner({
+			id: this.input.id,
+			runRoot: this.input.runRoot,
+			signal: this.input.signal,
+			model: this.input.model,
+			thinkingLevel: this.input.thinkingLevel,
+			agentDir: this.input.agentDir,
+			logs: this.input.logs,
+			logger: this.input.logger,
+			responseCollector: this.input.responseCollector,
+		});
+	}
+}

package/assets/packages/cli/src/internal/logs.ts

@@ -1,6 +1,6 @@
 import { createWriteStream, type WriteStream } from "node:fs";
 import { mkdir } from "node:fs/promises";
-import type { NornFileCoordinator } from "@vimhead.dev/norn/files";
+import type { NornFileCoordinator } from "./file-coordinator.ts";
 import { dirname, isAbsolute, relative, resolve, sep } from "node:path";
 import type { NornLogRef } from "@vimhead.dev/norn";
 

package/assets/packages/cli/src/internal/run-log.ts

@@ -1,5 +1,5 @@
 import { readFile } from "node:fs/promises";
-import type { NornFileCoordinator } from "@vimhead.dev/norn/files";
+import type { NornFileCoordinator } from "./file-coordinator.ts";
 import { isNodeError } from "@vimhead.dev/norn-core/errors";
 import { writeJsonAtomically } from "@vimhead.dev/norn-core/atomic-files";
 

package/assets/packages/cli/src/internal/run-state.ts

@@ -5,7 +5,7 @@ import { isNodeError } from "@vimhead.dev/norn-core/errors";
 import { readRunLaunchRequest, readOptionalRunResumeRequest, RESUME_START_GRACE_MS } from "./launch-request.ts";
 import { getRunLeaseHealth } from "./run-lease.ts";
 import { writeJsonAtomically } from "@vimhead.dev/norn-core/atomic-files";
-import { createRunFileCoordinator, type NornFileCoordinator } from "@vimhead.dev/norn/files";
+import { createRunFileCoordinator, type NornFileCoordinator } from "./file-coordinator.ts";
 import { runCurrentRoot } from "./run-store.ts";
 import { jsonValueSchema } from "@vimhead.dev/norn/schema";
 import { Value } from "typebox/value";
@@ -59,6 +59,7 @@ type NornRunWorkflowOutcome = {
 
 export type NornRunState = {
 	readonly version: 1 | typeof RUN_STATE_VERSION;
+	readonly projectRoot?: string;
 	readonly id: string;
 	readonly name: string;
 	readonly entrypointWorkflowId: string;
@@ -74,6 +75,7 @@ export type NornRunState = {
 };
 
 type CreateNornRunStateInput = {
+	readonly projectRoot: string;
 	readonly id: string;
 	readonly name: string;
 	readonly entrypointWorkflowId: string;
@@ -101,7 +103,8 @@ export class NornRunStateStore {
 			id: input.id,
 			name: input.name,
 			entrypointWorkflowId: input.entrypointWorkflowId,
-			workspace: input.workspace,
+			projectRoot: resolve(input.projectRoot),
+			workspace: resolve(input.workspace),
 			configOverride: input.configOverride,
 			status: "running",
 			current: input.current,
@@ -252,6 +255,7 @@ export async function getRunInfo(runRoot: string): Promise<NornRunInfo> {
 			id: state.id,
 			name: state.name,
 			path: runRoot,
+			paths: { project: state.projectRoot ?? resolve(runRoot, "../../.."), workspace: state.workspace },
 			entrypointWorkflowId: state.entrypointWorkflowId,
 			currentWorkflowId: state.current?.workflowId,
 			status: resumeRequest ? "running" : state.status,
@@ -317,6 +321,7 @@ async function getLaunchedRunInfo(runRoot: string): Promise<NornRunInfo> {
 		id: launchRequest.id,
 		name: launchRequest.name,
 		path: runRoot,
+		paths: { project: resolve(runRoot, "../../.."), workspace: join(runCurrentRoot(resolve(runRoot)), "workspace") },
 		entrypointWorkflowId: launchRequest.workflowId,
 		currentWorkflowId: launchRequest.workflowId,
 		status: "running",

package/assets/packages/cli/src/internal/worker-directory.ts

@@ -0,0 +1,17 @@
+import { chmod, lstat, mkdir, readdir } from "node:fs/promises";
+import { join } from "node:path";
+import { isNodeError } from "@vimhead.dev/norn-core/errors";
+
+export async function prepareRunWorkerDirectory(runRoot: string): Promise<string> {
+	const directory = join(runRoot, "worker");
+	try {
+		await mkdir(directory, { mode: 0o555 });
+	} catch (error) {
+		if (!isNodeError(error) || error.code !== "EEXIST") throw error;
+	}
+	const metadata = await lstat(directory);
+	if (!metadata.isDirectory() || metadata.isSymbolicLink()) throw new Error(`Run worker cwd must be a directory, not a symlink: ${directory}`);
+	if ((await readdir(directory)).length !== 0) throw new Error(`Run worker cwd must be empty: ${directory}`);
+	await chmod(directory, 0o555);
+	return directory;
+}

package/assets/packages/cli/src/internal/workflow-registry.ts

@@ -1,4 +1,4 @@
-import { isWorkflowComplete, isWorkflowDeclaration, isWorkflowFail, isWorkflowNext, type NornAnyWorkflowDeclaration, type NornDispose, type NornInspectedWorkflowInfo, type NornRegisteredWorkflowInfo, type NornRunComplete, type NornRunFail, type NornRunFor, type NornRunNext, type NornWorkflowContext, type NornWorkflowGateInfo, type NornWorkflowSource, type NornWorkflowScopeInfo, type NornProjectConfigurationInfo } from "@vimhead.dev/norn";
+import { isWorkflowComplete, isWorkflowDeclaration, isWorkflowFail, isWorkflowNext, type NornAnyWorkflowDeclaration, type NornDispose, type NornInspectedWorkflowInfo, type NornRegisteredWorkflowInfo, type NornRunComplete, type NornRunFail, type NornRunNext, type NornWorkflowPaths, type NornWorkflowContext, type NornWorkflowGateInfo, type NornWorkflowSource, type NornWorkflowScopeInfo, type NornProjectConfigurationInfo } from "@vimhead.dev/norn";
 import { assertWorkflowMetadata, inspectSchema, isPlainObject, schemaShape, schemaType, unwrapSchema } from "@vimhead.dev/norn/schema";
 import type { TSchema } from "typebox";
 import { Value } from "typebox/value";
@@ -42,6 +42,15 @@ export type NornWorkflowStepResult =
 	| { readonly type: "complete"; readonly workflow: NornAnyWorkflowDeclaration; readonly metadata?: NornRunComplete["metadata"] }
 	| { readonly type: "fail"; readonly workflow: NornAnyWorkflowDeclaration; readonly metadata: NornRunFail["metadata"] };
 
+type NornExecutionContextInput = {
+	readonly execution: Pick<NornWorkflowContext, "run" | "agents" | "commands" | "logs">;
+	readonly paths: NornWorkflowPaths;
+	readonly args: unknown;
+	readonly configOverride: unknown;
+};
+
+type NornWorkflowExecutionInput = NornExecutionContextInput & { readonly workflow: NornAnyWorkflowDeclaration };
+
 export class NornWorkflowRegistry {
 	private readonly entries = new Map<string, NornRegisteredWorkflow>();
 	private readonly scopes = new Map<string, NornRegisteredScope>();
@@ -99,32 +108,38 @@ export class NornWorkflowRegistry {
 	launchableEntries(): NornRegisteredWorkflow[] { return this.sortedEntries().filter(({ workflow }) => workflow.isEntrypoint); }
 	workflowById(workflowId: string): NornAnyWorkflowDeclaration | undefined { return this.entries.get(workflowId)?.workflow; }
 
-	async describeGate<TWorkflow extends NornAnyWorkflowDeclaration>(workflow: TWorkflow, run: NornRunFor<TWorkflow>, args: unknown, configOverride?: unknown): Promise<string> {
+	async describeGate(input: NornWorkflowExecutionInput): Promise<string> {
+		const { workflow } = input;
 		const entry = this.requireEntry(workflow.id);
 		if (!workflow.gate) throw new Error(`Workflow is not gated: ${workflow.id}`);
-		const context = this.createExecutionContext({ entry, run, args, configOverride });
+		const context = this.createExecutionContext({ ...input, entry });
 		const description = await entry.workflow.gate?.describe?.(context) ?? workflow.id;
 		if (typeof description !== "string" || description.trim().length === 0) throw new Error(`Workflow gate description must not be empty: ${workflow.id}`);
 		return description.trim();
 	}
 
-	async execute<TWorkflow extends NornAnyWorkflowDeclaration>(workflow: TWorkflow, run: NornRunFor<TWorkflow>, args: unknown, configOverride?: unknown): Promise<NornWorkflowStepResult> {
+	async execute(input: NornWorkflowExecutionInput): Promise<NornWorkflowStepResult> {
+		const { workflow } = input;
 		const entry = this.requireEntry(workflow.id);
-		const result = await entry.workflow.execute(this.createExecutionContext({ entry, run, args, configOverride }));
+		const result = await entry.workflow.execute(this.createExecutionContext({ ...input, entry }));
 		if (isWorkflowNext(result)) return result;
 		if (isWorkflowComplete(result)) return { type: "complete", workflow, metadata: result.metadata };
 		if (isWorkflowFail(result)) return { type: "fail", workflow, metadata: result.metadata };
 		throw new Error(`Workflow returned invalid control result: ${workflow.id}`);
 	}
 
-	private createExecutionContext(input: { readonly entry: NornRegisteredWorkflow; readonly run: NornRunFor<NornAnyWorkflowDeclaration>; readonly args: unknown; readonly configOverride: unknown }): NornWorkflowContext {
-		const { entry, run, configOverride } = input;
+	private createExecutionContext(input: NornExecutionContextInput & { readonly entry: NornRegisteredWorkflow }): NornWorkflowContext {
+		const { entry, execution, paths, configOverride } = input;
 		const scope = entry.scopeId ? this.scopes.get(entry.scopeId) : undefined;
 		return {
 			args: Value.Decode(entry.workflow.args, input.args),
 			config: parseExecutionConfig(entry.configuration, configOverride),
 			...(scope ? { scope: { id: scope.definition.id, config: parseExecutionConfig(scope.configuration, configOverride) } } : {}),
-			run,
+			paths,
+			run: execution.run,
+			agents: execution.agents,
+			commands: execution.commands,
+			logs: execution.logs,
 		};
 	}
 
@@ -175,7 +190,7 @@ function assertGateWorkflow(workflow: NornAnyWorkflowDeclaration): void {
 function workflowInfo(entry: NornRegisteredWorkflow): NornRegisteredWorkflowInfo {
 	return {
 		id: entry.workflow.id, instructions: entry.workflow.instructions, isEntrypoint: entry.workflow.isEntrypoint,
-		isolation: entry.workflow.isolation, source: entry.source,
+		source: entry.source,
 		configKey: entry.workflow.id,
 		scope: entry.scopeId ? { id: entry.scopeId } : undefined,
 	};

package/assets/packages/cli/src/internal/working-directory.ts

@@ -0,0 +1,6 @@
+import { isAbsolute, resolve } from "node:path";
+
+export function requireAbsoluteWorkingDirectory(cwd: string): string {
+	if (typeof cwd !== "string" || !isAbsolute(cwd)) throw new Error("Working directory (cwd) must be an absolute path");
+	return resolve(cwd);
+}

package/assets/packages/cli/src/workflow-loader.ts

@@ -1,7 +1,6 @@
 import * as nornModule from "@vimhead.dev/norn";
 import { isWorkflowDeclaration, type NornAnyWorkflowDeclaration, type NornDispose, type NornWorkflowDiagnostic, type NornProjectInfo, type NornProjectInspection, type NornProjectConfigurationInfo, type NornWorkflowCatalogInfo, type NornWorkflowInspection, type NornWorkflowSource } from "@vimhead.dev/norn";
 import { isNodeError } from "@vimhead.dev/norn-core/errors";
-import * as nornFilesModule from "@vimhead.dev/norn/files";
 import * as nornSchemaModule from "@vimhead.dev/norn/schema";
 import { inspectSchema, isPlainObject } from "@vimhead.dev/norn/schema";
 import { createJiti, type ModuleCache } from "jiti/static";
@@ -178,7 +177,7 @@ function createDiagnostic(input: { readonly source: NornWorkflowSource; readonly
 	return { configPath: input.source.configPath, modulePath: input.source.path, scopeId: input.scopeId, workflowId: input.workflowId, stage: input.stage, message: errorMessage(input.error), issues: input.error instanceof AssertError ? input.error.cause.errors : [] };
 }
 function nornWorkflowVirtualModules(): Record<string, unknown> {
-	return { "@vimhead.dev/norn": nornModule, "@vimhead.dev/norn/files": nornFilesModule, "@vimhead.dev/norn/schema": nornSchemaModule, typebox: typeboxModule, "typebox/value": typeboxValueModule, "typebox/compile": typeboxCompileModule, "typebox/schema": typeboxSchemaModule };
+	return { "@vimhead.dev/norn": nornModule, "@vimhead.dev/norn/schema": nornSchemaModule, typebox: typeboxModule, "typebox/value": typeboxValueModule, "typebox/compile": typeboxCompileModule, "typebox/schema": typeboxSchemaModule };
 }
 function mergeProjectConfig(files: readonly NornConfigFile[]): Record<string, unknown> {
 	const [project, ...reusable] = files;