@staff0rd/assist 0.362.1 → 0.364.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.362.1",
+  version: "0.364.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -254,7 +254,8 @@ var assistConfigSchema = z2.strictObject({
     tokenExpiresAt: z2.number().optional()
   }).optional(),
   prs: z2.strictObject({
-    slack: z2.string()
+    slack: z2.string().optional(),
+    required: z2.boolean().default(false)
   }).optional(),
   run: z2.array(z2.union([runConfigSchema, runLinkSchema])).optional(),
   subtasks: z2.array(
@@ -3120,7 +3121,7 @@ ${failed2.length} script(s) failed:`);
   }
 }
 function runEntry(entry) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const startTime = Date.now();
     const child = spawnCommand(
       entry.fullCommand,
@@ -3132,7 +3133,7 @@ function runEntry(entry) {
     child.on("close", (code) => {
       const exitCode = code ?? 1;
       flushIfFailed(exitCode, chunks);
-      resolve17({
+      resolve18({
         script: entry.name,
         code: exitCode,
         durationMs: Date.now() - startTime
@@ -4266,8 +4267,8 @@ function spawnClaude(prompt, options2 = {}) {
     stdio: "inherit",
     env
   });
-  const done2 = new Promise((resolve17, reject) => {
-    child.on("close", (code) => resolve17(code ?? 0));
+  const done2 = new Promise((resolve18, reject) => {
+    child.on("close", (code) => resolve18(code ?? 0));
     child.on("error", reject);
   });
   return { child, done: done2 };
@@ -4329,6 +4330,89 @@ function consumePause(itemId) {
   return true;
 }
 
+// src/commands/branch/createBranch.ts
+import { execSync as execSync21 } from "child_process";
+
+// src/commands/branch/buildBranchName.ts
+function buildBranchName({
+  prefix: prefix2,
+  jira,
+  slug
+}) {
+  const segments = [];
+  if (prefix2) segments.push(`${prefix2}/`);
+  if (jira) segments.push(`${jira}-`);
+  segments.push(slug);
+  return segments.join("");
+}
+
+// src/commands/branch/resolveDefaultBranch.ts
+import { execSync as execSync20 } from "child_process";
+var REMOTE_HEAD_REGEX = /^ref:\s+refs\/heads\/(\S+)\s+HEAD$/m;
+function resolveDefaultBranch(override, cwd) {
+  if (override) return override;
+  try {
+    const output = execSync20("git ls-remote --symref origin HEAD", {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd
+    });
+    const match = output.match(REMOTE_HEAD_REGEX);
+    if (match) return match[1];
+  } catch {
+  }
+  return "main";
+}
+
+// src/commands/branch/createBranch.ts
+async function createBranch({
+  slug,
+  jira
+}) {
+  const config = loadConfig();
+  const branchName = buildBranchName({
+    prefix: config.branch?.prefix,
+    jira,
+    slug
+  });
+  const defaultBranch = resolveDefaultBranch(config.branch?.defaultBranch);
+  execSync21("git fetch", { stdio: "inherit" });
+  execSync21(
+    `git switch -c ${shellQuote(branchName)} ${shellQuote(`origin/${defaultBranch}`)}`,
+    { stdio: "inherit" }
+  );
+  await recordBranchActivity(branchName);
+  return { branchName, defaultBranch };
+}
+async function recordBranchActivity(branchName) {
+  if (resolveSessionItemId() === null) return;
+  await recordSessionRefs([
+    { kind: "branch", ref: branchName, url: gitRefUrl("branch", branchName) }
+  ]);
+}
+
+// src/commands/branch/deriveBranchSlug.ts
+function deriveBranchSlug(name) {
+  const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return slug || "story";
+}
+
+// src/commands/backlog/ensureStoryBranch.ts
+async function ensureStoryBranch(item) {
+  const config = loadConfig();
+  if (!config.prs?.required) return;
+  if (hasBranchRef(item)) return;
+  process.env.ASSIST_BACKLOG_ITEM_ID = String(item.id);
+  const slug = deriveBranchSlug(item.name);
+  const { branchName } = await createBranch({ slug, jira: item.jiraKey });
+  appendDaemonLog(
+    `backlog run ${item.id}: prs.required set and no branch recorded; created ${branchName}`
+  );
+}
+function hasBranchRef(item) {
+  return (item.gitRefs ?? []).some((ref) => ref.kind === "branch");
+}
+
 // src/commands/backlog/shared.ts
 import chalk37 from "chalk";
 
@@ -4354,11 +4438,11 @@ function backupLocalBacklogFiles(dir) {
 }
 
 // src/commands/backlog/gitPullBacklog.ts
-import { execSync as execSync20 } from "child_process";
+import { execSync as execSync22 } from "child_process";
 import chalk35 from "chalk";
 function gitPullBacklog(dir) {
   try {
-    execSync20("git pull --ff-only", {
+    execSync22("git pull --ff-only", {
       cwd: dir,
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -4925,6 +5009,7 @@ async function searchItemIds(orm, query, origin) {
         ilike(items.name, pattern2),
         ilike(items.description, pattern2),
         ilike(items.acceptanceCriteria, pattern2),
+        ilike(items.jiraKey, pattern2),
         ilike(comments.text, pattern2),
         ilike(planPhases.name, pattern2)
       )
@@ -5082,9 +5167,9 @@ Failed to launch Claude for ${context}: ${message}`)
 // src/commands/sessions/daemon/connectToDaemon.ts
 import * as net from "net";
 function connectToDaemon() {
-  return new Promise((resolve17, reject) => {
+  return new Promise((resolve18, reject) => {
     const socket = net.connect(daemonPaths.socket);
-    socket.once("connect", () => resolve17(socket));
+    socket.once("connect", () => resolve18(socket));
     socket.once("error", reject);
   });
 }
@@ -5531,6 +5616,7 @@ async function runOnce(item, startPhase, plan2, spawnOptions) {
 async function run2(id2, spawnOptions) {
   const prepared = await prepareRun(id2);
   if (!prepared) return false;
+  await ensureStoryBranch(prepared.item);
   await setStatus(id2, "in-progress");
   discardStalePause(prepared.item.id);
   logProgress(id2, prepared);
@@ -5925,7 +6011,7 @@ import chalk59 from "chalk";
 import { WebSocketServer } from "ws";
 
 // src/shared/getInstallDir.ts
-import { execSync as execSync21 } from "child_process";
+import { execSync as execSync23 } from "child_process";
 import { dirname as dirname16, resolve as resolve7 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var __filename2 = fileURLToPath2(import.meta.url);
@@ -5935,7 +6021,7 @@ function getInstallDir() {
 }
 function isGitRepo(dir) {
   try {
-    const result = execSync21("git rev-parse --show-toplevel", {
+    const result = execSync23("git rev-parse --show-toplevel", {
       cwd: dir,
       stdio: "pipe"
     }).toString().trim();
@@ -5952,11 +6038,11 @@ import {
 import chalk54 from "chalk";
 
 // src/lib/openBrowser.ts
-import { execSync as execSync22 } from "child_process";
+import { execSync as execSync24 } from "child_process";
 function tryExec(commands) {
   for (const cmd of commands) {
     try {
-      execSync22(cmd, { stdio: "ignore" });
+      execSync24(cmd, { stdio: "ignore" });
       return true;
     } catch {
     }
@@ -6144,7 +6230,7 @@ function spawnDaemon(reason) {
   child.unref();
 }
 function delay(ms) {
-  return new Promise((resolve17) => setTimeout(resolve17, ms));
+  return new Promise((resolve18) => setTimeout(resolve18, ms));
 }
 
 // src/shared/createBundleHandler.ts
@@ -6354,12 +6440,12 @@ async function loadVisibleItems(req) {
 
 // src/commands/backlog/web/parseStatusBody.ts
 function readBody(req) {
-  return new Promise((resolve17, reject) => {
+  return new Promise((resolve18, reject) => {
     let body = "";
     req.on("data", (chunk) => {
       body += chunk.toString();
     });
-    req.on("end", () => resolve17(body));
+    req.on("end", () => resolve18(body));
     req.on("error", reject);
   });
 }
@@ -7106,17 +7192,17 @@ async function stopDaemon() {
   }
 }
 function closedBeforeTimeout(socket) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const timer = setTimeout(() => {
       socket.destroy();
-      resolve17(false);
+      resolve18(false);
     }, STOP_TIMEOUT_MS);
     socket.resume();
     socket.on("error", () => {
     });
     socket.once("close", () => {
       clearTimeout(timer);
-      resolve17(true);
+      resolve18(true);
     });
   });
 }
@@ -7167,8 +7253,8 @@ async function restartWeb(req, res, deps2 = {}) {
     respondJson(res, 400, { error: "Invalid target" });
     return;
   }
-  await new Promise((resolve17) => {
-    res.once("finish", resolve17);
+  await new Promise((resolve18) => {
+    res.once("finish", resolve18);
     respondJson(res, 200, { ok: true });
   });
   if (target === "daemon" || target === "both") {
@@ -7617,12 +7703,12 @@ import chalk61 from "chalk";
 import { eq as eq17 } from "drizzle-orm";
 
 // src/commands/jira/fetchIssue.ts
-import { execSync as execSync23 } from "child_process";
+import { execSync as execSync25 } from "child_process";
 import chalk60 from "chalk";
 function fetchIssue(issueKey, fields) {
   let result;
   try {
-    result = execSync23(
+    result = execSync25(
       `acli jira workitem view ${issueKey} -f ${fields} --json`,
       { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }
     );
@@ -8224,7 +8310,10 @@ function registerItemCommands(cmd) {
     "--status <type>",
     "Filter by status (todo, in-progress, done, wontdo)"
   ).option("-a, --all", "Include done/wontdo items").option("--all-repos", "List items across all repositories").option("-v, --verbose", "Show all item details").action(list2);
-  cmd.command("add").description("Add a new backlog item").option("--name <name>", "Item name").option("--type <type>", "Item type (story or bug)").option("--desc <description>", "Item description").option("--ac <criterion...>", "Acceptance criteria (repeatable)").action(add);
+  cmd.command("add").description("Add a new backlog item").option("--name <name>", "Item name").option("--type <type>", "Item type (story or bug)").option(
+    "--desc <description>",
+    String.raw`Item description (Markdown supported; use \n for line breaks)`
+  ).option("--ac <criterion...>", "Acceptance criteria (repeatable)").action(add);
   cmd.command("add-phase <id> <name>").description("Add a phase to an existing backlog item").option("--task <task...>", "Task description (repeatable)").option(
     "--manual-check <check...>",
     "Manual check description (repeatable)"
@@ -8847,7 +8936,8 @@ async function addSubtask(id2, options2) {
     return;
   }
   const { orm, item } = found;
-  await insertSubtask(orm, item.id, title, options2.desc);
+  const description = options2.desc?.replaceAll(String.raw`\n`, "\n");
+  await insertSubtask(orm, item.id, title, description);
   console.log(chalk91.green(`Added sub-task to item #${id2}: ${title}`));
 }
 
@@ -8896,7 +8986,10 @@ async function subtaskStatus(id2, index3, status2) {
 
 // src/commands/backlog/registerSubtaskCommands.ts
 function registerSubtaskCommands(cmd) {
-  cmd.command("add-subtask <id>").description("Add a sub-task to an existing backlog item").requiredOption("--title <title>", "Sub-task title").option("--desc <description>", "Sub-task description").action(addSubtask);
+  cmd.command("add-subtask <id>").description("Add a sub-task to an existing backlog item").requiredOption("--title <title>", "Sub-task title").option(
+    "--desc <description>",
+    String.raw`Sub-task description (Markdown supported; use \n for line breaks)`
+  ).action(addSubtask);
   cmd.command("subtask-status <id> <idx> <status>").description(
     "Set a sub-task's status (todo, in-progress, done) by its 1-based index"
   ).action(subtaskStatus);
@@ -9271,7 +9364,7 @@ function buildUpdateValues(options2) {
     fieldNames.push("name");
   }
   if (desc6) {
-    set.description = desc6;
+    set.description = desc6.replaceAll(String.raw`\n`, "\n");
     fieldNames.push("description");
   }
   if (type) {
@@ -9319,7 +9412,10 @@ function collect2(value, previous) {
   return [...previous, value];
 }
 function registerUpdateCommands(cmd) {
-  cmd.command("update-field <id>").description("Update fields on a backlog item").option("--name <name>", "New item name").option("--desc <description>", "New description").option("--type <type>", "New type (story or bug)").option("--ac <criterion...>", "Replace acceptance criteria (repeatable)").option(
+  cmd.command("update-field <id>").description("Update fields on a backlog item").option("--name <name>", "New item name").option(
+    "--desc <description>",
+    String.raw`New description (Markdown supported; use \n for line breaks)`
+  ).option("--type <type>", "New type (story or bug)").option("--ac <criterion...>", "Replace acceptance criteria (repeatable)").option(
     "--add-ac <text>",
     "Append one acceptance criterion (repeatable)",
     collect2,
@@ -9371,40 +9467,6 @@ function registerBacklog(program2) {
   }
 }
 
-// src/commands/branch/branch.ts
-import { execSync as execSync25 } from "child_process";
-
-// src/commands/branch/buildBranchName.ts
-function buildBranchName({
-  prefix: prefix2,
-  jira,
-  slug
-}) {
-  const segments = [];
-  if (prefix2) segments.push(`${prefix2}/`);
-  if (jira) segments.push(`${jira}-`);
-  segments.push(slug);
-  return segments.join("");
-}
-
-// src/commands/branch/resolveDefaultBranch.ts
-import { execSync as execSync24 } from "child_process";
-var REMOTE_HEAD_REGEX = /^ref:\s+refs\/heads\/(\S+)\s+HEAD$/m;
-function resolveDefaultBranch(override, cwd) {
-  if (override) return override;
-  try {
-    const output = execSync24("git ls-remote --symref origin HEAD", {
-      encoding: "utf8",
-      stdio: ["pipe", "pipe", "pipe"],
-      cwd
-    });
-    const match = output.match(REMOTE_HEAD_REGEX);
-    if (match) return match[1];
-  } catch {
-  }
-  return "main";
-}
-
 // src/commands/branch/validateSlug.ts
 var KEBAB_CASE_REGEX = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var HASH_REF_REGEX = /#\d+/;
@@ -9432,23 +9494,14 @@ async function branch(slug, options2) {
     console.error(`Error: ${slugError}`);
     process.exit(1);
   }
-  const config = loadConfig();
-  const branchName = buildBranchName({
-    prefix: config.branch?.prefix,
-    jira: options2.jira,
-    slug
-  });
   try {
-    const defaultBranch = resolveDefaultBranch(config.branch?.defaultBranch);
-    execSync25("git fetch", { stdio: "inherit" });
-    execSync25(
-      `git switch -c ${shellQuote(branchName)} ${shellQuote(`origin/${defaultBranch}`)}`,
-      { stdio: "inherit" }
-    );
+    const { branchName, defaultBranch } = await createBranch({
+      slug,
+      jira: options2.jira
+    });
     console.log(
       `Created and switched to ${branchName} (from origin/${defaultBranch})`
     );
-    await recordBranchActivity(branchName);
     process.exit(0);
   } catch (error) {
     console.error(
@@ -9457,12 +9510,6 @@ async function branch(slug, options2) {
     process.exit(1);
   }
 }
-async function recordBranchActivity(branchName) {
-  if (resolveSessionItemId() === null) return;
-  await recordSessionRefs([
-    { kind: "branch", ref: branchName, url: gitRefUrl("branch", branchName) }
-  ]);
-}
 
 // src/commands/registerBranch.ts
 function registerBranch(program2) {
@@ -10245,12 +10292,12 @@ function hasSubcommands(helpText) {
 // src/commands/permitCliReads/runHelp.ts
 import { exec as exec2 } from "child_process";
 function runHelp(args) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     exec2(
       `${args.join(" ")} --help`,
       { encoding: "utf8", timeout: 3e4 },
       (_err, stdout, stderr) => {
-        resolve17(stdout || stderr || "");
+        resolve18(stdout || stderr || "");
       }
     );
   });
@@ -13889,25 +13936,25 @@ function isVisibleText(t) {
   return /[a-zA-Z]{3,}/.test(t);
 }
 var isHashtag = (t) => /^#[A-Za-z0-9_]+$/.test(t);
-function collectRscText(v, resolve17, sink2, seen) {
+function collectRscText(v, resolve18, sink2, seen) {
   if (v == null) return;
   if (typeof v === "string") {
     if (isRscRef(v)) {
       if (!seen.has(v)) {
         seen.add(v);
-        collectRscText(resolve17(v), resolve17, sink2, seen);
+        collectRscText(resolve18(v), resolve18, sink2, seen);
       }
     } else if (isHashtag(v)) sink2.hashtags.push(v);
     else if (isVisibleText(v)) sink2.text.push(v);
     return;
   }
   if (Array.isArray(v)) {
-    for (const x of v) collectRscText(x, resolve17, sink2, seen);
+    for (const x of v) collectRscText(x, resolve18, sink2, seen);
     return;
   }
   if (typeof v === "object") {
     for (const val of Object.values(v)) {
-      collectRscText(val, resolve17, sink2, seen);
+      collectRscText(val, resolve18, sink2, seen);
     }
   }
 }
@@ -13939,7 +13986,7 @@ function visitObjects(root, fn) {
     }
   }
 }
-function buildMentionMap(rows, resolve17) {
+function buildMentionMap(rows, resolve18) {
   const map = /* @__PURE__ */ new Map();
   visitObjects(rows, (o) => {
     const url = profileActionUrl(o);
@@ -13947,7 +13994,7 @@ function buildMentionMap(rows, resolve17) {
     const slug = slugFromProfileUrl(url);
     if (!slug || map.has(slug)) return;
     const sink2 = { text: [], hashtags: [] };
-    collectRscText(o.children, resolve17, sink2, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve18, sink2, /* @__PURE__ */ new Set());
     const name = sink2.text.join(" ").replace(/\s+/g, " ").trim();
     map.set(slug, name ? { slug, name, url } : { slug, url });
   });
@@ -14033,10 +14080,10 @@ function buildPost(raw, mentionMap, author) {
 
 // src/commands/netcap/walkPostRow.ts
 var isCommentary = (o) => asObject(o.viewTrackingSpecs)?.viewName === "feed-commentary";
-function walkPostRow(v, resolve17, raw) {
+function walkPostRow(v, resolve18, raw) {
   if (v == null || typeof v !== "object") return;
   if (Array.isArray(v)) {
-    for (const x of v) walkPostRow(x, resolve17, raw);
+    for (const x of v) walkPostRow(x, resolve18, raw);
     return;
   }
   const o = v;
@@ -14050,9 +14097,9 @@ function walkPostRow(v, resolve17, raw) {
   }
   if (isCommentary(o)) {
     const sink2 = { text: raw.text, hashtags: raw.hashtags };
-    collectRscText(o.children, resolve17, sink2, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve18, sink2, /* @__PURE__ */ new Set());
   }
-  for (const val of Object.values(o)) walkPostRow(val, resolve17, raw);
+  for (const val of Object.values(o)) walkPostRow(val, resolve18, raw);
 }
 
 // src/commands/netcap/extractLinkedInPosts.ts
@@ -14066,8 +14113,8 @@ function findCommentaryRows(rows) {
 }
 function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
   const rows = parseRscRows(flight);
-  const resolve17 = makeRscResolver(rows);
-  const mentionMap = buildMentionMap(rows, resolve17);
+  const resolve18 = makeRscResolver(rows);
+  const mentionMap = buildMentionMap(rows, resolve18);
   const posts = [];
   for (const id2 of findCommentaryRows(rows)) {
     const raw = {
@@ -14077,7 +14124,7 @@ function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
       links: [],
       related: []
     };
-    walkPostRow(rows[id2], resolve17, raw);
+    walkPostRow(rows[id2], resolve18, raw);
     const post = buildPost(raw, mentionMap, author);
     if (post) posts.push(post);
   }
@@ -15956,7 +16003,7 @@ function getViolations(pattern2, options2 = {}, maxLines = DEFAULT_MAX_LINES) {
 
 // src/commands/refactor/check/index.ts
 function runScript(script, cwd) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const child = spawn5("npm", ["run", script], {
       stdio: "pipe",
       shell: true,
@@ -15970,7 +16017,7 @@ function runScript(script, cwd) {
       output += data.toString();
     });
     child.on("close", (code) => {
-      resolve17({ script, code: code ?? 1, output });
+      resolve18({ script, code: code ?? 1, output });
     });
   });
 }
@@ -18716,12 +18763,12 @@ function onCloseResult(ctx, code) {
   return { ...closed, stderr: ctx.stderr.value, stdout: ctx.stdout.value };
 }
 function waitForChildExit(ctx) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     let settled = false;
     const settle = (result) => {
       if (settled) return;
       settled = true;
-      resolve17(result);
+      resolve18(result);
     };
     ctx.child.on("error", (err) => settle(onErrorResult(ctx, err)));
     ctx.child.on("close", (code) => settle(onCloseResult(ctx, code)));
@@ -19798,9 +19845,9 @@ function createReadlineInterface() {
   });
 }
 function askQuestion(rl, question) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     rl.question(question, (answer) => {
-      resolve17(answer.trim());
+      resolve18(answer.trim());
     });
   });
 }
@@ -20448,7 +20495,7 @@ function extractCode(url, expectedState) {
   return code;
 }
 function waitForCallback(port, expectedState) {
-  return new Promise((resolve17, reject) => {
+  return new Promise((resolve18, reject) => {
     const timeout = setTimeout(() => {
       server.close();
       reject(new Error("Authorization timed out after 120 seconds"));
@@ -20465,7 +20512,7 @@ function waitForCallback(port, expectedState) {
         const code = extractCode(url, expectedState);
         respondHtml(res, 200, "Authorization successful!");
         server.close();
-        resolve17(code);
+        resolve18(code);
       } catch (error) {
         respondHtml(res, 400, error.message);
         server.close();
@@ -21214,10 +21261,10 @@ var STATUS_TIMEOUT_MS = 5e3;
 function queryDaemon(socket) {
   socket.write(`${JSON.stringify({ type: "ping" })}
 `);
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const result = { sessions: [] };
     const pending = /* @__PURE__ */ new Set(["sessions", "pong"]);
-    const timer = setTimeout(() => resolve17(result), STATUS_TIMEOUT_MS);
+    const timer = setTimeout(() => resolve18(result), STATUS_TIMEOUT_MS);
     const lines = createInterface5({ input: socket });
     lines.on("error", () => {
     });
@@ -21225,7 +21272,7 @@ function queryDaemon(socket) {
       applyLine(result, pending, line);
       if (pending.size === 0) {
         clearTimeout(timer);
-        resolve17(result);
+        resolve18(result);
       }
     });
   });
@@ -21411,8 +21458,8 @@ async function drainDaemon() {
 function requestDrain(socket) {
   socket.write(`${JSON.stringify({ type: "drain" })}
 `);
-  return new Promise((resolve17) => {
-    const timer = setTimeout(() => resolve17(0), DRAIN_TIMEOUT_MS);
+  return new Promise((resolve18) => {
+    const timer = setTimeout(() => resolve18(0), DRAIN_TIMEOUT_MS);
     const lines = createInterface6({ input: socket });
     lines.on("error", () => {
     });
@@ -21421,7 +21468,7 @@ function requestDrain(socket) {
         const data = JSON.parse(line);
         if (data.type === "drained") {
           clearTimeout(timer);
-          resolve17(data.count ?? 0);
+          resolve18(data.count ?? 0);
         }
       } catch {
       }
@@ -22507,7 +22554,7 @@ function windowsDaemonHost() {
 var CONNECT_TIMEOUT_MS = 2e3;
 var KEEPALIVE_PROBE_MS = 1e4;
 function connectToWindowsDaemon() {
-  return new Promise((resolve17, reject) => {
+  return new Promise((resolve18, reject) => {
     const socket = net2.connect(windowsDaemonPort(), windowsDaemonHost());
     socket.setTimeout(CONNECT_TIMEOUT_MS);
     socket.once("timeout", () => {
@@ -22517,7 +22564,7 @@ function connectToWindowsDaemon() {
     socket.once("connect", () => {
       socket.setTimeout(0);
       socket.setKeepAlive(true, KEEPALIVE_PROBE_MS);
-      resolve17(socket);
+      resolve18(socket);
     });
     socket.once("error", reject);
   });
@@ -22595,7 +22642,7 @@ async function waitForWindowsDaemon() {
   );
 }
 function delay2(ms) {
-  return new Promise((resolve17) => setTimeout(resolve17, ms));
+  return new Promise((resolve18) => setTimeout(resolve18, ms));
 }
 
 // src/commands/sessions/daemon/defaultConnect.ts
@@ -22843,7 +22890,7 @@ async function healWindowsDaemon() {
   daemonLog("windows daemon: auto-heal: stale daemon stopped");
 }
 function runOnWindowsHost(command, timeoutMs) {
-  return new Promise((resolve17, reject) => {
+  return new Promise((resolve18, reject) => {
     const child = spawn11("pwsh.exe", ["-Command", command], {
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -22863,7 +22910,7 @@ function runOnWindowsHost(command, timeoutMs) {
     });
     child.on("exit", (code) => {
       clearTimeout(timer);
-      if (code === 0) resolve17();
+      if (code === 0) resolve18();
       else
         reject(
           new Error(
@@ -24132,6 +24179,48 @@ function buildLimitsSegment(rateLimits) {
   return ` | Limits - ${fiveHr}, ${sevenDay}`;
 }
 
+// src/commands/readGitBranch.ts
+import { readFileSync as readFileSync47, statSync as statSync11 } from "fs";
+import { isAbsolute as isAbsolute2, join as join63, resolve as resolve16 } from "path";
+function resolveGitDir(cwd) {
+  const dotGit = join63(cwd, ".git");
+  let stat2;
+  try {
+    stat2 = statSync11(dotGit);
+  } catch {
+    return null;
+  }
+  if (stat2.isDirectory()) {
+    return dotGit;
+  }
+  let contents;
+  try {
+    contents = readFileSync47(dotGit, "utf8");
+  } catch {
+    return null;
+  }
+  const match = /^gitdir:\s*(.+)$/m.exec(contents.trim());
+  if (!match) {
+    return null;
+  }
+  const gitDir = match[1].trim();
+  return isAbsolute2(gitDir) ? gitDir : resolve16(cwd, gitDir);
+}
+function readGitBranch(cwd) {
+  const gitDir = resolveGitDir(cwd);
+  if (!gitDir) {
+    return null;
+  }
+  let head;
+  try {
+    head = readFileSync47(join63(gitDir, "HEAD"), "utf8");
+  } catch {
+    return null;
+  }
+  const match = /^ref:\s*refs\/heads\/(.+)$/m.exec(head.trim());
+  return match ? match[1] : null;
+}
+
 // src/commands/relayRateLimits.ts
 async function relayRateLimits(rateLimits) {
   if (!rateLimits) return;
@@ -24167,8 +24256,11 @@ async function statusLine() {
   const model = data.model.display_name;
   const { total_input_tokens: totalIn, total_output_tokens: totalOut } = data.context_window;
   const usedPct = data.context_window.used_percentage ?? 0;
+  const dir = data.workspace?.current_dir ?? data.cwd;
+  const branch2 = dir ? readGitBranch(windowsCwdToWslPath(dir)) : null;
+  const branchSegment = branch2 ? `\u{1F343}\uFE0F ${chalk191.cyan(branch2)} | ` : "";
   console.log(
-    `${model} | Tokens - ${formatNumber(totalOut)} \u2191 : ${formatNumber(totalIn)} \u2193 | Context - ${colorizePercent(usedPct)}${buildLimitsSegment(data.rate_limits)}`
+    `${branchSegment}${model} | Tokens - ${formatNumber(totalOut)} \u2191 : ${formatNumber(totalIn)} \u2193 | Context - ${colorizePercent(usedPct)}${buildLimitsSegment(data.rate_limits)}`
   );
   await relayRateLimits(data.rate_limits);
   await relayUsage(data.session_id, totalIn, totalOut);