@with-logic/elwood 0.2.0 → 0.2.2

package/dist/cli/output/cleanup-error.js

@@ -0,0 +1,67 @@
+/**
+ * The CLI's diagnostic for a failed session cleanup (PRD §12A.2, C-CLI-09): it names the
+ * typed Elwood failures behind it, each always by its error code, then by its errno tokens
+ * and unconfirmed process-group ids when it has them. It never carries their messages,
+ * paths, or other free text.
+ * Text mode's error lines (§12A.3) carry it beside a different primary failure.
+ */
+import { ElwoodError, isErrnoToken } from "../../core/errors.js";
+import { MAX_REPORTED_GROUPS } from "../../runtime/shutdown/detached-sweep/failures.js";
+/**
+ * `Cleanup failed.`, or `Cleanup failed (termination_failed EPERM).` when the failure is
+ * typed. A `teardown_failed` from `teardown()` is summarized by the typed failures of its
+ * steps (`details.failures`, §10), in order; an untyped one adds nothing.
+ */
+export function cleanupFailureMessage(error) {
+    const parts = typedCauses(error).map(describeCause);
+    return parts.length === 0 ? "Cleanup failed." : `Cleanup failed (${parts.join(", ")}).`;
+}
+/**
+ * Text mode's stderr lines for an error record (§12A.3), each `prefix` then a sanitized
+ * value: the error, then the cleanup diagnostic when a failed cleanup sits behind a
+ * different primary failure (§12A.2). A cleanup failure that is itself the primary
+ * failure is the error's own line.
+ */
+export function textErrorLines(record, prefix, value) {
+    const { cleanup, error } = record;
+    const separate = cleanup.status === "failed" && error.code !== "cleanup_failed";
+    const lines = separate ? [error.message, cleanup.error] : [error.message];
+    return lines.map((line) => `${prefix}${value(line)}\n`).join("");
+}
+function typedCauses(error) {
+    if (!(error instanceof ElwoodError))
+        return [];
+    const failures = error.details["failures"];
+    if (!Array.isArray(failures))
+        return [error];
+    // `runTeardownSteps` builds this list; an untyped step failure has only a message.
+    return failures.filter((failure) => "code" in failure);
+}
+/**
+ * `termination_failed EIO reap EPERM process groups 4242 4243`: the code, its errno, its
+ * reap's, then the process groups a detached sweep could not confirm reaped (§10).
+ */
+function describeCause({ code, details }) {
+    const errno = errnoToken(details["errno"]);
+    const reapErrno = errnoToken(details["reapErrno"]);
+    const groups = processGroupIds(details["unconfirmedProcessGroupIds"]);
+    return [
+        code,
+        errno,
+        reapErrno === undefined ? undefined : `reap ${reapErrno}`,
+        groups.length === 0 ? undefined : `process groups ${groups.join(" ")}`,
+    ]
+        .filter((part) => part !== undefined)
+        .join(" ");
+}
+function errnoToken(value) {
+    return isErrnoToken(value) ? value : undefined;
+}
+/** Positive integer ids only, as many as a sweep failure can name. */
+function processGroupIds(value) {
+    if (!Array.isArray(value))
+        return [];
+    const ids = value.filter((id) => Number.isSafeInteger(id) && id > 0);
+    return ids.slice(0, MAX_REPORTED_GROUPS);
+}
+//# sourceMappingURL=cleanup-error.js.map

package/dist/cli/output/cleanup-error.js.map

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

package/dist/cli/output/types.d.ts

@@ -5,10 +5,14 @@
 import type { ElwoodSessionStatus } from "../../core/types.ts";
 import type { CliAgent } from "../types.ts";
 export type CliCleanupAction = "none" | "preserve" | "teardown";
+/** A failed cleanup always carries its content-free diagnostic (§12A.2). */
 export type CliCleanup = {
     readonly action: CliCleanupAction;
-    readonly status: "succeeded" | "failed";
-    readonly error?: string;
+    readonly status: "succeeded";
+} | {
+    readonly action: CliCleanupAction;
+    readonly status: "failed";
+    readonly error: string;
 };
 export type CliTerminalBase = {
     readonly schemaVersion: 1;

package/dist/cli/output/types.d.ts.map

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

package/dist/cli/request/agent-detect.d.ts

@@ -18,11 +18,15 @@ export declare const noAgentFoundMessage: string;
 /**
  * True when the login shell resolves `agent` as a command. Uses the same
  * interactive login shell as the agent PTY so PATH resolution is identical, but
- * asks only `command -v`, so the agent itself never starts (C-CLI-14). A probe
+ * asks only `command -v`, so the agent itself never starts (C-CLI-14). Detection uses only
+ * `command -v`'s exit status; its output is discarded. A probe
  * that could not run at all (missing or broken shell, probe timeout) is a
  * distinct failure: it says nothing about which agents are installed.
  */
-export declare function loginShellResolves(agent: CliAgent, shell?: string): Promise<boolean>;
+export declare function loginShellResolves(agent: CliAgent, options?: {
+    readonly shell?: string;
+    readonly cwd?: string;
+}): Promise<boolean>;
 /**
  * Probes every agent concurrently and returns the first in detection order that
  * `probe` reports available; `no_agent_found` when none is.

package/dist/cli/request/agent-detect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-detect.d.ts","sourceRoot":"","sources":["../../../src/cli/request/agent-detect.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,KAAK,QAAQ,EAAsB,MAAM,aAAa,CAAC;AAChE,OAAO,EAAW,KAAK,YAAY,EAAW,MAAM,cAAc,CAAC;AAEnE,oEAAoE;AACpE,eAAO,MAAM,mBAAmB,8BAA6D,CAAC;AAE9F,0FAA0F;AAC1F,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;AACpD,KAAK,UAAU,GAAG,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAExD,eAAO,MAAM,mBAAmB,QAIgB,CAAC;AAEjD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,QAAQ,EACf,KAAK,GAAE,MAAoB,GAC1B,OAAO,CAAC,OAAO,CAAC,CAOlB;AAWD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,GAAE,UAA+B,GACrC,OAAO,CAAC,QAAQ,CAAC,CAKnB;AAED,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,cAAc,EACzB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAU/B"}
+{"version":3,"file":"agent-detect.d.ts","sourceRoot":"","sources":["../../../src/cli/request/agent-detect.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,KAAK,QAAQ,EAAsB,MAAM,aAAa,CAAC;AAChE,OAAO,EAAW,KAAK,YAAY,EAAW,MAAM,cAAc,CAAC;AAEnE,oEAAoE;AACpE,eAAO,MAAM,mBAAmB,8BAA6D,CAAC;AAE9F,0FAA0F;AAC1F,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;AACpD,KAAK,UAAU,GAAG,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAExD,eAAO,MAAM,mBAAmB,QAIgB,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,QAAQ,EACf,OAAO,GAAE;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/D,OAAO,CAAC,OAAO,CAAC,CASlB;AAoBD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,GAAE,UAA+B,GACrC,OAAO,CAAC,QAAQ,CAAC,CAKnB;AAED,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,cAAc,EACzB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAU/B"}

package/dist/cli/request/agent-detect.js

@@ -7,7 +7,7 @@
  * cannot run at all is reported as such, not as "no agent installed".
  */
 import { currentCommandRunner } from "../../runtime/seams.js";
-import { probeShellCommand, shellQuote, userShell } from "../../runtime/shell.js";
+import { probeShellStatus, shellQuote, userShell } from "../../runtime/shell.js";
 import { CliValidationError } from "../types.js";
 import { layered, sourced } from "./sources.js";
 /** Detection order: the first agent whose command resolves wins. */
@@ -21,20 +21,28 @@ export const noAgentFoundMessage = "No agent was found: neither `claude` nor `co
 /**
  * True when the login shell resolves `agent` as a command. Uses the same
  * interactive login shell as the agent PTY so PATH resolution is identical, but
- * asks only `command -v`, so the agent itself never starts (C-CLI-14). A probe
+ * asks only `command -v`, so the agent itself never starts (C-CLI-14). Detection uses only
+ * `command -v`'s exit status; its output is discarded. A probe
  * that could not run at all (missing or broken shell, probe timeout) is a
  * distinct failure: it says nothing about which agents are installed.
  */
-export async function loginShellResolves(agent, shell = userShell()) {
-    const command = probeShellCommand(`command -v ${shellQuote(agent)}`);
-    const result = await currentCommandRunner()(shell, command);
+export async function loginShellResolves(agent, options = {}) {
+    const shell = options.shell ?? userShell();
+    const cwd = options.cwd ?? process.cwd();
+    const command = probeShellStatus(`command -v ${shellQuote(agent)}`);
+    const result = await currentCommandRunner()(shell, command, { cwd });
     if (result.error !== undefined) {
         throw new CliValidationError("no_agent_found", probeFailedMessage(shell, result.error));
     }
     return result.status === 0;
 }
 function probeFailedMessage(shell, error) {
-    const reason = error.code === undefined ? "did not run" : `failed with ${error.code}`;
+    // A login-shell failure's message is Elwood's own fixed text, never captured output.
+    const reason = error.phase === "login_shell"
+        ? `failed before running the check (${error.message})`
+        : error.code === undefined
+            ? "did not run"
+            : `failed with ${error.code}`;
     return (`No agent was found because the probe itself failed: login shell ${JSON.stringify(shell)} ` +
         `${reason} while checking for \`claude\` and \`codex\`. Fix the shell, or select an agent ` +
         "with --agent, ELWOOD_AGENT, or `elwood config set agent <claude|codex>`.");

package/dist/cli/request/agent-detect.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-detect.js","sourceRoot":"","sources":["../../../src/cli/request/agent-detect.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAiB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,OAAO,EAAqB,OAAO,EAAE,MAAM,cAAc,CAAC;AAEnE,oEAAoE;AACpE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAwC,CAAC;AAE9F,0FAA0F;AAC1F,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAKlD,MAAM,CAAC,MAAM,mBAAmB,GAC9B,iFAAiF;IACjF,0EAA0E;IAC1E,4EAA4E;IAC5E,8CAA8C,CAAC;AAEjD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAe,EACf,QAAgB,SAAS,EAAE;IAE3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,kBAAkB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1F,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa,EAAE,KAA6C;IACtF,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,KAAK,CAAC,IAAI,EAAE,CAAC;IACtF,OAAO,CACL,mEAAmE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;QAC3F,GAAG,MAAM,kFAAkF;QAC3F,0EAA0E,CAC3E,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAoB,kBAAkB;IAEtC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtF,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;IACrF,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,IAAI,kBAAkB,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;IAC7F,OAAO,KAAK,CAAC;AACf,CAAC;AASD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,SAAyB,EACzB,MAAqB;IAErB,MAAM,MAAM,GAAG,OAAO,CACpB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,EAClC,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,EACtC,SAAS,CAAC,MAAM,EAChB,OAAO,CAAS,SAAS,EAAE,kBAAkB,CAAC,CAC/C,CAAC;IACF,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IAC9C,IAAI,SAAS,CAAC,QAAQ;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAClE,OAAO,OAAO,CAAC,MAAM,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"agent-detect.js","sourceRoot":"","sources":["../../../src/cli/request/agent-detect.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 /**
  * Finalizes adapter-dependent resume options, workspace, and images.
- * Implements PRD §12A.1/§12A.2 and C-CLI-03/C-CLI-04/C-CLI-06/C-CLI-08.
+ * Implements PRD §12A.1/§12A.2/§12A.5 and C-CLI-03/C-CLI-04/C-CLI-06/C-CLI-08/C-CLI-15.
  */
 import { type CliAgent, type EffectiveRunRequest, type ResolvedRunRequest } from "../types.ts";
 export declare function finalizeRunRequest(draft: ResolvedRunRequest, stored?: {

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

@@ -1 +1 @@
-{"version":3,"file":"finalize.d.ts","sourceRoot":"","sources":["../../../src/cli/request/finalize.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAEL,KAAK,QAAQ,EAEb,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAIrB,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,kBAAkB,EACzB,MAAM,CAAC,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC1D,OAAO,CAAC,mBAAmB,CAAC,CAgB9B"}
+{"version":3,"file":"finalize.d.ts","sourceRoot":"","sources":["../../../src/cli/request/finalize.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAEL,KAAK,QAAQ,EAEb,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAKrB,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,kBAAkB,EACzB,MAAM,CAAC,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC1D,OAAO,CAAC,mBAAmB,CAAC,CAS9B"}

package/dist/cli/request/finalize.js

@@ -1,43 +1,22 @@
 /**
  * Finalizes adapter-dependent resume options, workspace, and images.
- * Implements PRD §12A.1/§12A.2 and C-CLI-03/C-CLI-04/C-CLI-06/C-CLI-08.
+ * Implements PRD §12A.1/§12A.2/§12A.5 and C-CLI-03/C-CLI-04/C-CLI-06/C-CLI-08/C-CLI-15.
  */
-import { stat } from "node:fs/promises";
-import { isAbsolute, resolve } from "node:path";
-import { errnoCode } from "../../core/errors.js";
+import { resolve } from "node:path";
 import { validateImages } from "../../core/images/resolve.js";
 import { claudeReasoningEfforts, codexReasoningEfforts } from "../../core/reasoning-effort.js";
 import { agentDisplayName, } from "../types.js";
 import { settingConflict } from "./validation.js";
 import { choice, nonBlank, optional, usage } from "./values.js";
+import { validateWorkspace } from "./workspace.js";
 export async function finalizeRunRequest(draft, stored) {
     validateStored(draft, stored);
     const agent = stored?.agent ?? draft.agent;
     validateEffectiveAgent(draft, agent);
-    const cwd = stored?.cwd ?? draft.cwd;
-    if (cwd === undefined)
-        throw usage("The effective workspace could not be resolved.");
-    if (!isAbsolute(cwd))
-        throw usage(`Workspace '${cwd}' must be an absolute path.`);
-    const info = await workspaceStat(cwd);
-    if (!info.isDirectory())
-        throw usage(`Workspace '${cwd}' is not a directory.`);
-    const uid = process.getuid?.();
-    if (uid !== undefined && info.uid !== uid)
-        throw usage(`Workspace '${cwd}' must be owned by the current user.`);
+    const cwd = await validateWorkspace(stored?.cwd ?? draft.cwd);
     const images = await validateImages(draft.imagePaths.map((path) => ({ path: resolve(cwd, nonBlank(path, "image")) })));
     return effectiveRequest(draft, agent, cwd, images, stored !== undefined);
 }
-async function workspaceStat(cwd) {
-    try {
-        return await stat(cwd);
-    }
-    catch (error) {
-        if (errnoCode(error) === "ENOENT")
-            throw usage(`Workspace '${cwd}' does not exist.`);
-        throw usage(`Workspace '${cwd}' could not be inspected.`);
-    }
-}
 function validateStored(draft, stored) {
     if (draft.resume !== undefined && stored === undefined)
         throw usage("Stored session data is required to resolve a resume.");

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

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

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;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,CAyF7B"}
+{"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,EACL,KAAK,aAAa,EAInB,MAAM,mBAAmB,CAAC;AAoB3B,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,CAAC,EAAE,aAAa,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAK7B;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,eAAe,EACxB,WAAW,CAAC,EAAE,aAAa,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAgG7B"}

package/dist/cli/request/index.js

@@ -4,15 +4,16 @@ import { readConfigWithStatus } from "../config/store.js";
 import { parseDuration } from "../duration.js";
 import { readPromptInput } from "../input.js";
 import { cliAgents, cliOutputModes, } from "../types.js";
-import { detectAvailableAgent, selectAgent } from "./agent-detect.js";
+import { detectAvailableAgent, loginShellResolves, selectAgent, } from "./agent-detect.js";
 import { explicitAdapterOptions, layeredSettings } from "./layers.js";
 import { resolvePosture } from "./posture.js";
 import { ioSettings, optionSettings } from "./settings.js";
 import { configKey, sourced } from "./sources.js";
 import { validateHighTrust, validateLifecycle, validateOutput, validateSpecificFlags, } from "./validation.js";
 import { decodeEnvironment, optional, optionalNonBlank, reasoning, requiredChoice, } from "./values.js";
+import { validateWorkspace } from "./workspace.js";
 export { finalizeRunRequest } from "./finalize.js";
-export async function resolveRunRequest(parsed, context, detectAgent = detectAvailableAgent) {
+export async function resolveRunRequest(parsed, context, detectAgent) {
     return {
         ...(await resolveRunSettings(parsed, context, detectAgent)),
         prompt: await readPromptInput(parsed.promptWords, context.stdin),
@@ -22,7 +23,7 @@ export async function resolveRunRequest(parsed, context, detectAgent = detectAva
  * Resolve and validate settings without reading prompt input or starting an agent.
  * `detectAgent` runs only when nothing selects the agent for a new session (C-CLI-21).
  */
-export async function resolveRunSettings(parsed, context, detectAgent = detectAvailableAgent) {
+export async function resolveRunSettings(parsed, context, detectAgent) {
     const useDefaults = parsed.flags.ignoreDefaults !== true;
     const configLocation = resolveConfigLocation(context.env, context.invocationCwd, context.homeDir);
     const configRead = useDefaults
@@ -31,12 +32,18 @@ export async function resolveRunSettings(parsed, context, detectAgent = detectAv
     const config = configRead.config;
     const env = useDefaults ? decodeEnvironment(context.env) : {};
     const resuming = parsed.flags.resume !== undefined;
+    const layers = layeredSettings(parsed, env, config, configLocation.path, context, resuming);
+    const cwd = layers.cwd.value ?? context.invocationCwd;
     const agentSetting = await selectAgent({
         flag: parsed.flags.agent,
         env: env.agent,
         config: sourced(config.agent, configKey(configLocation.path, "agent")),
         resuming,
-    }, detectAgent);
+    }, async () => {
+        const validatedCwd = await validateWorkspace(cwd);
+        return (detectAgent?.() ??
+            detectAvailableAgent((agent) => loginShellResolves(agent, { cwd: validatedCwd })));
+    });
     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).
@@ -49,7 +56,6 @@ export async function resolveRunSettings(parsed, context, detectAgent = detectAv
     const debug = parsed.flags.debug ?? false;
     const head = parsed.flags.head ?? false;
     validateOutput(output, io.stream, io.verbose, debug, head);
-    const layers = layeredSettings(parsed, env, config, configLocation.path, context, resuming);
     const agentOptions = optionSettings(config, configLocation.path, layers.model, layers.effort);
     const selected = agentOptions.values[agent];
     const posture = resolvePosture(parsed, env, config, configLocation.path, agent);

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/path-replacement.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Looks for a way another user could change what a workspace path resolves to between
+ * validation and launch. Implements PRD §12A.5 and C-CLI-15.
+ *
+ * The path is resolved name by name, as the kernel resolves it at spawn, following each symlink.
+ * Every directory a name is looked up in must be owned by root or the user and not writable by
+ * group or others, unless it is sticky or its group is the user's private group; every
+ * directory and symlink passed must be owned by root or the user, since a sticky directory lets
+ * other users rename their own entries. Finding nothing means only that these owner and
+ * mode-bit checks found nothing: an ACL that grants another user write access, or another
+ * member of the user's private group, is not seen. A path whose links cannot be followed
+ * safely fails with a `PathInspectionError` that names the link.
+ */
+import { type PathUser } from "../../core/path-trust.ts";
+export { lookupFault, type PathUser } from "../../core/path-trust.ts";
+/** The path's links cannot be followed safely; the message names the link and the fix. */
+export declare class PathInspectionError extends Error {
+    readonly name = "PathInspectionError";
+}
+/**
+ * The first reason another user could redirect `path`, naming the directory or link that lets
+ * them, or `undefined` when the owner and mode-bit checks find none. A link the walk cannot
+ * follow throws a `PathInspectionError`, even past such a reason. The workspace itself is the
+ * caller's to check.
+ */
+export declare function pathReplacementReason(path: string, user: PathUser): Promise<string | undefined>;
+//# sourceMappingURL=path-replacement.d.ts.map

package/dist/cli/request/path-replacement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-replacement.d.ts","sourceRoot":"","sources":["../../../src/cli/request/path-replacement.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEtE,0FAA0F;AAC1F,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,SAAkB,IAAI,yBAAyB;CAChD;AAKD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,GACb,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA8B7B"}

package/dist/cli/request/path-replacement.js

@@ -0,0 +1,79 @@
+/**
+ * Looks for a way another user could change what a workspace path resolves to between
+ * validation and launch. Implements PRD §12A.5 and C-CLI-15.
+ *
+ * The path is resolved name by name, as the kernel resolves it at spawn, following each symlink.
+ * Every directory a name is looked up in must be owned by root or the user and not writable by
+ * group or others, unless it is sticky or its group is the user's private group; every
+ * directory and symlink passed must be owned by root or the user, since a sticky directory lets
+ * other users rename their own entries. Finding nothing means only that these owner and
+ * mode-bit checks found nothing: an ACL that grants another user write access, or another
+ * member of the user's private group, is not seen. A path whose links cannot be followed
+ * safely fails with a `PathInspectionError` that names the link.
+ */
+import { isUtf8 } from "node:buffer";
+import { lstat, readlink } from "node:fs/promises";
+import { dirname, isAbsolute, join } from "node:path";
+import { lookupFault, ownerFault } from "../../core/path-trust.js";
+export { lookupFault } from "../../core/path-trust.js";
+/** The path's links cannot be followed safely; the message names the link and the fix. */
+export class PathInspectionError extends Error {
+    name = "PathInspectionError";
+}
+/** As many symlinks as Linux follows in one path; a loop fails as uninspectable. */
+const MAX_LINKS = 40;
+/**
+ * The first reason another user could redirect `path`, naming the directory or link that lets
+ * them, or `undefined` when the owner and mode-bit checks find none. A link the walk cannot
+ * follow throws a `PathInspectionError`, even past such a reason. The workspace itself is the
+ * caller's to check.
+ */
+export async function pathReplacementReason(path, user) {
+    let current = "/";
+    let fault = lookupFault(await lstat(current), user, current);
+    const pending = namesOf(path);
+    let links = 0;
+    // The walk goes on past the first fault, which it keeps, so a link it cannot follow is still
+    // named rather than left for `stat` to fail on.
+    for (let name = pending.pop(); name !== undefined; name = pending.pop()) {
+        if (name === "..") {
+            current = dirname(current);
+            continue;
+        }
+        const next = join(current, name);
+        const info = await lstat(next);
+        if (info.isSymbolicLink()) {
+            fault ??= ownerFault(info, user, next, "link");
+            if (++links > MAX_LINKS)
+                throw new PathInspectionError(`symbolic link '${next}' is past the ${MAX_LINKS} links a path may follow, as in a loop; fix the links, or choose a workspace reached without them`);
+            const target = await linkTarget(next);
+            pending.push(...namesOf(target));
+            if (isAbsolute(target))
+                current = "/";
+            continue;
+        }
+        // The last name is the workspace; every other one is a directory the next name is looked in.
+        if (pending.length > 0)
+            fault ??= lookupFault(info, user, next);
+        current = next;
+    }
+    return fault;
+}
+/**
+ * The target of the link at `path`. One that is not UTF-8 fails: decoded, it would name another
+ * path than the bytes the kernel follows, so the walk could check the wrong directories.
+ */
+async function linkTarget(path) {
+    const bytes = await readlink(path, { encoding: "buffer" });
+    if (!isUtf8(bytes))
+        throw new PathInspectionError(`symbolic link '${path}' does not point to a UTF-8 path; point it at one, or choose a workspace reached without it`);
+    return bytes.toString("utf8");
+}
+/** The names of `path`, last first, so the next one to resolve is popped. */
+function namesOf(path) {
+    return path
+        .split("/")
+        .filter((name) => name !== "" && name !== ".")
+        .reverse();
+}
+//# sourceMappingURL=path-replacement.js.map

package/dist/cli/request/path-replacement.js.map

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

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

@@ -0,0 +1,8 @@
+/**
+ * Validates a run's effective workspace: an absolute, existing directory the user owns and can enter,
+ * reached through no directory or link the owner and mode-bit checks find another user could use
+ * to replace it before launch. Implements PRD §12A.5, C-CLI-03, and C-CLI-15.
+ */
+/** Returns `cwd` once it is a workspace Elwood may launch in, else throws a usage error. */
+export declare function validateWorkspace(cwd: string | undefined): Promise<string>;
+//# sourceMappingURL=workspace.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../src/cli/request/workspace.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,4FAA4F;AAC5F,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBhF"}

package/dist/cli/request/workspace.js

@@ -0,0 +1,50 @@
+/**
+ * Validates a run's effective workspace: an absolute, existing directory the user owns and can enter,
+ * reached through no directory or link the owner and mode-bit checks find another user could use
+ * to replace it before launch. Implements PRD §12A.5, C-CLI-03, and C-CLI-15.
+ */
+import { constants } from "node:fs";
+import { access, stat } from "node:fs/promises";
+import { isAbsolute } from "node:path";
+import { errnoCode } from "../../core/errors.js";
+import { PathInspectionError, pathReplacementReason } from "./path-replacement.js";
+import { usage } from "./values.js";
+/** Returns `cwd` once it is a workspace Elwood may launch in, else throws a usage error. */
+export async function validateWorkspace(cwd) {
+    if (cwd === undefined)
+        throw usage("The effective workspace could not be resolved.");
+    if (!isAbsolute(cwd))
+        throw usage(`Workspace '${cwd}' must be an absolute path.`);
+    const uid = process.getuid?.();
+    const user = uid === undefined ? undefined : { uid, gid: process.getgid() };
+    const { info, replacementReason } = await inspectWorkspace(cwd, user);
+    if (!info.isDirectory())
+        throw usage(`Workspace '${cwd}' is not a directory.`);
+    if (uid !== undefined && info.uid !== uid)
+        throw usage(`Workspace '${cwd}' must be owned by the current user.`);
+    if (replacementReason !== undefined)
+        throw usage(`Workspace '${cwd}' could be replaced by another user: ${replacementReason}.`);
+    try {
+        await access(cwd, constants.X_OK);
+    }
+    catch {
+        throw usage(`Workspace '${cwd}' cannot be entered; check directory search permissions.`);
+    }
+    return cwd;
+}
+/** The workspace and, where there is a POSIX user, any reason another user could redirect it. */
+async function inspectWorkspace(cwd, user) {
+    try {
+        // The walk first, so a link that cannot be followed is named rather than failing `stat`.
+        const replacementReason = user && (await pathReplacementReason(cwd, user));
+        return { info: await stat(cwd), replacementReason };
+    }
+    catch (error) {
+        if (errnoCode(error) === "ENOENT")
+            throw usage(`Workspace '${cwd}' does not exist.`);
+        if (error instanceof PathInspectionError)
+            throw usage(`Workspace '${cwd}' could not be inspected: ${error.message}.`);
+        throw usage(`Workspace '${cwd}' could not be inspected.`);
+    }
+}
+//# sourceMappingURL=workspace.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../src/cli/request/workspace.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAiB,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAuB;IAC7D,IAAI,GAAG,KAAK,SAAS;QAAE,MAAM,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACrF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,MAAM,KAAK,CAAC,cAAc,GAAG,6BAA6B,CAAC,CAAC;IAClF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,MAAO,EAAE,EAAE,CAAC;IAC7E,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACtE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAAE,MAAM,KAAK,CAAC,cAAc,GAAG,uBAAuB,CAAC,CAAC;IAC/E,IAAI,GAAG,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG;QACvC,MAAM,KAAK,CAAC,cAAc,GAAG,sCAAsC,CAAC,CAAC;IACvE,IAAI,iBAAiB,KAAK,SAAS;QACjC,MAAM,KAAK,CAAC,cAAc,GAAG,wCAAwC,iBAAiB,GAAG,CAAC,CAAC;IAC7F,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,KAAK,CAAC,cAAc,GAAG,0DAA0D,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,iGAAiG;AACjG,KAAK,UAAU,gBAAgB,CAAC,GAAW,EAAE,IAA0B;IACrE,IAAI,CAAC;QACH,yFAAyF;QACzF,MAAM,iBAAiB,GAAG,IAAI,IAAI,CAAC,MAAM,qBAAqB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,QAAQ;YAAE,MAAM,KAAK,CAAC,cAAc,GAAG,mBAAmB,CAAC,CAAC;QACrF,IAAI,KAAK,YAAY,mBAAmB;YACtC,MAAM,KAAK,CAAC,cAAc,GAAG,6BAA6B,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;QAC9E,MAAM,KAAK,CAAC,cAAc,GAAG,2BAA2B,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC"}

package/dist/cli/run/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../src/cli/run/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAM9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAoB,MAAM,oBAAoB,CAAC;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGzE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,KAAK,CAA0C;IACvD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,KAAK,CAAS;gBAGpB,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,MAAM;IAWzB,UAAU,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAI5C,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI/B,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrC,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,GAAG,IAAI;IAIrE,OAAO,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAOxC,QAAQ,IAAI,IAAI;IAMhB,aAAa,IAAI,IAAI;IAIf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,MAAM,CAAC,cAAc,EAAE,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BpE,OAAO,CAAC,OAAO;YAkBD,YAAY;IAI1B,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,KAAK;IAIb,0FAA0F;YAC5E,iBAAiB;IAU/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CACW;CAC5C"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../src/cli/run/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAO9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAoB,MAAM,oBAAoB,CAAC;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGzE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,KAAK,CAA0C;IACvD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,KAAK,CAAS;gBAGpB,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,MAAM;IAWzB,UAAU,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAI5C,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI/B,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrC,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,GAAG,IAAI;IAIrE,OAAO,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAOxC,QAAQ,IAAI,IAAI;IAMhB,aAAa,IAAI,IAAI;IAIf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,MAAM,CAAC,cAAc,EAAE,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BpE,OAAO,CAAC,OAAO;YAkBD,YAAY;IAI1B,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,KAAK;IAIb,0FAA0F;YAC5E,iBAAiB;IAU/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CACW;CAC5C"}

package/dist/cli/run/output.js

@@ -2,6 +2,7 @@
  * Accumulates one safe response while coordinating human and machine CLI renderers.
  * Implements PRD §12A.3 and C-CLI-10 through C-CLI-12.
  */
+import { textErrorLines } from "../output/cleanup-error.js";
 import { writeJson } from "../output/json.js";
 import { JsonlRenderer } from "../output/jsonl.js";
 import { progressFromTurn, progressFromWarning } from "../output/records.js";
@@ -84,7 +85,7 @@ export class RunOutput {
         else
             await this.observeWrite(writeFinalText(this.stdout, record.response));
         if (this.request.output === "text" && record.type === "error" && !this.stderr.closed) {
-            await this.observeDiagnostic(`elwood: ${this.diagnosticValue(record.error.message)}\n`);
+            await this.observeDiagnostic(textErrorLines(record, "elwood: ", this.diagnosticValue));
         }
         if (this.request.output === "text" &&
             this.request.keep &&