voratiq 0.1.0-beta.21 → 0.1.0-beta.23

package/dist/domain/interactive/persistence/adapter.js

@@ -5,7 +5,8 @@ import { SessionRecordParseError } from "../../../persistence/errors.js";
 import { acquireHistoryLock } from "../../../persistence/history-lock.js";
 import { createSessionStore, } from "../../../persistence/session-store.js";
 import { assertRepoRelativePath, resolvePath } from "../../../utils/path.js";
-import { getInteractiveHistoryLockPath, getInteractiveIndexPath, getInteractiveSessionArtifactsDirectoryPath, getInteractiveSessionDirectoryPath, getInteractiveSessionRecordPath, getInteractiveSessionsDirectoryPath, } from "../../../workspace/structure.js";
+import { getInteractiveHistoryLockPath, getInteractiveIndexPath, getInteractiveSessionArtifactsDirectoryPath, getInteractiveSessionDirectoryPath, getInteractiveSessionRecordPath, getInteractiveSessionsDirectoryPath, } from "../../../workspace/session-paths.js";
+import { buildLifecycleStartFields, buildRecordLifecycleCompleteFields, } from "../../shared/lifecycle.js";
 import { interactiveSessionIndexRecordSchema, interactiveSessionRecordSchema, } from "../model/types.js";
 const INTERACTIVE_INDEX_VERSION = 1;
 const interactivePersistence = createSessionStore({
@@ -36,6 +37,23 @@ export function resolveInteractiveSessionPaths(root, sessionId) {
         runtimePath: resolvePath(root, getInteractiveSessionDirectoryPath(sessionId), "runtime"),
     };
 }
+export async function readInteractiveRecords(options) {
+    const { root, interactiveFilePath, limit, predicate, onWarning } = options;
+    const paths = buildInteractivePaths(root, interactiveFilePath);
+    try {
+        return await interactivePersistence.readRecords({
+            paths,
+            limit,
+            predicate,
+            onWarning: onWarning
+                ? (warning) => onWarning(mapWarning(warning))
+                : undefined,
+        });
+    }
+    catch (error) {
+        throw mapSessionStoreError(error, sessionStoreErrorMapper);
+    }
+}
 export async function ensureInteractiveSessionDirectories(options) {
     const { sessionRoot, artifactsPath, runtimePath } = options;
     await Promise.all([
@@ -74,10 +92,29 @@ export async function updateInteractiveSessionStatus(options) {
     return await rewriteInteractiveSessionRecord({
         root,
         sessionId,
-        mutate: (record) => ({
-            ...record,
-            status,
-        }),
+        mutate: (record) => {
+            const timestamp = new Date().toISOString();
+            if (status === "running") {
+                return {
+                    ...record,
+                    status,
+                    ...buildLifecycleStartFields({
+                        existingStartedAt: record.startedAt,
+                        timestamp,
+                    }),
+                    completedAt: undefined,
+                };
+            }
+            return {
+                ...record,
+                status,
+                ...buildRecordLifecycleCompleteFields({
+                    existing: record,
+                    startedAt: record.startedAt ?? record.createdAt,
+                    completedAt: timestamp,
+                }),
+            };
+        },
         forceFlush: true,
     });
 }
@@ -128,6 +165,31 @@ function buildInteractiveSessionStorePaths(root) {
         lockPath: resolvePath(root, getInteractiveHistoryLockPath()),
     };
 }
+function buildInteractivePaths(root, interactiveFilePath) {
+    return {
+        root,
+        indexPath: interactiveFilePath,
+        sessionsDir: resolvePath(root, getInteractiveSessionsDirectoryPath()),
+        lockPath: resolvePath(root, getInteractiveHistoryLockPath()),
+    };
+}
+function mapWarning(warning) {
+    if (warning.kind === "parse-error") {
+        return {
+            kind: "parse-error",
+            sessionId: warning.sessionId,
+            recordPath: warning.recordPath,
+            displayPath: warning.displayPath,
+            details: warning.details,
+        };
+    }
+    return {
+        kind: "missing-record",
+        sessionId: warning.sessionId,
+        recordPath: warning.recordPath,
+        displayPath: warning.displayPath,
+    };
+}
 function parseInteractiveRecord(path, raw) {
     let parsed;
     try {

package/dist/domain/interactive/prompt.d.ts

@@ -1,3 +1,3 @@
 import type { ToolAttachmentStatus } from "./model/types.js";
-export declare const FIRST_PARTY_ATTACHED_LAUNCH_PROMPT: "Context only. Do not respond to this message unless asked. Voratiq MCP tools are attached in this repo. For Voratiq session history and workflow actions, prefer the Voratiq MCP tools over bash, search, or direct file reads.";
+export declare const FIRST_PARTY_ATTACHED_LAUNCH_PROMPT: "Voratiq MCP tools are attached to this repository: voratiq_spec, voratiq_run, voratiq_reduce, voratiq_verify, voratiq_message, voratiq_list, voratiq_apply, and voratiq_prune. For Voratiq session history and workflow actions, prefer these tools over bash, search, or direct file reads. Read the guide resource at voratiq://guide for the full operator reference, workflow composition, and usage guidance.";
 export declare function resolveFirstPartyLaunchPrompt(toolAttachmentStatus: ToolAttachmentStatus): string | undefined;

package/dist/domain/interactive/prompt.js

@@ -1,4 +1,4 @@
-export const FIRST_PARTY_ATTACHED_LAUNCH_PROMPT = "Context only. Do not respond to this message unless asked. Voratiq MCP tools are attached in this repo. For Voratiq session history and workflow actions, prefer the Voratiq MCP tools over bash, search, or direct file reads.";
+export const FIRST_PARTY_ATTACHED_LAUNCH_PROMPT = "Voratiq MCP tools are attached to this repository: voratiq_spec, voratiq_run, voratiq_reduce, voratiq_verify, voratiq_message, voratiq_list, voratiq_apply, and voratiq_prune. For Voratiq session history and workflow actions, prefer these tools over bash, search, or direct file reads. Read the guide resource at voratiq://guide for the full operator reference, workflow composition, and usage guidance.";
 export function resolveFirstPartyLaunchPrompt(toolAttachmentStatus) {
     if (toolAttachmentStatus !== "attached") {
         return undefined;

package/dist/domain/interactive/session-env.d.ts

@@ -0,0 +1,10 @@
+export type InteractiveSessionEnvLineage = {
+    kind: "trusted";
+    sessionId: string;
+} | {
+    kind: "ignore";
+};
+export declare function resolveInteractiveSessionEnvLineage(options: {
+    root: string;
+    envValue: string | undefined;
+}): Promise<InteractiveSessionEnvLineage>;

package/dist/domain/interactive/session-env.js

@@ -0,0 +1,25 @@
+import { getInteractiveSessionRecordSnapshot } from "./persistence/adapter.js";
+// Resolve whether the VORATIQ_INTERACTIVE_SESSION_ID env value still points at
+// a live interactive session. Env values inherited from a stale shell or a
+// stale MCP config must not be persisted as lineage; callers treat "ignore"
+// the same as "no env was set" so the original no-lineage message behavior
+// applies. I/O failures fall through to "ignore" to fail safe.
+export async function resolveInteractiveSessionEnvLineage(options) {
+    const envValue = options.envValue?.trim();
+    if (!envValue) {
+        return { kind: "ignore" };
+    }
+    try {
+        const record = await getInteractiveSessionRecordSnapshot({
+            root: options.root,
+            sessionId: envValue,
+        });
+        if (!record || record.status !== "running") {
+            return { kind: "ignore" };
+        }
+        return { kind: "trusted", sessionId: envValue };
+    }
+    catch {
+        return { kind: "ignore" };
+    }
+}

package/dist/domain/message/competition/adapter.js

@@ -5,14 +5,14 @@ import { runSandboxedAgent } from "../../../agents/runtime/harness.js";
 import { teardownSessionAuth } from "../../../agents/runtime/registry.js";
 import { stageExtraContextFiles, } from "../../../competition/shared/extra-context.js";
 import { composeStageSandboxPolicy } from "../../../competition/shared/sandbox-policy.js";
-import { createTeardownController, runTeardown, } from "../../../competition/shared/teardown.js";
+import { createTeardownController, registerScratchWorkspaceTeardownPaths, runTeardown, } from "../../../competition/shared/teardown.js";
 import { buildUnavailableTokenUsageResult, resolveTokenUsage, } from "../../../domain/shared/token-usage.js";
 import { toErrorMessage } from "../../../utils/errors.js";
 import { normalizePathForDisplay, relativeToRoot, resolvePath, } from "../../../utils/path.js";
 import { extractProviderNativeTokenUsageForSession } from "../../../workspace/chat/native-usage.js";
+import { MESSAGE_RESPONSE_FILENAME, VORATIQ_MESSAGE_DIR, } from "../../../workspace/constants.js";
 import { scaffoldAgentSessionWorkspace, } from "../../../workspace/layout.js";
 import { promoteWorkspaceFile } from "../../../workspace/promotion.js";
-import { MESSAGE_RESPONSE_FILENAME, VORATIQ_MESSAGE_DIR, } from "../../../workspace/structure.js";
 import { buildMessagePrompt } from "./prompt.js";
 export function createMessageCompetitionAdapter(input) {
     const { root, messageId, prompt, environment, extraContextFiles = [], teardown: providedTeardown, } = input;
@@ -39,7 +39,7 @@ export function createMessageCompetitionAdapter(input) {
                         sessionId: messageId,
                         agentId: candidate.id,
                     });
-                    registerScratchWorkspaceTeardown(teardown, workspacePaths, candidate.id);
+                    registerScratchWorkspaceTeardownPaths(teardown, workspacePaths, candidate.id);
                     await stageExtraContextFiles({
                         contextPath: workspacePaths.contextPath,
                         files: extraContextFiles,
@@ -180,12 +180,6 @@ export function createMessageCompetitionAdapter(input) {
         sortResults: compareMessageExecutionsByAgentId,
     };
 }
-function registerScratchWorkspaceTeardown(teardown, workspacePaths, agentId) {
-    teardown.addPath(workspacePaths.workspacePath, `${agentId} workspace`);
-    teardown.addPath(workspacePaths.contextPath, `${agentId} context`);
-    teardown.addPath(workspacePaths.runtimePath, `${agentId} runtime`);
-    teardown.addPath(workspacePaths.sandboxPath, `${agentId} sandbox`);
-}
 function compareMessageExecutionsByAgentId(left, right) {
     return left.agentId.localeCompare(right.agentId);
 }

package/dist/domain/message/model/types.d.ts

@@ -2,6 +2,27 @@ import { z } from "zod";
 import { type MessageRecipientStatus, messageRecipientStatusSchema, type MessageStatus, messageStatusSchema, TERMINAL_MESSAGE_RECIPIENT_STATUSES, TERMINAL_MESSAGE_STATUSES } from "../../../status/index.js";
 export type { MessageRecipientStatus, MessageStatus };
 export { messageRecipientStatusSchema, messageStatusSchema, TERMINAL_MESSAGE_RECIPIENT_STATUSES, TERMINAL_MESSAGE_STATUSES, };
+declare const MESSAGE_TARGET_KIND_VALUES: readonly ["interactive", "run", "spec", "reduce", "verify"];
+export type MessageTargetKind = (typeof MESSAGE_TARGET_KIND_VALUES)[number];
+export declare const messageTargetKindSchema: z.ZodEnum<{
+    spec: "spec";
+    reduce: "reduce";
+    run: "run";
+    verify: "verify";
+    interactive: "interactive";
+}>;
+export declare const messageTargetSchema: z.ZodObject<{
+    kind: z.ZodEnum<{
+        spec: "spec";
+        reduce: "reduce";
+        run: "run";
+        verify: "verify";
+        interactive: "interactive";
+    }>;
+    sessionId: z.ZodString;
+    agentId: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
+export type MessageTarget = z.infer<typeof messageTargetSchema>;
 export declare const messageRecipientEntrySchema: z.ZodObject<{
     agentId: z.ZodString;
     status: z.ZodEnum<{
@@ -52,7 +73,17 @@ export declare const messageRecordSchema: z.ZodObject<{
     }>;
     baseRevisionSha: z.ZodOptional<z.ZodString>;
     prompt: z.ZodString;
-    sourceInteractiveSessionId: z.ZodOptional<z.ZodString>;
+    target: z.ZodOptional<z.ZodObject<{
+        kind: z.ZodEnum<{
+            spec: "spec";
+            reduce: "reduce";
+            run: "run";
+            verify: "verify";
+            interactive: "interactive";
+        }>;
+        sessionId: z.ZodString;
+        agentId: z.ZodOptional<z.ZodString>;
+    }, z.core.$strict>>;
     extraContext: z.ZodOptional<z.ZodArray<z.ZodString>>;
     extraContextMetadata: z.ZodOptional<z.ZodArray<z.ZodObject<{
         stagedPath: z.ZodString;

package/dist/domain/message/model/types.js

@@ -9,6 +9,30 @@ export { messageRecipientStatusSchema, messageStatusSchema, TERMINAL_MESSAGE_REC
 const RUNNING_MESSAGE_RECORD_STATUSES = [
     "running",
 ];
+const MESSAGE_TARGET_KIND_VALUES = [
+    "interactive",
+    "run",
+    "spec",
+    "reduce",
+    "verify",
+];
+export const messageTargetKindSchema = z.enum(MESSAGE_TARGET_KIND_VALUES);
+export const messageTargetSchema = z
+    .object({
+    kind: messageTargetKindSchema,
+    sessionId: z.string().min(1),
+    agentId: agentIdSchema.optional(),
+})
+    .strict()
+    .superRefine((target, ctx) => {
+    if (target.kind === "interactive" && target.agentId) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["agentId"],
+            message: "interactive message targets must not persist an `agentId` lane reference",
+        });
+    }
+});
 export const messageRecipientEntrySchema = z
     .object({
     agentId: agentIdSchema,
@@ -48,7 +72,7 @@ export const messageRecordSchema = z
     status: messageStatusSchema,
     baseRevisionSha: z.string().optional(),
     prompt: z.string(),
-    sourceInteractiveSessionId: z.string().optional(),
+    target: messageTargetSchema.optional(),
     extraContext: z.array(persistedExtraContextPathSchema).optional(),
     extraContextMetadata: z.array(extraContextMetadataEntrySchema).optional(),
     recipients: z

package/dist/domain/reduce/competition/adapter.js

@@ -6,8 +6,9 @@ import { teardownSessionAuth } from "../../../agents/runtime/registry.js";
 import { RunNotFoundCliError } from "../../../cli/errors.js";
 import { stageExtraContextFiles, } from "../../../competition/shared/extra-context.js";
 import { composeStageSandboxPolicy } from "../../../competition/shared/sandbox-policy.js";
-import { createTeardownController, runTeardown, } from "../../../competition/shared/teardown.js";
+import { createTeardownController, registerScratchWorkspaceTeardownPaths, runTeardown, } from "../../../competition/shared/teardown.js";
 import { readMessageRecords } from "../../../domain/message/persistence/adapter.js";
+import { deriveReductionStatusFromReducers } from "../../../domain/reduce/competition/finalize.js";
 import { validateReductionOutputContract } from "../../../domain/reduce/competition/output-validation.js";
 import { buildReducePrompt } from "../../../domain/reduce/competition/prompt.js";
 import { parseReductionArtifact } from "../../../domain/reduce/competition/reduction.js";
@@ -23,10 +24,11 @@ import { buildPersistedExtraContextFields } from "../../../extra-context/contrac
 import { emitStageProgressEvent } from "../../../render/transcripts/stage-progress.js";
 import { toErrorMessage } from "../../../utils/errors.js";
 import { normalizePathForDisplay, relativeToRoot, resolvePath, } from "../../../utils/path.js";
+import { emitSwarmSessionAcknowledgement } from "../../../utils/swarm-session-ack.js";
 import { extractProviderNativeTokenUsageForSession } from "../../../workspace/chat/native-usage.js";
+import { MESSAGE_RESPONSE_FILENAME, REDUCTION_ARTIFACT_INFO_FILENAME, REDUCTION_DATA_FILENAME, REDUCTION_FILENAME, VORATIQ_REDUCTION_DIR, } from "../../../workspace/constants.js";
 import { scaffoldAgentSessionWorkspace, } from "../../../workspace/layout.js";
 import { promoteWorkspaceFile } from "../../../workspace/promotion.js";
-import { MESSAGE_RESPONSE_FILENAME, REDUCTION_ARTIFACT_INFO_FILENAME, REDUCTION_DATA_FILENAME, REDUCTION_FILENAME, VORATIQ_REDUCTION_DIR, } from "../../../workspace/structure.js";
 export function createReduceCompetitionAdapter(input) {
     const { root, reductionId, createdAt, reductionsFilePath, specsFilePath, runsFilePath, messagesFilePath, verificationsFilePath, target, environment, extraContextFiles = [], renderer, } = input;
     let failure;
@@ -87,6 +89,11 @@ export function createReduceCompetitionAdapter(input) {
                 reductionsFilePath,
                 record,
             });
+            await emitSwarmSessionAcknowledgement({
+                operator: "reduce",
+                sessionId: reductionId,
+                status: "queued",
+            });
             const prepared = [];
             for (const candidate of candidates) {
                 tokenUsageIdentityByReducerAgentId.set(candidate.id, {
@@ -99,7 +106,7 @@ export function createReduceCompetitionAdapter(input) {
                     sessionId: reductionId,
                     agentId: candidate.id,
                 });
-                registerScratchWorkspaceTeardown(teardown, workspacePaths, candidate.id);
+                registerScratchWorkspaceTeardownPaths(teardown, workspacePaths, candidate.id);
                 await stageReductionTargetContext({
                     workspacePath: workspacePaths.workspacePath,
                     targetContext,
@@ -323,7 +330,7 @@ export function createReduceCompetitionAdapter(input) {
             };
         },
         finalizeCompetition: async () => {
-            const failed = failure !== undefined;
+            let finalizedStatus;
             const completedAt = new Date().toISOString();
             await rewriteReductionRecord({
                 root,
@@ -335,25 +342,30 @@ export function createReduceCompetitionAdapter(input) {
                         startedAt: record.startedAt ?? completedAt,
                         completedAt,
                     });
-                    const status = failed ? "failed" : "succeeded";
+                    const status = deriveReductionStatusFromReducers(record.reducers);
+                    finalizedStatus = status;
                     return {
                         ...record,
                         status,
                         ...recordComplete,
-                        error: failed ? toErrorMessage(failure) : null,
+                        error: status === "failed" && failure !== undefined
+                            ? toErrorMessage(failure)
+                            : null,
                         reducers: record.reducers.map((reducer) => {
                             if (reducer.status !== "running" && reducer.status !== "queued") {
                                 return reducer;
                             }
                             return {
                                 ...reducer,
-                                status,
+                                status: "failed",
                                 ...buildOperationLifecycleCompleteFields({
                                     existing: reducer,
                                     startedAt: reducer.startedAt ?? recordComplete.completedAt,
                                     completedAt: recordComplete.completedAt,
                                 }),
-                                error: failed ? toErrorMessage(failure) : null,
+                                error: failure !== undefined
+                                    ? toErrorMessage(failure)
+                                    : reducer.error,
                             };
                         }),
                     };
@@ -396,10 +408,11 @@ export function createReduceCompetitionAdapter(input) {
                 });
             }
             else {
+                const status = finalizedStatus ?? (failure === undefined ? "succeeded" : "failed");
                 emitStageProgressEvent(renderer, {
                     type: "stage.status",
                     stage: "reduce",
-                    status: failed ? "failed" : "succeeded",
+                    status,
                 });
             }
             await runTeardown(teardown);
@@ -412,12 +425,6 @@ export function createReduceCompetitionAdapter(input) {
         },
     };
 }
-function registerScratchWorkspaceTeardown(teardown, workspacePaths, agentId) {
-    teardown.addPath(workspacePaths.workspacePath, `${agentId} workspace`);
-    teardown.addPath(workspacePaths.contextPath, `${agentId} context`);
-    teardown.addPath(workspacePaths.runtimePath, `${agentId} runtime`);
-    teardown.addPath(workspacePaths.sandboxPath, `${agentId} sandbox`);
-}
 async function rewriteOrAppendReductionRecord(options) {
     const { root, reductionsFilePath, record } = options;
     const existing = await readReductionRecords({
@@ -617,6 +624,9 @@ async function prepareVerificationTargetContext(options) {
             ...(method.error ? { error: method.error } : {}),
         });
     }
+    if (artifacts.length === 0) {
+        throw new Error(`Verification session \`${target.id}\` has no reduction-ready artifacts.`);
+    }
     return {
         target,
         displayPath: `.voratiq/verify/sessions/${record.sessionId}`,
@@ -647,7 +657,11 @@ async function prepareReductionTargetContextInternal(options) {
     }
     const stagedFiles = [];
     const artifacts = [];
-    for (const reducer of record.reducers) {
+    const succeededReducers = record.reducers.filter((reducer) => reducer.status === "succeeded" && typeof reducer.outputPath === "string");
+    if (succeededReducers.length === 0) {
+        throw new Error(`Reduction session \`${target.id}\` has no successful reduction artifacts.`);
+    }
+    for (const reducer of succeededReducers) {
         const reductionRelative = `inputs/reducers/${reducer.agentId}/reduction.md`;
         stagedFiles.push({
             sourceAbsolutePath: resolvePath(root, reducer.outputPath),

package/dist/domain/reduce/competition/finalize.d.ts

@@ -0,0 +1,7 @@
+import type { ReductionRecord } from "../model/types.js";
+/**
+ * Derive the reduction session status from per-reducer outcomes.
+ * Returns "succeeded" when at least one reducer succeeds, "aborted" when all
+ * terminal reducers aborted, and "failed" otherwise.
+ */
+export declare function deriveReductionStatusFromReducers(reducers: readonly Pick<ReductionRecord["reducers"][number], "status">[]): ReductionRecord["status"];

package/dist/domain/reduce/competition/finalize.js

@@ -0,0 +1,19 @@
+/**
+ * Derive the reduction session status from per-reducer outcomes.
+ * Returns "succeeded" when at least one reducer succeeds, "aborted" when all
+ * terminal reducers aborted, and "failed" otherwise.
+ */
+export function deriveReductionStatusFromReducers(reducers) {
+    const terminalReducers = reducers.filter((reducer) => reducer.status === "succeeded" ||
+        reducer.status === "failed" ||
+        reducer.status === "aborted");
+    const hasSucceeded = terminalReducers.some((reducer) => reducer.status === "succeeded");
+    if (hasSucceeded) {
+        return "succeeded";
+    }
+    if (terminalReducers.length > 0 &&
+        terminalReducers.every((reducer) => reducer.status === "aborted")) {
+        return "aborted";
+    }
+    return "failed";
+}

package/dist/domain/reduce/model/types.d.ts

@@ -4,8 +4,8 @@ export type { ReductionStatus };
 export { reductionStatusSchema, TERMINAL_REDUCTION_STATUSES };
 export declare const reductionTargetTypeSchema: z.ZodEnum<{
     message: "message";
-    reduce: "reduce";
     spec: "spec";
+    reduce: "reduce";
     run: "run";
     verify: "verify";
 }>;
@@ -13,8 +13,8 @@ export type ReductionTargetType = z.infer<typeof reductionTargetTypeSchema>;
 export declare const reductionTargetSchema: z.ZodObject<{
     type: z.ZodEnum<{
         message: "message";
-        reduce: "reduce";
         spec: "spec";
+        reduce: "reduce";
         run: "run";
         verify: "verify";
     }>;
@@ -60,8 +60,8 @@ export declare const reductionRecordSchema: z.ZodObject<{
     target: z.ZodObject<{
         type: z.ZodEnum<{
             message: "message";
-            reduce: "reduce";
             spec: "spec";
+            reduce: "reduce";
             run: "run";
             verify: "verify";
         }>;

package/dist/domain/run/competition/agents/artifacts.js

@@ -7,7 +7,9 @@ import { gitAddAll, gitCommitAll, gitDiff, gitDiffShortStat, gitHasStagedChanges
 import { enforceCredentialExclusion } from "../../../../workspace/credential-guard.js";
 import { cleanupWorkspaceDependencies, ensureWorkspaceDependencies, WorkspaceDependencyCleanupError, } from "../../../../workspace/dependencies.js";
 import { promoteWorkspaceFile } from "../../../../workspace/promotion.js";
+import { WORKSPACE_SHIM_RELATIVE_PATH } from "../../../../workspace/shim.js";
 import { WORKSPACE_SUMMARY_FILENAME, } from "./workspace.js";
+const EXPORT_EXCLUDED_PATHS = [WORKSPACE_SHIM_RELATIVE_PATH.join("/")];
 export async function collectAgentArtifacts(options) {
     const { baseRevisionSha, workspacePaths, root, environment, persona } = options;
     const { workspacePath, artifactsPath, summaryPath, diffPath } = workspacePaths;
@@ -33,7 +35,7 @@ export async function collectAgentArtifacts(options) {
     let artifactResult;
     let dependencyRestoreError;
     try {
-        await runGitStep("Git add failed", async () => gitAddAll(workspacePath));
+        await runGitStep("Git add failed", async () => gitAddAll(workspacePath, EXPORT_EXCLUDED_PATHS));
         const hasChangesBeforeSummary = await gitHasStagedChanges(workspacePath);
         if (!hasChangesBeforeSummary) {
             throw new AgentProcessError({
@@ -45,7 +47,7 @@ export async function collectAgentArtifacts(options) {
             artifactsPath,
             summaryPath,
         });
-        await runGitStep("Git add failed", async () => gitAddAll(workspacePath));
+        await runGitStep("Git add failed", async () => gitAddAll(workspacePath, EXPORT_EXCLUDED_PATHS));
         const hasChanges = await gitHasStagedChanges(workspacePath);
         if (!hasChanges) {
             throw new AgentProcessError({

package/dist/domain/run/competition/agents/lifecycle.js

@@ -6,7 +6,7 @@ import { AgentProcessError, GitOperationError, RunCommandError, } from "../../..
 import { toErrorMessage } from "../../../../utils/errors.js";
 import { GIT_AUTHOR_EMAIL, GIT_AUTHOR_NAME } from "../../../../utils/git.js";
 import { extractProviderNativeTokenUsageForSession } from "../../../../workspace/chat/native-usage.js";
-import { VORATIQ_RUN_DIR } from "../../../../workspace/structure.js";
+import { VORATIQ_RUN_DIR } from "../../../../workspace/constants.js";
 import { runPostProcessingAndCollectArtifacts } from "./post-processing.js";
 export async function runPreparedAgent(execution) {
     return await executeAgentLifecycle(execution);

package/dist/domain/run/competition/agents/workspace.js

@@ -2,8 +2,9 @@ import { mkdir, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
 import { normalizePathForDisplay, resolvePath, } from "../../../../utils/path.js";
 import { prepareAgentWorkspace } from "../../../../workspace/agents.js";
+import { getAgentSessionDiffPath, getAgentSessionSummaryPath, } from "../../../../workspace/artifact-paths.js";
+import { VORATIQ_RUN_DIR } from "../../../../workspace/constants.js";
 import { buildAgentWorkspacePaths, } from "../../../../workspace/layout.js";
-import { getAgentSessionDiffPath, getAgentSessionSummaryPath, VORATIQ_RUN_DIR, } from "../../../../workspace/structure.js";
 export const WORKSPACE_SUMMARY_FILENAME = ".summary.txt";
 export async function buildRunAgentWorkspace(options) {
     const { root, runId, agentId, baseRevisionSha, environment } = options;

package/dist/domain/run/competition/errors.d.ts

@@ -52,7 +52,7 @@ export declare class AuthProviderStageError extends RunCommandError {
 export declare class RunPreflightError extends RunCommandError {
     readonly kind: "workspace-setup";
     readonly issues: readonly PreflightIssue[];
-    constructor(issues: readonly PreflightIssue[], hintLines?: readonly string[]);
+    constructor(issues: readonly PreflightIssue[], preProviderIssueCount?: number);
 }
 export declare class NoAgentsEnabledError extends RunCommandError {
     readonly kind: "workspace-setup";

package/dist/domain/run/competition/errors.js

@@ -1,4 +1,4 @@
-import { formatPreflightIssueLines, PREFLIGHT_HINT, } from "../../../competition/shared/preflight.js";
+import { formatOperatorPreflightIssueLines, resolveOperatorPreflightHintLines, } from "../../../preflight/formatting.js";
 import { DisplayableError, } from "../../../utils/errors.js";
 export class RunCommandError extends DisplayableError {
     constructor(message, options = {}) {
@@ -76,16 +76,13 @@ export class AuthProviderStageError extends RunCommandError {
         });
     }
 }
-const RUN_PREFLIGHT_UNLABELED_AGENT_IDS = ["settings"];
 export class RunPreflightError extends RunCommandError {
     kind = "workspace-setup";
     issues;
-    constructor(issues, hintLines = [PREFLIGHT_HINT]) {
+    constructor(issues, preProviderIssueCount = issues.length) {
         super("Preflight failed. Aborting run.", {
-            detailLines: formatPreflightIssueLines(issues, {
-                unlabeledAgentIds: RUN_PREFLIGHT_UNLABELED_AGENT_IDS,
-            }),
-            hintLines,
+            detailLines: formatOperatorPreflightIssueLines(issues),
+            hintLines: resolveOperatorPreflightHintLines(issues, preProviderIssueCount) ?? [],
         });
         this.issues = Array.from(issues);
         this.name = "RunPreflightError";

package/dist/domain/run/competition/reports.js

@@ -1,4 +1,5 @@
-import { buildAgentArtifactPaths, getAgentDirectoryPath, getAgentManifestPath, } from "../../../workspace/structure.js";
+import { buildAgentArtifactPaths, getAgentManifestPath, } from "../../../workspace/artifact-paths.js";
+import { getAgentDirectoryPath } from "../../../workspace/session-paths.js";
 import { RunReportInvariantError } from "./errors.js";
 export function finalizeAgentResult(runId, record, derivations) {
     return {

package/dist/domain/run/model/enhanced.d.ts

@@ -1,4 +1,4 @@
-import { type AgentArtifactPaths } from "../../../workspace/structure.js";
+import { type AgentArtifactPaths } from "../../../workspace/artifact-paths.js";
 import type { AgentStatus, ExtractedTokenUsage, RunApplyStatus, RunAutoOutcome, RunRecord, RunSpecDescriptor } from "./types.js";
 export interface AgentInvocationEnhanced {
     agentId: string;

package/dist/domain/run/model/enhanced.js

@@ -2,7 +2,8 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { normalizeDiffStatistics } from "../../../utils/diff.js";
 import { isFileSystemError } from "../../../utils/fs.js";
-import { buildAgentArtifactPaths, getAgentDirectoryPath, getAgentManifestPath, } from "../../../workspace/structure.js";
+import { buildAgentArtifactPaths, getAgentManifestPath, } from "../../../workspace/artifact-paths.js";
+import { getAgentDirectoryPath } from "../../../workspace/session-paths.js";
 export function buildRunRecordEnhanced(record) {
     const agents = (record.agents ?? []).map((agent) => {
         const baseDirectory = getAgentDirectoryPath(record.runId, agent.agentId);