@kelceyp/caw-server 1.0.274 → 1.0.276

package/dist/pty-emit-result.mjs

@@ -0,0 +1,86 @@
+/**
+ * Side-effect-free extraction of `emitResult()` from `pty-wrapper.mjs`.
+ *
+ * The wrapper's `onExit` handler reads the Stop-hook sentinel file, then hands
+ * the parsed payload to this function to build either the `type:"result"` or
+ * `type:"error"` stdout line. Splitting the branch construction out of the
+ * wrapper mirrors `pty-deferred-teardown.mjs` (already extracts
+ * `readSentinelPayload` and `hasPendingWork`) so the sentinel-success and
+ * error branches can be unit-tested without spawning a real PTY.
+ *
+ * Inputs are function arguments only — no module-level state, no top-level
+ * side effects, no file IO. The caller (the wrapper's delegator) reads the
+ * sentinel via `readSentinelPayload()` and passes the parsed payload in as
+ * `hookData`; a null / falsy `hookData` is a no-op, mirroring the wrapper's
+ * pre-extraction `if (!existsSync(sentinelPath)) return;` guard one level up.
+ *
+ * Wire is preserved byte-for-byte relative to the pre-extraction wrapper:
+ *   - success line: `{ type: 'result', result, metadata }` with
+ *     `metadata = { sessionId, transcriptPath, permissionMode[, durationMs] }`
+ *     — same field set, same field order, same fallback chains
+ *     (`hookData.transcript_path || transcriptPath || null`,
+ *      `hookData.session_id || effectiveSessionId`, `hookData.permission_mode || null`).
+ *   - error line: `{ type: 'error', error, message }` — same shape, no
+ *     `metadata` field at all.
+ *
+ * The double-emit guard (previously `if (resultEmitted || failureEmitted) return;`
+ * at `pty-wrapper.mjs:401`) is preserved via the `alreadyEmitted` input: the
+ * caller passes the current flag state, and the function no-ops when true.
+ * The return value `{ emitted: 'result' | 'error' | null }` lets the caller
+ * translate a successful call back into its module-level `resultEmitted` /
+ * `failureEmitted` flags, which the prompt-too-long branch at
+ * `pty-wrapper.mjs:488` still reads externally.
+ */
+
+const defaultWrite = (line) => process.stdout.write(line);
+const defaultLog = () => {};
+
+export function emitResult({
+    hookData,
+    transcriptPath = null,
+    effectiveSessionId = null,
+    startedAt = null,
+    endedAt = null,
+    alreadyEmitted = false,
+    suppressFallback = false,
+    write = defaultWrite,
+    log = defaultLog
+} = {}) {
+    if (alreadyEmitted) return { emitted: null };
+    if (!hookData) return { emitted: null };
+
+    try {
+        if (hookData.error) {
+            write(JSON.stringify({
+                type: 'error',
+                error: hookData.error,
+                message: hookData.last_assistant_message || ''
+            }) + '\n');
+            return { emitted: 'error' };
+        }
+
+        const metadata = {
+            sessionId: hookData.session_id || effectiveSessionId,
+            transcriptPath: hookData.transcript_path || transcriptPath || null,
+            permissionMode: hookData.permission_mode || null
+        };
+        if (startedAt !== null && endedAt !== null) {
+            metadata.durationMs = endedAt - startedAt;
+        }
+        // D11 test-only override: when the wrapper's CAW_PTY_SUPPRESS_STOP_FALLBACK
+        // gate is set, blank the `result` field on the success branch only. The
+        // wire is deliberately identical to a real empty-message turn — that IS
+        // the point of the override. Metadata, field order, and everything else
+        // stay byte-for-byte identical (Task 3's guarantee).
+        const result = suppressFallback ? '' : (hookData.last_assistant_message || '');
+        write(JSON.stringify({
+            type: 'result',
+            result,
+            metadata
+        }) + '\n');
+        return { emitted: 'result' };
+    } catch (err) {
+        log(`Error reading sentinel: ${err.message}`);
+        return { emitted: null };
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kelceyp/caw-server",
-  "version": "1.0.274",
+  "version": "1.0.276",
   "description": "CAW server - REST API, MCP server and core features",
   "type": "module",
   "main": "dist/main.js",
@@ -19,7 +19,7 @@
     "build": "bash scripts/bun-build.sh",
     "build:client": "cd ../client && bun run build",
     "build:cli": "cd ../cli && bun run build && cp dist/cli.js ../server/dist/",
-    "build:all": "bun run clean && bun run generate:applyPojo && bun run build:client && bun run build && cp src/core/services/embedding-worker.js dist/embedding-worker.js && cp src/core/agents/pty-wrapper.mjs dist/pty-wrapper.mjs && cp src/core/agents/pty-deferred-teardown.mjs dist/pty-deferred-teardown.mjs && bun run build:cli",
+    "build:all": "bun run clean && bun run generate:applyPojo && bun run build:client && bun run build && cp src/core/services/embedding-worker.js dist/embedding-worker.js && cp src/core/agents/pty-wrapper.mjs dist/pty-wrapper.mjs && cp src/core/agents/pty-deferred-teardown.mjs dist/pty-deferred-teardown.mjs && cp src/core/agents/pty-emit-result.mjs dist/pty-emit-result.mjs && bun run build:cli",
     "dev": "STATIC_PATH=../client/src bun --define __BUILTIN_POSTHOG_KEY__=null run src/main.js",
     "start": "node dist/main.js",
     "test": "bun test --define __BUILTIN_POSTHOG_KEY__=null test/unit test/integration test/component test/cli test/investigation && (cd ../client && bun test)",