@bondsmith/bondsmithd 0.1.12 → 0.1.13

package/dist/index.js

@@ -4,7 +4,7 @@
 import { createServer } from "http";
 import { existsSync } from "fs";
 import { hostname as hostname2 } from "os";
-import { dirname as dirname5, join as join11 } from "path";
+import { dirname as dirname5, join as join12 } from "path";
 import { fileURLToPath } from "url";
 
 // ../../packages/local-agent-protocol/src/session.ts
@@ -16,7 +16,15 @@ 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 = 14;
+var PROTOCOL_VERSION = 16;
+
+// ../../packages/local-agent-protocol/src/branch-name.ts
+var MAX_BRANCH_NAME_LENGTH = 250;
+var BRANCH_CHARACTERS = /^[\p{L}\p{N}._/+#@-]+$/u;
+var REJECTED_SHAPES = /^[-/]|\/\/|\.\.|@\{|^@$|[/.]$|(^|\/)\.|\.lock(\/|$)/;
+function isValidBranchName(name) {
+  return name.length > 0 && name.length <= MAX_BRANCH_NAME_LENGTH && BRANCH_CHARACTERS.test(name) && !REJECTED_SHAPES.test(name);
+}
 
 // ../../packages/local-agent-protocol/src/worktree-setup.ts
 var MAX_COPY_GLOBS = 50;
@@ -271,6 +279,7 @@ var browserMessageSchema = z3.discriminatedUnion("type", [
     worktreeBranch: z3.string().min(1).max(250).refine((value) => !value.startsWith("-"), {
       message: "branch name can't start with -"
     }).optional(),
+    baseBranch: z3.string().max(MAX_BRANCH_NAME_LENGTH).refine(isValidBranchName).optional(),
     worktreeSetup: worktreeSetupSchema.optional(),
     requestId: z3.string().min(1).max(200).optional()
   }),
@@ -456,7 +465,8 @@ var daemonMessageSchema = z3.discriminatedUnion("type", [
     expiresAt: z3.number().int().positive(),
     // .catch(undefined): a malformed informational field must never fail the whole handshake message.
     protocolVersion: z3.number().int().positive().optional().catch(void 0),
-    daemonVersion: z3.string().optional().catch(void 0)
+    daemonVersion: z3.string().optional().catch(void 0),
+    installedAgents: z3.array(z3.string().max(40)).max(20).optional().catch(void 0)
   }),
   z3.object({
     type: z3.literal("connection.authenticated"),
@@ -1542,12 +1552,28 @@ async function commitExists(cwd, sha) {
     return false;
   }
 }
+async function isAncestor(cwd, ancestor, descendant) {
+  try {
+    await runGit(["merge-base", "--is-ancestor", ancestor, descendant], cwd);
+    return true;
+  } catch (error2) {
+    if (error2.code === 1) return false;
+    throw error2;
+  }
+}
 async function resolveBaseFor(cwd, baseline) {
   if (!baseline) return resolveComparisonBase(cwd);
   if (baseline.baseSha !== null && !await commitExists(cwd, baseline.baseSha)) {
     return resolveComparisonBase(cwd);
   }
-  return { sha: baseline.baseSha ?? EMPTY_TREE_SHA, ref: SESSION_START_REF };
+  const start2 = {
+    sha: baseline.baseSha ?? EMPTY_TREE_SHA,
+    ref: SESSION_START_REF
+  };
+  if (baseline.baseSha === null) return start2;
+  const meeting = await resolveComparisonBase(cwd);
+  if (meeting.ref === null || await isAncestor(cwd, meeting.sha, baseline.baseSha)) return start2;
+  return meeting;
 }
 async function dropPreexisting(cwd, entries, baseline) {
   if (baseline.preexisting.size === 0) return entries;
@@ -2183,8 +2209,27 @@ var ConnectionAuthState = class {
   }
 };
 
+// src/sessions/agents/installed-agents.ts
+import { accessSync, constants as constants3, statSync } from "fs";
+import { delimiter, join as join6 } from "path";
+var KNOWN_AGENTS = ["claude", "codex", "opencode"];
+function isExecutableFile(path) {
+  try {
+    accessSync(path, constants3.X_OK);
+    return statSync(path).isFile();
+  } catch {
+    return false;
+  }
+}
+function listInstalledAgents(env = process.env) {
+  const directories = (env.PATH ?? "").split(delimiter).filter((directory) => directory !== "");
+  return KNOWN_AGENTS.filter(
+    (agent) => directories.some((directory) => isExecutableFile(join6(directory, agent)))
+  );
+}
+
 // src/version.ts
-var DAEMON_VERSION = true ? "0.1.12" : "dev";
+var DAEMON_VERSION = true ? "0.1.13" : "dev";
 var VERSION_FLAGS = ["--version", "-v"];
 function versionLine() {
   return `bondsmithd ${DAEMON_VERSION} (protocol ${PROTOCOL_VERSION})`;
@@ -2555,13 +2600,14 @@ async function dispatch(conn, message, {
       return;
     }
     case "session.create": {
-      const { title, cwd, command, worktreeBranch, worktreeSetup, requestId } = message;
+      const { title, cwd, command, worktreeBranch, baseBranch, worktreeSetup, requestId } = message;
       try {
         const session = await sessionManager.create({
           title,
           cwd,
           command,
           worktreeBranch,
+          baseBranch,
           worktreeSetup
         });
         broadcast({ type: "session.created", session, requestId });
@@ -2997,7 +3043,8 @@ function startRelayClient(deps) {
       hostname: deps.hostname(),
       expiresAt: challenge.expiresAt,
       protocolVersion: PROTOCOL_VERSION,
-      daemonVersion: DAEMON_VERSION
+      daemonVersion: DAEMON_VERSION,
+      installedAgents: listInstalledAgents()
     });
   }
   function handleFrame(frame) {
@@ -3137,9 +3184,9 @@ function startRelayClient(deps) {
 import { generateKeyPairSync, sign as sign2, verify as verify4 } from "crypto";
 import { mkdir as mkdir2, readFile as readFile2, rename as rename2, rm as rm2, writeFile as writeFile2 } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { dirname as dirname2, join as join6 } from "path";
+import { dirname as dirname2, join as join7 } from "path";
 function defaultCredentialsPath() {
-  return join6(homedir4(), ".bondsmith", "credentials");
+  return join7(homedir4(), ".bondsmith", "credentials");
 }
 async function loadOrCreateDaemonIdentity(credentialsPath = defaultCredentialsPath()) {
   const existing = await tryReadIdentity(credentialsPath);
@@ -3208,9 +3255,9 @@ function createDaemonProofSigner(privateKeyPem) {
 import { randomBytes as randomBytes2 } from "crypto";
 import { mkdir as mkdir3, readFile as readFile3, rename as rename3, rm as rm3, writeFile as writeFile3 } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { dirname as dirname3, join as join7 } from "path";
+import { dirname as dirname3, join as join8 } from "path";
 function defaultDevTunnelTokenPath() {
-  return join7(homedir5(), ".bondsmith", "dev-tunnel-token");
+  return join8(homedir5(), ".bondsmith", "dev-tunnel-token");
 }
 async function loadOrCreateDevTunnelToken(tokenPath = defaultDevTunnelTokenPath()) {
   const existing = await tryReadToken(tokenPath);
@@ -3834,11 +3881,11 @@ function stderrOf(error2) {
   const stderr = error2.stderr;
   return typeof stderr === "string" ? stderr : "";
 }
-async function createWorktree(sourceCwd, worktreePath, branch) {
+async function createWorktree(sourceCwd, worktreePath, branch, startPoint) {
+  const args = ["worktree", "add", "--no-track", "-b", branch, worktreePath];
+  if (startPoint) args.push(startPoint);
   try {
-    await execFile3("git", [...SAFE_GIT_CONFIG, "worktree", "add", "-b", branch, worktreePath], {
-      cwd: sourceCwd
-    });
+    await execFile3("git", [...SAFE_GIT_CONFIG, ...args], { cwd: sourceCwd });
   } catch (error2) {
     const stderr = stderrOf(error2);
     if (stderr.includes("a branch named")) {
@@ -3955,14 +4002,14 @@ function resolveSessionAttention(report, lastActivityAt, { nowMs, acknowledgedAt
 // src/sessions/tmux/create.ts
 import { access } from "fs/promises";
 import { homedir as homedir7 } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 
 // src/sessions/agents/claude-hooks.ts
 import { execFile as execFile4 } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
 import { mkdir as mkdir4, rename as rename4, rm as rm4, writeFile as writeFile4 } from "fs/promises";
 import { homedir as homedir6 } from "os";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 import { promisify as promisify4 } from "util";
 
 // src/sessions/session-env.ts
@@ -4044,7 +4091,7 @@ function claudeSettings() {
 
 // src/sessions/agents/claude-hooks.ts
 var execFileAsync = promisify4(execFile4);
-var CLAUDE_HOOKS_DIR = join8(homedir6(), ".bondsmith", "hooks");
+var CLAUDE_HOOKS_DIR = join9(homedir6(), ".bondsmith", "hooks");
 var AGENT_HOOKS_ENV_VAR = "BONDSMITH_AGENT_HOOKS";
 var HOOKS_OFF_VALUES = /^(off|0|false|no)$/i;
 var CLAUDE_BINARY = "claude";
@@ -4096,7 +4143,7 @@ async function prepareAgentCommand(command, {
   if (HOOKS_OFF_VALUES.test(env[AGENT_HOOKS_ENV_VAR] ?? "")) return command;
   if (!isPlainClaudeCommand(command)) return command;
   if (!await supportsSettings()) return command;
-  const file = join8(hooksDir, "claude-settings.json");
+  const file = join9(hooksDir, "claude-settings.json");
   const staging = `${file}.${randomUUID2()}.tmp`;
   try {
     await mkdir4(hooksDir, { recursive: true });
@@ -4116,10 +4163,33 @@ async function prepareAgentCommand(command, {
   );
 }
 
+// src/sessions/git/start-point.ts
+var WorktreeBaseBranchNotFoundError = class extends Error {
+  constructor(branch) {
+    super(`base branch "${branch}" was not found (looked for origin/${branch} and ${branch})`);
+    this.name = "WorktreeBaseBranchNotFoundError";
+  }
+};
+async function commitExists2(ref, cwd) {
+  try {
+    await runGit(["rev-parse", "--verify", "--quiet", `${ref}^{commit}`], cwd);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveWorktreeStartPoint(sourceCwd, baseBranch) {
+  if (baseBranch === void 0) return await findDefaultBranchRef(sourceCwd) ?? void 0;
+  for (const candidate of [`origin/${baseBranch}`, baseBranch]) {
+    if (await commitExists2(candidate, sourceCwd)) return candidate;
+  }
+  throw new WorktreeBaseBranchNotFoundError(baseBranch);
+}
+
 // src/sessions/worktree-setup/copy-files.ts
-import { constants as constants3 } from "fs";
+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 join9, relative, sep as sep2 } from "path";
+import { dirname as dirname4, isAbsolute as isAbsolute3, join as join10, relative, sep as sep2 } from "path";
 function isInside(root, path) {
   const rel = relative(root, path);
   return rel !== ".." && !rel.startsWith(`..${sep2}`) && !isAbsolute3(rel);
@@ -4147,14 +4217,14 @@ async function copyFilesIntoWorktree(sourceRoot, worktreeRoot, globs) {
   return result;
 }
 async function copyOne(source, worktree, match) {
-  const from = join9(source, match);
+  const from = join10(source, match);
   if (!(await lstat3(from)).isFile()) return false;
   if (!isInside(source, await realpath2(from))) return false;
-  const to = join9(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, constants3.COPYFILE_EXCL);
+    await copyFile(from, to, constants4.COPYFILE_EXCL);
   } catch (error2) {
     if (error2.code === "EEXIST") return false;
     throw error2;
@@ -4170,7 +4240,7 @@ var InvalidCwdError = class extends Error {
   }
 };
 function worktreePathFor(sessionId) {
-  return join10(homedir7(), ".bondsmith", "worktrees", sessionId);
+  return join11(homedir7(), ".bondsmith", "worktrees", sessionId);
 }
 async function createTmuxSession(input) {
   const sourceCwd = expandHome(input.cwd);
@@ -4179,7 +4249,8 @@ async function createTmuxSession(input) {
   let setupFailed = false;
   if (input.worktreeBranch) {
     const worktreePath = worktreePathFor(input.id);
-    await createWorktree(sourceCwd, worktreePath, input.worktreeBranch);
+    const startPoint = await resolveWorktreeStartPoint(sourceCwd, input.baseBranch);
+    await createWorktree(sourceCwd, worktreePath, input.worktreeBranch, startPoint);
     cwd = worktreePath;
     worktreeOf = sourceCwd;
     if (input.worktreeSetup?.copyGlobs.length) {
@@ -4580,7 +4651,8 @@ function createDaemonWebSocketServer(httpServer, config, daemonFingerprint, pend
       hostname: hostname(),
       expiresAt: challenge.expiresAt,
       protocolVersion: PROTOCOL_VERSION,
-      daemonVersion: DAEMON_VERSION
+      daemonVersion: DAEMON_VERSION,
+      installedAgents: listInstalledAgents()
     });
     const unauthenticatedTimer = setTimeout(() => {
       if (!connectionAuth.isAuthenticated()) socket.close();
@@ -4645,10 +4717,10 @@ if (isVersionRequest(process.argv.slice(2))) {
   process.exit(0);
 }
 function loadRepoRootEnv() {
-  const repoRoot = join11(dirname5(fileURLToPath(import.meta.url)), "..", "..", "..");
-  if (!existsSync(join11(repoRoot, "pnpm-workspace.yaml"))) return;
-  const envLocal = join11(repoRoot, ".env.local");
-  const envDefault = join11(repoRoot, ".env");
+  const repoRoot = join12(dirname5(fileURLToPath(import.meta.url)), "..", "..", "..");
+  if (!existsSync(join12(repoRoot, "pnpm-workspace.yaml"))) return;
+  const envLocal = join12(repoRoot, ".env.local");
+  const envDefault = join12(repoRoot, ".env");
   loadEnv({ path: existsSync(envLocal) ? envLocal : envDefault });
 }
 loadRepoRootEnv();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bondsmith/bondsmithd",
-	"version": "0.1.12",
+	"version": "0.1.13",
 	"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",