@with-logic/elwood 0.1.0 → 0.1.2

package/dist/cli/main-failure.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Failure classification and protocol-aware error rendering shared by every command.
+ * Implements PRD §12A.3/§12A.5 and C-CLI-11/C-CLI-17.
+ */
+import type { CliCleanup, CliError } from "./output/types.ts";
+import type { AsyncOutputSink } from "./stream.ts";
+import { type CliAgent, type CliEnvironment, type CliOutputMode } from "./types.ts";
+export type StaticFailure = {
+    readonly code: string;
+    readonly message: string;
+    readonly exitCode: 1 | 2;
+};
+export declare function cliFailure(error: unknown): StaticFailure;
+/** Build the canonical version-1 error record for a failure that produced no response. */
+export declare function errorRecord(agent: CliAgent | null, failure: {
+    readonly code: string;
+    readonly message: string;
+}, durationMs: number, cleanup?: CliCleanup): CliError;
+/** Write one error record in the selected protocol: JSON/JSONL to stdout, text to stderr. */
+export declare function renderErrorRecord(output: CliOutputMode, record: CliError, stdout: AsyncOutputSink, stderr: AsyncOutputSink): Promise<void>;
+export declare function explicitStructuredOutput(args: readonly string[]): CliOutputMode | undefined;
+/**
+ * Agent an argument/config failure record reports before resolution ran: the
+ * `--agent` flag, else `ELWOOD_AGENT` unless `--no-defaults` ignores it, else
+ * `null` because nothing selected one (auto-detection had not chosen yet).
+ */
+export declare function agentHint(args: readonly string[], env: CliEnvironment): CliAgent | null;
+//# sourceMappingURL=main-failure.d.ts.map

package/dist/cli/main-failure.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main-failure.d.ts","sourceRoot":"","sources":["../../src/cli/main-failure.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,cAAc,EACnB,KAAK,aAAa,EAGnB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;CAC1B,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,CAMxD;AAED,0FAA0F;AAC1F,wBAAgB,WAAW,CACzB,KAAK,EAAE,QAAQ,GAAG,IAAI,EACtB,OAAO,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAC5D,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,UAAoD,GAC5D,QAAQ,CAYV;AAED,6FAA6F;AAC7F,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,aAAa,GAAG,SAAS,CAU3F;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAYvF"}

package/dist/cli/main-failure.js

@@ -0,0 +1,78 @@
+/**
+ * Failure classification and protocol-aware error rendering shared by every command.
+ * Implements PRD §12A.3/§12A.5 and C-CLI-11/C-CLI-17.
+ */
+import { ElwoodError } from "../core/errors.js";
+import { isOneOf } from "../core/predicates.js";
+import { writeJson } from "./output/json.js";
+import { JsonlRenderer } from "./output/jsonl.js";
+import { createCliSanitizer, formatDiagnosticValue } from "./output/sanitize.js";
+import { CliValidationError, cliAgents, } from "./types.js";
+export function cliFailure(error) {
+    if (error instanceof CliValidationError)
+        return { code: error.code, message: error.message, exitCode: 2 };
+    if (error instanceof ElwoodError)
+        return { code: error.code, message: error.message, exitCode: 1 };
+    return { code: "runtime_error", message: "Elwood could not run the agent.", exitCode: 1 };
+}
+/** Build the canonical version-1 error record for a failure that produced no response. */
+export function errorRecord(agent, failure, durationMs, cleanup = { action: "none", status: "succeeded" }) {
+    const clean = createCliSanitizer();
+    return {
+        schemaVersion: 1,
+        type: "error",
+        agent,
+        response: "",
+        sessionId: null,
+        durationMs,
+        cleanup,
+        error: { code: clean(failure.code), message: clean(failure.message) },
+    };
+}
+/** Write one error record in the selected protocol: JSON/JSONL to stdout, text to stderr. */
+export async function renderErrorRecord(output, record, stdout, stderr) {
+    if (output === "json")
+        await writeJson(stdout, record);
+    else if (output === "jsonl")
+        await new JsonlRenderer(stdout, () => record.durationMs).finish(record);
+    else
+        await stderr.write(`elwood: ${formatDiagnosticValue(record.error.message, createCliSanitizer())}\n`);
+}
+export function explicitStructuredOutput(args) {
+    if (args[0] === "config")
+        return undefined;
+    let candidate;
+    for (let index = 0; index < args.length; index += 1) {
+        const arg = args[index];
+        if (arg === "--")
+            break;
+        if (arg === "--output")
+            candidate = args[index + 1];
+        else if (arg?.startsWith("--output="))
+            candidate = arg.slice("--output=".length);
+    }
+    return candidate === "json" || candidate === "jsonl" ? candidate : undefined;
+}
+/**
+ * Agent an argument/config failure record reports before resolution ran: the
+ * `--agent` flag, else `ELWOOD_AGENT` unless `--no-defaults` ignores it, else
+ * `null` because nothing selected one (auto-detection had not chosen yet).
+ */
+export function agentHint(args, env) {
+    let flag;
+    let useDefaults = true;
+    for (let index = 0; index < args.length; index += 1) {
+        const arg = args[index];
+        if (arg === "--")
+            break;
+        if (arg === "--no-defaults")
+            useDefaults = false;
+        else if (arg === "--agent")
+            flag = args[index + 1];
+        else if (arg?.startsWith("--agent="))
+            flag = arg.slice("--agent=".length);
+    }
+    const candidate = flag ?? (useDefaults ? env["ELWOOD_AGENT"] : undefined);
+    return isOneOf(candidate, cliAgents) ? candidate : null;
+}
+//# sourceMappingURL=main-failure.js.map

package/dist/cli/main-failure.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"main-failure.js","sourceRoot":"","sources":["../../src/cli/main-failure.ts"],"names":[],"mappings":"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"}

package/dist/cli/main.d.ts

@@ -1,18 +1,21 @@
 /**
- * Side-effect-free routing for metadata, config, validation, and headless execution.
- * Implements PRD §12A and C-CLI-02/C-CLI-11/C-CLI-14/C-CLI-17.
+ * Side-effect-free routing for metadata, config, listing, interactive, and headless execution.
+ * Implements PRD §12A and C-CLI-02/C-CLI-11/C-CLI-14/C-CLI-17/C-CLI-21 through C-CLI-26.
  */
 import type { CliHeadTarget } from "./head/types.ts";
+import type { runInteractiveCommand } from "./interactive/index.ts";
 import type { CliSignalSource } from "./lifecycle/index.ts";
-import { resolveRunRequest } from "./request/index.ts";
+import type { executeModels } from "./models/index.ts";
+import { resolveRunRequest, resolveRunSettings } from "./request/index.ts";
 import type { executeRun } from "./run/index.ts";
 import type { prepareCliSession } from "./session/index.ts";
 import { type CliWritable } from "./stream.ts";
-import { type CliEnvironment, type PromptStdin } from "./types.ts";
+import type { CliEnvironment, PromptStdin } from "./types.ts";
 export type CliMainContext = {
     readonly stdout: CliWritable;
     readonly stderr: CliWritable;
     readonly stdin: PromptStdin;
+    readonly stdoutIsTTY?: boolean;
     readonly env: CliEnvironment;
     readonly invocationCwd: string;
     readonly homeDir: string;
@@ -22,12 +25,17 @@ export type CliMainContext = {
 export type CliMainDependencies = {
     readonly version: () => string;
     readonly resolve: typeof resolveRunRequest;
+    readonly settings: typeof resolveRunSettings;
     readonly prepare: typeof prepareCliSession;
     readonly execute: typeof executeRun;
+    readonly listModels: typeof executeModels;
+    readonly interactive: typeof runInteractiveCommand;
     readonly now: () => number;
 };
 export declare const prepareDefaultCliSession: typeof prepareCliSession;
 export declare const executeDefaultCliRun: typeof executeRun;
+export declare const executeDefaultModels: typeof executeModels;
+export declare const runDefaultInteractive: typeof runInteractiveCommand;
 /** Route one invocation and settle every selected output write before returning its status. */
 export declare function main(args: readonly string[], context: CliMainContext, dependencies?: CliMainDependencies): Promise<number>;
 //# sourceMappingURL=main.d.ts.map

package/dist/cli/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAEL,KAAK,cAAc,EAInB,KAAK,WAAW,EACjB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,UAAU,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,OAAO,iBACmB,CAAC;AAElE,eAAO,MAAM,oBAAoB,EAAE,OAAO,UACY,CAAC;AAUvD,+FAA+F;AAC/F,wBAAsB,IAAI,CACxB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,cAAc,EACvB,YAAY,GAAE,mBAA8B,GAC3C,OAAO,CAAC,MAAM,CAAC,CA0DjB"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQ5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG9D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,OAAO,kBAAkB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,UAAU,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,OAAO,aAAa,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,OAAO,qBAAqB,CAAC;IACnD,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,OAAO,iBACmB,CAAC;AAElE,eAAO,MAAM,oBAAoB,EAAE,OAAO,UACY,CAAC;AAEvD,eAAO,MAAM,oBAAoB,EAAE,OAAO,aACkB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,EAAE,OAAO,qBAC8B,CAAC;AAa1E,+FAA+F;AAC/F,wBAAsB,IAAI,CACxB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,cAAc,EACvB,YAAY,GAAE,mBAA8B,GAC3C,OAAO,CAAC,MAAM,CAAC,CA0EjB"}

package/dist/cli/main.js

@@ -1,28 +1,29 @@
 /**
- * Side-effect-free routing for metadata, config, validation, and headless execution.
- * Implements PRD §12A and C-CLI-02/C-CLI-11/C-CLI-14/C-CLI-17.
+ * Side-effect-free routing for metadata, config, listing, interactive, and headless execution.
+ * Implements PRD §12A and C-CLI-02/C-CLI-11/C-CLI-14/C-CLI-17/C-CLI-21 through C-CLI-26.
  */
-import { ElwoodError } from "../core/errors.js";
-import { isOneOf } from "../core/predicates.js";
 import { parseCliArgs } from "./args/index.js";
 import { runConfigCommand } from "./config/commands.js";
 import { HeadedDisplay } from "./head/display.js";
 import { cliHelp } from "./help.js";
-import { writeJson } from "./output/json.js";
-import { JsonlRenderer } from "./output/jsonl.js";
-import { createCliSanitizer, formatDiagnosticValue } from "./output/sanitize.js";
-import { resolveRunRequest } from "./request/index.js";
+import { agentHint, cliFailure, errorRecord, explicitStructuredOutput, renderErrorRecord, } from "./main-failure.js";
+import { resolveRunRequest, resolveRunSettings } from "./request/index.js";
 import { optional, usage } from "./request/values.js";
+import { assertListingOutput, runSessionsCommand } from "./sessions/index.js";
 import { AsyncOutputSink } from "./stream.js";
-import { CliValidationError, cliAgents, } from "./types.js";
 import { readCliVersion } from "./version.js";
 export const prepareDefaultCliSession = async (...args) => (await import("./session/index.js")).prepareCliSession(...args);
 export const executeDefaultCliRun = async (...args) => (await import("./run/index.js")).executeRun(...args);
+export const executeDefaultModels = async (...args) => (await import("./models/index.js")).executeModels(...args);
+export const runDefaultInteractive = async (...args) => (await import("./interactive/index.js")).runInteractiveCommand(...args);
 const defaults = {
     version: readCliVersion,
     resolve: resolveRunRequest,
+    settings: resolveRunSettings,
     prepare: prepareDefaultCliSession,
     execute: executeDefaultCliRun,
+    listModels: executeDefaultModels,
+    interactive: runDefaultInteractive,
     now: Date.now,
 };
 /** Route one invocation and settle every selected output write before returning its status. */
@@ -47,6 +48,21 @@ export async function main(args, context, dependencies = defaults) {
             await runConfigCommand(parsed.args, { ...context, stdout });
             return 0;
         }
+        if (parsed.command === "sessions") {
+            return await runSessionsCommand(parsed, { ...context, stdout, stderr });
+        }
+        if (parsed.command === "interactive") {
+            return await dependencies.interactive(parsed, context);
+        }
+        if (parsed.command === "models") {
+            const settings = await dependencies.settings(parsed.run, context);
+            assertListingOutput(settings, "models");
+            output = settings.output;
+            agent = settings.agent;
+            const prepared = await dependencies.prepare(settings);
+            agent = prepared.request.agent;
+            return await dependencies.listModels(prepared.request, prepared.session, { stdout, stderr }, { signals: context.signals });
+        }
         const resolved = await dependencies.resolve(parsed, context);
         output = resolved.output;
         agent = resolved.agent;
@@ -63,7 +79,8 @@ export async function main(args, context, dependencies = defaults) {
     catch (error) {
         await head?.close();
         const failure = cliFailure(error);
-        await renderFailure(output, agent, failure, Math.max(0, Math.trunc(dependencies.now() - startedAt)), stdout, stderr).catch(() => undefined);
+        const durationMs = Math.max(0, Math.trunc(dependencies.now() - startedAt));
+        await renderErrorRecord(output, errorRecord(agent, failure, durationMs), stdout, stderr).catch(() => undefined);
         return failure.exitCode;
     }
     finally {
@@ -73,67 +90,4 @@ export async function main(args, context, dependencies = defaults) {
         stderr.dispose();
     }
 }
-function cliFailure(error) {
-    if (error instanceof CliValidationError)
-        return { code: error.code, message: error.message, exitCode: 2 };
-    if (error instanceof ElwoodError)
-        return { code: error.code, message: error.message, exitCode: 1 };
-    return { code: "runtime_error", message: "Elwood could not run the agent.", exitCode: 1 };
-}
-async function renderFailure(output, agent, failure, durationMs, stdout, stderr) {
-    const clean = createCliSanitizer();
-    const record = {
-        schemaVersion: 1,
-        type: "error",
-        agent,
-        response: "",
-        sessionId: null,
-        durationMs,
-        cleanup: { action: "none", status: "succeeded" },
-        error: { code: clean(failure.code), message: clean(failure.message) },
-    };
-    if (output === "json")
-        await writeJson(stdout, record);
-    else if (output === "jsonl")
-        await new JsonlRenderer(stdout, () => durationMs).finish(record);
-    else
-        await stderr.write(`elwood: ${formatDiagnosticValue(record.error.message, clean)}\n`);
-}
-function explicitStructuredOutput(args) {
-    if (args[0] === "config")
-        return undefined;
-    let candidate;
-    for (let index = 0; index < args.length; index += 1) {
-        const arg = args[index];
-        if (arg === "--")
-            break;
-        if (arg === "--output")
-            candidate = args[index + 1];
-        else if (arg?.startsWith("--output="))
-            candidate = arg.slice("--output=".length);
-    }
-    return candidate === "json" || candidate === "jsonl" ? candidate : undefined;
-}
-/**
- * Agent an argument/config failure record reports before resolution ran: the
- * `--agent` flag, else `ELWOOD_AGENT` unless `--no-defaults` ignores it, else
- * `null` because nothing selected one (auto-detection had not chosen yet).
- */
-function agentHint(args, env) {
-    let flag;
-    let useDefaults = true;
-    for (let index = 0; index < args.length; index += 1) {
-        const arg = args[index];
-        if (arg === "--")
-            break;
-        if (arg === "--no-defaults")
-            useDefaults = false;
-        else if (arg === "--agent")
-            flag = args[index + 1];
-        else if (arg?.startsWith("--agent="))
-            flag = arg.slice("--agent=".length);
-    }
-    const candidate = flag ?? (useDefaults ? env["ELWOOD_AGENT"] : undefined);
-    return isOneOf(candidate, cliAgents) ? candidate : null;
-}
 //# sourceMappingURL=main.js.map

package/dist/cli/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"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"}

package/dist/cli/models/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * `elwood models`: start one throwaway headless session, list its models through the
+ * public picker operation, always tear it down, and render rows or an error record
+ * under the run lifecycle's deadline, SIGINT, blocked-prompt, and cleanup rules.
+ * Implements PRD §12A.10 and C-CLI-26.
+ */
+import { type CliLifecycleClock, type CliSignalSource } from "../lifecycle/index.ts";
+import type { CliSessionFacade } from "../session/index.ts";
+import type { AsyncOutputSink } from "../stream.ts";
+import type { EffectiveRunRequest } from "../types.ts";
+export type ExecuteModelsIo = {
+    readonly stdout: AsyncOutputSink;
+    readonly stderr: AsyncOutputSink;
+};
+export type ExecuteModelsDependencies = {
+    readonly signals: CliSignalSource;
+    readonly clock?: CliLifecycleClock;
+};
+export declare function executeModels(request: EffectiveRunRequest, session: CliSessionFacade, io: ExecuteModelsIo, dependencies: ExecuteModelsDependencies): Promise<number>;
+//# sourceMappingURL=index.d.ts.map

package/dist/cli/models/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAgB,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIvD,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;CAClC,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;CACpC,CAAC;AAEF,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,yBAAyB,GACtC,OAAO,CAAC,MAAM,CAAC,CAkDjB"}

package/dist/cli/models/index.js

@@ -0,0 +1,63 @@
+/**
+ * `elwood models`: start one throwaway headless session, list its models through the
+ * public picker operation, always tear it down, and render rows or an error record
+ * under the run lifecycle's deadline, SIGINT, blocked-prompt, and cleanup rules.
+ * Implements PRD §12A.10 and C-CLI-26.
+ */
+import { CliLifecycle } from "../lifecycle/index.js";
+import { errorRecord, renderErrorRecord } from "../main-failure.js";
+import { progressFromWarning } from "../output/records.js";
+import { createCliSanitizer, formatDiagnosticValue } from "../output/sanitize.js";
+import { warningLine } from "../run/output-lines.js";
+import { subscribeRunEvents } from "../run/subscribe.js";
+import { CodexUpdateAttentionGuard } from "../update-attention.js";
+import { renderModels } from "./render.js";
+export async function executeModels(request, session, io, dependencies) {
+    const lifecycle = new CliLifecycle(request, session, dependencies.signals, dependencies.clock);
+    const clean = createCliSanitizer();
+    const warnings = [];
+    const updateAttention = request.agent === "codex"
+        ? new CodexUpdateAttentionGuard(session, lifecycle, dependencies.clock)
+        : undefined;
+    const unsubscribers = subscribeRunEvents(request, session, lifecycle, {
+        status: () => undefined,
+        warning: (event) => warnings.push(writeWarning(io.stderr, event, clean)),
+    }, undefined, updateAttention);
+    let models;
+    lifecycle.start();
+    try {
+        lifecycle.beginLaunch();
+        const started = await lifecycle.race(session.start());
+        if (started.completed) {
+            const ready = await lifecycle.race(started.value.waitForStatus((status) => status === "ready"));
+            if (ready.completed) {
+                const listed = await lifecycle.race(started.value.listModels());
+                if (listed.completed)
+                    models = listed.value;
+            }
+        }
+    }
+    catch (error) {
+        lifecycle.fail(error);
+    }
+    updateAttention?.dispose();
+    const cleanup = await lifecycle.cleanup();
+    lifecycle.dispose();
+    for (const unsubscribe of unsubscribers)
+        unsubscribe();
+    await Promise.all(warnings);
+    const failure = lifecycle.failure;
+    if (failure === undefined) {
+        // Both races completed (the lifecycle only stops on a recorded failure), so rows exist.
+        await renderModels(request.output, request.agent, models, io.stdout);
+        return 0;
+    }
+    const record = errorRecord(request.agent, failure, lifecycle.durationMs(), cleanup);
+    await renderErrorRecord(request.output, record, io.stdout, io.stderr);
+    return failure.exitCode;
+}
+function writeWarning(stderr, event, clean) {
+    const record = progressFromWarning(event, clean);
+    return stderr.write(warningLine(record, (value) => formatDiagnosticValue(value, clean)));
+}
+//# sourceMappingURL=index.js.map

package/dist/cli/models/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"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"}

package/dist/cli/models/render.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Table and JSON rendering for `elwood models`.
+ * Implements PRD §12A.10 and C-CLI-26.
+ */
+import type { AgentModelOption } from "../../core/models/rows.ts";
+import type { AsyncOutputSink } from "../stream.ts";
+import type { CliAgent, CliOutputMode } from "../types.ts";
+export declare function renderModels(output: CliOutputMode, agent: CliAgent, models: readonly AgentModelOption[], stdout: AsyncOutputSink): Promise<void>;
+//# sourceMappingURL=render.d.ts.map

package/dist/cli/models/render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI3D,wBAAsB,YAAY,CAChC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,SAAS,gBAAgB,EAAE,EACnC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAoBf"}

package/dist/cli/models/render.js

@@ -0,0 +1,33 @@
+/**
+ * Table and JSON rendering for `elwood models`.
+ * Implements PRD §12A.10 and C-CLI-26.
+ */
+import { createCliSanitizer } from "../output/sanitize.js";
+import { renderTable } from "../table.js";
+const header = ["CURRENT", "ID", "LABEL", "DEFAULT", "DESCRIPTION"];
+export async function renderModels(output, agent, models, stdout) {
+    const clean = createCliSanitizer();
+    const rows = models.map((model) => sanitizedModel(model, clean));
+    if (output === "json") {
+        const document = { schemaVersion: 1, type: "models", agent, models: rows };
+        await stdout.write(`${JSON.stringify(document)}\n`);
+        return;
+    }
+    await stdout.write(renderTable(header, rows.map((model) => [
+        model.isCurrent ? "*" : "",
+        model.id,
+        model.label,
+        model.isDefault ? "(default)" : "",
+        model.description ?? "",
+    ])));
+}
+function sanitizedModel(model, clean) {
+    return {
+        ...model,
+        id: clean(model.id),
+        label: clean(model.label),
+        ...(model.description === undefined ? {} : { description: clean(model.description) }),
+        raw: clean(model.raw),
+    };
+}
+//# sourceMappingURL=render.js.map

package/dist/cli/models/render.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,MAAM,MAAM,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAEpE,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAqB,EACrB,KAAe,EACf,MAAmC,EACnC,MAAuB;IAEvB,MAAM,KAAK,GAAG,kBAAkB,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACjE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC3E,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO;IACT,CAAC;IACD,MAAM,MAAM,CAAC,KAAK,CAChB,WAAW,CACT,MAAM,EACN,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC1B,KAAK,CAAC,EAAE;QACR,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QAClC,KAAK,CAAC,WAAW,IAAI,EAAE;KACxB,CAAC,CACH,CACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CACrB,KAAuB,EACvB,KAAgC;IAEhC,OAAO;QACL,GAAG,KAAK;QACR,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;QACzB,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QACrF,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;KACtB,CAAC;AACJ,CAAC"}

package/dist/cli/request/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/request/index.ts"],"names":[],"mappings":"AAAA,qGAAqG;AAMrG,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,KAAK,aAAa,EAAqC,MAAM,mBAAmB,CAAC;AAa1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,KAAK,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAErD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,cAAc,EACvB,WAAW,GAAE,aAAoC,GAChD,OAAO,CAAC,kBAAkB,CAAC,CAK7B;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,eAAe,EACxB,WAAW,GAAE,aAAoC,GAChD,OAAO,CAAC,kBAAkB,CAAC,CAmF7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/request/index.ts"],"names":[],"mappings":"AAAA,qGAAqG;AAMrG,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,KAAK,aAAa,EAAqC,MAAM,mBAAmB,CAAC;AAmB1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,KAAK,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAErD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,cAAc,EACvB,WAAW,GAAE,aAAoC,GAChD,OAAO,CAAC,kBAAkB,CAAC,CAK7B;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,eAAe,EACxB,WAAW,GAAE,aAAoC,GAChD,OAAO,CAAC,kBAAkB,CAAC,CAwF7B"}

package/dist/cli/request/index.js

@@ -6,9 +6,10 @@ import { readPromptInput } from "../input.js";
 import { cliAgents, cliOutputModes, } from "../types.js";
 import { detectAvailableAgent, selectAgent } from "./agent-detect.js";
 import { explicitAdapterOptions, layeredSettings } from "./layers.js";
-import { ioSettings, optionSettings, resolvePosture } from "./settings.js";
+import { resolvePosture } from "./posture.js";
+import { ioSettings, optionSettings } from "./settings.js";
 import { configKey, sourced } from "./sources.js";
-import { validateLifecycle, validateOutput, validateSpecificFlags } from "./validation.js";
+import { validateHighTrust, validateLifecycle, validateOutput, validateSpecificFlags, } from "./validation.js";
 import { decodeEnvironment, optional, optionalNonBlank, reasoning, requiredChoice, } from "./values.js";
 export { finalizeRunRequest } from "./finalize.js";
 export async function resolveRunRequest(parsed, context, detectAgent = detectAvailableAgent) {
@@ -37,6 +38,9 @@ export async function resolveRunSettings(parsed, context, detectAgent = detectAv
         resuming,
     }, detectAgent);
     const agent = requiredChoice(agentSetting.value, cliAgents, "agent");
+    // High trust is rejected against explicit posture BEFORE the adapter check, so
+    // `--high-trust --codex-sandbox …` names the switch rather than the agent (C-CLI-22).
+    validateHighTrust(parsed, env);
     if (!resuming)
         validateSpecificFlags(parsed, env, agent, agentSetting.source);
     validateLifecycle(parsed, env);
@@ -56,6 +60,7 @@ export async function resolveRunSettings(parsed, context, detectAgent = detectAv
         outputExplicit: parsed.explicit.has("output"),
         ...(layers.timeout.value !== undefined && { timeoutMs: parseDuration(layers.timeout.value) }),
         trust: io.trust.value,
+        highTrust: posture.highTrust.value,
         stateDir: layers.stateDir.value,
         verbose: io.verbose.value,
         stream: io.stream.value,
@@ -83,6 +88,7 @@ export async function resolveRunSettings(parsed, context, detectAgent = detectAv
                 output: io.output.source,
                 timeoutMs: layers.timeout.source,
                 trust: io.trust.source,
+                highTrust: posture.highTrust.source,
                 stateDir: layers.stateDir.source,
                 verbose: io.verbose.source,
                 stream: io.stream.source,

package/dist/cli/request/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/request/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/request/index.ts"],"names":[],"mappings":"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"}

package/dist/cli/request/layers.d.ts

@@ -27,4 +27,6 @@ export declare function explicitAdapterOptions(parsed: ParsedRunCommand, env: En
     readonly claudeOptionsExplicit: boolean;
     readonly codexOptionsExplicit: boolean;
 };
+/** Resolve the state path without selecting or validating any agent (C-CLI-24). */
+export declare function resolveStateSetting(parsed: ParsedRunCommand, env: EnvSettings, config: CliConfig, configPath: string, context: LayerContext): SourcedValue<string>;
 //# sourceMappingURL=layers.d.ts.map

package/dist/cli/request/layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/cli/request/layers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAsB,KAAK,YAAY,EAAW,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,KAAK,WAAW,EAA8B,MAAM,aAAa,CAAC;AAE3E,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,oGAAoG;IACpG,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACtC,oEAAoE;IACpE,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,eAAe,CAC7B,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,OAAO,GAChB,eAAe,CA4CjB;AAYD,wFAAwF;AACxF,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,GACf;IAAE,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;CAAE,CAUrF"}
+{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/cli/request/layers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAsB,KAAK,YAAY,EAAW,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,KAAK,WAAW,EAA8B,MAAM,aAAa,CAAC;AAE3E,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,oGAAoG;IACpG,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACtC,oEAAoE;IACpE,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,eAAe,CAC7B,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,OAAO,GAChB,eAAe,CAgCjB;AAYD,wFAAwF;AACxF,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,GACf;IAAE,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;CAAE,CAUrF;AAED,mFAAmF;AACnF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,GACpB,YAAY,CAAC,MAAM,CAAC,CActB"}

package/dist/cli/request/layers.js

@@ -10,14 +10,10 @@ import { nonBlank, optionalNonBlank } from "./values.js";
 export function layeredSettings(parsed, env, config, configPath, context, resuming) {
     const flags = parsed.flags;
     const key = (name) => configKey(configPath, name);
-    const stateLocation = resolveStateLocation(context.env, context.homeDir);
-    const state = layered(sourced(flags.stateDir, "--state-dir"), sourced(env.stateDir, "ELWOOD_STATE_DIR"), sourced(config.stateDir, key("stateDir")), sourced(stateLocation.path, stateLocation.source));
     const persona = layered(sourced(flags.persona, "--persona"), sourced(env.persona, "ELWOOD_PERSONA"), sourced(resuming ? undefined : config.persona, key("persona")), sourced(undefined, "unset"));
     return {
         timeout: layered(sourced(flags.timeout, "--timeout"), sourced(env.timeout, "ELWOOD_TIMEOUT"), sourced(config.timeout, key("timeout")), sourced(undefined, "built-in")),
-        stateDir: sourced(state.source === stateLocation.source
-            ? state.value
-            : resolve(context.invocationCwd, nonBlank(state.value, "stateDir")), state.source),
+        stateDir: resolveStateSetting(parsed, env, config, configPath, context),
         persona: sourced(optionalNonBlank(persona.value, "persona"), persona.source),
         model: layered(sourced(flags.model, "--model"), sourced(env.model, "ELWOOD_MODEL"), sourced(undefined, "unset"), sourced(undefined, "unset")),
         effort: layered(sourced(flags.reasoningEffort, "--reasoning-effort"), sourced(env.reasoningEffort, "ELWOOD_REASONING_EFFORT"), sourced(undefined, "unset"), sourced(undefined, "unset")),
@@ -41,4 +37,12 @@ export function explicitAdapterOptions(parsed, env) {
             env.codexApprovalPolicy !== undefined,
     };
 }
+/** Resolve the state path without selecting or validating any agent (C-CLI-24). */
+export function resolveStateSetting(parsed, env, config, configPath, context) {
+    const stateLocation = resolveStateLocation(context.env, context.homeDir);
+    const state = layered(sourced(parsed.flags.stateDir, "--state-dir"), sourced(env.stateDir, "ELWOOD_STATE_DIR"), sourced(config.stateDir, configKey(configPath, "stateDir")), sourced(stateLocation.path, stateLocation.source));
+    return sourced(state.source === stateLocation.source
+        ? state.value
+        : resolve(context.invocationCwd, nonBlank(state.value, "stateDir")), state.source);
+}
 //# sourceMappingURL=layers.js.map