@bondsmith/bondsmithd 0.1.13 → 0.1.14

package/dist/index.js

@@ -10,13 +10,14 @@ import { fileURLToPath } from "url";
 // ../../packages/local-agent-protocol/src/session.ts
 var SESSION_STATUSES = ["running", "exited"];
 var AGENT_STATES = ["working", "waiting", "done"];
+var MAX_SKIPPED_FILES_REPORTED = 20;
 
 // ../../packages/local-agent-protocol/src/messages.ts
 var REPLAYED_COMMAND_MESSAGE = "command already used (replay rejected)";
 var INVALID_MESSAGE_ERROR = "invalid message";
 
 // ../../packages/local-agent-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 16;
+var PROTOCOL_VERSION = 17;
 
 // ../../packages/local-agent-protocol/src/branch-name.ts
 var MAX_BRANCH_NAME_LENGTH = 250;
@@ -204,6 +205,7 @@ var localSessionSchema = z3.object({
   // .catch(undefined): a state this version doesn't know must never drop the whole session message.
   agentState: z3.enum(AGENT_STATES).nullable().optional().catch(void 0),
   worktreeSetupFailed: z3.boolean().optional().catch(void 0),
+  worktreeSetupSkipped: z3.array(z3.string().max(300)).max(MAX_SKIPPED_FILES_REPORTED).optional().catch(void 0),
   headline: z3.string().nullable().optional().catch(void 0)
 });
 var workspaceFileEntrySchema = z3.object({
@@ -1184,7 +1186,7 @@ function expandHome(cwd) {
 }
 
 // src/sessions/git/client.ts
-import { execFile as execFileCb } from "child_process";
+import { execFile as execFileCb, spawn as spawn2 } from "child_process";
 import { promisify } from "util";
 var execFile = promisify(execFileCb);
 var MAX_GIT_OUTPUT_BYTES = 64 * 1024 * 1024;
@@ -1239,6 +1241,43 @@ function runGitDiff(args, cwd) {
 function runGitDiffAllowingExitCodes(args, cwd, allowedExitCodes) {
   return runGitAllowingExitCodes(["diff", ...SAFE_DIFF_FLAGS, ...args], cwd, allowedExitCodes);
 }
+var GIT_INPUT_TIMEOUT_MS = 3e4;
+async function runGitWithInput(args, cwd, input, options = {}) {
+  const { allowedExitCodes = [], timeoutMs = GIT_INPUT_TIMEOUT_MS } = options;
+  return new Promise((resolve2, reject) => {
+    const child = spawn2("git", [...SAFE_GIT_CONFIG, ...args], { cwd });
+    const stdout = [];
+    const stderr = [];
+    let settled = false;
+    const settle = (finish) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      finish();
+    };
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      settle(() => reject(new Error(`git ${args[0]} timed out after ${timeoutMs} ms`)));
+    }, timeoutMs);
+    child.stdout.on("data", (chunk) => stdout.push(chunk));
+    child.stderr.on("data", (chunk) => stderr.push(chunk));
+    child.stdin.on("error", () => {
+    });
+    child.on("error", (error2) => settle(() => reject(error2)));
+    child.on(
+      "close",
+      (code) => settle(() => {
+        if (code === 0 || code !== null && allowedExitCodes.includes(code)) {
+          resolve2(Buffer.concat(stdout).toString("utf8"));
+          return;
+        }
+        const message = Buffer.concat(stderr).toString("utf8").trim();
+        reject(new Error(`git ${args[0]} exited with ${code}${message ? `: ${message}` : ""}`));
+      })
+    );
+    child.stdin.end(input);
+  });
+}
 
 // src/sessions/files/plan-file.ts
 import { constants as constants2 } from "fs";
@@ -2229,7 +2268,7 @@ function listInstalledAgents(env = process.env) {
 }
 
 // src/version.ts
-var DAEMON_VERSION = true ? "0.1.13" : "dev";
+var DAEMON_VERSION = true ? "0.1.14" : "dev";
 var VERSION_FLAGS = ["--version", "-v"];
 function versionLine() {
   return `bondsmithd ${DAEMON_VERSION} (protocol ${PROTOCOL_VERSION})`;
@@ -3934,11 +3973,25 @@ function wrapCommandWithSetup(input) {
   ].join(" ");
 }
 
+// src/sessions/worktree-setup/skipped-files.ts
+var SETUP_SKIPPED_OPTION = "@bondsmith-setup-skipped";
+function encodeSkippedFiles(names) {
+  return names.slice(0, MAX_SKIPPED_FILES_REPORTED).map(encodeURIComponent).join(",");
+}
+function decodeSkippedFiles(raw) {
+  if (raw === "") return [];
+  try {
+    return raw.split(",").map(decodeURIComponent);
+  } catch {
+    return [];
+  }
+}
+
 // src/sessions/tmux/agent-state.ts
 var AGENT_STATE_OPTION = "@bondsmith-agent-state";
 var HEADLINE_OPTION = "@bondsmith-headline";
 var MAX_HEADLINE_CHARS = 200;
-var LIVE_SESSION_REPORTS_FORMAT = `#{session_name}	#{${AGENT_STATE_OPTION}}	#{window_bell_flag}	#{${SETUP_FAILED_OPTION}}	#{${HEADLINE_OPTION}}`;
+var LIVE_SESSION_REPORTS_FORMAT = `#{session_name}	#{${AGENT_STATE_OPTION}}	#{window_bell_flag}	#{${SETUP_FAILED_OPTION}}	#{${SETUP_SKIPPED_OPTION}}	#{${HEADLINE_OPTION}}`;
 var AGENT_STATE_OUTPUT_GRACE_MS = 2e3;
 var FUTURE_REPORT_ALLOWANCE_MS = 2e3;
 var WORKING_SILENCE_MS = 12e4;
@@ -3956,12 +4009,20 @@ function isAgentState(value) {
 function parseLiveSessionReports(output) {
   const reports = /* @__PURE__ */ new Map();
   for (const line of output.split("\n")) {
-    const [sessionName, agentState = "", bell = "", setupFailed = "", ...headline] = line.split("	");
+    const [
+      sessionName,
+      agentState = "",
+      bell = "",
+      setupFailed = "",
+      setupSkipped = "",
+      ...headline
+    ] = line.split("	");
     if (sessionName) {
       reports.set(sessionName, {
         agentState,
         bell: bell === "1",
         setupFailed: setupFailed === "1",
+        setupSkipped: decodeSkippedFiles(setupSkipped),
         headline: cleanHeadline(headline.join(" "))
       });
     }
@@ -4190,19 +4251,74 @@ async function resolveWorktreeStartPoint(sourceCwd, baseBranch) {
 import { constants as constants4 } from "fs";
 import { copyFile, glob, lstat as lstat3, mkdir as mkdir5, realpath as realpath2 } from "fs/promises";
 import { dirname as dirname4, isAbsolute as isAbsolute3, join as join10, relative, sep as sep2 } from "path";
+var GIT_EXIT_NONE_IGNORED = 1;
+var TRACKED_CHECK_BATCH = 200;
 function isInside(root, path) {
   const rel = relative(root, path);
   return rel !== ".." && !rel.startsWith(`..${sep2}`) && !isAbsolute3(rel);
 }
+async function ignoredPaths(worktree, paths) {
+  if (paths.length === 0) return /* @__PURE__ */ new Set();
+  const output = await runGitWithInput(
+    ["check-ignore", "--stdin", "-z"],
+    worktree,
+    paths.map((path) => `${path}\0`).join(""),
+    { allowedExitCodes: [GIT_EXIT_NONE_IGNORED] }
+  );
+  return new Set(output.split("\0").filter((path) => path !== ""));
+}
+async function trackedPaths(worktree, paths) {
+  const tracked = /* @__PURE__ */ new Set();
+  for (let start2 = 0; start2 < paths.length; start2 += TRACKED_CHECK_BATCH) {
+    const output = await runGit(
+      [
+        "--literal-pathspecs",
+        "ls-files",
+        "-z",
+        "--",
+        ...paths.slice(start2, start2 + TRACKED_CHECK_BATCH)
+      ],
+      worktree
+    );
+    for (const path of output.split("\0")) if (path !== "") tracked.add(path);
+  }
+  return tracked;
+}
 async function copyFilesIntoWorktree(sourceRoot, worktreeRoot, globs) {
-  const result = { copied: [], failed: 0 };
+  const result = { copied: [], failed: 0, skipped: [] };
   const patterns = globs.filter(isSafeCopyGlob);
   if (patterns.length === 0) return result;
   try {
     const source = await realpath2(sourceRoot);
     const worktree = await realpath2(worktreeRoot);
+    const candidates = [];
     for await (const match of glob(patterns, { cwd: source })) {
       if (match.split(sep2).includes(".git")) continue;
+      try {
+        if (await isCopyCandidate(source, worktree, match)) candidates.push(match);
+      } catch (error2) {
+        result.failed += 1;
+        console.error("Failed to inspect a file to copy into the worktree", { match, error: error2 });
+      }
+    }
+    let tracked;
+    let ignored;
+    try {
+      tracked = await trackedPaths(worktree, candidates);
+      ignored = await ignoredPaths(worktree, candidates);
+    } catch (error2) {
+      result.failed += candidates.length;
+      console.error("Could not ask git what the worktree tracks and ignores; copying nothing", {
+        error: error2
+      });
+      return result;
+    }
+    for (const match of candidates) {
+      if (tracked.has(match)) continue;
+      if (!ignored.has(match)) {
+        result.skipped.push(match);
+        continue;
+      }
       try {
         if (await copyOne(source, worktree, match)) result.copied.push(match);
       } catch (error2) {
@@ -4216,15 +4332,24 @@ async function copyFilesIntoWorktree(sourceRoot, worktreeRoot, globs) {
   }
   return result;
 }
-async function copyOne(source, worktree, match) {
+async function isCopyCandidate(source, worktree, match) {
   const from = join10(source, match);
   if (!(await lstat3(from)).isFile()) return false;
   if (!isInside(source, await realpath2(from))) return false;
+  try {
+    await lstat3(join10(worktree, match));
+    return false;
+  } catch (error2) {
+    if (error2.code === "ENOENT") return true;
+    throw error2;
+  }
+}
+async function copyOne(source, worktree, match) {
   const to = join10(worktree, match);
   await mkdir5(dirname4(to), { recursive: true });
   if (!isInside(worktree, await realpath2(dirname4(to)))) return false;
   try {
-    await copyFile(from, to, constants4.COPYFILE_EXCL);
+    await copyFile(join10(source, match), to, constants4.COPYFILE_EXCL);
   } catch (error2) {
     if (error2.code === "EEXIST") return false;
     throw error2;
@@ -4247,6 +4372,7 @@ async function createTmuxSession(input) {
   let cwd = sourceCwd;
   let worktreeOf = null;
   let setupFailed = false;
+  let skippedFiles = [];
   if (input.worktreeBranch) {
     const worktreePath = worktreePathFor(input.id);
     const startPoint = await resolveWorktreeStartPoint(sourceCwd, input.baseBranch);
@@ -4260,6 +4386,7 @@ async function createTmuxSession(input) {
         input.worktreeSetup.copyGlobs
       );
       setupFailed = copy.failed > 0;
+      skippedFiles = copy.skipped;
     }
   }
   try {
@@ -4297,6 +4424,15 @@ async function createTmuxSession(input) {
     await runTmux(["set-option", "-t", tmuxSessionName, "@bondsmith-worktree-of", worktreeOf]);
   }
   if (setupFailed) await runTmux(["set-option", "-t", tmuxSessionName, SETUP_FAILED_OPTION, "1"]);
+  if (skippedFiles.length > 0) {
+    await runTmux([
+      "set-option",
+      "-t",
+      tmuxSessionName,
+      SETUP_SKIPPED_OPTION,
+      encodeSkippedFiles(skippedFiles)
+    ]);
+  }
   if (baseline) {
     await runTmux([
       "set-option",
@@ -4319,7 +4455,10 @@ async function createTmuxSession(input) {
     lastActivityAt: null,
     changedFileCount: null,
     worktreeOf,
-    ...setupFailed && { worktreeSetupFailed: true }
+    ...setupFailed && { worktreeSetupFailed: true },
+    ...skippedFiles.length > 0 && {
+      worktreeSetupSkipped: skippedFiles.slice(0, MAX_SKIPPED_FILES_REPORTED)
+    }
   };
   return { session: await enrichSessionWithGitMetadata(session, baseline), baseline };
 }
@@ -4515,17 +4654,15 @@ ${error2.message}
             session,
             this.baselines.get(session.id)
           );
+          const report = agentReports.get(session.tmuxSessionName);
           const updated = {
             ...enriched,
-            agentState: resolveSessionAttention(
-              agentReports.get(session.tmuxSessionName),
-              enriched.lastActivityAt,
-              { acknowledgedAtMs: this.acknowledgements.get(session.id) ?? null }
-            ),
-            headline: agentReports.get(session.tmuxSessionName)?.headline ?? null,
-            ...agentReports.get(session.tmuxSessionName)?.setupFailed && {
-              worktreeSetupFailed: true
-            }
+            agentState: resolveSessionAttention(report, enriched.lastActivityAt, {
+              acknowledgedAtMs: this.acknowledgements.get(session.id) ?? null
+            }),
+            headline: report?.headline ?? null,
+            ...report?.setupFailed && { worktreeSetupFailed: true },
+            ...report?.setupSkipped?.length && { worktreeSetupSkipped: report.setupSkipped }
           };
           if (!snapshotEquals(session, updated)) {
             this.sessions.set(session.id, updated);
@@ -4550,7 +4687,7 @@ ${error2.message}
   }
 };
 function snapshotEquals(a, b) {
-  return a.branch === b.branch && a.repositoryFullName === b.repositoryFullName && a.changedFileCount === b.changedFileCount && a.lastActivityAt === b.lastActivityAt && (a.agentState ?? null) === (b.agentState ?? null) && (a.headline ?? null) === (b.headline ?? null) && (a.worktreeSetupFailed ?? false) === (b.worktreeSetupFailed ?? false);
+  return a.branch === b.branch && a.repositoryFullName === b.repositoryFullName && a.changedFileCount === b.changedFileCount && a.lastActivityAt === b.lastActivityAt && (a.agentState ?? null) === (b.agentState ?? null) && (a.headline ?? null) === (b.headline ?? null) && (a.worktreeSetupFailed ?? false) === (b.worktreeSetupFailed ?? false) && JSON.stringify(a.worktreeSetupSkipped ?? []) === JSON.stringify(b.worktreeSetupSkipped ?? []);
 }
 
 // src/ws/server.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bondsmith/bondsmithd",
-	"version": "0.1.13",
+	"version": "0.1.14",
 	"private": false,
 	"description": "Local daemon for Bondsmith agent sessions — runs on the user's own machine, pairs with a Bondsmith account, and exposes tmux-backed terminal sessions to the Bondsmith web app over a signed WebSocket protocol.",
 	"homepage": "https://bondsmith.dev",