@kelceyp/caw-server 1.0.288 → 1.0.289

package/dist/pty-non-interactive-setup.mjs

@@ -7,14 +7,22 @@
  * `--skip-non-interactive-setup`.
  *
  * Fail-fast / atomic / idempotent write contract (As1016):
+ *   - `CLAUDE_CONFIG_DIR` refused → before any filesystem access, throw the
+ *     As1065 guard's own error (`assertClaudeConfigDirForwardable` in
+ *     `claude-config-dir-guard.mjs`), whose message starts with
+ *     `CLAUDE_CONFIG_DIR_REFUSED (<RULE>): ...`. This module does not own
+ *     the config-dir check; it delegates to the guard, the same predicate
+ *     the claude strategies' direct-mode `validatePrerequisites` apply.
  *   - Absent  → seed with data = {} and mode 0o644, then atomic write.
  *   - Present but stat/read/parse fails (with one-shot SyntaxError retry) →
  *     throw a typed error whose message starts with
- *     `CLAUDE_JSON_UNREADABLE (<code>): <path>. ...`. No write. The wrapper's
- *     discriminating catch (pty-wrapper.mjs `:316`) re-emits `err.message + '\n'`
- *     to stderr and calls `process.exit(1)` — byte-for-byte identical to
- *     today's inline behaviour. Non-`CLAUDE_JSON_UNREADABLE` errors are
- *     rethrown by the wrapper.
+ *     `CLAUDE_JSON_UNREADABLE (<code>): <path>. ...`. No write.
+ *   - The wrapper's discriminating catch (the `ensureNonInteractiveSetup`
+ *     call site in `pty-wrapper.mjs`) classifies both prefixes,
+ *     `CLAUDE_JSON_UNREADABLE` and `CLAUDE_CONFIG_DIR_REFUSED`: it re-emits
+ *     `err.message + '\n'` to stderr and calls `process.exit(1)` —
+ *     byte-for-byte identical to today's inline behaviour. Every other
+ *     error is rethrown by the wrapper.
  *   - Present and read succeeded → apply the guarded mutations; short-circuit
  *     via the idempotent guard when both onboarding and every trust-set entry
  *     are already recorded.
@@ -36,7 +44,9 @@
  * from `server/dist/`, and the wrapper carries its own inline copy for the
  * same reason. Three co-located literals (`shared/jobErrorPrefixes.js`,
  * `pty-wrapper.mjs`, this module) must stay in sync per As1016 D8 (extended
- * from dual- to triple-literal by this commit).
+ * from dual- to triple-literal by this commit). The
+ * `CLAUDE_CONFIG_DIR_REFUSED` prefix is not carried here: it lives in the
+ * guard (literal copy 2 of 2; copy 1 is in `shared/jobErrorPrefixes.js`).
  */
 
 import {
@@ -53,6 +63,7 @@ import {
     readdirSync,
 } from 'fs';
 import { join, dirname, basename, resolve, isAbsolute } from 'path';
+import { assertClaudeConfigDirForwardable } from './claude-config-dir-guard.mjs';
 
 export const CLAUDE_JSON_UNREADABLE_PREFIX = 'CLAUDE_JSON_UNREADABLE';
 
@@ -83,18 +94,19 @@ export const ensureNonInteractiveSetup = (cwd, { home, configDir, log = noopLog
     // not consult, silently defeating both the setup and the mutex that
     // serialises writes to it. Route the seed through `$CLAUDE_CONFIG_DIR`
     // when it is present, else fall back to `$HOME` (Task 3 pre-AC-19
-    // behaviour). Absolute-path validation on `configDir` matches `home`'s
-    // fail-fast shape so the wrapper's discriminating catch classifies both
-    // identically.
-    let baseDir = home;
-    if (configDir !== undefined && configDir !== null) {
-        if (typeof configDir !== 'string' || configDir.length === 0 || !isAbsolute(configDir)) {
-            throw new Error(
-                `${CLAUDE_JSON_UNREADABLE_PREFIX} (CLAUDE_CONFIG_DIR_INVALID): CLAUDE_CONFIG_DIR is set but is not an absolute path (got ${JSON.stringify(configDir)}). Unset it or point it at an absolute path, then retry.`
-            );
-        }
-        baseDir = configDir;
-    }
+    // behaviour).
+    //
+    // The value check belongs to the As1065 guard
+    // (`assertClaudeConfigDirForwardable`), the same predicate the claude
+    // strategies' direct-mode `validatePrerequisites` apply. A refused value
+    // throws the guard's own `CLAUDE_CONFIG_DIR_REFUSED (<RULE>): ...` error,
+    // unwrapped, before anything below touches the filesystem; the wrapper's
+    // discriminating catch classifies that prefix alongside
+    // `CLAUDE_JSON_UNREADABLE`. `configDir` is `string | undefined`: a
+    // non-string, including `null`, throws the guard's `TypeError` (As1065
+    // KD5).
+    assertClaudeConfigDirForwardable(configDir);
+    const baseDir = configDir === undefined ? home : configDir;
 
     const nominal = join(baseDir, '.claude.json');
 

package/dist/pty-wrapper.mjs

@@ -27,6 +27,7 @@ import { readSentinelPayload, hasPendingWork } from './pty-deferred-teardown.mjs
 import { emitResult as emitResultLine } from './pty-emit-result.mjs';
 import { TEARDOWN_REASONS } from './teardownReasons.mjs';
 import { ensureNonInteractiveSetup } from './pty-non-interactive-setup.mjs';
+import { CLAUDE_CONFIG_DIR_REFUSED_PREFIX } from './claude-config-dir-guard.mjs';
 import { createTranscriptTailer } from './transcript-tailer.mjs';
 import { createPromptRejectionDetector } from './prompt-rejection-detector.mjs';
 
@@ -91,8 +92,10 @@ try {
 // (`claude-session.js#getDockerConfig`'s `commandParts` omits it by
 // design), so the in-container wrapper still runs the setup itself. This
 // wrapper's local call site preserves the same discriminating catch that
-// re-emits classified `CLAUDE_JSON_UNREADABLE` errors byte-for-byte with
-// today's stderr + exit contract and rethrows every other error. See As1016
+// re-emits classified errors byte-for-byte with today's stderr + exit
+// contract and rethrows every other error. Two prefixes are classified:
+// `CLAUDE_JSON_UNREADABLE` (As1016) and `CLAUDE_CONFIG_DIR_REFUSED` (As1065,
+// the guard's refusal of the container's own `CLAUDE_CONFIG_DIR`). See As1016
 // for the fail-fast / atomic / idempotent invariants that module preserves.
 //
 // The invocation stays here (post log()/stdin-drain/claude-binary,
@@ -117,6 +120,12 @@ try {
 // `server/dist/`, and the wrapper keeps this local const so the
 // discriminating catch below can classify without importing the sibling's
 // export. Keep all three literals in sync per As1016 D8.
+//
+// The second classified prefix, `CLAUDE_CONFIG_DIR_REFUSED_PREFIX`, is NOT
+// carried as a literal here: it is imported above from
+// `./claude-config-dir-guard.mjs`, which is already in this wrapper's
+// closure via `pty-non-interactive-setup.mjs`. It has exactly two literals
+// (`shared/jobErrorPrefixes.js` and the guard; As1065 KD4).
 const CLAUDE_JSON_UNREADABLE_PREFIX = 'CLAUDE_JSON_UNREADABLE';
 
 // As1050 Commit B (C3) — the `--skip-non-interactive-setup` CLI arg is
@@ -138,14 +147,20 @@ if (!hasFlag('--skip-non-interactive-setup')) {
             log
         });
     } catch (err) {
-        // Discriminating catch: only classified `CLAUDE_JSON_UNREADABLE`-prefixed
-        // throws are re-emitted to stderr as a fail-fast (matching today's
+        // Discriminating catch: only throws with one of the two classified
+        // prefixes are re-emitted to stderr as a fail-fast (matching today's
         // process.stderr.write + process.exit(1) contract byte-for-byte; the
         // extracted module's `.message` omits the trailing `\n` that the wrapper
-        // concatenates here). All other errors are RETHROWN — the wrapper does
-        // NOT swallow them, so today's uncaught-exception behaviour on
-        // non-`CLAUDE_JSON_UNREADABLE` failures is preserved.
-        if (err && typeof err.message === 'string' && err.message.startsWith(CLAUDE_JSON_UNREADABLE_PREFIX)) {
+        // concatenates here):
+        //   - `CLAUDE_JSON_UNREADABLE` — the As1016 file-level and `HOME_UNSET`
+        //     fail-fast branches;
+        //   - `CLAUDE_CONFIG_DIR_REFUSED` — the As1065 guard refusing the
+        //     container's own `CLAUDE_CONFIG_DIR` (`ensureNonInteractiveSetup`
+        //     delegates its config-dir check to `assertClaudeConfigDirForwardable`).
+        // All other errors are RETHROWN — the wrapper does NOT swallow them, so
+        // today's uncaught-exception behaviour on unclassified failures is
+        // preserved.
+        if (err && typeof err.message === 'string' && (err.message.startsWith(CLAUDE_JSON_UNREADABLE_PREFIX) || err.message.startsWith(CLAUDE_CONFIG_DIR_REFUSED_PREFIX))) {
             process.stderr.write(err.message + '\n');
             process.exit(1);
         }