chainlesschain 0.165.5 → 0.165.8

package/src/harness/session-index.js

@@ -20,7 +20,8 @@
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { join, basename } from "node:path";
 import { createRequire } from "node:module";
-import { getHomeDir } from "../lib/paths.js";
+import { ensureClaudeProjectStorageTree, getHomeDir } from "../lib/paths.js";
+import { resolveClaudeProjectStorageDir } from "../lib/claude-project-storage-layout.js";
 import { ensurePrivateDirectory, ensurePrivateFile } from "../lib/secure-fs.js";
 import { readVerifiedProjection } from "./jsonl-session-store.js";
 
@@ -39,12 +40,22 @@ export const _deps = {
 };
 
 function sessionsDir() {
-  return join(getHomeDir(), "sessions");
+  const homeDir = getHomeDir();
+  return resolveClaudeProjectStorageDir(homeDir) || join(homeDir, "sessions");
 }
 
 function indexPath() {
-  const dir = getHomeDir();
-  ensurePrivateDirectory(dir);
+  const homeDir = getHomeDir();
+  const projectDir = resolveClaudeProjectStorageDir(homeDir);
+  if (projectDir) {
+    ensureClaudeProjectStorageTree(homeDir, projectDir);
+  }
+  const dir = projectDir || homeDir;
+  if (!projectDir) ensurePrivateDirectory(dir);
+  // Keep the long-standing global cache path for legacy sessions. A
+  // Claude-compatible project layout must not make one project's index scan
+  // another project's transcripts, so its derived index lives beside those
+  // project-local JSONL files.
   return join(dir, "session-index.db");
 }
 

package/src/lib/agent-worktree.js

@@ -244,7 +244,14 @@ export function finishAgentWorktree(info, { deps = _deps } = {}) {
   let headSha = null;
   let readable = false;
   try {
-    dirty = git(["status", "--porcelain"], info.path, deps).trim().length > 0;
+    // Do not inherit status.showUntrackedFiles=no from repository/user config:
+    // an untracked agent output is still work that finalize must preserve.
+    dirty =
+      git(
+        ["status", "--porcelain=v1", "--untracked-files=all"],
+        info.path,
+        deps,
+      ).trim().length > 0;
     headSha = git(["rev-parse", "HEAD"], info.path, deps).trim();
     readable = true;
   } catch {

package/src/lib/auto-mode-safety-classifier.js

@@ -20,6 +20,7 @@ import {
   isSecretEnvName,
 } from "./credential-guard.js";
 import { containsSecret } from "./secret-scan.js";
+import { normalizePermissionRequest } from "./permission-request.js";
 
 const require_ = createRequire(import.meta.url);
 const shellPolicy = require_("../runtime/coding-agent-shell-policy.cjs");
@@ -459,21 +460,6 @@ function canonicalShellKeyword(token) {
     .replace(/\\(.)/g, "$1");
 }
 
-function inputCommand(input) {
-  const command = input?.args?.command;
-  if (typeof command === "string") return command;
-  const argv = input?.args?.argv;
-  return Array.isArray(argv)
-    ? argv
-        .map((value) => {
-          const token = String(value);
-          if (token && !/[\s|;&"'\\]/.test(token)) return token;
-          return `"${token.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
-        })
-        .join(" ")
-    : "";
-}
-
 function workspaceRoots(context = {}) {
   const roots = [];
   if (Array.isArray(context.workspaceRoots)) {
@@ -1817,7 +1803,7 @@ export function classifyAutoModeSafety(input = {}) {
   const args = input.args && typeof input.args === "object" ? input.args : {};
   const context =
     input.context && typeof input.context === "object" ? input.context : {};
-  const command = inputCommand({ args });
+  const command = normalizePermissionRequest({ tool, args }).command;
   const segments = collectCommandSegments(command);
   const argsText = stableSerialize(args);
   const baseRiskLevel = normalizeRisk(input.baseRiskLevel, "medium");
@@ -2000,7 +1986,7 @@ export function evaluateAutoModeSafety(input = {}, opts = {}) {
       : classifyAutoModeSafety;
   const classification = classifier(input);
   const tool = String(input?.tool || "unknown").toLowerCase();
-  const command = inputCommand(input);
+  const command = normalizePermissionRequest(input).command;
   let policy = null;
   if (tool === "run_shell") {
     const result = evaluateShellCommandPolicy(command, {

package/src/lib/background-agent-keeper-protocol.js

@@ -257,12 +257,16 @@ export function prepareBackgroundAgentLocalPipePath(
   { platform = process.platform } = {},
 ) {
   if (platform === "win32") return pipePath;
-  const directory = fallbackLocalPipeDirectory(pipePath);
-  if (!directory) return pipePath;
-  try {
-    mkdirSync(directory, { mode: 0o700 });
-  } catch (error) {
-    if (error?.code !== "EEXIST") throw error;
+  const normalizedPipePath = posix.resolve(
+    String(pipePath || "").replaceAll("\\", "/"),
+  );
+  const directory = posix.dirname(normalizedPipePath);
+  if (fallbackLocalPipeDirectory(pipePath)) {
+    try {
+      mkdirSync(directory, { mode: 0o700 });
+    } catch (error) {
+      if (error?.code !== "EEXIST") throw error;
+    }
   }
   const stat = lstatSync(directory);
   const uid = typeof process.getuid === "function" ? process.getuid() : null;
@@ -274,6 +278,22 @@ export function prepareBackgroundAgentLocalPipePath(
   ) {
     throw new Error("background agent socket directory is not private");
   }
+
+  let socketStat = null;
+  try {
+    socketStat = lstatSync(normalizedPipePath);
+  } catch (error) {
+    if (error?.code !== "ENOENT") throw error;
+  }
+  if (socketStat) {
+    if (
+      socketStat.isSymbolicLink() ||
+      !socketStat.isSocket() ||
+      (uid !== null && socketStat.uid !== uid)
+    ) {
+      throw new Error("background agent socket path is not an owned socket");
+    }
+  }
   return pipePath;
 }
 

package/src/lib/background-agent-supervisor.js

@@ -1,6 +1,8 @@
 import {
+  chmodSync,
   closeSync,
   existsSync,
+  lstatSync,
   mkdirSync,
   openSync,
   readFileSync,
@@ -651,7 +653,21 @@ export function backgroundAgentsDir() {
   const dir =
     process.env.CC_BACKGROUND_AGENTS_DIR ||
     join(getHomeDir(), "background-agents");
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true, mode: 0o700 });
+  if (process.platform !== "win32") {
+    const stat = lstatSync(dir);
+    const uid = typeof process.getuid === "function" ? process.getuid() : null;
+    if (
+      !stat.isDirectory() ||
+      stat.isSymbolicLink() ||
+      (uid !== null && stat.uid !== uid)
+    ) {
+      throw new Error(
+        "background agent state directory is not owner-controlled",
+      );
+    }
+    chmodSync(dir, 0o700);
+  }
   return dir;
 }
 

package/src/lib/background-session-transport.js

@@ -33,6 +33,10 @@ import {
 
 const HELLO_TIMEOUT_MS = 5000;
 const MAX_LINE_BYTES = 1024 * 1024;
+export const BACKGROUND_SESSION_BACKLOG_LIMITS = Object.freeze({
+  messages: 256,
+  bytes: 1024 * 1024,
+});
 
 /** Pipe endpoint for a session id (Windows named pipe / POSIX socket file). */
 export function transportPipePath(id, dir, options = {}) {
@@ -70,14 +74,128 @@ export function createNdjsonReader(onMessage, onError = () => {}) {
   };
 }
 
-function writeMessage(socket, message) {
-  if (!socket || socket.destroyed) return false;
-  try {
-    socket.write(`${JSON.stringify(message)}\n`);
-    return true;
-  } catch {
+/**
+ * A socket writer with an application-level queue above Node's native write
+ * buffer. Once `socket.write()` reports backpressure, later messages wait for
+ * `drain`; a consumer that exceeds either cap is disconnected instead of
+ * retaining an unbounded event history in the worker.
+ */
+export function createBoundedSocketWriter(socket, configured = {}) {
+  const maxMessages = Math.max(
+    1,
+    Number.isFinite(configured.messages)
+      ? Math.floor(configured.messages)
+      : BACKGROUND_SESSION_BACKLOG_LIMITS.messages,
+  );
+  const maxBytes = Math.max(
+    1024,
+    Number.isFinite(configured.bytes)
+      ? Math.floor(configured.bytes)
+      : BACKGROUND_SESSION_BACKLOG_LIMITS.bytes,
+  );
+  const queue = [];
+  let queuedBytes = 0;
+  let waitingForDrain = false;
+  let closed = false;
+  let overflowed = false;
+
+  const nativeBufferedBytes = () =>
+    Number.isFinite(socket?.writableLength)
+      ? Math.max(0, socket.writableLength)
+      : 0;
+  const clear = () => {
+    queue.length = 0;
+    queuedBytes = 0;
+    waitingForDrain = false;
+  };
+  const overflow = () => {
+    if (overflowed) return false;
+    overflowed = true;
+    closed = true;
+    clear();
+    try {
+      configured.onOverflow?.({ maxMessages, maxBytes });
+    } catch {
+      /* observer errors do not change the fail-closed outcome */
+    }
+    try {
+      socket?.destroy();
+    } catch {
+      /* already closed */
+    }
     return false;
-  }
+  };
+  const writePayload = (payload) => {
+    try {
+      if (socket.write(payload) === false) waitingForDrain = true;
+      return true;
+    } catch {
+      closed = true;
+      clear();
+      return false;
+    }
+  };
+  const flush = () => {
+    if (closed || socket?.destroyed) {
+      closed = true;
+      clear();
+      return;
+    }
+    waitingForDrain = false;
+    while (queue.length > 0 && !waitingForDrain) {
+      const next = queue.shift();
+      queuedBytes -= next.bytes;
+      if (!writePayload(next.payload)) break;
+    }
+  };
+  const close = () => {
+    if (closed) return;
+    closed = true;
+    clear();
+    socket?.removeListener?.("drain", flush);
+  };
+
+  socket?.on?.("drain", flush);
+  socket?.once?.("close", close);
+  socket?.once?.("error", close);
+
+  return Object.freeze({
+    write(message) {
+      if (closed || !socket || socket.destroyed) return false;
+      let payload;
+      try {
+        payload = `${JSON.stringify(message)}\n`;
+      } catch {
+        return false;
+      }
+      const bytes = Buffer.byteLength(payload, "utf8");
+      if (bytes > maxBytes) return overflow();
+      if (waitingForDrain || queue.length > 0) {
+        if (
+          queue.length + 1 > maxMessages ||
+          nativeBufferedBytes() + queuedBytes + bytes > maxBytes
+        ) {
+          return overflow();
+        }
+        queue.push({ payload, bytes });
+        queuedBytes += bytes;
+        return true;
+      }
+      if (nativeBufferedBytes() + bytes > maxBytes) return overflow();
+      return writePayload(payload);
+    },
+    close,
+    state: () => ({
+      queuedMessages: queue.length,
+      queuedBytes,
+      nativeBufferedBytes: nativeBufferedBytes(),
+      waitingForDrain,
+      overflowed,
+      closed,
+      maxMessages,
+      maxBytes,
+    }),
+  });
 }
 
 /**
@@ -117,7 +235,7 @@ export function startBackgroundSessionServer(opts) {
       /* fine — usually ENOENT */
     }
   }
-  const clients = new Set();
+  const clients = new Map();
   const notifyClients = () => {
     try {
       onClientChange?.(clients.size);
@@ -128,6 +246,8 @@ export function startBackgroundSessionServer(opts) {
 
   const server = net.createServer((socket) => {
     let authed = false;
+    const writer = createBoundedSocketWriter(socket);
+    const send = (message) => writer.write(message);
     const helloTimer = setTimeout(() => {
       if (!authed) socket.destroy();
     }, HELLO_TIMEOUT_MS);
@@ -141,8 +261,8 @@ export function startBackgroundSessionServer(opts) {
             if (message.type === "hello" && message.token === token) {
               authed = true;
               clearTimeout(helloTimer);
-              clients.add(socket);
-              writeMessage(socket, {
+              clients.set(socket, writer);
+              send({
                 type: "hello",
                 ...(getStatus ? getStatus() : { id }),
               });
@@ -156,7 +276,7 @@ export function startBackgroundSessionServer(opts) {
             case "prompt": {
               const text = String(message.text || "").trim();
               if (!text) {
-                writeMessage(socket, {
+                send({
                   type: "error",
                   message: "prompt text is empty",
                 });
@@ -164,12 +284,12 @@ export function startBackgroundSessionServer(opts) {
               }
               try {
                 const result = onPrompt(text);
-                writeMessage(socket, {
+                send({
                   type: "accepted",
                   queued: result?.queued ?? 1,
                 });
               } catch (error) {
-                writeMessage(socket, {
+                send({
                   type: "error",
                   message: error?.message || String(error),
                 });
@@ -177,7 +297,7 @@ export function startBackgroundSessionServer(opts) {
               return;
             }
             case "status": {
-              writeMessage(socket, {
+              send({
                 type: "status",
                 ...(getStatus ? getStatus() : { id }),
               });
@@ -186,9 +306,9 @@ export function startBackgroundSessionServer(opts) {
             case "stop": {
               try {
                 onStop?.();
-                writeMessage(socket, { type: "stopping" });
+                send({ type: "stopping" });
               } catch (error) {
-                writeMessage(socket, {
+                send({
                   type: "error",
                   message: error?.message || String(error),
                 });
@@ -206,7 +326,7 @@ export function startBackgroundSessionServer(opts) {
                   message;
                 const resolvedId = requestId || intId;
                 if (!resolvedId) {
-                  writeMessage(socket, {
+                  send({
                     type: "error",
                     message: "interaction_response requires requestId or intId",
                   });
@@ -219,7 +339,7 @@ export function startBackgroundSessionServer(opts) {
                   answer: answer ?? result,
                   error,
                 });
-                writeMessage(socket, {
+                send({
                   type: "received",
                   requestId: resolvedId,
                   accepted:
@@ -232,7 +352,7 @@ export function startBackgroundSessionServer(opts) {
                       : false,
                 });
               } catch (err) {
-                writeMessage(socket, {
+                send({
                   type: "error",
                   message: err?.message || String(err),
                 });
@@ -240,7 +360,7 @@ export function startBackgroundSessionServer(opts) {
               return;
             }
             default:
-              writeMessage(socket, {
+              send({
                 type: "error",
                 message: `unknown message type: ${message.type}`,
               });
@@ -256,6 +376,7 @@ export function startBackgroundSessionServer(opts) {
 
     const drop = () => {
       clearTimeout(helloTimer);
+      writer.close();
       if (clients.delete(socket)) notifyClients();
     };
     socket.on("close", drop);
@@ -281,11 +402,11 @@ export function startBackgroundSessionServer(opts) {
         pipePath,
         clientCount: () => clients.size,
         broadcast: (message) => {
-          for (const socket of clients) writeMessage(socket, message);
+          for (const writer of clients.values()) writer.write(message);
         },
         broadcastInteractionRequest: (intId, payload, binding = null) => {
-          for (const socket of clients)
-            writeMessage(socket, {
+          for (const writer of clients.values())
+            writer.write({
               type: "interaction_request",
               intId,
               requestId: intId,
@@ -302,7 +423,10 @@ export function startBackgroundSessionServer(opts) {
         },
         close: () =>
           new Promise((done) => {
-            for (const socket of clients) socket.destroy();
+            for (const [socket, writer] of clients) {
+              writer.close();
+              socket.destroy();
+            }
             clients.clear();
             server.close(() => {
               if (process.platform !== "win32") {
@@ -341,6 +465,7 @@ export function connectBackgroundSession(opts) {
   return new Promise((resolve, reject) => {
     let settled = false;
     const socket = net.connect(pipePath);
+    const writer = createBoundedSocketWriter(socket);
     const timer = setTimeout(() => {
       if (!settled) {
         settled = true;
@@ -367,7 +492,7 @@ export function connectBackgroundSession(opts) {
             socket.unref?.();
             resolve({
               hello: message,
-              send: (msg) => writeMessage(socket, msg),
+              send: (msg) => writer.write(msg),
               close: () => {
                 // Best-effort graceful detach, then HARD destroy so the client
                 // handle is released synchronously. `socket.end()` alone leaves
@@ -380,10 +505,11 @@ export function connectBackgroundSession(opts) {
                 // the worker sees the socket close and finalizes the same as it
                 // would on an explicit detach.
                 try {
-                  writeMessage(socket, { type: "detach" });
+                  writer.write({ type: "detach" });
                 } catch {
                   /* peer already gone */
                 }
+                writer.close();
                 socket.destroy();
               },
             });
@@ -398,7 +524,7 @@ export function connectBackgroundSession(opts) {
       }),
     );
     socket.on("connect", () => {
-      writeMessage(socket, { type: "hello", token });
+      writer.write({ type: "hello", token });
     });
     socket.on("error", (error) => {
       if (!settled) {