voratiq 0.1.0-beta.22 → 0.1.0-beta.23

package/README.md

@@ -15,7 +15,7 @@ npm install -g voratiq
 
 - Node 20+
 - git
-- 1+ AI coding agent (Claude [>=2.1.63](https://github.com/anthropics/claude-code?tab=readme-ov-file#get-started), Codex [>=0.107.0](https://github.com/openai/codex?tab=readme-ov-file#quickstart), or Gemini [>=0.31.0](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quick-install))
+- 1+ AI coding agent (Claude [>=2.1.111](https://github.com/anthropics/claude-code?tab=readme-ov-file#get-started), Codex [>=0.107.0](https://github.com/openai/codex?tab=readme-ov-file#quickstart), or Gemini [>=0.31.0](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quick-install))
 - macOS: `ripgrep`
 - Linux (Debian/Ubuntu): `bubblewrap`, `socat`, `ripgrep`
 

package/dist/agents/runtime/policy.js

@@ -1,5 +1,6 @@
 import { isAbsolute, relative, resolve as resolveAbsolute } from "node:path";
-import { resolveWorkspacePath, VORATIQ_AGENTS_FILE, VORATIQ_ENVIRONMENT_FILE, VORATIQ_HISTORY_LOCK_FILENAME, VORATIQ_ORCHESTRATION_FILE, VORATIQ_REDUCTION_DIR, VORATIQ_RUN_DIR, VORATIQ_RUN_FILE, VORATIQ_SANDBOX_FILE, VORATIQ_SPEC_DIR, VORATIQ_VERIFICATION_DIR, } from "../../workspace/structure.js";
+import { VORATIQ_AGENTS_FILE, VORATIQ_ENVIRONMENT_FILE, VORATIQ_HISTORY_LOCK_FILENAME, VORATIQ_ORCHESTRATION_FILE, VORATIQ_REDUCTION_DIR, VORATIQ_RUN_DIR, VORATIQ_RUN_FILE, VORATIQ_SANDBOX_FILE, VORATIQ_SPEC_DIR, VORATIQ_VERIFICATION_DIR, } from "../../workspace/constants.js";
+import { resolveWorkspacePath } from "../../workspace/path-resolvers.js";
 export function buildSandboxPolicy(input) {
     const { stageId, root, workspacePath, sandboxHomePath, sandboxSettingsPath, runtimePath, artifactsPath, repoRootPath, providerFilesystem, providerNetwork, policyOverrides, stageDenyWritePaths = [], stageDenyReadPaths = [], } = input;
     const baseline = buildBaselineFilesystemPolicy({

package/dist/auth/providers/utils.js

@@ -2,7 +2,7 @@ import { constants as fsConstants } from "node:fs";
 import { access, chmod, copyFile, mkdir, rm, stat, writeFile, } from "node:fs/promises";
 import { isAbsolute, resolve as resolveNative } from "node:path";
 import { isMissing } from "../../utils/fs.js";
-import { SANDBOX_DIRNAME } from "../../workspace/structure.js";
+import { SANDBOX_DIRNAME } from "../../workspace/constants.js";
 const STAGED_FILE_MODE = 0o600;
 export function resolveProviderHome(runtime, envVar, defaultSubdir) {
     const configured = runtime.env[envVar]?.trim();

package/dist/cli/auto.js

@@ -9,22 +9,13 @@ import { renderWorkspaceAutoInitializedNotice } from "../render/transcripts/shar
 import { renderCliError } from "../render/utils/errors.js";
 import { HintedError } from "../utils/errors.js";
 import { formatAlertMessage } from "../utils/output.js";
-import { parsePositiveInteger } from "../utils/validators.js";
 import { runApplyCommand } from "./apply.js";
 import { toCliError } from "./errors.js";
+import { collectRepeatedStringOption, parseMaxParallelOption, } from "./option-parsers.js";
 import { beginChainedCommandOutput, writeCommandOutput } from "./output.js";
 import { runRunCommand } from "./run.js";
 import { runSpecCommand } from "./spec.js";
 import { runVerifyCommand } from "./verify.js";
-function parseMaxParallelOption(value) {
-    return parsePositiveInteger(value, "Expected positive integer after --max-parallel", "--max-parallel must be greater than 0");
-}
-function collectRunAgentOption(value, previous) {
-    return [...previous, value];
-}
-function collectVerifyAgentOption(value, previous) {
-    return [...previous, value];
-}
 function replayAutoCommandEvent(event) {
     if (event.kind === "body") {
         writeCommandOutput({
@@ -45,10 +36,6 @@ function replayAutoCommandEvent(event) {
         writeCommandOutput({ body: renderCliError(toCliError(event.error)) });
         return;
     }
-    const warningBody = formatAlertMessage("Action required", "yellow", event.detail);
-    writeCommandOutput({
-        body: event.separateWithDivider ? `---\n\n${warningBody}` : warningBody,
-    });
 }
 async function persistAutoOutcome(options) {
     const { runId, outcome } = options;
@@ -207,10 +194,10 @@ export function createAutoCommand() {
         .option("--description <text>", "Generate a spec, then run and verify it")
         .addOption(new Option("--run-agent <agent-id>", "Set run-stage agents directly (repeatable; order preserved)")
         .default([], "")
-        .argParser(collectRunAgentOption))
+        .argParser(collectRepeatedStringOption))
         .addOption(new Option("--verify-agent <agent-id>", "Set verify-stage agents directly (repeatable)")
         .default([], "")
-        .argParser(collectVerifyAgentOption))
+        .argParser(collectRepeatedStringOption))
         .option("--profile <name>", 'Orchestration profile (default: "default")')
         .option("--max-parallel <count>", "Max concurrent agents/verifiers", parseMaxParallelOption)
         .option("--branch", "Create or checkout a branch named after the spec")

package/dist/cli/list.js

@@ -2,7 +2,8 @@ import { Command } from "commander";
 import { executeListCommand } from "../commands/list/command.js";
 import { resolveCliContext } from "../preflight/index.js";
 import { parsePositiveInteger } from "../utils/validators.js";
-import { resolveWorkspacePath, VORATIQ_INTERACTIVE_FILE, VORATIQ_MESSAGE_FILE, VORATIQ_REDUCTION_FILE, VORATIQ_VERIFICATION_FILE, } from "../workspace/structure.js";
+import { VORATIQ_INTERACTIVE_FILE, VORATIQ_MESSAGE_FILE, VORATIQ_REDUCTION_FILE, VORATIQ_VERIFICATION_FILE, } from "../workspace/constants.js";
+import { resolveWorkspacePath } from "../workspace/path-resolvers.js";
 import { parseListInspectionCommandOptions } from "./contract.js";
 import { writeCommandOutput } from "./output.js";
 export async function runListCommand(options) {

package/dist/cli/message.js

@@ -4,15 +4,17 @@ import { checkPlatformSupport } from "../agents/runtime/sandbox.js";
 import { executeMessageCommand } from "../commands/message/command.js";
 import { buildMarkdownPreviewLines } from "../commands/shared/preview.js";
 import { resolveExtraContextFiles } from "../competition/shared/extra-context.js";
+import { resolveInteractiveSessionEnvLineage } from "../domain/interactive/session-env.js";
 import { ensureSandboxDependencies, resolveCliContext, } from "../preflight/index.js";
 import { createMessageRenderer, formatMessageElapsed, formatMessageRecipientDuration, renderMessageTranscript, } from "../render/transcripts/message.js";
 import { renderWorkspaceAutoInitializedNotice } from "../render/transcripts/shared.js";
 import { createStageStartLineEmitter } from "../render/utils/stage-output.js";
 import { resolvePath } from "../utils/path.js";
-import { parsePositiveInteger } from "../utils/validators.js";
-import { resolveWorkspacePath, VORATIQ_MESSAGE_FILE, } from "../workspace/structure.js";
+import { VORATIQ_MESSAGE_FILE } from "../workspace/constants.js";
+import { resolveWorkspacePath } from "../workspace/path-resolvers.js";
 import { parseMessageExecutionCommandOptions } from "./contract.js";
 import { buildMessageOperatorEnvelope, createSilentCliWriter, writeOperatorResultEnvelope, } from "./operator-envelope.js";
+import { collectRepeatedStringOption, parseMaxParallelOption, } from "./option-parsers.js";
 import { writeCommandOutput } from "./output.js";
 export async function runMessageCommand(options) {
     const { prompt, agentIds, profile, maxParallel, extraContext, json = false, stdout, stderr, writeOutput, } = options;
@@ -52,6 +54,10 @@ export async function runMessageCommand(options) {
         stdout: rendererStdout,
         stderr: rendererStderr,
     });
+    const envLineage = await resolveInteractiveSessionEnvLineage({
+        root,
+        envValue: process.env.VORATIQ_INTERACTIVE_SESSION_ID,
+    });
     const execution = await executeMessageCommand({
         root,
         messagesFilePath: workspacePaths.messagesFile ??
@@ -61,7 +67,12 @@ export async function runMessageCommand(options) {
         profileName: profile,
         maxParallel,
         extraContextFiles,
-        sourceInteractiveSessionId: process.env.VORATIQ_INTERACTIVE_SESSION_ID?.trim() || undefined,
+        target: envLineage.kind === "trusted"
+            ? {
+                kind: "interactive",
+                sessionId: envLineage.sessionId,
+            }
+            : undefined,
         renderer,
     });
     const body = renderMessageTranscript({
@@ -101,24 +112,18 @@ export async function runMessageCommand(options) {
         })),
     };
 }
-function collectStringOption(value, previous) {
-    return [...previous, value];
-}
-function parseMaxParallelOption(value) {
-    return parsePositiveInteger(value, "Expected positive integer after --max-parallel", "--max-parallel must be greater than 0");
-}
 export function createMessageCommand() {
     return new Command("message")
         .description("Send an isolated prompt to one or more agents")
         .requiredOption("--prompt <text>", "Prompt to send")
         .addOption(new Option("--agent <agent-id>", "Set recipient agents directly (repeatable; order preserved)")
         .default([], "")
-        .argParser(collectStringOption))
+        .argParser(collectRepeatedStringOption))
         .option("--profile <name>", 'Orchestration profile (default: "default")')
         .option("--max-parallel <count>", "Max concurrent recipients (default: all)", parseMaxParallelOption)
         .addOption(new Option("--extra-context <path>", "Stage an extra context file into each recipient workspace (repeatable)")
         .default([], "")
-        .argParser(collectStringOption))
+        .argParser(collectRepeatedStringOption))
         .option("--json", "Emit a machine-readable result envelope")
         .allowExcessArguments(false)
         .action(async (options, command) => {

package/dist/cli/operator-envelope.d.ts

@@ -5,7 +5,7 @@ import type { SelectionDecision } from "../policy/index.js";
 import type { ReductionStatus, RunStatus, VerificationStatus } from "../status/index.js";
 import { externalExecutionOperators } from "./contract.js";
 export type EnvelopeOperator = (typeof externalExecutionOperators)[number];
-export type EnvelopeStatus = "succeeded" | "failed" | "unresolved";
+export type EnvelopeStatus = "queued" | "running" | "succeeded" | "failed" | "unresolved";
 export interface EnvelopeArtifactRef {
     kind: string;
     path: string;
@@ -71,6 +71,8 @@ export declare const operatorResultEnvelopeSchema: z.ZodObject<{
         prune: "prune";
     }>;
     status: z.ZodEnum<{
+        queued: "queued";
+        running: "running";
         succeeded: "succeeded";
         failed: "failed";
         unresolved: "unresolved";
@@ -184,6 +186,11 @@ export declare function buildRunOperatorEnvelope(options: {
 export declare function buildVerifyOperatorEnvelope(options: VerifyEnvelopeInput): OperatorResultEnvelope;
 export declare function buildReduceOperatorEnvelope(options: ReduceEnvelopeInput): OperatorResultEnvelope;
 export declare function buildMessageOperatorEnvelope(options: MessageEnvelopeInput): OperatorResultEnvelope;
+export declare function buildSwarmSessionAcknowledgementEnvelope(options: {
+    operator: Extract<EnvelopeOperator, "spec" | "run" | "reduce" | "verify" | "message">;
+    sessionId: string;
+    status: Extract<EnvelopeStatus, "queued" | "running" | "succeeded" | "failed">;
+}): OperatorResultEnvelope;
 export declare function buildApplyOperatorEnvelope(options: ApplyEnvelopeInput): OperatorResultEnvelope;
 export declare function buildPruneOperatorEnvelope(options: PruneEnvelopeInput): OperatorResultEnvelope;
 export declare function writeOperatorResultEnvelope(envelope: OperatorResultEnvelope, exitCode?: number): void;

package/dist/cli/operator-envelope.js

@@ -1,12 +1,12 @@
 import { z } from "zod";
-import { getMessageSessionDirectoryPath, getReductionSessionDirectoryPath, getRunDirectoryPath, getSpecSessionDirectoryPath, } from "../workspace/structure.js";
+import { getMessageSessionDirectoryPath, getReductionSessionDirectoryPath, getRunDirectoryPath, getSpecSessionDirectoryPath, getVerificationSessionDirectoryPath, } from "../workspace/session-paths.js";
 import { externalExecutionOperators } from "./contract.js";
 import { toCliError } from "./errors.js";
 export const operatorResultEnvelopeSchema = z
     .object({
     version: z.literal(1),
     operator: z.enum(externalExecutionOperators),
-    status: z.enum(["succeeded", "failed", "unresolved"]),
+    status: z.enum(["queued", "running", "succeeded", "failed", "unresolved"]),
     timestamp: z.string(),
     ids: z
         .object({
@@ -285,6 +285,38 @@ export function buildMessageOperatorEnvelope(options) {
         ],
     });
 }
+export function buildSwarmSessionAcknowledgementEnvelope(options) {
+    const ids = options.operator === "run"
+        ? { runId: options.sessionId }
+        : { sessionId: options.sessionId };
+    const sessionPath = options.operator === "spec"
+        ? getSpecSessionDirectoryPath(options.sessionId)
+        : options.operator === "run"
+            ? getRunDirectoryPath(options.sessionId)
+            : options.operator === "reduce"
+                ? getReductionSessionDirectoryPath(options.sessionId)
+                : options.operator === "verify"
+                    ? getVerificationSessionDirectoryPath(options.sessionId)
+                    : getMessageSessionDirectoryPath(options.sessionId);
+    return buildOperatorEnvelope({
+        operator: options.operator,
+        status: options.status,
+        ids,
+        artifacts: [
+            {
+                kind: "session",
+                role: "session",
+                path: sessionPath,
+            },
+        ],
+        alerts: [
+            {
+                level: "info",
+                message: "Recorded swarm session acknowledged. Use `voratiq_list` to inspect progress instead of retrying.",
+            },
+        ],
+    });
+}
 export function buildApplyOperatorEnvelope(options) {
     return buildOperatorEnvelope({
         operator: "apply",

package/dist/cli/option-parsers.d.ts

@@ -0,0 +1,2 @@
+export declare function collectRepeatedStringOption(value: string, previous: string[]): string[];
+export declare function parseMaxParallelOption(value: string): number;

package/dist/cli/option-parsers.js

@@ -0,0 +1,7 @@
+import { parsePositiveInteger } from "../utils/validators.js";
+export function collectRepeatedStringOption(value, previous) {
+    return [...previous, value];
+}
+export function parseMaxParallelOption(value) {
+    return parsePositiveInteger(value, "Expected positive integer after --max-parallel", "--max-parallel must be greater than 0");
+}

package/dist/cli/output.d.ts

@@ -1,8 +1,5 @@
+import type { CliWriter } from "../render/utils/cli-writer.js";
 import { type FormatCliOutputOptions } from "../utils/output.js";
-type CliWriter = Pick<NodeJS.WriteStream, "write"> & {
-    isTTY?: boolean;
-    columns?: number;
-};
 export type AlertSeverity = "info" | "warn" | "error";
 export interface Alert {
     readonly severity: AlertSeverity;
@@ -25,4 +22,3 @@ export interface ChainedCommandOutput {
 export declare function beginChainedCommandOutput(): ChainedCommandOutput;
 export declare function writeCommandOutput(payload: CommandOutputPayload): void;
 export declare function renderCommandOutput(payload: CommandOutputPayload): void;
-export {};

package/dist/cli/reduce.js

@@ -10,10 +10,11 @@ import { ensureSandboxDependencies, resolveCliContext, } from "../preflight/inde
 import { createReduceRenderer, formatReduceElapsed, formatReducerDuration, renderReduceTranscript, } from "../render/transcripts/reduce.js";
 import { createStageStartLineEmitter } from "../render/utils/stage-output.js";
 import { normalizePathForDisplay, relativeToRoot, resolvePath, } from "../utils/path.js";
-import { parsePositiveInteger } from "../utils/validators.js";
-import { resolveWorkspacePath, VORATIQ_MESSAGE_FILE, VORATIQ_REDUCTION_FILE, VORATIQ_VERIFICATION_FILE, } from "../workspace/structure.js";
+import { VORATIQ_MESSAGE_FILE, VORATIQ_REDUCTION_FILE, VORATIQ_VERIFICATION_FILE, } from "../workspace/constants.js";
+import { resolveWorkspacePath } from "../workspace/path-resolvers.js";
 import { parseReduceExecutionCommandOptions } from "./contract.js";
 import { buildReduceOperatorEnvelope, createSilentCliWriter, writeOperatorResultEnvelope, } from "./operator-envelope.js";
+import { collectRepeatedStringOption, parseMaxParallelOption, } from "./option-parsers.js";
 import { writeCommandOutput } from "./output.js";
 export async function runReduceCommand(options) {
     const { target, agentIds, agentOverrideFlag, profile, maxParallel, extraContext, json = false, suppressHint, writeOutput, stdout, stderr, } = options;
@@ -147,15 +148,6 @@ function formatReductionSnippet(reduction) {
     }
     return lines.join("\n");
 }
-function collectAgentOption(value, previous) {
-    return [...previous, value];
-}
-function collectExtraContextOption(value, previous) {
-    return [...previous, value];
-}
-function parseMaxParallelOption(value) {
-    return parsePositiveInteger(value, "Expected positive integer after --max-parallel", "--max-parallel must be greater than 0");
-}
 export function createReduceCommand() {
     return new Command("reduce")
         .description("Reduce artifact sets into a summarized form")
@@ -166,12 +158,12 @@ export function createReduceCommand() {
         .addOption(new Option("--message <message-id>", "Message session to reduce"))
         .addOption(new Option("--agent <agent-id>", "Set reducers directly (repeatable; order preserved)")
         .default([], "")
-        .argParser(collectAgentOption))
+        .argParser(collectRepeatedStringOption))
         .option("--profile <name>", 'Orchestration profile (default: "default")')
         .option("--max-parallel <count>", "Max concurrent reducers (default: all)", parseMaxParallelOption)
         .addOption(new Option("--extra-context <path>", "Stage an extra context file into each reducer workspace (repeatable)")
         .default([], "")
-        .argParser(collectExtraContextOption))
+        .argParser(collectRepeatedStringOption))
         .option("--json", "Emit a machine-readable result envelope")
         .allowExcessArguments(false)
         .action(async (options, command) => {

package/dist/cli/run.js

@@ -9,9 +9,9 @@ import { createRunRenderer } from "../render/transcripts/run.js";
 import { renderWorkspaceAutoInitializedNotice } from "../render/transcripts/shared.js";
 import { createStageStartLineEmitter } from "../render/utils/stage-output.js";
 import { mapRunStatusToExitCode } from "../status/index.js";
-import { parsePositiveInteger } from "../utils/validators.js";
 import { parseRunExecutionCommandOptions } from "./contract.js";
 import { buildRunOperatorEnvelope, createSilentCliWriter, writeOperatorResultEnvelope, } from "./operator-envelope.js";
+import { collectRepeatedStringOption, parseMaxParallelOption, } from "./option-parsers.js";
 import { writeCommandOutput } from "./output.js";
 export async function runRunCommand(options) {
     const { specPath, agentIds, agentOverrideFlag, profile, maxParallel, branch, extraContext, json = false, suppressHint, suppressLeadingBlankLine, suppressTrailingBlankLine, stdout, stderr, writeOutput, } = options;
@@ -91,28 +91,19 @@ export function deriveBranchNameFromSpecPath(specPath) {
     }
     return base.slice(0, lastDotIndex);
 }
-function collectAgentOption(value, previous) {
-    return [...previous, value];
-}
-function collectExtraContextOption(value, previous) {
-    return [...previous, value];
-}
-function parseMaxParallelOption(value) {
-    return parsePositiveInteger(value, "Expected positive integer after --max-parallel", "--max-parallel must be greater than 0");
-}
 export function createRunCommand() {
     return new Command("run")
         .description("Execute agents against a spec")
         .requiredOption("--spec <path>", "Path to the spec file")
         .addOption(new Option("--agent <agent-id>", "Set agents directly (repeatable; order preserved)")
         .default([], "")
-        .argParser(collectAgentOption))
+        .argParser(collectRepeatedStringOption))
         .option("--profile <name>", 'Orchestration profile (default: "default")')
         .option("--max-parallel <count>", "Max concurrent agents (default: all)", parseMaxParallelOption)
         .option("--branch", "Create or checkout a branch named after the spec")
         .addOption(new Option("--extra-context <path>", "Stage an extra context file into each agent workspace (repeatable)")
         .default([], "")
-        .argParser(collectExtraContextOption))
+        .argParser(collectRepeatedStringOption))
         .option("--json", "Emit a machine-readable result envelope")
         .allowExcessArguments(false)
         .action(async (options, command) => {

package/dist/cli/spec.js

@@ -9,10 +9,10 @@ import { renderWorkspaceAutoInitializedNotice } from "../render/transcripts/shar
 import { createSpecRenderer, formatSpecAgentDuration, formatSpecElapsed, renderSpecTranscript, } from "../render/transcripts/spec.js";
 import { createStageStartLineEmitter } from "../render/utils/stage-output.js";
 import { resolvePath } from "../utils/path.js";
-import { parsePositiveInteger } from "../utils/validators.js";
-import { getSpecSessionDirectoryPath } from "../workspace/structure.js";
+import { getSpecSessionDirectoryPath } from "../workspace/session-paths.js";
 import { parseSpecExecutionCommandOptions } from "./contract.js";
 import { buildSpecOperatorEnvelope, createSilentCliWriter, writeOperatorResultEnvelope, } from "./operator-envelope.js";
+import { collectRepeatedStringOption, parseMaxParallelOption, } from "./option-parsers.js";
 import { writeCommandOutput } from "./output.js";
 export async function runSpecCommand(options) {
     const { description, agentIds, profile, maxParallel, title, extraContext, json = false, suppressHint, suppressLeadingBlankLine, suppressTrailingBlankLine, stdout, stderr, writeOutput, } = options;
@@ -135,18 +135,12 @@ function formatSpecPreview(spec) {
     return lines.join("\n");
 }
 export function createSpecCommand() {
-    const parseMaxParallelOption = (value) => parsePositiveInteger(value, "Expected positive integer after --max-parallel", "--max-parallel must be greater than 0");
-    const collectAgentOption = (value, previous) => [
-        ...previous,
-        value,
-    ];
-    const collectExtraContextOption = (value, previous) => [...previous, value];
     return new Command("spec")
         .description("Generate a spec from a task description")
         .requiredOption("--description <text>", "Task description")
         .addOption(new Option("--agent <agent-id>", "Set agents directly (repeatable; order preserved)")
         .default([], "")
-        .argParser(collectAgentOption))
+        .argParser(collectRepeatedStringOption))
         .option("--profile <name>", 'Orchestration profile (default: "default")')
         .addOption(new Option("--max-parallel <count>", "Max concurrent agents")
         .argParser(parseMaxParallelOption)
@@ -154,7 +148,7 @@ export function createSpecCommand() {
         .option("--title <text>", "Spec title; agent infers if omitted")
         .addOption(new Option("--extra-context <path>", "Stage an extra context file into the spec workspace (repeatable)")
         .default([], "")
-        .argParser(collectExtraContextOption))
+        .argParser(collectRepeatedStringOption))
         .option("--json", "Emit a machine-readable result envelope")
         .allowExcessArguments(false)
         .action(async (options, command) => {

package/dist/cli/verify.js

@@ -18,26 +18,25 @@ import { TERMINAL_VERIFICATION_STATUSES } from "../status/index.js";
 import { colorize } from "../utils/colors.js";
 import { toErrorMessage } from "../utils/errors.js";
 import { normalizePathForDisplay, relativeToRoot, resolvePath, } from "../utils/path.js";
-import { parsePositiveInteger } from "../utils/validators.js";
-import { resolveWorkspacePath, VORATIQ_MESSAGE_FILE, VORATIQ_REDUCTION_FILE, VORATIQ_VERIFICATION_FILE, VORATIQ_VERIFICATION_SESSIONS_DIR, } from "../workspace/structure.js";
+import { VORATIQ_MESSAGE_FILE, VORATIQ_REDUCTION_FILE, VORATIQ_VERIFICATION_FILE, VORATIQ_VERIFICATION_SESSIONS_DIR, } from "../workspace/constants.js";
+import { resolveWorkspacePath } from "../workspace/path-resolvers.js";
 import { parseVerifyExecutionCommandOptions } from "./contract.js";
 import { buildVerifyOperatorEnvelope, createSilentCliWriter, writeOperatorResultEnvelope, } from "./operator-envelope.js";
+import { collectRepeatedStringOption, parseMaxParallelOption, } from "./option-parsers.js";
 import { writeCommandOutput } from "./output.js";
+const UNRESOLVED_VERIFICATION_MESSAGE = "Verification did not produce a resolvable candidate; manual review required.";
 function resolveVerifyManualActionMessage(options) {
     const { targetKind, status, selection, selectedSpecPath } = options;
     if (status !== "succeeded") {
         return undefined;
     }
     if (targetKind === "spec" && !selectedSpecPath) {
-        return "Verification did not select a spec path; manual review required.";
+        return UNRESOLVED_VERIFICATION_MESSAGE;
     }
     if (selection?.decision.state !== "unresolved") {
         return undefined;
     }
-    if (targetKind === "run") {
-        return "Verification did not produce a resolvable candidate; manual selection required.";
-    }
-    return "Verification did not produce a resolvable result; manual review required.";
+    return UNRESOLVED_VERIFICATION_MESSAGE;
 }
 export async function runVerifyCommand(options) {
     const { target, agentIds, agentOverrideFlag, profile, maxParallel, extraContext, json = false, suppressHint, stdout, stderr, writeOutput, } = options;
@@ -185,15 +184,6 @@ export async function runVerifyCommand(options) {
         ...(warningMessage ? { warningMessage } : {}),
     };
 }
-function collectAgentOption(value, previous) {
-    return [...previous, value];
-}
-function collectExtraContextOption(value, previous) {
-    return [...previous, value];
-}
-function parseMaxParallelOption(value) {
-    return parsePositiveInteger(value, "Expected positive integer after --max-parallel", "--max-parallel must be greater than 0");
-}
 export function createVerifyCommand() {
     return new Command("verify")
         .description("Verify a recorded spec, run, reduction, or message session")
@@ -203,12 +193,12 @@ export function createVerifyCommand() {
         .addOption(new Option("--message <message-id>", "Message session to verify"))
         .addOption(new Option("--agent <agent-id>", "Set verifiers directly (repeatable; order preserved)")
         .default([], "")
-        .argParser(collectAgentOption))
+        .argParser(collectRepeatedStringOption))
         .option("--profile <name>", 'Orchestration profile (default: "default")')
         .option("--max-parallel <count>", "Max concurrent verifiers (default: all)", parseMaxParallelOption)
         .addOption(new Option("--extra-context <path>", "Stage an extra context file into each verifier workspace (repeatable)")
         .default([], "")
-        .argParser(collectExtraContextOption))
+        .argParser(collectRepeatedStringOption))
         .option("--json", "Emit a machine-readable result envelope")
         .allowExcessArguments(false)
         .action(async (options, command) => {

package/dist/commands/auto/command.js

@@ -114,7 +114,6 @@ export async function executeAutoCommand(options, dependencies) {
                 }
                 else if (specVerifyResult.selection) {
                     const specSelectionDisposition = classifyAutoVerificationSelection({
-                        targetKind: "spec",
                         selection: specVerifyResult.selection,
                     });
                     if (specSelectionDisposition.kind !== "action_required") {
@@ -239,7 +238,6 @@ export async function executeAutoCommand(options, dependencies) {
             }
             if (verifySelection?.state === "unresolved") {
                 const verifySelectionDisposition = classifyAutoVerificationSelection({
-                    targetKind: "run",
                     selection: verifySelection,
                 });
                 applyAutoVerificationSelectionDisposition({
@@ -280,7 +278,6 @@ export async function executeAutoCommand(options, dependencies) {
                 });
             }
             classifyAutoVerificationSelection({
-                targetKind: "run",
                 selection: verifySelection,
             });
             if (verifySelection.state !== "resolvable") {

package/dist/commands/auto/validation.js

@@ -1,7 +1,9 @@
 import { join } from "node:path";
 import { HintedError } from "../../utils/errors.js";
 import { isDirectory, isFile } from "../../utils/fs.js";
-import { formatWorkspacePath, resolveWorkspacePath, VORATIQ_VERIFICATION_TEMPLATES_DIR, } from "../../workspace/structure.js";
+import { VORATIQ_VERIFICATION_TEMPLATES_DIR } from "../../workspace/constants.js";
+import { formatWorkspacePath } from "../../workspace/path-formatters.js";
+import { resolveWorkspacePath } from "../../workspace/path-resolvers.js";
 import { AutoPreflightError } from "./errors.js";
 export async function validateAutoVerificationConfig(options) {
     const requiredSelectors = resolveRequiredAutoSelectors(options.command);

package/dist/commands/doctor/agents.js

@@ -2,8 +2,10 @@ import { getAgentDefaultId, getSupportedAgentDefaults, } from "../../configs/age
 import { readAgentsConfig } from "../../configs/agents/loader.js";
 import { detectBinary } from "../../utils/binaries.js";
 import { isDefaultYamlTemplate, loadYamlConfig, writeConfigIfChanged, } from "../../utils/yaml.js";
+import { VORATIQ_AGENTS_FILE } from "../../workspace/constants.js";
 import { isManagedAgentsFingerprintMatch, readManagedState, } from "../../workspace/managed-state.js";
-import { formatWorkspacePath, resolveWorkspacePath, VORATIQ_AGENTS_FILE, } from "../../workspace/structure.js";
+import { formatWorkspacePath } from "../../workspace/path-formatters.js";
+import { resolveWorkspacePath } from "../../workspace/path-resolvers.js";
 import { buildDefaultAgentsTemplate, serializeAgentsConfigEntries, } from "../../workspace/templates.js";
 export const AGENTS_CONFIG_DISPLAY_PATH = formatWorkspacePath(VORATIQ_AGENTS_FILE);
 export async function bootstrapDoctorAgents(root, preset, options) {

package/dist/commands/doctor/command.js

@@ -5,8 +5,9 @@ import { prepareConfiguredOperatorReadiness } from "../../preflight/operator.js"
 import { toErrorMessage } from "../../utils/errors.js";
 import { pathExists } from "../../utils/fs.js";
 import { WorkspaceError, WorkspaceMissingEntryError, } from "../../workspace/errors.js";
+import { formatWorkspacePath } from "../../workspace/path-formatters.js";
+import { resolveWorkspacePath } from "../../workspace/path-resolvers.js";
 import { repairWorkspaceStructure, validateWorkspace, } from "../../workspace/setup.js";
-import { formatWorkspacePath, resolveWorkspacePath, } from "../../workspace/structure.js";
 import { executeDoctorBootstrap } from "./fix.js";
 import { executeDoctorReconcile } from "./reconcile.js";
 const DOCTOR_PREFLIGHT_UNLABELED_AGENT_IDS = ["settings"];

package/dist/commands/doctor/environment.js

@@ -3,7 +3,9 @@ import { EnvironmentConfigParseError } from "../../configs/environment/errors.js
 import { readEnvironmentConfig, serializeEnvironmentConfig, } from "../../configs/environment/loader.js";
 import { getNodeDependencyRoots, getPythonEnvironmentPath, isNodeEnvironmentDisabled, isPythonEnvironmentDisabled, } from "../../configs/environment/types.js";
 import { persistYamlConfig, readConfigSnapshot } from "../../utils/yaml.js";
-import { formatWorkspacePath, resolveWorkspacePath, VORATIQ_ENVIRONMENT_FILE, } from "../../workspace/structure.js";
+import { VORATIQ_ENVIRONMENT_FILE } from "../../workspace/constants.js";
+import { formatWorkspacePath } from "../../workspace/path-formatters.js";
+import { resolveWorkspacePath } from "../../workspace/path-resolvers.js";
 import { buildDefaultEnvironmentTemplate } from "../../workspace/templates.js";
 const ENVIRONMENT_CONFIG_DISPLAY_PATH = formatWorkspacePath(VORATIQ_ENVIRONMENT_FILE);
 export async function reconcileDoctorEnvironment(root, options) {

package/dist/commands/doctor/fix.js

@@ -5,9 +5,11 @@ import { loadEnvironmentConfig } from "../../configs/environment/loader.js";
 import { buildDefaultOrchestrationTemplate } from "../../configs/orchestration/bootstrap.js";
 import { pathExists } from "../../utils/fs.js";
 import { normalizeConfigText, readConfigSnapshot, writeConfigIfChanged, } from "../../utils/yaml.js";
+import { VORATIQ_AGENTS_FILE, VORATIQ_ORCHESTRATION_FILE, VORATIQ_SANDBOX_FILE, } from "../../workspace/constants.js";
 import { updateManagedState } from "../../workspace/managed-state.js";
+import { formatWorkspacePath } from "../../workspace/path-formatters.js";
+import { resolveWorkspacePath } from "../../workspace/path-resolvers.js";
 import { createWorkspace } from "../../workspace/setup.js";
-import { formatWorkspacePath, resolveWorkspacePath, VORATIQ_AGENTS_FILE, VORATIQ_ORCHESTRATION_FILE, VORATIQ_SANDBOX_FILE, } from "../../workspace/structure.js";
 import { listAgentPresetTemplates, serializeAgentsConfigEntries, } from "../../workspace/templates.js";
 import { bootstrapDoctorAgents } from "./agents.js";
 import { reconcileDoctorEnvironment } from "./environment.js";

package/dist/commands/doctor/reconcile.js

@@ -3,9 +3,11 @@ import { readAgentsConfig } from "../../configs/agents/loader.js";
 import { buildDefaultOrchestrationTemplate } from "../../configs/orchestration/bootstrap.js";
 import { pathExists } from "../../utils/fs.js";
 import { readConfigSnapshot, writeConfigIfChanged } from "../../utils/yaml.js";
+import { VORATIQ_ORCHESTRATION_FILE } from "../../workspace/constants.js";
 import { computeManagedFingerprint, isManagedFingerprintMatch, readManagedState, updateManagedState, } from "../../workspace/managed-state.js";
+import { formatWorkspacePath } from "../../workspace/path-formatters.js";
+import { resolveWorkspacePath } from "../../workspace/path-resolvers.js";
 import { createWorkspace } from "../../workspace/setup.js";
-import { formatWorkspacePath, resolveWorkspacePath, VORATIQ_ORCHESTRATION_FILE, } from "../../workspace/structure.js";
 import { reconcileManagedDoctorAgents } from "./agents.js";
 import { reconcileDoctorEnvironment } from "./environment.js";
 export async function executeDoctorReconcile(input) {

package/dist/commands/interactive/lifecycle.js

@@ -1,5 +1,6 @@
 import { runTeardown } from "../../competition/shared/teardown.js";
 import { disposeInteractiveSessionBuffer, getInteractiveSessionRecordSnapshot, rewriteInteractiveSessionRecord, } from "../../domain/interactive/persistence/adapter.js";
+import { buildRecordLifecycleCompleteFields } from "../../domain/shared/lifecycle.js";
 import { toErrorMessage } from "../../utils/errors.js";
 const INTERACTIVE_TERMINATION_WAIT_MS = 1_000;
 let activeInteractive;
@@ -122,15 +123,22 @@ async function waitForInteractiveCompletion(completion) {
     ]);
 }
 function buildTerminatedRecord(record, status, reason) {
+    const lifecycle = buildRecordLifecycleCompleteFields({
+        existing: record,
+        startedAt: record.startedAt ?? record.createdAt,
+        completedAt: new Date().toISOString(),
+    });
     if (status === "aborted") {
         return {
             ...record,
             status: "succeeded",
+            ...lifecycle,
         };
     }
     return {
         ...record,
         status: "failed",
+        ...lifecycle,
         error: {
             code: "provider_launch_failed",
             message: buildTerminationMessage(status, reason),