@cam5/baby-bird 0.1.1 → 0.1.2

package/README.md

@@ -61,6 +61,8 @@ bb --dump-prompt       print the prompt instead of calling the model
 bb --refresh           regenerate even if a cached tour exists
 bb --preset claude-sonnet
 bb --no-progress       no live status block
+bb ask "why is the cache keyed by command?"      chat about the current branch's tour
+bb ask HEAD~1 "what is going on in progress.ts?" chat about a specific range
 ```
 
 ### What does bare `bb` tour?
@@ -72,6 +74,25 @@ bb --no-progress       no live status block
 
 The header of every tour says which one was used.
 
+### Asking questions about a tour
+
+`bb ask` opens an interactive chat with the same LLM CLI, primed with the tour:
+
+```
+bb ask                                       the tour bare `bb` would show
+bb ask "where is the retry handled?"         with an opening question
+bb ask HEAD~1 "what is going on in progress.ts?"
+bb ask main..feature --preset claude-opus
+bb ask --staged "is this safe to commit?"
+bb ask --dump-context                        print what the chat would be given, and exit
+```
+
+It takes the same range arguments and flags as `bb`, then an opening message. The first word is treated as a range only when git can resolve it (`HEAD~3`, `main..feature`); anything else is part of the message, so quoting is optional for plain questions.
+
+The tour is generated first, or taken from the cache: run `bb HEAD~1` in one window, and `bb ask HEAD~1 ...` in another reuses that tour and opens the chat straight away. The chat gets, as a system prompt: a short framing, the whole tour (sections, descriptions, excerpts with line numbers, the base and head SHAs), and then the same labeled diff the tour was built from, shortened to `llm.maxPromptBytes` like the prompt. With the Claude presets the chat is a normal interactive Claude Code session in the repository, so it can also open files and run git. `bb ask` exits with the chat's exit code.
+
+The command that opens the chat is the preset's `chatCommand` (see [LLM presets](#llm-presets)); presets without one cannot be asked.
+
 ## Configuration
 
 Config is JSON, merged in this order (later wins; objects merge, arrays replace):
@@ -80,7 +101,7 @@ Config is JSON, merged in this order (later wins; objects merge, arrays replace)
 2. `$XDG_CONFIG_HOME/baby-bird/config.json` (default `~/.config/baby-bird/config.json`)
 3. `<repo>/.baby-bird/config.json` (create one with `bb init`)
 4. environment: `BB_PRESET`, `BB_LLM_COMMAND`, `BB_CODEHOST`, `BB_CACHE_DIR`, `BB_NO_CACHE`, `NO_COLOR`
-5. flags: `--preset`, `--color/--no-color`, `--no-cache`, `--no-pager`
+5. flags: `--preset`, `--color/--no-color`, `--no-cache`, `--no-pager` (before or after a subcommand name)
 
 `bb config` shows every layer, what it contributed, the resolved LLM command, and all presets.
 
@@ -93,6 +114,7 @@ All keys, with defaults:
     "presets": {},             // your own presets; same names shadow built-ins
     "args": [],                // extra argv appended to the preset's command
     "command": null,           // a whole custom invocation; when set, "preset" is ignored
+    "chatCommand": null,       // what `bb ask` runs; replaces the preset's (see below)
     "promptVia": null,         // "stdin" (default) or "arg" (replace {prompt} in argv)
     "kind": null,              // "claude" (streams progress from the Claude Code CLI) or "plain"; default from the preset
     "jsonSchema": false,       // Claude kind: also pass --json-schema so the CLI validates the answer (see below)
@@ -108,8 +130,7 @@ All keys, with defaults:
   },
   "render": {
     "color": "auto", "pager": "auto", "maxExcerptLines": 60, "width": null,
-    "highlight": "auto",       // syntax colors in excerpts on 256-color terminals; "always" | "never"
-    "theme": "dark"            // background tint palette for added/removed lines; "light" for light terminals
+    "highlight": "auto"        // syntax colors in excerpts; "always" | "never"
   },
   "cache":  { "enabled": true, "dir": null }  // default $XDG_CACHE_HOME/baby-bird
 }
@@ -134,6 +155,8 @@ The model is just a command: the prompt goes in on stdin, the answer comes out o
 | `claude-haiku` | the above plus `--model haiku` |
 | `llm` | `llm` ([Simon Willison's CLI](https://llm.datasette.io/)) |
 
+Each preset also has a `chatCommand`, which is what `bb ask` runs. For the Claude presets it is `claude [model and effort flags] --append-system-prompt-file {context-file} -- {message}`: a regular interactive session (your settings and CLAUDE.md apply) with the tour appended to the system prompt and the question as the first message. The `llm` preset uses `llm chat -s {context}`; `llm chat` cannot take an opening message, so `bb` says so and you type the question into the chat. In a chat command, `{context-file}` is replaced by the path of a temporary file holding the context, `{context}` by the text itself (mind your OS's argument size limits with big diffs), and `{message}` by the opening message; an argv entry that is only `{message}` is dropped when there is none.
+
 Add flags to a preset, define your own, or replace the command entirely:
 
 ```jsonc
@@ -143,12 +166,18 @@ Add flags to a preset, define your own, or replace the command entirely:
     "args": ["--fallback-model", "haiku"],
     "presets": {
       "local": { "command": ["ollama", "run", "qwen2.5-coder:14b"] },
-      "gemini": { "command": ["gemini", "-p", "{prompt}"], "promptVia": "arg" }
+      "gemini": {
+        "command": ["gemini", "-p", "{prompt}"],
+        "promptVia": "arg",
+        "chatCommand": ["gemini", "-i", "{message}"]
+      }
     }
   }
 }
 ```
 
+`llm.args` only applies to the tour command. A custom `llm.command` has no chat command of its own; set `llm.chatCommand` next to it if you want `bb ask` to work.
+
 ```sh
 bb --preset local
 BB_LLM_COMMAND='llm -m gpt-4.1' bb
@@ -162,7 +191,7 @@ The effective command is part of the cache key, so switching presets regenerates
 
 ### Excerpt highlighting
 
-On a 256-color terminal, excerpts get language-aware token colors (keywords, strings, comments) chosen by file extension, and added/removed lines are marked by a bold `+`/`-` sign plus a subtle green/red row tint underneath, so both signals read at once. The token palette never uses green or red. Turn it off with `--no-highlight` or `render.highlight: "never"`, and pick `--theme light` (or `render.theme`) on a light terminal background. Files with no known language keep the plain green/red rendering.
+Excerpts get language-aware token colors (keywords, strings, comments) chosen by file extension, and added/removed lines are always marked by a green/red `+`/`-` sign — no row background and no bold (some terminal themes render bold color via a washed-out "bright" palette slot), so it reads well on any terminal theme. The token palette never uses green or red, so the sign stays unambiguous. Turn syntax coloring off with `--no-highlight` or `render.highlight: "never"`; files with no known language keep the same green/red sign with plain text.
 
 ### Code host
 
@@ -190,7 +219,7 @@ bb cache path
 
 ## Using it as a library
 
-The CLI is one consumer of a small core. `import { generateTour, CliRenderer, type Tour } from '@cam5/baby-bird'` gives you the same pipeline for a TUI, a web view, or a bot; a `Tour` is plain JSON (sections, stats, excerpts) with no git or LLM dependencies.
+The CLI is one consumer of a small core. `import { generateTour, CliRenderer, type Tour } from '@cam5/baby-bird'` gives you the same pipeline for a TUI, a web view, or a bot; a `Tour` is plain JSON (sections, stats, excerpts) with no git or LLM dependencies. `buildChatContext` produces the text `bb ask` hands to a chat, and `launchChat` runs a chat command with it.
 
 ## Development
 
@@ -221,6 +250,8 @@ git push --follow-tags
 | 4 | the LLM command failed to run |
 | 5 | the model's output was unusable even after a repair attempt |
 
+`bb ask` exits with the chat command's own exit code once the chat ends.
+
 ## License
 
 MIT

package/dist/{chunk-7ALXKEST.js → chunk-YI2UL4IC.js}

@@ -136,34 +136,43 @@ import { homedir } from "os";
 import { join } from "path";
 import { z as z2 } from "zod";
 var CLAUDE_BASE = ["claude", "-p", "--no-session-persistence", "--setting-sources", "", "--tools", ""];
+var CLAUDE_CHAT = ["claude", "--append-system-prompt-file", "{context-file}", "--", "{message}"];
+var claudeChat = (...flags) => [CLAUDE_CHAT[0], ...flags, ...CLAUDE_CHAT.slice(1)];
 var BUILTIN_PRESETS = Object.freeze({
   claude: {
     command: [...CLAUDE_BASE],
+    chatCommand: claudeChat(),
     kind: "claude",
     description: "Claude Code CLI with its default model"
   },
   "claude-sonnet": {
     command: [...CLAUDE_BASE, "--model", "sonnet", "--effort", "high"],
+    chatCommand: claudeChat("--model", "sonnet", "--effort", "high"),
     kind: "claude",
     description: "Claude Code CLI, Sonnet at high effort"
   },
   "claude-opus": {
     command: [...CLAUDE_BASE, "--model", "opus", "--effort", "high"],
+    chatCommand: claudeChat("--model", "opus", "--effort", "high"),
     kind: "claude",
     description: "Claude Code CLI, Opus at high effort"
   },
   "claude-fable": {
     command: [...CLAUDE_BASE, "--model", "fable", "--effort", "high"],
+    chatCommand: claudeChat("--model", "fable", "--effort", "high"),
     kind: "claude",
     description: "Claude Code CLI, Fable at high effort"
   },
   "claude-haiku": {
     command: [...CLAUDE_BASE, "--model", "haiku"],
+    chatCommand: claudeChat("--model", "haiku"),
     kind: "claude",
     description: "Claude Code CLI, Haiku (fast and cheap)"
   },
   llm: {
     command: ["llm"],
+    // `llm chat` has no opening-message argument; bb warns and the question is typed into the chat.
+    chatCommand: ["llm", "chat", "-s", "{context}"],
     description: "Simon Willison's llm CLI with its default model"
   }
 });
@@ -171,6 +180,7 @@ var PromptViaSchema = z2.enum(["stdin", "arg"]);
 var LlmKindSchema = z2.enum(["plain", "claude"]);
 var LlmPresetSchema = z2.object({
   command: z2.array(z2.string()).min(1),
+  chatCommand: z2.array(z2.string()).min(1).optional(),
   promptVia: PromptViaSchema.optional(),
   kind: LlmKindSchema.optional(),
   description: z2.string().optional()
@@ -181,6 +191,8 @@ var ConfigSchema = z2.object({
     presets: z2.record(z2.string(), LlmPresetSchema),
     args: z2.array(z2.string()),
     command: z2.array(z2.string()).min(1).nullable(),
+    /** Interactive command for `bb ask`; when set it replaces the preset's chatCommand. Same tokens as a preset's. */
+    chatCommand: z2.array(z2.string()).min(1).nullable(),
     promptVia: PromptViaSchema.nullable(),
     kind: LlmKindSchema.nullable(),
     /** Claude kind only: pass --json-schema so the CLI validates the answer itself. Off by default (see README). */
@@ -201,10 +213,8 @@ var ConfigSchema = z2.object({
     pager: z2.enum(["auto", "always", "never"]),
     maxExcerptLines: z2.number().int().positive(),
     width: z2.number().int().positive().nullable(),
-    /** Language-aware token colors in excerpts (needs a 256-color terminal for the add/del tints). */
-    highlight: z2.enum(["auto", "always", "never"]),
-    /** Background tint palette for added/removed lines. */
-    theme: z2.enum(["dark", "light"])
+    /** Language-aware token colors in excerpts. */
+    highlight: z2.enum(["auto", "always", "never"])
   }),
   cache: z2.object({
     enabled: z2.boolean(),
@@ -224,6 +234,7 @@ var DEFAULT_CONFIG = {
     presets: {},
     args: [],
     command: null,
+    chatCommand: null,
     promptVia: null,
     kind: null,
     jsonSchema: false,
@@ -245,7 +256,7 @@ var DEFAULT_CONFIG = {
       "**/*.map"
     ]
   },
-  render: { color: "auto", pager: "auto", maxExcerptLines: 60, width: null, highlight: "auto", theme: "dark" },
+  render: { color: "auto", pager: "auto", maxExcerptLines: 60, width: null, highlight: "auto" },
   cache: { enabled: true, dir: null }
 };
 function userConfigPath(env = process.env) {
@@ -377,26 +388,44 @@ function resolveLlm(config) {
     ...common2
   };
 }
+function resolveChat(config) {
+  const { llm } = config;
+  if (llm.chatCommand) return { command: [...llm.chatCommand], preset: null, env: llm.env };
+  if (llm.command) {
+    throw new ConfigError("llm.command is set but llm.chatCommand is not, so there is nothing to chat with.", "Set llm.chatCommand (see README), or pick a preset with --preset.");
+  }
+  const presets = allPresets(config);
+  const preset = presets[llm.preset];
+  if (!preset) {
+    const names = Object.keys(presets).sort().join(", ");
+    throw new ConfigError(`Unknown LLM preset "${llm.preset}"`, `Available presets: ${names}. Define your own under llm.presets, or set llm.command.`);
+  }
+  if (!preset.chatCommand) {
+    const withChat = Object.entries(presets).filter(([, p]) => p.chatCommand).map(([n]) => n).sort().join(", ");
+    throw new ConfigError(`Preset "${llm.preset}" has no chatCommand.`, `Add one under llm.presets.${llm.preset}.chatCommand, set llm.chatCommand, or use a preset that has one: ${withChat}.`);
+  }
+  return { command: [...preset.chatCommand], preset: llm.preset, env: llm.env };
+}
 function shellSplit(input) {
   const out = [];
   let cur = "";
   let inToken = false;
-  let quote = null;
+  let quote2 = null;
   for (let i = 0; i < input.length; i++) {
     const ch = input[i];
-    if (quote === "'") {
-      if (ch === "'") quote = null;
+    if (quote2 === "'") {
+      if (ch === "'") quote2 = null;
       else cur += ch;
       continue;
     }
-    if (quote === '"') {
-      if (ch === '"') quote = null;
+    if (quote2 === '"') {
+      if (ch === '"') quote2 = null;
       else if (ch === "\\" && i + 1 < input.length && '"\\$`'.includes(input[i + 1])) cur += input[++i];
       else cur += ch;
       continue;
     }
     if (ch === "'" || ch === '"') {
-      quote = ch;
+      quote2 = ch;
       inToken = true;
     } else if (ch === "\\" && i + 1 < input.length) {
       cur += input[++i];
@@ -412,7 +441,7 @@ function shellSplit(input) {
       inToken = true;
     }
   }
-  if (quote) throw new ConfigError(`Unterminated quote in command: ${input}`);
+  if (quote2) throw new ConfigError(`Unterminated quote in command: ${input}`);
   if (inToken) out.push(cur);
   return out;
 }
@@ -926,6 +955,10 @@ var KEEP_LINES = 40;
 var MAX_PR_BODY_BYTES = 12e3;
 function buildPrompt(input) {
   const header = promptHeader(Boolean(input.structured));
+  const change = renderChange(input, input.maxBytes - bytes(header) - 8);
+  return { prompt: [header, change.text].join("\n"), truncation: change.truncation };
+}
+function renderChange(input, maxBytes) {
   const context = renderContext(input);
   const truncation = { truncated: [], omitted: [] };
   const blocks = input.diff.files.map((file) => {
@@ -942,7 +975,7 @@ function buildPrompt(input) {
   });
   const text = (b) => b.mode === "full" ? b.full : b.mode === "truncated" ? b.truncated : b.omitted;
   const total = () => bytes(diffPreamble(truncation)) + blocks.reduce((n, b) => n + bytes(text(b)), 0);
-  const budget = input.maxBytes - bytes(header) - bytes(context) - 8;
+  const budget = maxBytes - bytes(context);
   if (total() > budget) {
     const bySize = [...blocks].sort((a, b) => bytes(b.full) - bytes(a.full));
     for (const block of bySize) {
@@ -959,8 +992,7 @@ function buildPrompt(input) {
       truncation.omitted.push(block.file.path);
     }
   }
-  const prompt = [header, context, diffPreamble(truncation), ...blocks.map(text)].join("\n");
-  return { prompt, truncation };
+  return { text: [context, diffPreamble(truncation), ...blocks.map(text)].join("\n"), truncation };
 }
 function bytes(s) {
   return Buffer.byteLength(s, "utf8");
@@ -1785,6 +1817,128 @@ function parseOutput(raw) {
   return { ok: true, value: parsed.data };
 }
 
+// src/core/chat.ts
+var FRAMING = `# About this conversation
+
+You are chatting with a developer about one specific change in the git repository you are running in. \`bb\` (the baby-bird CLI) generated the guided code tour below for that change; the developer has it open next to this chat, so treat it as shared context. Answer questions about the change using the tour, the diff after it, and the repository's files whenever you can read them. Refer to tour sections by number and title, and to code by file path and line number. If the diff below was shortened to fit, say so instead of guessing at what was left out.`;
+function buildChatContext(input) {
+  const head = [FRAMING, "", ...renderTour(input.tour, input.change, input.tourPath ?? null), ""].join("\n");
+  const change = renderChange(input.change, Math.max(0, input.maxBytes - Buffer.byteLength(head, "utf8") - 1));
+  return { text: head + change.text, truncation: change.truncation };
+}
+function renderTour(tour, change, tourPath) {
+  const lines = [`# The code tour: ${tour.title}`, ""];
+  lines.push(`- Change: ${describeSource(change.source, change.branch)}`);
+  lines.push(`- Revisions: ${describeRevisions(change.source)}`);
+  if (tour.pullRequest) lines.push(`- Pull request #${tour.pullRequest.number}: ${tour.pullRequest.title}${tour.pullRequest.url ? ` (${tour.pullRequest.url})` : ""}`);
+  lines.push(`- Size: ${tour.stats.files} file${tour.stats.files === 1 ? "" : "s"}, +${tour.stats.additions} -${tour.stats.deletions}, ${tour.sections.length} section${tour.sections.length === 1 ? "" : "s"}`);
+  lines.push(`- Generated: ${tour.generatedAt} by ${tour.generator.preset ?? tour.generator.command[0] ?? "unknown"}`);
+  if (tourPath) lines.push(`- Tour JSON: ${tourPath}`);
+  if (tour.summary.trim()) lines.push("", tour.summary.trim());
+  tour.sections.forEach((s, i) => lines.push("", ...renderSection(s, i + 1)));
+  return lines;
+}
+function describeRevisions(source) {
+  const head = source.headSha.slice(0, 12);
+  if (source.kind === "working") return `HEAD is ${head}`;
+  const base = (source.mergeBase ?? source.baseSha).slice(0, 12);
+  return `base ${base}, head ${head}; \`git diff ${base} ${head}\` reproduces the diff`;
+}
+function renderSection(s, n) {
+  const lines = [`## ${n}. ${s.title}`, "", `${s.stats.files} file${s.stats.files === 1 ? "" : "s"}, +${s.stats.additions} -${s.stats.deletions}`];
+  if (s.description.trim()) lines.push("", s.description.trim());
+  if (s.files.length) lines.push("", "Files:", ...s.files.map((f) => `- ${f}`));
+  for (const e of s.excerpts) lines.push("", ...renderExcerpt(e));
+  return lines;
+}
+function renderExcerpt(e) {
+  const note = e.note ? ` \u2014 ${e.note}` : "";
+  const lines = [`Excerpt \`${e.file}:${e.newStart}\` (hunk ${e.hunkId})${note}`, "", "```"];
+  const maxNo = Math.max(...e.lines.map((l) => Math.max(l.oldNo ?? 0, l.newNo ?? 0)), 1);
+  const w = String(maxNo).length;
+  for (const l of e.lines) {
+    const oldNo = l.oldNo === void 0 ? " ".repeat(w) : String(l.oldNo).padStart(w);
+    const newNo = l.newNo === void 0 ? " ".repeat(w) : String(l.newNo).padStart(w);
+    const sign = l.type === "add" ? "+" : l.type === "del" ? "-" : " ";
+    lines.push(`${oldNo} ${newNo} \u2502${sign}${l.text}`);
+  }
+  lines.push("```");
+  return lines;
+}
+
+// src/llm/chat.ts
+import { spawn as spawn2 } from "child_process";
+import { mkdtemp, rm as rm2, writeFile as writeFile2 } from "fs/promises";
+import { constants as osConstants, tmpdir } from "os";
+import { join as join4 } from "path";
+var CONTEXT_FILE_TOKEN = "{context-file}";
+var CONTEXT_TOKEN = "{context}";
+var MESSAGE_TOKEN = "{message}";
+function chatArgv(input) {
+  const message = input.message?.trim() ?? "";
+  const out = [];
+  for (const arg of input.command) {
+    if (arg === MESSAGE_TOKEN && !message) continue;
+    out.push(arg.replaceAll(CONTEXT_FILE_TOKEN, input.contextFile).replaceAll(CONTEXT_TOKEN, input.context).replaceAll(MESSAGE_TOKEN, message));
+  }
+  return out;
+}
+function chatSlots(command) {
+  const joined = command.join("\0");
+  return { context: joined.includes(CONTEXT_FILE_TOKEN) || joined.includes(CONTEXT_TOKEN), message: joined.includes(MESSAGE_TOKEN) };
+}
+async function launchChat(opts) {
+  const debug = opts.debug ?? (() => {
+  });
+  const dir = await mkdtemp(join4(tmpdir(), "bb-chat-"));
+  const contextFile = join4(dir, "context.md");
+  await writeFile2(contextFile, opts.context, { encoding: "utf8", mode: 384 });
+  const [bin, ...args] = chatArgv({ command: opts.command, contextFile, context: opts.context, message: opts.message });
+  debug(`launching ${describeArgv([bin, ...args], opts.context)} (context ${Buffer.byteLength(opts.context)} bytes in ${contextFile})`);
+  try {
+    return await new Promise((resolve, reject) => {
+      const env = { ...process.env, ...opts.env };
+      delete env.CLAUDECODE;
+      const child = spawn2(bin, args, { cwd: opts.cwd, env, stdio: opts.stdio ?? "inherit" });
+      const onInt = () => {
+      };
+      const onTerm = () => child.kill("SIGTERM");
+      const onHup = () => child.kill("SIGHUP");
+      process.on("SIGINT", onInt);
+      process.on("SIGTERM", onTerm);
+      process.on("SIGHUP", onHup);
+      const cleanup = () => {
+        process.off("SIGINT", onInt);
+        process.off("SIGTERM", onTerm);
+        process.off("SIGHUP", onHup);
+      };
+      child.on("error", (e) => {
+        cleanup();
+        if (e.code === "ENOENT") {
+          reject(new LlmFailedError(`Chat command not found: ${bin}`, { hint: "Install it, or choose another preset with --preset / llm.preset.", cause: e }));
+        } else {
+          reject(new LlmFailedError(`Could not run ${bin}: ${e.message}`, { cause: e }));
+        }
+      });
+      child.on("close", (code, signal) => {
+        cleanup();
+        debug(`chat exited with ${signal ? `signal ${signal}` : `code ${code}`}`);
+        const exitCode = code ?? (signal ? 128 + (osConstants.signals[signal] ?? 0) : 1);
+        resolve({ exitCode, signal });
+      });
+    });
+  } finally {
+    await rm2(dir, { recursive: true, force: true });
+  }
+}
+function describeArgv(argv, context) {
+  return argv.map((a) => context && a.includes(context) ? a.replace(context, "<context>") : a).map(quote).join(" ");
+}
+function quote(arg) {
+  if (arg === "") return '""';
+  return /^[\w@%+=:,./{}-]+$/.test(arg) ? arg : `'${arg.replaceAll("'", `'\\''`)}'`;
+}
+
 // src/render/cli.ts
 import pc from "picocolors";
 
@@ -1986,14 +2140,6 @@ function truncateAnsi(s, max) {
   }
   return out + SOFT_RESET + "\u2026";
 }
-function lineTint(type, theme) {
-  const code = theme === "dark" ? type === "add" ? 22 : 52 : type === "add" ? 194 : 224;
-  return { open: `\x1B[48;5;${code}m`, close: "\x1B[49m" };
-}
-function supports256Colors(env = process.env) {
-  if (env.TERM === "dumb") return false;
-  return Boolean(env.COLORTERM) || /256color|truecolor|direct/i.test(env.TERM ?? "") || Boolean(env.TERM_PROGRAM) || Boolean(env.WT_SESSION);
-}
 
 // src/render/cli.ts
 var MIN_WIDTH = 40;
@@ -2002,7 +2148,7 @@ var CliRenderer = class {
   render(tour, opts) {
     const c = pc.createColors(opts.color);
     const width = Math.max(MIN_WIDTH, Math.min(MAX_WIDTH, opts.width));
-    const style = { highlight: Boolean(opts.color && opts.highlight), theme: opts.theme ?? "dark" };
+    const style = { highlight: Boolean(opts.color && opts.highlight) };
     const out = [];
     out.push(...renderHeader(tour, c, width, opts.fromCache ?? false));
     out.push("");
@@ -2011,12 +2157,12 @@ var CliRenderer = class {
       if (!section) {
         throw new UsageError(`No section ${opts.section}; this tour has ${tour.sections.length} section${tour.sections.length === 1 ? "" : "s"}.`);
       }
-      out.push(...renderSection(section, opts.section, tour.sections.length, c, width, style));
+      out.push(...renderSection2(section, opts.section, tour.sections.length, c, width, style));
     } else {
       out.push(...renderToc(tour, c, width));
       out.push("");
       tour.sections.forEach((s, i) => {
-        out.push(...renderSection(s, i + 1, tour.sections.length, c, width, style));
+        out.push(...renderSection2(s, i + 1, tour.sections.length, c, width, style));
         out.push("");
       });
     }
@@ -2055,7 +2201,7 @@ function renderToc(tour, c, width) {
   }
   return lines;
 }
-function renderSection(s, index, count, c, width, style) {
+function renderSection2(s, index, count, c, width, style) {
   const lines = [];
   lines.push(c.dim("\u2500".repeat(width)));
   lines.push(c.bold(`${index}. ${s.title}`) + c.dim(`   (${index}/${count})`));
@@ -2070,11 +2216,11 @@ function renderSection(s, index, count, c, width, style) {
   }
   for (const e of s.excerpts) {
     lines.push("");
-    lines.push(...renderExcerpt(e, c, width, style));
+    lines.push(...renderExcerpt2(e, c, width, style));
   }
   return lines;
 }
-function renderExcerpt(e, c, width, style) {
+function renderExcerpt2(e, c, width, style) {
   const lines = [];
   const title = `   ${c.cyan(e.file)}${c.dim(":" + e.newStart)}`;
   lines.push(e.note ? `${title}  ${c.italic(c.dim(e.note))}` : title);
@@ -2091,19 +2237,17 @@ function renderExcerpt(e, c, width, style) {
     const gutter = c.dim(`   ${oldNo} ${newNo} \u2502`);
     const plain = texts[i];
     if (!highlighted) {
-      const body = `${sign}${truncate(plain, budget)}`;
-      lines.push(`${gutter}${l.type === "add" ? c.green(body) : l.type === "del" ? c.red(body) : body}`);
+      const signStyled2 = l.type === "add" ? c.green(sign) : l.type === "del" ? c.red(sign) : sign;
+      lines.push(`${gutter}${signStyled2}${truncate(plain, budget)}`);
       return;
     }
     const text = truncateAnsi(highlighted[i], budget);
-    const pad = " ".repeat(Math.max(0, budget - visibleLength(text)));
     if (l.type === "ctx") {
       lines.push(`${gutter} ${text}`);
       return;
     }
-    const tint = lineTint(l.type, style.theme);
-    const signStyled = l.type === "add" ? c.green(c.bold("+")) : c.red(c.bold("-"));
-    lines.push(`${gutter}${tint.open}${signStyled}${text}${pad}${tint.close}`);
+    const signStyled = l.type === "add" ? c.green("+") : c.red("-");
+    lines.push(`${gutter}${signStyled}${text}`);
   });
   return lines;
 }
@@ -2161,7 +2305,7 @@ function relativeTime(iso, now = /* @__PURE__ */ new Date()) {
 }
 
 // src/render/pager.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 async function writeMaybePaged(output, opts) {
   const env = opts.env ?? process.env;
   const lineCount = output.split("\n").length;
@@ -2173,7 +2317,7 @@ async function writeMaybePaged(output, opts) {
   const pagerCmd = env.PAGER && env.PAGER.trim() || "less";
   const cmd = pagerCmd === "less" && !env.LESS ? "less -RFX" : pagerCmd;
   await new Promise((resolve) => {
-    const child = spawn2(cmd, { shell: true, stdio: ["pipe", "inherit", "inherit"], env });
+    const child = spawn3(cmd, { shell: true, stdio: ["pipe", "inherit", "inherit"], env });
     let fellBack = false;
     child.on("error", () => {
       fellBack = true;
@@ -2217,6 +2361,7 @@ export {
   loadConfig,
   allPresets,
   resolveLlm,
+  resolveChat,
   shellSplit,
   TourCache,
   extractJson,
@@ -2228,10 +2373,12 @@ export {
   PROMPT_VERSION,
   promptHeader,
   buildPrompt,
+  renderChange,
   describeSource,
   GhCodeHost,
   NoCodeHost,
   createCodeHost,
+  git,
   gitRoot,
   revParse,
   currentBranch,
@@ -2246,7 +2393,10 @@ export {
   noProgress,
   prepareTour,
   generateTour,
-  supports256Colors,
+  buildChatContext,
+  chatArgv,
+  chatSlots,
+  launchChat,
   CliRenderer,
   describeSource2,
   wrap,
@@ -2254,4 +2404,4 @@ export {
   writeMaybePaged,
   writeStdout
 };
-//# sourceMappingURL=chunk-7ALXKEST.js.map
+//# sourceMappingURL=chunk-YI2UL4IC.js.map