chainlesschain 0.165.6 → 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;
 }