hermes-git 0.3.6 → 0.3.8

package/dist/index.js

@@ -14820,15 +14820,15 @@ var require_route = __commonJS((exports, module) => {
     };
   }
   function wrapConversion(toModel, graph) {
-    const path4 = [graph[toModel].parent, toModel];
+    const path5 = [graph[toModel].parent, toModel];
     let fn = conversions[graph[toModel].parent][toModel];
     let cur = graph[toModel].parent;
     while (graph[cur].parent) {
-      path4.unshift(graph[cur].parent);
+      path5.unshift(graph[cur].parent);
       fn = link(conversions[graph[cur].parent][cur], fn);
       cur = graph[cur].parent;
     }
-    fn.conversion = path4;
+    fn.conversion = path5;
     return fn;
   }
   module.exports = function(fromModel) {
@@ -15099,7 +15099,7 @@ var require_wrap_ansi = __commonJS((exports, module) => {
     }
     return words.slice(0, last).join(" ") + words.slice(last).join("");
   };
-  var exec2 = (string, columns, options = {}) => {
+  var exec3 = (string, columns, options = {}) => {
     if (options.trim !== false && string.trim() === "") {
       return "";
     }
@@ -15173,7 +15173,7 @@ var require_wrap_ansi = __commonJS((exports, module) => {
   module.exports = (string, columns, options) => {
     return String(string).normalize().replace(/\r\n/g, `
 `).split(`
-`).map((line) => exec2(line, columns, options)).join(`
+`).map((line) => exec3(line, columns, options)).join(`
 `);
   };
 });
@@ -24156,16 +24156,16 @@ var require_os_tmpdir = __commonJS((exports, module) => {
   var isWindows = process.platform === "win32";
   var trailingSlashRe = isWindows ? /[^:]\\$/ : /.\/$/;
   module.exports = function() {
-    var path4;
+    var path5;
     if (isWindows) {
-      path4 = process.env.TEMP || process.env.TMP || (process.env.SystemRoot || process.env.windir) + "\\temp";
+      path5 = process.env.TEMP || process.env.TMP || (process.env.SystemRoot || process.env.windir) + "\\temp";
     } else {
-      path4 = process.env.TMPDIR || process.env.TMP || process.env.TEMP || "/tmp";
+      path5 = process.env.TMPDIR || process.env.TMP || process.env.TEMP || "/tmp";
     }
-    if (trailingSlashRe.test(path4)) {
-      path4 = path4.slice(0, -1);
+    if (trailingSlashRe.test(path5)) {
+      path5 = path5.slice(0, -1);
     }
-    return path4;
+    return path5;
   };
 });
 
@@ -24179,7 +24179,7 @@ var require_tmp = __commonJS((exports, module) => {
    * MIT Licensed
    */
   var fs = __require("fs");
-  var path4 = __require("path");
+  var path5 = __require("path");
   var crypto2 = __require("crypto");
   var osTmpDir = require_os_tmpdir();
   var _c = process.binding("constants");
@@ -24221,7 +24221,7 @@ var require_tmp = __commonJS((exports, module) => {
   }
   function _generateTmpName(opts) {
     if (opts.name) {
-      return path4.join(opts.dir || tmpDir, opts.name);
+      return path5.join(opts.dir || tmpDir, opts.name);
     }
     if (opts.template) {
       return opts.template.replace(TEMPLATE_PATTERN, _randomChars(6));
@@ -24232,7 +24232,7 @@ var require_tmp = __commonJS((exports, module) => {
       _randomChars(12),
       opts.postfix || ""
     ].join("");
-    return path4.join(opts.dir || tmpDir, name);
+    return path5.join(opts.dir || tmpDir, name);
   }
   function tmpName(options, callback) {
     var args = _parseArguments(options, callback), opts = args[0], cb = args[1], tries = opts.name ? 1 : opts.tries || DEFAULT_TRIES;
@@ -24320,7 +24320,7 @@ var require_tmp = __commonJS((exports, module) => {
     do {
       var dir2 = dirs.pop(), deferred = false, files = fs.readdirSync(dir2);
       for (var i = 0, length = files.length;i < length; i++) {
-        var file2 = path4.join(dir2, files[i]), stat = fs.lstatSync(file2);
+        var file2 = path5.join(dir2, files[i]), stat = fs.lstatSync(file2);
         if (stat.isDirectory()) {
           if (!deferred) {
             deferred = true;
@@ -34338,6 +34338,13 @@ var chalk = createChalk();
 var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
+// src/lib/ai.ts
+import { exec } from "child_process";
+import { promisify } from "util";
+import { mkdtemp, readFile as readFile2, rm } from "fs/promises";
+import { tmpdir } from "os";
+import path4 from "path";
+
 // src/lib/env.ts
 import { readFile, writeFile, mkdir, chmod } from "fs/promises";
 import { existsSync } from "fs";
@@ -34420,7 +34427,7 @@ async function getResolvedEnv() {
       return { value: global.geminiApiKey, source: "global-config" };
     return { value: null, source: null };
   })();
-  const validProviders = ["anthropic", "openai", "gemini"];
+  const validProviders = ["anthropic", "openai", "gemini", "claude-code", "codex"];
   const provider = validProviders.includes(rawProvider.value) ? rawProvider.value : null;
   _resolved = {
     provider,
@@ -34453,6 +34460,7 @@ function formatSource(source) {
 }
 
 // src/lib/ai.ts
+var execAsync = promisify(exec);
 async function makeAnthropicProvider(apiKey) {
   const { default: Anthropic2 } = await Promise.resolve().then(() => (init_sdk(), exports_sdk));
   const client = new Anthropic2({ apiKey });
@@ -34517,6 +34525,70 @@ async function makeGeminiProvider(apiKey) {
     }
   };
 }
+async function makeClaudeCodeProvider() {
+  try {
+    await execAsync("claude --version", { timeout: 5000 });
+  } catch {
+    throw new Error("claude CLI not found — install Claude Code first");
+  }
+  return {
+    name: "Claude Code",
+    model: "claude (via CLI)",
+    async complete(prompt) {
+      const env3 = { ...process.env };
+      delete env3.CLAUDECODE;
+      const escaped = prompt.replace(/'/g, `'"'"'`);
+      const { stdout, stderr } = await execAsync(`claude -p '${escaped}' --no-session-persistence --tools ""`, { env: env3, timeout: 60000 });
+      const text = (stdout || stderr).trim();
+      if (!text)
+        throw new Error("Empty response from Claude Code CLI");
+      return text.replace(/\x1b\[[0-9;]*m/g, "");
+    }
+  };
+}
+async function makeCodexProvider() {
+  try {
+    await execAsync("codex --version", { timeout: 5000 });
+  } catch {
+    throw new Error("codex CLI not found — install OpenAI Codex first");
+  }
+  return {
+    name: "Codex",
+    model: "codex (via CLI)",
+    async complete(prompt) {
+      const tmpDir = await mkdtemp(path4.join(tmpdir(), "hermes-"));
+      const promptFile = path4.join(tmpDir, "prompt.txt");
+      const outputFile = path4.join(tmpDir, "output.txt");
+      try {
+        const { writeFile: writeFile2 } = await import("fs/promises");
+        await writeFile2(promptFile, prompt, "utf-8");
+        await execAsync(`codex exec --color never -o "${outputFile}" - < "${promptFile}"`, { timeout: 60000 });
+        const text = (await readFile2(outputFile, "utf-8")).trim();
+        if (!text)
+          throw new Error("Empty response from Codex CLI");
+        return text;
+      } finally {
+        await rm(tmpDir, { recursive: true, force: true });
+      }
+    }
+  };
+}
+async function isCodexAvailable() {
+  try {
+    await execAsync("codex --version", { timeout: 3000 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function isClaudeCodeAvailable() {
+  try {
+    await execAsync("claude --version", { timeout: 3000 });
+    return true;
+  } catch {
+    return false;
+  }
+}
 var _provider = null;
 async function getProvider() {
   if (_provider)
@@ -34538,7 +34610,9 @@ async function getProvider() {
         if (!env3.geminiApiKey)
           throw new MissingKeyError("gemini");
         return makeGeminiProvider(env3.geminiApiKey);
-      }
+      },
+      "claude-code": () => makeClaudeCodeProvider(),
+      codex: () => makeCodexProvider()
     };
     _provider = await factories[env3.provider]();
     return _provider;
@@ -34555,6 +34629,14 @@ async function getProvider() {
     _provider = await makeGeminiProvider(env3.geminiApiKey);
     return _provider;
   }
+  if (await isClaudeCodeAvailable()) {
+    _provider = await makeClaudeCodeProvider();
+    return _provider;
+  }
+  if (await isCodexAvailable()) {
+    _provider = await makeCodexProvider();
+    return _provider;
+  }
   throw new NoProviderError;
 }
 
@@ -34613,15 +34695,18 @@ class NoProviderError extends Error {
   constructor() {
     super([
       "",
-      source_default.red("❌ No AI provider configured"),
+      source_default.red("  ✖ No AI provider configured"),
       "",
-      source_default.bold("Set one of these environment variables:"),
+      source_default.bold("  Option 1 — use a local AI CLI (no API key needed):"),
+      source_default.dim("    Claude Code: ") + source_default.cyan("hermes config set provider claude-code"),
+      source_default.dim("    Codex CLI:   ") + source_default.cyan("hermes config set provider codex"),
       "",
-      source_default.white("  Anthropic  ") + source_default.dim('export ANTHROPIC_API_KEY="sk-ant-..."') + source_default.dim("  → console.anthropic.com"),
-      source_default.white("  OpenAI     ") + source_default.dim('export OPENAI_API_KEY="sk-..."      ') + source_default.dim("  → platform.openai.com/api-keys"),
-      source_default.white("  Gemini     ") + source_default.dim('export GEMINI_API_KEY="AIza..."     ') + source_default.dim("  → aistudio.google.com/app/apikey"),
+      source_default.bold("  Option 2 — set an API key:"),
+      source_default.white("    Anthropic  ") + source_default.dim('export ANTHROPIC_API_KEY="sk-ant-..."  → console.anthropic.com'),
+      source_default.white("    OpenAI     ") + source_default.dim('export OPENAI_API_KEY="sk-..."         → platform.openai.com/api-keys'),
+      source_default.white("    Gemini     ") + source_default.dim('export GEMINI_API_KEY="AIza..."        → aistudio.google.com/app/apikey'),
       "",
-      source_default.dim("Or pin a provider: export HERMES_PROVIDER=anthropic|openai|gemini"),
+      source_default.dim("  Or run: hermes config setup"),
       ""
     ].join(`
 `));
@@ -34671,6 +34756,24 @@ Ensure all Git commands are:
   }
   return response;
 }
+async function getAllAvailableProviders() {
+  const env3 = await getResolvedEnv();
+  const providers = [];
+  if (env3.anthropicApiKey) {
+    providers.push(await makeAnthropicProvider(env3.anthropicApiKey));
+  } else if (await isClaudeCodeAvailable()) {
+    providers.push(await makeClaudeCodeProvider());
+  }
+  if (env3.openaiApiKey) {
+    providers.push(await makeOpenAIProvider(env3.openaiApiKey));
+  } else if (await isCodexAvailable()) {
+    providers.push(await makeCodexProvider());
+  }
+  if (env3.geminiApiKey) {
+    providers.push(await makeGeminiProvider(env3.geminiApiKey));
+  }
+  return providers;
+}
 async function getActiveProvider() {
   const provider = await getProvider();
   return { name: provider.name, model: provider.model };
@@ -34697,9 +34800,9 @@ function stripMarkdownCodeBlock(text) {
 }
 
 // src/lib/git.ts
-import { exec } from "child_process";
-import { promisify } from "util";
-var execAsync = promisify(exec);
+import { exec as exec2 } from "child_process";
+import { promisify as promisify2 } from "util";
+var execAsync2 = promisify2(exec2);
 async function getRepoState() {
   try {
     const [
@@ -34710,12 +34813,12 @@ async function getRepoState() {
       mergeStatus,
       cherryPickStatus
     ] = await Promise.all([
-      execAsync("git rev-parse --abbrev-ref HEAD").then((r) => r.stdout.trim()),
-      execAsync("git status --porcelain").then((r) => r.stdout.trim()),
-      execAsync("git rev-parse --abbrev-ref @{upstream}").then((r) => r.stdout.trim()).catch(() => null),
-      execAsync("git rev-parse --git-dir").then((r) => execAsync(`test -d ${r.stdout.trim()}/rebase-merge`)).then(() => true).catch(() => false),
-      execAsync("git rev-parse --git-dir").then((r) => execAsync(`test -f ${r.stdout.trim()}/MERGE_HEAD`)).then(() => true).catch(() => false),
-      execAsync("git rev-parse --git-dir").then((r) => execAsync(`test -f ${r.stdout.trim()}/CHERRY_PICK_HEAD`)).then(() => true).catch(() => false)
+      execAsync2("git rev-parse --abbrev-ref HEAD").then((r) => r.stdout.trim()).catch(() => execAsync2("git symbolic-ref --short HEAD").then((r) => r.stdout.trim()).catch(() => "main")),
+      execAsync2("git status --porcelain").then((r) => r.stdout.trim()),
+      execAsync2("git rev-parse --abbrev-ref @{upstream}").then((r) => r.stdout.trim()).catch(() => null),
+      execAsync2("git rev-parse --git-dir").then((r) => execAsync2(`test -d ${r.stdout.trim()}/rebase-merge`)).then(() => true).catch(() => false),
+      execAsync2("git rev-parse --git-dir").then((r) => execAsync2(`test -f ${r.stdout.trim()}/MERGE_HEAD`)).then(() => true).catch(() => false),
+      execAsync2("git rev-parse --git-dir").then((r) => execAsync2(`test -f ${r.stdout.trim()}/CHERRY_PICK_HEAD`)).then(() => true).catch(() => false)
     ]);
     const statusLines = status.split(`
 `).filter((line) => line);
@@ -34724,7 +34827,7 @@ async function getRepoState() {
     let ahead = 0;
     let behind = 0;
     if (tracking) {
-      const aheadBehind = await execAsync(`git rev-list --left-right --count ${tracking}...HEAD`).then((r) => r.stdout.trim().split("\t")).catch(() => ["0", "0"]);
+      const aheadBehind = await execAsync2(`git rev-list --left-right --count ${tracking}...HEAD`).then((r) => r.stdout.trim().split("\t")).catch(() => ["0", "0"]);
       behind = parseInt(aheadBehind[0], 10);
       ahead = parseInt(aheadBehind[1], 10);
     }
@@ -34746,7 +34849,7 @@ async function getRepoState() {
 }
 async function isGitInstalled() {
   try {
-    await execAsync("git --version");
+    await execAsync2("git --version");
     return true;
   } catch {
     return false;
@@ -34754,7 +34857,7 @@ async function isGitInstalled() {
 }
 async function isGitRepository() {
   try {
-    await execAsync("git rev-parse --git-dir");
+    await execAsync2("git rev-parse --git-dir");
     return true;
   } catch {
     return false;
@@ -34762,7 +34865,7 @@ async function isGitRepository() {
 }
 async function hasCommits() {
   try {
-    await execAsync("git rev-parse HEAD");
+    await execAsync2("git rev-parse HEAD");
     return true;
   } catch {
     return false;
@@ -34770,7 +34873,7 @@ async function hasCommits() {
 }
 async function executeGitCommand(command) {
   try {
-    const { stdout, stderr } = await execAsync(command);
+    const { stdout, stderr } = await execAsync2(command);
     return stdout || stderr;
   } catch (error3) {
     throw new Error(`Git command failed: ${error3.message}`);
@@ -34778,7 +34881,7 @@ async function executeGitCommand(command) {
 }
 async function getConflictedFiles() {
   try {
-    const { stdout } = await execAsync("git diff --name-only --diff-filter=U");
+    const { stdout } = await execAsync2("git diff --name-only --diff-filter=U");
     return stdout.trim().split(`
 `).filter((line) => line);
   } catch {
@@ -34833,494 +34936,187 @@ function displayConflictExplanation(explanation, files) {
   console.log(explanation);
 }
 
-// src/commands/plan.ts
-function planCommand(program2) {
-  program2.command("plan").description("Analyze the current repository state and propose a safe Git plan").argument("<intent>", "What you want to achieve").action(async (intent) => {
-    try {
-      const { name, model } = await getActiveProvider();
-      console.log(`\uD83D\uDD0D Analyzing repository state... ${source_default.dim(`[${name} / ${model}]`)}
-`);
-      const repoState = await getRepoState();
-      const analysis = await analyzeGitState(repoState, intent);
-      displayPlan(analysis, repoState);
-      console.log(source_default.dim(`
-\uD83D\uDCA1 No changes have been made. Review the plan above.`));
-    } catch (error3) {
-      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
-      process.exit(1);
-    }
-  });
-}
-
-// src/lib/config.ts
-import { readFile as readFile2 } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
-async function loadConfig() {
-  const configPath = ".hermes/config.json";
-  if (!existsSync2(configPath)) {
-    return null;
-  }
-  try {
-    const content = await readFile2(configPath, "utf-8");
-    return JSON.parse(content);
-  } catch (error3) {
-    console.warn("⚠️  Could not load .hermes/config.json");
-    return null;
+// node_modules/@inquirer/core/dist/esm/lib/key.mjs
+var isUpKey = (key) => key.name === "up" || key.name === "k" || key.ctrl && key.name === "p";
+var isDownKey = (key) => key.name === "down" || key.name === "j" || key.ctrl && key.name === "n";
+var isSpaceKey = (key) => key.name === "space";
+var isBackspaceKey = (key) => key.name === "backspace";
+var isNumberKey = (key) => "123456789".includes(key.name);
+var isEnterKey = (key) => key.name === "enter" || key.name === "return";
+// node_modules/@inquirer/core/dist/esm/lib/errors.mjs
+class AbortPromptError extends Error {
+  name = "AbortPromptError";
+  message = "Prompt was aborted";
+  constructor(options) {
+    super();
+    this.cause = options?.cause;
   }
 }
-function generateBranchName(pattern, description, ticket) {
-  let branchName = pattern;
-  branchName = branchName.replace("{description}", slugify(description));
-  branchName = branchName.replace("{ticket}", ticket || "");
-  branchName = branchName.replace(/\/{2,}/g, "/");
-  branchName = branchName.replace(/\/$/, "");
-  return branchName;
+
+class CancelPromptError extends Error {
+  name = "CancelPromptError";
+  message = "Prompt was canceled";
 }
-function slugify(text) {
-  return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+
+class ExitPromptError extends Error {
+  name = "ExitPromptError";
 }
 
-// src/lib/stats.ts
-import { readFile as readFile3, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
-import { existsSync as existsSync3 } from "fs";
-var STATS_FILE = ".hermes/stats.json";
-var MAX_HISTORY = 1000;
-async function loadStats() {
-  if (!existsSync3(STATS_FILE)) {
-    return createEmptyStats();
-  }
-  try {
-    const content = await readFile3(STATS_FILE, "utf-8");
-    return JSON.parse(content);
-  } catch {
-    return createEmptyStats();
-  }
+class HookError extends Error {
+  name = "HookError";
 }
-async function saveStats(stats) {
-  try {
-    await mkdir2(".hermes", { recursive: true });
-    if (stats.commandHistory.length > MAX_HISTORY) {
-      stats.commandHistory = stats.commandHistory.slice(-MAX_HISTORY);
-    }
-    await writeFile2(STATS_FILE, JSON.stringify(stats, null, 2));
-  } catch (error3) {}
+
+class ValidationError extends Error {
+  name = "ValidationError";
 }
-async function recordCommand(command, args, duration, success, gitCommandsRun = 0) {
-  const stats = await loadStats();
-  const entry = {
-    timestamp: Date.now(),
-    command,
-    args,
-    duration,
-    success,
-    gitCommandsRun
+// node_modules/@inquirer/core/dist/esm/lib/use-prefix.mjs
+import { AsyncResource as AsyncResource2 } from "node:async_hooks";
+
+// node_modules/@inquirer/core/dist/esm/lib/hook-engine.mjs
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
+var hookStorage = new AsyncLocalStorage;
+function createStore(rl) {
+  const store = {
+    rl,
+    hooks: [],
+    hooksCleanup: [],
+    hooksEffect: [],
+    index: 0,
+    handleChange() {}
   };
-  stats.totalCommands++;
-  stats.totalGitCommands += gitCommandsRun;
-  stats.lastUsed = Date.now();
-  stats.commandHistory.push(entry);
-  await saveStats(stats);
+  return store;
 }
-async function getStatsSummary(days = 30) {
-  const stats = await loadStats();
-  const cutoff = Date.now() - days * 24 * 60 * 60 * 1000;
-  const recentEntries = stats.commandHistory.filter((e) => e.timestamp >= cutoff);
-  const commandCounts = {};
-  let successCount = 0;
-  recentEntries.forEach((entry) => {
-    commandCounts[entry.command] = (commandCounts[entry.command] || 0) + 1;
-    if (entry.success)
-      successCount++;
+function withHooks(rl, cb) {
+  const store = createStore(rl);
+  return hookStorage.run(store, () => {
+    function cycle(render) {
+      store.handleChange = () => {
+        store.index = 0;
+        render();
+      };
+      store.handleChange();
+    }
+    return cb(cycle);
   });
-  const topCommands = Object.entries(commandCounts).sort(([, a], [, b]) => b - a).slice(0, 5).map(([cmd, count]) => ({ command: cmd, count }));
-  const totalDays = Math.max(1, Math.ceil((Date.now() - stats.startDate) / (24 * 60 * 60 * 1000)));
-  return {
-    totalCommands: recentEntries.length,
-    allTimeCommands: stats.totalCommands,
-    gitCommandsRun: recentEntries.reduce((sum, e) => sum + e.gitCommandsRun, 0),
-    allTimeGitCommands: stats.totalGitCommands,
-    successRate: recentEntries.length ? successCount / recentEntries.length : 0,
-    topCommands,
-    daysActive: totalDays,
-    commandsPerDay: stats.totalCommands / totalDays
+}
+function getStore() {
+  const store = hookStorage.getStore();
+  if (!store) {
+    throw new HookError("[Inquirer] Hook functions can only be called from within a prompt");
+  }
+  return store;
+}
+function readline() {
+  return getStore().rl;
+}
+function withUpdates(fn) {
+  const wrapped = (...args) => {
+    const store = getStore();
+    let shouldUpdate = false;
+    const oldHandleChange = store.handleChange;
+    store.handleChange = () => {
+      shouldUpdate = true;
+    };
+    const returnValue = fn(...args);
+    if (shouldUpdate) {
+      oldHandleChange();
+    }
+    store.handleChange = oldHandleChange;
+    return returnValue;
   };
+  return AsyncResource.bind(wrapped);
 }
-function createEmptyStats() {
-  return {
-    totalCommands: 0,
-    totalGitCommands: 0,
-    commandHistory: [],
-    startDate: Date.now(),
-    lastUsed: Date.now()
+function withPointer(cb) {
+  const store = getStore();
+  const { index } = store;
+  const pointer = {
+    get() {
+      return store.hooks[index];
+    },
+    set(value) {
+      store.hooks[index] = value;
+    },
+    initialized: index in store.hooks
   };
+  const returnValue = cb(pointer);
+  store.index++;
+  return returnValue;
 }
-
-// src/commands/start.ts
-function startCommand(program2) {
-  program2.command("start").description("Start a new piece of work safely").argument("<task>", "Description of the task").action(async (task) => {
-    const startTime = Date.now();
-    let gitCommandsRun = 0;
-    try {
-      console.log(`\uD83D\uDE80 Starting new task...
-`);
-      const config = await loadConfig();
-      const repoState = await getRepoState();
-      let suggestedBranchName;
-      if (config) {
-        suggestedBranchName = generateBranchName(config.branches.featurePattern, task);
-        console.log(`\uD83D\uDCA1 Suggested branch: ${suggestedBranchName}
-`);
-      }
-      const planResponse = await getGitPlan(repoState, `Start working on: ${task}. ${suggestedBranchName ? `Suggested branch name: ${suggestedBranchName}.` : ""} Provide base branch, conventional branch name, and Git commands to create and switch to the branch.`);
-      let plan;
-      try {
-        plan = JSON.parse(planResponse);
-      } catch {
-        console.log(`\uD83D\uDCAD Hermes suggests:
-`);
-        console.log(planResponse);
-        console.log(`
-⚠️  Could not auto-execute. Please review the plan above.`);
-        return;
-      }
-      if (plan.baseBranch && plan.branchName) {
-        console.log(`\uD83D\uDCCD Base branch: ${plan.baseBranch}`);
-        console.log(`\uD83C\uDF3F New branch: ${plan.branchName}
-`);
-      }
-      if (plan.explanation) {
-        console.log(`\uD83D\uDCAD ${plan.explanation}
-`);
-      }
-      if (plan.commands && Array.isArray(plan.commands)) {
-        for (const command of plan.commands) {
-          let cmdString;
-          if (typeof command === "string") {
-            cmdString = command;
-          } else if (typeof command === "object" && command.command) {
-            cmdString = command.command;
-          } else if (typeof command === "object" && command.cmd) {
-            cmdString = command.cmd;
-          } else {
-            console.warn("⚠️  Skipping invalid command:", command);
-            continue;
-          }
-          validateGitCommand(cmdString);
-          displayStep(cmdString);
-          await executeGitCommand(cmdString);
-          gitCommandsRun++;
-        }
-        const branchName = plan.branchName || "new branch";
-        displaySuccess(`Successfully created and switched to ${branchName}`);
-        if (config?.preferences.learningMode) {
-          console.log(`
-\uD83D\uDCA1 Learning tip: Branch created from clean state ensures no unexpected commits`);
-        }
-      } else {
-        console.log("⚠️  No commands to execute. See analysis above.");
-      }
-      const duration = (Date.now() - startTime) / 1000;
-      await recordCommand("start", [task], duration, true, gitCommandsRun);
-    } catch (error3) {
-      const duration = (Date.now() - startTime) / 1000;
-      await recordCommand("start", [task], duration, false, gitCommandsRun);
-      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
-      process.exit(1);
-    }
-  });
+function handleChange() {
+  getStore().handleChange();
 }
-
-// src/commands/wip.ts
-function wipCommand(program2) {
-  program2.command("wip").description("Save work safely when things get messy").option("-m, --message <message>", "Custom WIP message").action(async (options) => {
-    try {
-      console.log(`\uD83D\uDCBE Saving work in progress...
-`);
-      const repoState = await getRepoState();
-      const messageNote = options.message ? ` with message: "${options.message}"` : "";
-      const planResponse = await getGitPlan(repoState, `Save work in progress${messageNote}. Decide whether to commit or stash. Return JSON with: approach, commands[], explanation.`);
-      let plan;
-      try {
-        plan = JSON.parse(planResponse);
-      } catch {
-        console.log(`\uD83D\uDCAD Hermes suggests:
-`);
-        console.log(planResponse);
-        console.log(`
-⚠️  Could not auto-execute. Please review the plan above.`);
-        return;
-      }
-      if (plan.explanation) {
-        console.log(`\uD83D\uDCAD ${plan.explanation}
-`);
+var effectScheduler = {
+  queue(cb) {
+    const store = getStore();
+    const { index } = store;
+    store.hooksEffect.push(() => {
+      store.hooksCleanup[index]?.();
+      const cleanFn = cb(readline());
+      if (cleanFn != null && typeof cleanFn !== "function") {
+        throw new ValidationError("useEffect return value must be a cleanup function or nothing.");
       }
-      if (plan.commands && Array.isArray(plan.commands)) {
-        for (const command of plan.commands) {
-          let cmdString;
-          if (typeof command === "string") {
-            cmdString = command;
-          } else if (typeof command === "object" && command.command) {
-            cmdString = command.command;
-          } else if (typeof command === "object" && command.cmd) {
-            cmdString = command.cmd;
-          } else {
-            console.warn("⚠️  Skipping invalid command:", command);
-            continue;
-          }
-          validateGitCommand(cmdString);
-          displayStep(cmdString);
-          await executeGitCommand(cmdString);
-        }
-        const approach = plan.approach || "selected method";
-        displaySuccess(`Work saved using ${approach}`);
-      } else {
-        console.log("⚠️  No commands to execute.");
+      store.hooksCleanup[index] = cleanFn;
+    });
+  },
+  run() {
+    const store = getStore();
+    withUpdates(() => {
+      store.hooksEffect.forEach((effect) => {
+        effect();
+      });
+      store.hooksEffect.length = 0;
+    })();
+  },
+  clearAll() {
+    const store = getStore();
+    store.hooksCleanup.forEach((cleanFn) => {
+      cleanFn?.();
+    });
+    store.hooksEffect.length = 0;
+    store.hooksCleanup.length = 0;
+  }
+};
+
+// node_modules/@inquirer/core/dist/esm/lib/use-state.mjs
+function useState(defaultValue) {
+  return withPointer((pointer) => {
+    const setFn = (newValue) => {
+      if (pointer.get() !== newValue) {
+        pointer.set(newValue);
+        handleChange();
       }
-    } catch (error3) {
-      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
-      process.exit(1);
+    };
+    if (pointer.initialized) {
+      return [pointer.get(), setFn];
     }
+    const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+    pointer.set(value);
+    return [value, setFn];
   });
 }
 
-// src/commands/sync.ts
-function syncCommand(program2) {
-  program2.command("sync").description("Bring your branch up to date safely").option("--from <branch>", "Source branch to sync from (default: main)").action(async (options) => {
-    try {
-      console.log(`\uD83D\uDD04 Syncing branch...
-`);
-      const repoState = await getRepoState();
-      const fromNote = options.from ? ` from ${options.from}` : " from main";
-      const planResponse = await getGitPlan(repoState, `Sync branch${fromNote}. Evaluate if rebase or merge is safer. Check if branch is shared. Return JSON with: approach, isRisky, riskExplanation, commands[], explanation.`);
-      let plan;
-      try {
-        plan = JSON.parse(planResponse);
-      } catch {
-        console.log(`\uD83D\uDCAD Hermes suggests:
-`);
-        console.log(planResponse);
-        console.log(`
-⚠️  Could not auto-execute. Please review the plan above.`);
-        return;
-      }
-      if (plan.isRisky && plan.riskExplanation) {
-        displayWarning(plan.riskExplanation);
-        console.log();
-      }
-      if (plan.explanation) {
-        console.log(`\uD83D\uDCAD ${plan.explanation}
-`);
-      }
-      if (plan.commands && Array.isArray(plan.commands)) {
-        for (const command of plan.commands) {
-          let cmdString;
-          if (typeof command === "string") {
-            cmdString = command;
-          } else if (typeof command === "object" && command.command) {
-            cmdString = command.command;
-          } else if (typeof command === "object" && command.cmd) {
-            cmdString = command.cmd;
-          } else {
-            console.warn("⚠️  Skipping invalid command:", command);
-            continue;
-          }
-          validateGitCommand(cmdString);
-          displayStep(cmdString);
-          await executeGitCommand(cmdString);
-        }
-        const approach = plan.approach || "selected method";
-        displaySuccess(`Branch synced using ${approach}`);
-      } else {
-        console.log("⚠️  No commands to execute.");
-      }
-    } catch (error3) {
-      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
-      process.exit(1);
+// node_modules/@inquirer/core/dist/esm/lib/use-effect.mjs
+function useEffect(cb, depArray) {
+  withPointer((pointer) => {
+    const oldDeps = pointer.get();
+    const hasChanged = !Array.isArray(oldDeps) || depArray.some((dep, i) => !Object.is(dep, oldDeps[i]));
+    if (hasChanged) {
+      effectScheduler.queue(cb);
     }
+    pointer.set(depArray);
   });
 }
 
-// node_modules/@inquirer/core/dist/esm/lib/key.mjs
-var isUpKey = (key) => key.name === "up" || key.name === "k" || key.ctrl && key.name === "p";
-var isDownKey = (key) => key.name === "down" || key.name === "j" || key.ctrl && key.name === "n";
-var isSpaceKey = (key) => key.name === "space";
-var isBackspaceKey = (key) => key.name === "backspace";
-var isNumberKey = (key) => "123456789".includes(key.name);
-var isEnterKey = (key) => key.name === "enter" || key.name === "return";
-// node_modules/@inquirer/core/dist/esm/lib/errors.mjs
-class AbortPromptError extends Error {
-  name = "AbortPromptError";
-  message = "Prompt was aborted";
-  constructor(options) {
-    super();
-    this.cause = options?.cause;
-  }
-}
-
-class CancelPromptError extends Error {
-  name = "CancelPromptError";
-  message = "Prompt was canceled";
-}
+// node_modules/@inquirer/core/dist/esm/lib/theme.mjs
+var import_yoctocolors_cjs = __toESM(require_yoctocolors_cjs(), 1);
 
-class ExitPromptError extends Error {
-  name = "ExitPromptError";
-}
-
-class HookError extends Error {
-  name = "HookError";
-}
-
-class ValidationError extends Error {
-  name = "ValidationError";
-}
-// node_modules/@inquirer/core/dist/esm/lib/use-prefix.mjs
-import { AsyncResource as AsyncResource2 } from "node:async_hooks";
-
-// node_modules/@inquirer/core/dist/esm/lib/hook-engine.mjs
-import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
-var hookStorage = new AsyncLocalStorage;
-function createStore(rl) {
-  const store = {
-    rl,
-    hooks: [],
-    hooksCleanup: [],
-    hooksEffect: [],
-    index: 0,
-    handleChange() {}
-  };
-  return store;
-}
-function withHooks(rl, cb) {
-  const store = createStore(rl);
-  return hookStorage.run(store, () => {
-    function cycle(render) {
-      store.handleChange = () => {
-        store.index = 0;
-        render();
-      };
-      store.handleChange();
-    }
-    return cb(cycle);
-  });
-}
-function getStore() {
-  const store = hookStorage.getStore();
-  if (!store) {
-    throw new HookError("[Inquirer] Hook functions can only be called from within a prompt");
-  }
-  return store;
-}
-function readline() {
-  return getStore().rl;
-}
-function withUpdates(fn) {
-  const wrapped = (...args) => {
-    const store = getStore();
-    let shouldUpdate = false;
-    const oldHandleChange = store.handleChange;
-    store.handleChange = () => {
-      shouldUpdate = true;
-    };
-    const returnValue = fn(...args);
-    if (shouldUpdate) {
-      oldHandleChange();
-    }
-    store.handleChange = oldHandleChange;
-    return returnValue;
-  };
-  return AsyncResource.bind(wrapped);
-}
-function withPointer(cb) {
-  const store = getStore();
-  const { index } = store;
-  const pointer = {
-    get() {
-      return store.hooks[index];
-    },
-    set(value) {
-      store.hooks[index] = value;
-    },
-    initialized: index in store.hooks
-  };
-  const returnValue = cb(pointer);
-  store.index++;
-  return returnValue;
-}
-function handleChange() {
-  getStore().handleChange();
-}
-var effectScheduler = {
-  queue(cb) {
-    const store = getStore();
-    const { index } = store;
-    store.hooksEffect.push(() => {
-      store.hooksCleanup[index]?.();
-      const cleanFn = cb(readline());
-      if (cleanFn != null && typeof cleanFn !== "function") {
-        throw new ValidationError("useEffect return value must be a cleanup function or nothing.");
-      }
-      store.hooksCleanup[index] = cleanFn;
-    });
-  },
-  run() {
-    const store = getStore();
-    withUpdates(() => {
-      store.hooksEffect.forEach((effect) => {
-        effect();
-      });
-      store.hooksEffect.length = 0;
-    })();
-  },
-  clearAll() {
-    const store = getStore();
-    store.hooksCleanup.forEach((cleanFn) => {
-      cleanFn?.();
-    });
-    store.hooksEffect.length = 0;
-    store.hooksCleanup.length = 0;
-  }
-};
-
-// node_modules/@inquirer/core/dist/esm/lib/use-state.mjs
-function useState(defaultValue) {
-  return withPointer((pointer) => {
-    const setFn = (newValue) => {
-      if (pointer.get() !== newValue) {
-        pointer.set(newValue);
-        handleChange();
-      }
-    };
-    if (pointer.initialized) {
-      return [pointer.get(), setFn];
-    }
-    const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
-    pointer.set(value);
-    return [value, setFn];
-  });
-}
-
-// node_modules/@inquirer/core/dist/esm/lib/use-effect.mjs
-function useEffect(cb, depArray) {
-  withPointer((pointer) => {
-    const oldDeps = pointer.get();
-    const hasChanged = !Array.isArray(oldDeps) || depArray.some((dep, i) => !Object.is(dep, oldDeps[i]));
-    if (hasChanged) {
-      effectScheduler.queue(cb);
-    }
-    pointer.set(depArray);
-  });
-}
-
-// node_modules/@inquirer/core/dist/esm/lib/theme.mjs
-var import_yoctocolors_cjs = __toESM(require_yoctocolors_cjs(), 1);
-
-// node_modules/@inquirer/figures/dist/esm/index.js
-import process3 from "node:process";
-function isUnicodeSupported() {
-  if (process3.platform !== "win32") {
-    return process3.env["TERM"] !== "linux";
-  }
-  return Boolean(process3.env["WT_SESSION"]) || Boolean(process3.env["TERMINUS_SUBLIME"]) || process3.env["ConEmuTask"] === "{cmd::Cmder}" || process3.env["TERM_PROGRAM"] === "Terminus-Sublime" || process3.env["TERM_PROGRAM"] === "vscode" || process3.env["TERM"] === "xterm-256color" || process3.env["TERM"] === "alacritty" || process3.env["TERMINAL_EMULATOR"] === "JetBrains-JediTerm";
+// node_modules/@inquirer/figures/dist/esm/index.js
+import process3 from "node:process";
+function isUnicodeSupported() {
+  if (process3.platform !== "win32") {
+    return process3.env["TERM"] !== "linux";
+  }
+  return Boolean(process3.env["WT_SESSION"]) || Boolean(process3.env["TERMINUS_SUBLIME"]) || process3.env["ConEmuTask"] === "{cmd::Cmder}" || process3.env["TERM_PROGRAM"] === "Terminus-Sublime" || process3.env["TERM_PROGRAM"] === "vscode" || process3.env["TERM"] === "xterm-256color" || process3.env["TERM"] === "alacritty" || process3.env["TERMINAL_EMULATOR"] === "JetBrains-JediTerm";
 }
 var common = {
   circleQuestionMark: "(?)",
@@ -37131,9 +36927,9 @@ var import_mute_stream2 = __toESM(require_lib(), 1);
 import readline3 from "node:readline";
 var import_ansi_escapes5 = __toESM(require_ansi_escapes(), 1);
 var _ = {
-  set: (obj, path4 = "", value) => {
+  set: (obj, path5 = "", value) => {
     let pointer = obj;
-    path4.split(".").forEach((key2, index, arr) => {
+    path5.split(".").forEach((key2, index, arr) => {
       if (key2 === "__proto__" || key2 === "constructor")
         return;
       if (index === arr.length - 1) {
@@ -37144,8 +36940,8 @@ var _ = {
       pointer = pointer[key2];
     });
   },
-  get: (obj, path4 = "", defaultValue) => {
-    const travel = (regexp) => String.prototype.split.call(path4, regexp).filter(Boolean).reduce((res, key2) => res !== null && res !== undefined ? res[key2] : res, obj);
+  get: (obj, path5 = "", defaultValue) => {
+    const travel = (regexp) => String.prototype.split.call(path5, regexp).filter(Boolean).reduce((res, key2) => res !== null && res !== undefined ? res[key2] : res, obj);
     const result = travel(/[,[\]]+?/) || travel(/[,.[\]]+?/);
     return result === undefined || result === obj ? defaultValue : result;
   }
@@ -37383,8 +37179,537 @@ var inquirer = {
 };
 var esm_default12 = inquirer;
 
+// src/lib/council.ts
+async function broadcastToCouncil(prompt2) {
+  const providers = await getAllAvailableProviders();
+  if (providers.length === 0) {
+    throw new Error("No AI providers available. Run hermes config setup.");
+  }
+  const results = await Promise.allSettled(providers.map(async (p) => {
+    const response = await p.complete(prompt2);
+    return { providerName: p.name, model: p.model, response };
+  }));
+  return results.map((r, i) => r.status === "fulfilled" ? r.value : { providerName: providers[i].name, model: providers[i].model, response: "", error: r.reason?.message ?? "Unknown error" });
+}
+async function synthesizePerspectives(originalPrompt, perspectives, userFeedback) {
+  const valid = perspectives.filter((p) => !p.error);
+  if (valid.length === 0)
+    throw new Error("No valid perspectives to synthesize");
+  if (valid.length === 1)
+    return valid[0].response;
+  const perspectiveBlock = valid.map((p) => `### ${p.providerName} (${p.model})
+${p.response}`).join(`
+
+`);
+  const feedbackLine = userFeedback ? `
+User feedback to incorporate: "${userFeedback}"
+` : "";
+  const prompt2 = `You are synthesizing advice from multiple AI assistants into one clear, actionable recommendation.
+
+Original request: "${originalPrompt}"
+${feedbackLine}
+Each assistant's perspective:
+
+${perspectiveBlock}
+
+Synthesize these into a single, concise, actionable response. Where they agree, state the consensus confidently. Where they differ, explain the trade-off briefly and make a clear recommendation. Do not attribute individual opinions.`;
+  return getAISuggestion(prompt2);
+}
+async function runCouncilSession(prompt2, options = {}) {
+  const session = { originalPrompt: prompt2, rounds: [] };
+  console.log(`
+  ` + source_default.bold("Council") + (options.label ? source_default.dim(` — ${options.label}`) : "") + `
+`);
+  let currentPrompt = prompt2;
+  let round = 0;
+  while (true) {
+    round++;
+    process.stdout.write(source_default.dim(`  Consulting council${round > 1 ? ` (round ${round})` : ""}...`));
+    const perspectives = await broadcastToCouncil(currentPrompt);
+    session.rounds.push({ feedback: round > 1 ? currentPrompt : undefined, perspectives });
+    process.stdout.write("\r" + " ".repeat(50) + "\r");
+    displayPerspectives(perspectives);
+    const validPerspectives = perspectives.filter((p) => !p.error);
+    const choices = [];
+    validPerspectives.forEach((p, i) => {
+      choices.push({ name: `Accept  [${i + 1}] ${p.providerName}`, value: `accept:${i}` });
+    });
+    if (validPerspectives.length > 1) {
+      choices.push({ name: "Synthesize  — have the council agree on one answer", value: "synthesize" });
+    }
+    choices.push({ name: "Refine  — give feedback and re-ask the council", value: "refine" });
+    choices.push({ name: "Follow-up  — ask the council a new question", value: "followup" });
+    choices.push({ name: "Exit  — discard", value: "exit" });
+    const { action } = await esm_default12.prompt([{
+      type: "list",
+      name: "action",
+      message: "What would you like to do?",
+      choices
+    }]);
+    if (action === "exit")
+      return null;
+    if (action.startsWith("accept:")) {
+      const idx = parseInt(action.split(":")[1], 10);
+      return validPerspectives[idx].response;
+    }
+    if (action === "synthesize") {
+      process.stdout.write(source_default.dim("  Synthesizing...\r"));
+      const synthesis = await synthesizePerspectives(prompt2, perspectives);
+      process.stdout.write(" ".repeat(30) + "\r");
+      console.log(`
+` + source_default.dim("  ─".repeat(27)));
+      console.log("  " + source_default.bold.cyan("Synthesis"));
+      console.log(source_default.dim("  ─".repeat(27)));
+      wrapText(synthesis).forEach((l) => console.log("  " + l));
+      console.log(source_default.dim("  ─".repeat(27)) + `
+`);
+      const { synthAction } = await esm_default12.prompt([{
+        type: "list",
+        name: "synthAction",
+        message: "Use this synthesis?",
+        choices: [
+          { name: "Yes, accept", value: "accept" },
+          { name: "Refine further", value: "refine" },
+          { name: "Exit", value: "exit" }
+        ]
+      }]);
+      if (synthAction === "accept")
+        return synthesis;
+      if (synthAction === "exit")
+        return null;
+    }
+    const isFollowUp = action === "followup";
+    const { feedback } = await esm_default12.prompt([{
+      type: "input",
+      name: "feedback",
+      message: isFollowUp ? "Your question:" : "Your feedback (what to change or add):",
+      validate: (v) => v.trim().length > 0 || "Please enter something"
+    }]);
+    if (isFollowUp) {
+      currentPrompt = feedback.trim();
+    } else {
+      const perspectiveContext = perspectives.filter((p) => !p.error).map((p) => `[${p.providerName}]: ${p.response.slice(0, 500)}`).join(`
+
+`);
+      currentPrompt = `Original request: "${prompt2}"
+
+Previous perspectives from the council:
+${perspectiveContext}
+
+User feedback: "${feedback.trim()}"
+
+Respond with an improved answer that addresses the feedback.`;
+    }
+    console.log();
+  }
+}
+function displayPerspectives(perspectives) {
+  const valid = perspectives.filter((p) => !p.error);
+  const failed = perspectives.filter((p) => p.error);
+  perspectives.filter((p) => !p.error).forEach((p, i) => {
+    console.log(source_default.dim("  ─".repeat(27)));
+    console.log(`  ${source_default.bold.cyan(`[${i + 1}]`)} ${source_default.bold(p.providerName)} ${source_default.dim(p.model)}`);
+    console.log(source_default.dim("  ─".repeat(27)));
+    wrapText(p.response).forEach((l) => console.log("  " + l));
+    console.log();
+  });
+  if (failed.length > 0) {
+    failed.forEach((p) => {
+      console.log(source_default.dim(`  [${p.providerName}] unavailable: ${p.error}`));
+    });
+    console.log();
+  }
+  if (valid.length === 0) {
+    throw new Error("All council members failed to respond.");
+  }
+}
+function wrapText(text, width = 72) {
+  const lines2 = [];
+  for (const paragraph of text.split(`
+`)) {
+    if (paragraph.trim() === "") {
+      lines2.push("");
+      continue;
+    }
+    const words = paragraph.split(" ");
+    let line = "";
+    for (const word of words) {
+      if ((line + " " + word).trim().length > width) {
+        if (line)
+          lines2.push(line);
+        line = word;
+      } else {
+        line = line ? line + " " + word : word;
+      }
+    }
+    if (line)
+      lines2.push(line);
+  }
+  return lines2;
+}
+
+// src/commands/plan.ts
+function planCommand(program2) {
+  program2.command("plan").description("Analyze the current repository state and propose a safe Git plan").argument("<intent>", "What you want to achieve").option("--council", "Force council mode (all available providers)").option("--no-council", "Skip council mode, use single provider only").action(async (intent, options) => {
+    try {
+      const repoState = await getRepoState();
+      const providers = await getAllAvailableProviders();
+      const useCouncil = options.council === true ? true : options.council === false ? false : providers.length >= 2;
+      if (useCouncil && providers.length >= 2) {
+        const providerList = providers.map((p) => source_default.dim(`[${p.name}]`)).join(" ");
+        console.log(`
+  ${providerList}
+`);
+        const prompt2 = buildPlanPrompt(intent, repoState);
+        const result = await runCouncilSession(prompt2, { label: intent });
+        if (result) {
+          displayPlan(result, repoState);
+          console.log(source_default.dim(`
+  No changes made. Review the plan above.
+`));
+        } else {
+          console.log(source_default.dim(`
+  Exited without selecting a plan.
+`));
+        }
+      } else {
+        const { name, model } = await getActiveProvider();
+        console.log(`
+  Analyzing...  ${source_default.dim(`[${name} / ${model}]`)}
+`);
+        const analysis = await analyzeGitState(repoState, intent);
+        displayPlan(analysis, repoState);
+        console.log(source_default.dim(`
+  No changes made. Review the plan above.
+`));
+        if (providers.length >= 2) {
+          console.log(source_default.dim(`  Tip: run with --council to get perspectives from all providers.
+`));
+        }
+      }
+    } catch (error3) {
+      console.error(source_default.red(`
+  ✖ ` + (error3 instanceof Error ? error3.message : error3)));
+      process.exit(1);
+    }
+  });
+}
+function buildPlanPrompt(intent, repoState) {
+  return `You are a Git expert. A developer wants to: "${intent}"
+
+Current repository state:
+- Branch: ${repoState.currentBranch}
+- Clean: ${repoState.isClean}
+- Uncommitted changes: ${repoState.hasUncommittedChanges}
+- Untracked files: ${repoState.hasUntrackedFiles}
+- Ahead: ${repoState.ahead} commits, Behind: ${repoState.behind} commits
+- In rebase: ${repoState.isInRebase}, In merge: ${repoState.isInMerge}
+- Remote tracking: ${repoState.remoteTracking ?? "none"}
+
+Provide a clear, safe Git plan with:
+1. Recommended approach and reasoning
+2. Step-by-step git commands (must start with "git ")
+3. Any risks or things to watch out for
+
+Be specific and concise.`;
+}
+
+// src/lib/config.ts
+import { readFile as readFile3 } from "fs/promises";
+import { existsSync as existsSync2 } from "fs";
+async function loadConfig() {
+  const configPath = ".hermes/config.json";
+  if (!existsSync2(configPath)) {
+    return null;
+  }
+  try {
+    const content = await readFile3(configPath, "utf-8");
+    return JSON.parse(content);
+  } catch (error3) {
+    console.warn("⚠️  Could not load .hermes/config.json");
+    return null;
+  }
+}
+function generateBranchName(pattern, description, ticket) {
+  let branchName = pattern;
+  branchName = branchName.replace("{description}", slugify(description));
+  branchName = branchName.replace("{ticket}", ticket || "");
+  branchName = branchName.replace(/\/{2,}/g, "/");
+  branchName = branchName.replace(/\/$/, "");
+  return branchName;
+}
+function slugify(text) {
+  return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function isProtectedBranch(branch, config) {
+  if (!config) {
+    return ["main", "master", "production", "staging"].includes(branch);
+  }
+  return config.project.protectedBranches.includes(branch);
+}
+
+// src/lib/stats.ts
+import { readFile as readFile4, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
+import { existsSync as existsSync3 } from "fs";
+var STATS_FILE = ".hermes/stats.json";
+var MAX_HISTORY = 1000;
+async function loadStats() {
+  if (!existsSync3(STATS_FILE)) {
+    return createEmptyStats();
+  }
+  try {
+    const content = await readFile4(STATS_FILE, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return createEmptyStats();
+  }
+}
+async function saveStats(stats) {
+  try {
+    await mkdir2(".hermes", { recursive: true });
+    if (stats.commandHistory.length > MAX_HISTORY) {
+      stats.commandHistory = stats.commandHistory.slice(-MAX_HISTORY);
+    }
+    await writeFile2(STATS_FILE, JSON.stringify(stats, null, 2));
+  } catch (error3) {}
+}
+async function recordCommand(command, args, duration, success, gitCommandsRun = 0) {
+  const stats = await loadStats();
+  const entry = {
+    timestamp: Date.now(),
+    command,
+    args,
+    duration,
+    success,
+    gitCommandsRun
+  };
+  stats.totalCommands++;
+  stats.totalGitCommands += gitCommandsRun;
+  stats.lastUsed = Date.now();
+  stats.commandHistory.push(entry);
+  await saveStats(stats);
+}
+async function getStatsSummary(days = 30) {
+  const stats = await loadStats();
+  const cutoff = Date.now() - days * 24 * 60 * 60 * 1000;
+  const recentEntries = stats.commandHistory.filter((e) => e.timestamp >= cutoff);
+  const commandCounts = {};
+  let successCount = 0;
+  recentEntries.forEach((entry) => {
+    commandCounts[entry.command] = (commandCounts[entry.command] || 0) + 1;
+    if (entry.success)
+      successCount++;
+  });
+  const topCommands = Object.entries(commandCounts).sort(([, a], [, b]) => b - a).slice(0, 5).map(([cmd, count]) => ({ command: cmd, count }));
+  const totalDays = Math.max(1, Math.ceil((Date.now() - stats.startDate) / (24 * 60 * 60 * 1000)));
+  return {
+    totalCommands: recentEntries.length,
+    allTimeCommands: stats.totalCommands,
+    gitCommandsRun: recentEntries.reduce((sum, e) => sum + e.gitCommandsRun, 0),
+    allTimeGitCommands: stats.totalGitCommands,
+    successRate: recentEntries.length ? successCount / recentEntries.length : 0,
+    topCommands,
+    daysActive: totalDays,
+    commandsPerDay: stats.totalCommands / totalDays
+  };
+}
+function createEmptyStats() {
+  return {
+    totalCommands: 0,
+    totalGitCommands: 0,
+    commandHistory: [],
+    startDate: Date.now(),
+    lastUsed: Date.now()
+  };
+}
+
+// src/commands/start.ts
+function startCommand(program2) {
+  program2.command("start").description("Start a new piece of work safely").argument("<task>", "Description of the task").action(async (task) => {
+    const startTime = Date.now();
+    let gitCommandsRun = 0;
+    try {
+      console.log(`\uD83D\uDE80 Starting new task...
+`);
+      const config = await loadConfig();
+      const repoState = await getRepoState();
+      let suggestedBranchName;
+      if (config) {
+        suggestedBranchName = generateBranchName(config.branches.featurePattern, task);
+        console.log(`\uD83D\uDCA1 Suggested branch: ${suggestedBranchName}
+`);
+      }
+      const planResponse = await getGitPlan(repoState, `Start working on: ${task}. ${suggestedBranchName ? `Suggested branch name: ${suggestedBranchName}.` : ""} Provide base branch, conventional branch name, and Git commands to create and switch to the branch.`);
+      let plan;
+      try {
+        plan = JSON.parse(planResponse);
+      } catch {
+        console.log(`\uD83D\uDCAD Hermes suggests:
+`);
+        console.log(planResponse);
+        console.log(`
+⚠️  Could not auto-execute. Please review the plan above.`);
+        return;
+      }
+      if (plan.baseBranch && plan.branchName) {
+        console.log(`\uD83D\uDCCD Base branch: ${plan.baseBranch}`);
+        console.log(`\uD83C\uDF3F New branch: ${plan.branchName}
+`);
+      }
+      if (plan.explanation) {
+        console.log(`\uD83D\uDCAD ${plan.explanation}
+`);
+      }
+      if (plan.commands && Array.isArray(plan.commands)) {
+        for (const command of plan.commands) {
+          let cmdString;
+          if (typeof command === "string") {
+            cmdString = command;
+          } else if (typeof command === "object" && command.command) {
+            cmdString = command.command;
+          } else if (typeof command === "object" && command.cmd) {
+            cmdString = command.cmd;
+          } else {
+            console.warn("⚠️  Skipping invalid command:", command);
+            continue;
+          }
+          validateGitCommand(cmdString);
+          displayStep(cmdString);
+          await executeGitCommand(cmdString);
+          gitCommandsRun++;
+        }
+        const branchName = plan.branchName || "new branch";
+        displaySuccess(`Successfully created and switched to ${branchName}`);
+        if (config?.preferences.learningMode) {
+          console.log(`
+\uD83D\uDCA1 Learning tip: Branch created from clean state ensures no unexpected commits`);
+        }
+      } else {
+        console.log("⚠️  No commands to execute. See analysis above.");
+      }
+      const duration = (Date.now() - startTime) / 1000;
+      await recordCommand("start", [task], duration, true, gitCommandsRun);
+    } catch (error3) {
+      const duration = (Date.now() - startTime) / 1000;
+      await recordCommand("start", [task], duration, false, gitCommandsRun);
+      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
+      process.exit(1);
+    }
+  });
+}
+
+// src/commands/wip.ts
+function wipCommand(program2) {
+  program2.command("wip").description("Save work safely when things get messy").option("-m, --message <message>", "Custom WIP message").action(async (options) => {
+    try {
+      console.log(`\uD83D\uDCBE Saving work in progress...
+`);
+      const repoState = await getRepoState();
+      const messageNote = options.message ? ` with message: "${options.message}"` : "";
+      const planResponse = await getGitPlan(repoState, `Save work in progress${messageNote}. Decide whether to commit or stash. Return JSON with: approach, commands[], explanation.`);
+      let plan;
+      try {
+        plan = JSON.parse(planResponse);
+      } catch {
+        console.log(`\uD83D\uDCAD Hermes suggests:
+`);
+        console.log(planResponse);
+        console.log(`
+⚠️  Could not auto-execute. Please review the plan above.`);
+        return;
+      }
+      if (plan.explanation) {
+        console.log(`\uD83D\uDCAD ${plan.explanation}
+`);
+      }
+      if (plan.commands && Array.isArray(plan.commands)) {
+        for (const command of plan.commands) {
+          let cmdString;
+          if (typeof command === "string") {
+            cmdString = command;
+          } else if (typeof command === "object" && command.command) {
+            cmdString = command.command;
+          } else if (typeof command === "object" && command.cmd) {
+            cmdString = command.cmd;
+          } else {
+            console.warn("⚠️  Skipping invalid command:", command);
+            continue;
+          }
+          validateGitCommand(cmdString);
+          displayStep(cmdString);
+          await executeGitCommand(cmdString);
+        }
+        const approach = plan.approach || "selected method";
+        displaySuccess(`Work saved using ${approach}`);
+      } else {
+        console.log("⚠️  No commands to execute.");
+      }
+    } catch (error3) {
+      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
+      process.exit(1);
+    }
+  });
+}
+
+// src/commands/sync.ts
+function syncCommand(program2) {
+  program2.command("sync").description("Bring your branch up to date safely").option("--from <branch>", "Source branch to sync from (default: main)").action(async (options) => {
+    try {
+      console.log(`\uD83D\uDD04 Syncing branch...
+`);
+      const repoState = await getRepoState();
+      const fromNote = options.from ? ` from ${options.from}` : " from main";
+      const planResponse = await getGitPlan(repoState, `Sync branch${fromNote}. Evaluate if rebase or merge is safer. Check if branch is shared. Return JSON with: approach, isRisky, riskExplanation, commands[], explanation.`);
+      let plan;
+      try {
+        plan = JSON.parse(planResponse);
+      } catch {
+        console.log(`\uD83D\uDCAD Hermes suggests:
+`);
+        console.log(planResponse);
+        console.log(`
+⚠️  Could not auto-execute. Please review the plan above.`);
+        return;
+      }
+      if (plan.isRisky && plan.riskExplanation) {
+        displayWarning(plan.riskExplanation);
+        console.log();
+      }
+      if (plan.explanation) {
+        console.log(`\uD83D\uDCAD ${plan.explanation}
+`);
+      }
+      if (plan.commands && Array.isArray(plan.commands)) {
+        for (const command of plan.commands) {
+          let cmdString;
+          if (typeof command === "string") {
+            cmdString = command;
+          } else if (typeof command === "object" && command.command) {
+            cmdString = command.command;
+          } else if (typeof command === "object" && command.cmd) {
+            cmdString = command.cmd;
+          } else {
+            console.warn("⚠️  Skipping invalid command:", command);
+            continue;
+          }
+          validateGitCommand(cmdString);
+          displayStep(cmdString);
+          await executeGitCommand(cmdString);
+        }
+        const approach = plan.approach || "selected method";
+        displaySuccess(`Branch synced using ${approach}`);
+      } else {
+        console.log("⚠️  No commands to execute.");
+      }
+    } catch (error3) {
+      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
+      process.exit(1);
+    }
+  });
+}
+
 // src/commands/conflict.ts
-import { readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
+import { readFile as readFile5, writeFile as writeFile3 } from "fs/promises";
 function conflictCommand(program2) {
   const conflict = program2.command("conflict").description("Understand and resolve merge conflicts");
   conflict.command("explain").description("Understand why a conflict exists").action(async () => {
@@ -37418,7 +37743,7 @@ function conflictCommand(program2) {
 \uD83D\uDCC4 ${file}`);
         let fileContent;
         try {
-          fileContent = await readFile4(file, "utf-8");
+          fileContent = await readFile5(file, "utf-8");
         } catch (error3) {
           console.log(`⚠️  Could not read ${file}, skipping...`);
           continue;
@@ -37526,8 +37851,8 @@ function worktreeCommand(program2) {
           displayStep(cmdString);
           await executeGitCommand(cmdString);
         }
-        const path4 = plan.worktreePath || "new worktree";
-        displaySuccess(`Worktree created at ${path4}`);
+        const path5 = plan.worktreePath || "new worktree";
+        displaySuccess(`Worktree created at ${path5}`);
       } else {
         console.log("⚠️  No commands to execute.");
       }
@@ -37541,10 +37866,10 @@ function worktreeCommand(program2) {
 // src/commands/init.ts
 import { writeFile as writeFile4, mkdir as mkdir3 } from "fs/promises";
 import { existsSync as existsSync4 } from "fs";
-import path4 from "path";
-import { exec as exec2 } from "child_process";
-import { promisify as promisify2 } from "util";
-var execAsync2 = promisify2(exec2);
+import path5 from "path";
+import { exec as exec3 } from "child_process";
+import { promisify as promisify3 } from "util";
+var execAsync3 = promisify3(exec3);
 function initCommand(program2) {
   program2.command("init").description("Initialize Hermes configuration for this repository").option("--quick", "Skip interactive prompts, use defaults").action(async (options) => {
     try {
@@ -37561,7 +37886,7 @@ function initCommand(program2) {
 `);
         if (options.quick) {
           console.log("Running: git init");
-          await execAsync2("git init");
+          await execAsync3("git init");
           console.log(`✓ Git repository initialized
 `);
         } else {
@@ -37577,7 +37902,7 @@ function initCommand(program2) {
             console.log("Cancelled. Please run this command in a Git repository.");
             process.exit(1);
           }
-          await execAsync2("git init");
+          await execAsync3("git init");
           console.log(`✓ Git repository initialized
 `);
         }
@@ -37603,7 +37928,7 @@ function initCommand(program2) {
         currentBranch = repoState.currentBranch;
       } else {
         try {
-          const { stdout } = await execAsync2("git config --get init.defaultBranch");
+          const { stdout } = await execAsync3("git config --get init.defaultBranch");
           currentBranch = stdout.trim() || "main";
         } catch {
           currentBranch = "main";
@@ -37655,7 +37980,7 @@ function createDefaultConfig(currentBranch) {
   return {
     version: "0.1.0",
     project: {
-      name: path4.basename(process.cwd()),
+      name: path5.basename(process.cwd()),
       mainBranch: currentBranch === "master" ? "master" : "main",
       protectedBranches: ["main", "master", "production", "staging"]
     },
@@ -37687,7 +38012,7 @@ async function interactiveConfig(repoInfo) {
       type: "input",
       name: "projectName",
       message: "Project name:",
-      default: path4.basename(process.cwd())
+      default: path5.basename(process.cwd())
     },
     {
       type: "input",
@@ -37770,7 +38095,8 @@ var GITIGNORE_ENTRIES = [
   { pattern: ".env.*", comment: null },
   { pattern: "!.env.example", comment: null },
   { pattern: ".hermes/backups/", comment: null },
-  { pattern: ".hermes/stats.json", comment: null }
+  { pattern: ".hermes/stats.json", comment: null },
+  { pattern: ".hermes/plans/", comment: null }
 ];
 async function updateGitignore() {
   const { appendFile, readFile: rf } = await import("fs/promises");
@@ -37850,60 +38176,425 @@ function statsCommand(program2) {
 }
 
 // src/commands/workflow.ts
+import { exec as exec7 } from "child_process";
+import { promisify as promisify7 } from "util";
+
+// src/lib/standup.ts
+import { readFile as readFile6, writeFile as writeFile5, mkdir as mkdir4 } from "fs/promises";
+import { existsSync as existsSync5 } from "fs";
+import { exec as exec4 } from "child_process";
+import { promisify as promisify4 } from "util";
+import path6 from "path";
+var execAsync4 = promisify4(exec4);
+var PLANS_DIR = ".hermes/plans";
+function toDateString(d) {
+  return d.toISOString().slice(0, 10);
+}
+function today() {
+  return toDateString(new Date);
+}
+function lastWorkday() {
+  const d = new Date;
+  const day = d.getDay();
+  const daysBack = day === 1 ? 3 : day === 0 ? 2 : 1;
+  d.setDate(d.getDate() - daysBack);
+  return toDateString(d);
+}
+function planPath(date) {
+  return path6.join(PLANS_DIR, `${date}.md`);
+}
+async function readPlan(date) {
+  const file = planPath(date);
+  if (!existsSync5(file))
+    return null;
+  try {
+    const text = (await readFile6(file, "utf-8")).trim();
+    return text || null;
+  } catch {
+    return null;
+  }
+}
+async function writePlan(date, content) {
+  await mkdir4(PLANS_DIR, { recursive: true });
+  await writeFile5(planPath(date), content.trim() + `
+`);
+}
+function todayKey() {
+  return today();
+}
+function lastWorkdayKey() {
+  return lastWorkday();
+}
+async function getCommitsSince(sinceDate) {
+  try {
+    const authorEmail = await execAsync4("git config user.email").then((r) => r.stdout.trim()).catch(() => "");
+    const format = "%H\x1F%s\x1F%as";
+    const authorFlag = authorEmail ? `--author=${JSON.stringify(authorEmail)}` : "";
+    const { stdout } = await execAsync4(`git log --since="${sinceDate} 00:00" --format="${format}" ${authorFlag} --no-merges`);
+    return stdout.trim().split(`
+`).filter(Boolean).map((line) => {
+      const [hash, subject, date] = line.split("\x1F");
+      return { hash: hash.slice(0, 7), subject, date };
+    });
+  } catch {
+    return [];
+  }
+}
+async function detectBlockers(repoState) {
+  const blockers = [];
+  if (repoState.isInRebase) {
+    blockers.push({ severity: "block", message: "Rebase in progress — resolve before continuing" });
+  }
+  if (repoState.isInMerge) {
+    blockers.push({ severity: "block", message: "Merge in progress — resolve conflicts" });
+  }
+  if (repoState.isInCherryPick) {
+    blockers.push({ severity: "block", message: "Cherry-pick in progress" });
+  }
+  if (repoState.behind > 0) {
+    blockers.push({
+      severity: "warn",
+      message: `Branch is ${repoState.behind} commit${repoState.behind !== 1 ? "s" : ""} behind remote — run hermes sync`
+    });
+  }
+  if (repoState.hasUncommittedChanges) {
+    blockers.push({ severity: "warn", message: "Uncommitted changes in working tree" });
+  }
+  try {
+    const { stdout } = await execAsync4(`git log --format="%as" ${repoState.currentBranch} --not --remotes=origin/main --not --remotes=origin/master -- 2>/dev/null | tail -1`);
+    const oldest = stdout.trim();
+    if (oldest) {
+      const daysOld = Math.floor((Date.now() - new Date(oldest).getTime()) / 86400000);
+      if (daysOld >= 5) {
+        blockers.push({
+          severity: "warn",
+          message: `Branch has unmerged work going back ${daysOld} days — consider opening a PR`
+        });
+      }
+    }
+  } catch {}
+  return blockers;
+}
+async function suggestTodayPlan(ctx) {
+  const prompt2 = `You are helping a developer plan their day based on their git activity.
+
+Suggest a concise, practical focus for today in 1-2 sentences.
+Be specific — reference the actual work in progress from the branch name and commits.
+Do NOT use bullet points or markdown. Return plain text only.
+
+Context:
+- Current branch: ${ctx.currentBranch}
+- Yesterday's plan: ${ctx.yesterdayPlan ?? "(not recorded)"}
+- Yesterday's commits: ${ctx.yesterdayCommits.length > 0 ? ctx.yesterdayCommits.map((c) => c.subject).join(", ") : "none"}
+- Today's commits so far: ${ctx.todayCommits.length > 0 ? ctx.todayCommits.map((c) => c.subject).join(", ") : "none"}
+- Uncommitted work in progress: ${ctx.hasUncommittedChanges ? "yes" : "no"}
+- Blockers: ${ctx.blockers.length > 0 ? ctx.blockers.map((b) => b.message).join("; ") : "none"}
+
+Suggest what to focus on today:`;
+  return getAISuggestion(prompt2);
+}
+
+// src/lib/integrations/claude-code.ts
+import { readFile as readFile7 } from "fs/promises";
+import { existsSync as existsSync6 } from "fs";
+import { exec as exec5 } from "child_process";
+import { promisify as promisify5 } from "util";
+import { homedir as homedir2 } from "os";
+import path7 from "path";
+var execAsync5 = promisify5(exec5);
+function pathToProjectKey(absPath) {
+  return absPath.replace(/\//g, "-");
+}
+async function getProjectSessionIds() {
+  const projectKey = pathToProjectKey(process.cwd());
+  const projectDir = path7.join(homedir2(), ".claude", "projects", projectKey);
+  if (!existsSync6(projectDir))
+    return [];
+  try {
+    const { stdout } = await execAsync5(`ls -1 "${projectDir}"`);
+    return stdout.trim().split(`
+`).filter((name) => name && !name.endsWith(".jsonl"));
+  } catch {
+    return [];
+  }
+}
+async function getClaudeCodeTodos() {
+  const sessionIds = await getProjectSessionIds();
+  if (sessionIds.length === 0)
+    return [];
+  const todosDir = path7.join(homedir2(), ".claude", "todos");
+  if (!existsSync6(todosDir))
+    return [];
+  const todos = [];
+  for (const sessionId of sessionIds) {
+    try {
+      const { stdout: files } = await execAsync5(`ls -1 "${todosDir}" | grep "^${sessionId}"`);
+      for (const file of files.trim().split(`
+`).filter(Boolean)) {
+        try {
+          const raw = await readFile7(path7.join(todosDir, file), "utf-8");
+          const parsed = JSON.parse(raw);
+          if (Array.isArray(parsed)) {
+            for (const todo of parsed) {
+              if (todo.status === "pending" || todo.status === "in_progress") {
+                todos.push(todo);
+              }
+            }
+          }
+        } catch {}
+      }
+    } catch {}
+  }
+  const seen = new Set;
+  return todos.filter((t) => {
+    if (seen.has(t.content))
+      return false;
+    seen.add(t.content);
+    return true;
+  });
+}
+
+// src/lib/integrations/github.ts
+import { exec as exec6 } from "child_process";
+import { promisify as promisify6 } from "util";
+var execAsync6 = promisify6(exec6);
+async function getAssignedIssues() {
+  try {
+    await execAsync6("gh --version");
+  } catch {
+    return null;
+  }
+  try {
+    const { stdout } = await execAsync6("gh issue list --assignee @me --state open --limit 20 --json number,title,url,labels");
+    const raw = JSON.parse(stdout);
+    return raw.map((i) => ({
+      number: i.number,
+      title: i.title,
+      url: i.url,
+      labels: i.labels.map((l) => l.name)
+    }));
+  } catch {
+    return null;
+  }
+}
+
+// src/commands/workflow.ts
+var execAsync7 = promisify7(exec7);
 function workflowCommand(program2) {
   const workflow = program2.command("workflow").description("Run predefined workflow shortcuts");
-  workflow.command("pr-ready").description("Prepare branch for pull request").action(async () => {
+  workflow.command("pr-ready").description("Prepare branch for pull request (fetch, rebase, push)").action(async () => {
     try {
-      console.log(`\uD83D\uDCE6 Preparing branch for PR...
+      const config = await loadConfig();
+      const mainBranch = config?.project?.mainBranch ?? "main";
+      const repoState = await getRepoState();
+      if (isProtectedBranch(repoState.currentBranch, config)) {
+        console.error(source_default.red(`  ✖ You're on ${source_default.bold(repoState.currentBranch)}.`) + source_default.dim(" Switch to a feature branch first."));
+        process.exit(1);
+      }
+      console.log(`
+  Preparing ${source_default.cyan(repoState.currentBranch)} for PR against ` + `${source_default.dim(mainBranch)}...
 `);
+      let stashed = false;
+      if (!repoState.isClean) {
+        console.log(source_default.yellow("  ⚠  Uncommitted changes detected."));
+        const { action } = await esm_default12.prompt([{
+          type: "list",
+          name: "action",
+          message: "What would you like to do?",
+          choices: [
+            { name: "Stash changes, rebase, then restore them", value: "stash" },
+            { name: "Abort", value: "abort" }
+          ]
+        }]);
+        if (action === "abort") {
+          console.log("  Aborted.");
+          return;
+        }
+        displayStep('git stash push -m "hermes pr-ready auto-stash"');
+        await executeGitCommand('git stash push -m "hermes pr-ready auto-stash"');
+        stashed = true;
+        console.log();
+      }
       const steps = [
         { cmd: "git fetch origin", desc: "Fetching latest changes" },
-        { cmd: "git rebase origin/main", desc: "Rebasing on main" },
+        { cmd: `git rebase origin/${mainBranch}`, desc: `Rebasing on ${mainBranch}` },
         { cmd: "git push --force-with-lease", desc: "Pushing changes safely" }
       ];
       for (const { cmd, desc } of steps) {
-        console.log(`
-${desc}...`);
+        console.log(`  ${desc}...`);
         displayStep(cmd);
         await executeGitCommand(cmd);
       }
+      if (stashed) {
+        console.log(`
+  Restoring stashed changes...`);
+        displayStep("git stash pop");
+        await executeGitCommand("git stash pop");
+      }
       displaySuccess("Branch ready for PR!");
-      console.log("\n\uD83D\uDCA1 Next: Create PR with `gh pr create` or use your Git hosting UI");
+      console.log(source_default.dim(`
+  Next: gh pr create  or open your hosting UI`));
+      console.log();
     } catch (error3) {
-      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
+      console.error(source_default.red(`
+  ✖ ` + (error3 instanceof Error ? error3.message : error3)));
       process.exit(1);
     }
   });
-  workflow.command("daily-sync").description("Daily workflow: fetch, show status, suggest actions").action(async () => {
+  workflow.command("daily-sync").description("Daily standup: what you did, what's next, and any blockers").action(async () => {
     try {
-      console.log(`\uD83C\uDF05 Running daily sync...
-`);
-      displayStep("git fetch --all --prune");
-      await executeGitCommand("git fetch --all --prune");
-      const repoState = await getRepoState();
       console.log(`
-\uD83D\uDCCA Status:`);
-      console.log(`  Current branch: ${repoState.currentBranch}`);
-      console.log(`  Status: ${repoState.isClean ? "✅ Clean" : "⚠️  Uncommitted changes"}`);
-      if (repoState.behind > 0) {
-        console.log(`  Behind main: ${repoState.behind} commits`);
-        console.log("\n\uD83D\uDCA1 Suggestion: Run `hermes sync` to catch up");
-      } else {
-        console.log("  ✅ Up to date with remote");
+  ` + source_default.bold("Daily sync") + source_default.dim(` — gathering data...
+`));
+      displayStep("git fetch --all --prune");
+      await executeGitCommand("git fetch --all --prune").catch(() => {});
+      const todayDate = todayKey();
+      const yesterdayDate = lastWorkdayKey();
+      const [repoState, stashList, mergedBranches, yesterdayCommits, todayCommits, yesterdayPlan] = await Promise.all([
+        getRepoState(),
+        execAsync7("git stash list").then((r) => r.stdout.trim().split(`
+`).filter(Boolean)).catch(() => []),
+        execAsync7("git branch --merged HEAD").then((r) => r.stdout.trim().split(`
+`).map((b) => b.trim().replace(/^\* /, "")).filter((b) => b && !["main", "master", "staging", "production", "develop"].includes(b))).catch(() => []),
+        getCommitsSince(yesterdayDate),
+        getCommitsSince(todayDate),
+        readPlan(yesterdayDate)
+      ]);
+      const blockers = await detectBlockers(repoState);
+      let todayPlan = await readPlan(todayDate);
+      if (!todayPlan) {
+        console.log(source_default.yellow(`  No plan set for today (${todayDate}).
+`));
+        const [claudeTodos, githubIssues] = await Promise.all([
+          getClaudeCodeTodos().catch(() => []),
+          getAssignedIssues().catch(() => null)
+        ]);
+        const choices = [
+          { name: "Type it myself", value: "manual" },
+          { name: "Let AI suggest based on my repo", value: "ai" }
+        ];
+        if (claudeTodos.length > 0) {
+          choices.push({
+            name: `Import from Claude Code  ${source_default.dim(`(${claudeTodos.length} pending task${claudeTodos.length !== 1 ? "s" : ""})`)}`,
+            value: "claude"
+          });
+        }
+        if (githubIssues !== null) {
+          choices.push({
+            name: `Import from GitHub issues  ${source_default.dim(`(${githubIssues.length} open)`)}`,
+            value: "github"
+          });
+        }
+        choices.push({ name: "Skip for now", value: "skip" });
+        const { planMode } = await esm_default12.prompt([{
+          type: "list",
+          name: "planMode",
+          message: "What are you focusing on today?",
+          choices
+        }]);
+        todayPlan = await resolvePlan(planMode, {
+          repoState,
+          yesterdayPlan,
+          yesterdayCommits,
+          todayCommits,
+          blockers,
+          claudeTodos,
+          githubIssues: githubIssues ?? []
+        });
+        if (todayPlan) {
+          await writePlan(todayDate, todayPlan);
+        }
+        console.log();
+      }
+      const yesterdaySection = yesterdayCommits.length > 0 ? yesterdayCommits.map((c) => `- ${c.subject}`).join(`
+`) : "(no commits found)";
+      const todayCommitsSection = todayCommits.length > 0 ? todayCommits.map((c) => `- ${c.subject}`).join(`
+`) : "(no commits yet today)";
+      const blockersSection = blockers.length > 0 ? blockers.map((b) => `- [${b.severity}] ${b.message}`).join(`
+`) : "(none)";
+      const prompt2 = `You are a developer writing a daily standup update for their team.
+
+Use the data below to write a clear, concise standup. Write it in first person.
+Keep each section to 1-3 sentences. Be specific — mention actual work items from the commit subjects.
+If there are no commits, infer from the plan what was likely being worked on.
+
+---
+YESTERDAY'S INTENDED PLAN:
+${yesterdayPlan ?? "(not recorded)"}
+
+COMMITS FROM YESTERDAY / LAST WORKDAY:
+${yesterdaySection}
+
+COMMITS FROM TODAY SO FAR:
+${todayCommitsSection}
+
+TODAY'S PLAN:
+${todayPlan}
+
+BLOCKERS / REPO STATE:
+${blockersSection}
+
+CURRENT BRANCH: ${repoState.currentBranch}
+---
+
+Format your response as exactly three labelled sections:
+
+Yesterday: <what was accomplished>
+Today: <what will be worked on>
+Blockers: <blockers or "None">
+
+No bullet points, no markdown, no extra commentary.`;
+      console.log(`  Generating standup...
+`);
+      const standup = await getAISuggestion(prompt2);
+      const divider = source_default.dim("  " + "─".repeat(52));
+      console.log(divider);
+      standup.split(`
+`).forEach((line) => {
+        const trimmed = line.trim();
+        if (!trimmed)
+          return;
+        const colonIdx = trimmed.indexOf(":");
+        if (colonIdx > 0 && colonIdx < 15) {
+          const label = trimmed.slice(0, colonIdx);
+          const body = trimmed.slice(colonIdx + 1).trim();
+          console.log(`  ${source_default.bold.cyan(label + ":")} ${body}`);
+        } else {
+          console.log("  " + trimmed);
+        }
+      });
+      console.log(divider);
+      const notes = [];
+      if (repoState.behind > 0)
+        notes.push(source_default.yellow(`${repoState.behind} commits behind`) + source_default.dim(" — hermes sync"));
+      if (repoState.ahead > 0)
+        notes.push(source_default.cyan(`${repoState.ahead} commits ahead`) + source_default.dim(" — git push"));
+      if (!repoState.isClean)
+        notes.push(source_default.yellow("uncommitted changes"));
+      if (mergedBranches.length > 0)
+        notes.push(source_default.dim(`${mergedBranches.length} merged branch${mergedBranches.length !== 1 ? "es" : ""} to clean up — hermes workflow cleanup`));
+      if (stashList.length > 0)
+        notes.push(source_default.dim(`${stashList.length} stash${stashList.length !== 1 ? "es" : ""} saved`));
+      if (notes.length > 0) {
+        console.log(`
+  ${source_default.bold("Repo notes")}`);
+        notes.forEach((n) => console.log(`  • ${n}`));
       }
-      displaySuccess("Daily sync complete!");
+      console.log();
     } catch (error3) {
-      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
+      console.error(source_default.red(`
+  ✖ ` + (error3 instanceof Error ? error3.message : error3)));
       process.exit(1);
     }
   });
-  workflow.command("quick-commit").description("Stage changed files and commit with an AI-generated message").option("-a, --all", "Stage all changes (default: only already-staged files)").action(async (options) => {
+  workflow.command("quick-commit").description("Stage changed files and commit with an AI-generated message").option("-a, --all", "Stage all changes (default: only already-staged files)").option("-p, --push", "Push after committing").action(async (options) => {
     try {
-      console.log(`⚡ Quick commit...
+      console.log(`
+  Quick commit...
 `);
       const repoState = await getRepoState();
       if (repoState.isClean) {
-        console.log("✅ Nothing to commit");
+        console.log("  " + source_default.green("✓") + " Nothing to commit");
         return;
       }
       if (options.all) {
@@ -37913,14 +38604,14 @@ ${desc}...`);
       const diff = await executeGitCommand("git diff --cached --stat");
       const diffFull = await executeGitCommand("git diff --cached");
       if (!diff.trim()) {
-        console.log("⚠️  No staged changes. Use --all to stage everything, or `git add` specific files first.");
+        console.log("  " + source_default.yellow("⚠") + "  No staged changes. Use --all to stage everything, or stage files first.");
         return;
       }
+      console.log("  Staged changes:");
+      diff.trim().split(`
+`).forEach((l) => console.log("  " + source_default.dim(l)));
       console.log(`
-\uD83D\uDCDD Staged changes:`);
-      console.log(diff);
-      console.log(`
-\uD83E\uDD16 Generating commit message...`);
+  Generating commit message...`);
       const message = await getAISuggestion(`Generate a concise git commit message for these changes.
 
 Rules:
@@ -37933,68 +38624,219 @@ Rules:
 Diff:
 ${diffFull.slice(0, 8000)}`);
       console.log(`
-\uD83D\uDCAC Proposed message:
-   ${source_default.cyan(message)}
+  Proposed: ${source_default.cyan(message)}
 `);
-      const { action } = await esm_default12.prompt([
-        {
-          type: "list",
-          name: "action",
-          message: "Commit with this message?",
-          choices: [
-            { name: "Yes, commit", value: "commit" },
-            { name: "Edit message", value: "edit" },
-            { name: "Cancel", value: "cancel" }
-          ]
-        }
-      ]);
+      const { action } = await esm_default12.prompt([{
+        type: "list",
+        name: "action",
+        message: "Commit with this message?",
+        choices: [
+          { name: "Yes, commit", value: "commit" },
+          { name: "Edit message", value: "edit" },
+          { name: "Cancel", value: "cancel" }
+        ]
+      }]);
       if (action === "cancel") {
-        console.log("Cancelled. Changes remain staged.");
+        console.log("  Cancelled. Changes remain staged.");
         return;
       }
       let finalMessage = message;
       if (action === "edit") {
-        const { edited } = await esm_default12.prompt([
-          {
-            type: "input",
-            name: "edited",
-            message: "Commit message:",
-            default: message
-          }
-        ]);
+        const { edited } = await esm_default12.prompt([{
+          type: "input",
+          name: "edited",
+          message: "Commit message:",
+          default: message
+        }]);
         finalMessage = edited;
       }
       displayStep(`git commit -m "${finalMessage}"`);
       await executeGitCommand(`git commit -m ${JSON.stringify(finalMessage)}`);
       displaySuccess("Committed!");
+      if (options.push) {
+        console.log();
+        const freshState = await getRepoState();
+        const pushCmd = freshState.remoteTracking ? "git push" : `git push -u origin ${freshState.currentBranch}`;
+        displayStep(pushCmd);
+        await executeGitCommand(pushCmd);
+        displaySuccess("Pushed!");
+      }
+      console.log();
     } catch (error3) {
-      console.error("❌ Error:", error3 instanceof Error ? error3.message : error3);
+      console.error(source_default.red(`
+  ✖ ` + (error3 instanceof Error ? error3.message : error3)));
+      process.exit(1);
+    }
+  });
+  workflow.command("cleanup").description("Delete branches that have already been merged").option("--remote", "Also delete the corresponding remote tracking branches").action(async (options) => {
+    try {
+      const config = await loadConfig();
+      const mainBranch = config?.project?.mainBranch ?? "main";
+      const protected_ = config?.project?.protectedBranches ?? ["main", "master", "staging", "production"];
+      console.log(`
+  Scanning for merged branches...
+`);
+      displayStep(`git fetch origin --prune`);
+      await executeGitCommand("git fetch origin --prune").catch(() => {});
+      const { stdout: branchOutput } = await execAsync7(`git branch --merged ${mainBranch}`);
+      const repoState = await getRepoState();
+      const merged = branchOutput.split(`
+`).map((b) => b.trim().replace(/^\* /, "")).filter((b) => b && !protected_.includes(b) && b !== repoState.currentBranch);
+      if (merged.length === 0) {
+        console.log("  " + source_default.green("✓") + " No merged branches to clean up.");
+        console.log();
+        return;
+      }
+      console.log(`  Found ${source_default.yellow(merged.length)} merged branch${merged.length !== 1 ? "es" : ""}:
+`);
+      merged.forEach((b) => console.log(`  ${source_default.dim("•")} ${b}`));
+      console.log();
+      const { selected } = await esm_default12.prompt([{
+        type: "checkbox",
+        name: "selected",
+        message: "Select branches to delete:",
+        choices: merged.map((b) => ({ name: b, value: b, checked: true }))
+      }]);
+      if (selected.length === 0) {
+        console.log("  Nothing selected. Exiting.");
+        return;
+      }
+      for (const branch of selected) {
+        displayStep(`git branch -d ${branch}`);
+        await executeGitCommand(`git branch -d ${branch}`);
+        if (options.remote) {
+          try {
+            displayStep(`git push origin --delete ${branch}`);
+            await executeGitCommand(`git push origin --delete ${branch}`);
+          } catch {
+            console.log(source_default.dim(`  (remote branch ${branch} not found — skipping)`));
+          }
+        }
+      }
+      displaySuccess(`Deleted ${selected.length} branch${selected.length !== 1 ? "es" : ""}!`);
+      console.log();
+    } catch (error3) {
+      console.error(source_default.red(`
+  ✖ ` + (error3 instanceof Error ? error3.message : error3)));
       process.exit(1);
     }
   });
   workflow.command("list").description("List available workflow shortcuts").action(async () => {
     const config = await loadConfig();
-    console.log(`\uD83D\uDD04 Available Workflows:
+    console.log(`
+  ` + source_default.bold("Built-in workflows") + `
 `);
-    console.log("Built-in:");
-    console.log("  • pr-ready      - Sync, rebase, and push for PR");
-    console.log("  • daily-sync    - Fetch updates and show status");
-    console.log("  • quick-commit  - Stage and commit all changes");
-    if (config?.workflows) {
+    console.log(`  ${source_default.cyan("pr-ready")}      Rebase on main and push — safe PR prep with stash guard`);
+    console.log(`  ${source_default.cyan("daily-sync")}    Fetch, show status, surface what to act on`);
+    console.log(`  ${source_default.cyan("quick-commit")}  AI commit message; add ${source_default.dim("--push")} to commit + push`);
+    console.log(`  ${source_default.cyan("cleanup")}       Delete merged branches; add ${source_default.dim("--remote")} to also clean remote`);
+    if (config?.workflows && Object.keys(config.workflows).length > 0) {
       console.log(`
-Project-specific:`);
-      Object.keys(config.workflows).forEach((name) => {
-        const steps = config.workflows[name];
-        console.log(`  • ${name.padEnd(15)} - ${steps.join(" → ")}`);
-      });
+  ` + source_default.bold("Project workflows") + source_default.dim(" (.hermes/config.json)") + `
+`);
+      for (const [name, steps] of Object.entries(config.workflows)) {
+        console.log(`  ${source_default.cyan(name.padEnd(14))} ${source_default.dim(steps.join(" → "))}`);
+      }
     } else {
-      console.log("\n\uD83D\uDCA1 Run `hermes init` to define custom workflows");
+      console.log(`
+  ` + source_default.dim("No project workflows defined. Run hermes init to set them up."));
     }
+    console.log();
   });
 }
+async function resolvePlan(mode, ctx) {
+  if (mode === "skip")
+    return null;
+  if (mode === "manual") {
+    const { typed } = await esm_default12.prompt([{
+      type: "input",
+      name: "typed",
+      message: "Today's plan:",
+      validate: (v) => v.trim().length > 0 || "Please enter something"
+    }]);
+    return typed.trim();
+  }
+  if (mode === "ai") {
+    process.stdout.write(source_default.dim(`
+  Thinking...\r`));
+    const suggested = await suggestTodayPlan({
+      currentBranch: ctx.repoState.currentBranch,
+      yesterdayPlan: ctx.yesterdayPlan,
+      yesterdayCommits: ctx.yesterdayCommits,
+      todayCommits: ctx.todayCommits,
+      hasUncommittedChanges: ctx.repoState.hasUncommittedChanges,
+      blockers: ctx.blockers
+    });
+    process.stdout.write(" ".repeat(30) + "\r");
+    return confirmOrEdit(suggested);
+  }
+  if (mode === "claude") {
+    const { selected } = await esm_default12.prompt([{
+      type: "checkbox",
+      name: "selected",
+      message: "Select tasks to include in today's plan:",
+      choices: ctx.claudeTodos.map((t) => ({
+        name: `${t.status === "in_progress" ? source_default.yellow("(in progress) ") : ""}${t.content}` + source_default.dim(` [${t.priority}]`),
+        value: t.content,
+        checked: t.status === "in_progress"
+      }))
+    }]);
+    if (selected.length === 0)
+      return null;
+    const plan = selected.join("; ");
+    return confirmOrEdit(plan);
+  }
+  if (mode === "github") {
+    if (ctx.githubIssues.length === 0) {
+      console.log(source_default.dim("  No open issues assigned to you."));
+      return null;
+    }
+    const { selected } = await esm_default12.prompt([{
+      type: "checkbox",
+      name: "selected",
+      message: "Select issues to include in today's plan:",
+      choices: ctx.githubIssues.map((i) => ({
+        name: `#${i.number} ${i.title}` + (i.labels.length > 0 ? source_default.dim(` [${i.labels.join(", ")}]`) : ""),
+        value: `#${i.number} ${i.title}`,
+        checked: true
+      }))
+    }]);
+    if (selected.length === 0)
+      return null;
+    const plan = selected.join("; ");
+    return confirmOrEdit(plan);
+  }
+  return null;
+}
+async function confirmOrEdit(suggestion) {
+  console.log(`
+  ${source_default.bold("Plan:")} ${source_default.cyan(suggestion)}
+`);
+  const { action } = await esm_default12.prompt([{
+    type: "list",
+    name: "action",
+    message: "Use this?",
+    choices: [
+      { name: "Yes", value: "accept" },
+      { name: "Edit", value: "edit" },
+      { name: "Skip", value: "skip" }
+    ]
+  }]);
+  if (action === "accept")
+    return suggestion;
+  if (action === "skip")
+    return null;
+  const { edited } = await esm_default12.prompt([{
+    type: "input",
+    name: "edited",
+    message: "Today's plan:",
+    default: suggestion
+  }]);
+  return edited.trim() || null;
+}
 
 // src/commands/config.ts
-var VALID_PROVIDERS = ["anthropic", "openai", "gemini"];
+var VALID_PROVIDERS = ["anthropic", "openai", "gemini", "claude-code"];
 var KEY_ALIASES = {
   provider: "provider",
   "anthropic-key": "anthropicApiKey",
@@ -38002,7 +38844,7 @@ var KEY_ALIASES = {
   "gemini-key": "geminiApiKey"
 };
 var KEY_DESCRIPTIONS = {
-  provider: "Default AI provider (anthropic | openai | gemini)",
+  provider: "Default AI provider (anthropic | openai | gemini | claude-code)",
   anthropicApiKey: "Anthropic API key",
   openaiApiKey: "OpenAI API key",
   geminiApiKey: "Gemini API key"
@@ -38100,55 +38942,71 @@ function configCommand(program2) {
     console.log(source_default.dim(`  ${GLOBAL_CONFIG_PATH}
 `));
     const globalConfig = await loadGlobalConfig();
-    const { provider } = await esm_default12.prompt([
-      {
-        type: "list",
-        name: "provider",
-        message: "Which AI provider do you want to use?",
-        choices: [
-          { name: "Anthropic (Claude)", value: "anthropic" },
-          { name: "OpenAI (GPT-4o)", value: "openai" },
-          { name: "Google (Gemini)", value: "gemini" },
-          { name: "Auto-detect (use whichever key is available)", value: "" }
-        ],
-        default: globalConfig.provider || ""
-      }
+    const [claudeAvailable, codexAvailable] = await Promise.all([
+      isClaudeCodeAvailable(),
+      isCodexAvailable()
     ]);
+    const cliChoices = [
+      claudeAvailable ? { name: `Claude Code CLI ${source_default.green("(detected)")}`, value: "claude-code" } : { name: `Claude Code CLI ${source_default.dim("(not found)")}`, value: "claude-code", disabled: true },
+      codexAvailable ? { name: `OpenAI Codex CLI ${source_default.green("(detected)")}`, value: "codex" } : { name: `OpenAI Codex CLI ${source_default.dim("(not found)")}`, value: "codex", disabled: true }
+    ];
+    const providerChoices = [
+      ...cliChoices,
+      { name: "Anthropic API  (ANTHROPIC_API_KEY)", value: "anthropic" },
+      { name: "OpenAI API     (OPENAI_API_KEY)", value: "openai" },
+      { name: "Google Gemini  (GEMINI_API_KEY)", value: "gemini" },
+      { name: "Auto-detect    (use whichever is available)", value: "" }
+    ];
+    const defaultProvider = globalConfig.provider || (claudeAvailable ? "claude-code" : codexAvailable ? "codex" : "");
+    const { provider } = await esm_default12.prompt([{
+      type: "list",
+      name: "provider",
+      message: "Which AI provider do you want to use?",
+      choices: providerChoices,
+      default: defaultProvider
+    }]);
     if (provider) {
       globalConfig.provider = provider;
     } else {
       delete globalConfig.provider;
     }
-    const askProviders = provider ? [provider] : VALID_PROVIDERS;
+    if (provider === "claude-code" || provider === "codex") {
+      await saveGlobalConfig(globalConfig);
+      const label = provider === "claude-code" ? "claude CLI" : "codex CLI";
+      console.log(`
+  ${source_default.green("✓")} Provider set to ${source_default.cyan(provider)}`);
+      console.log(source_default.dim(`  Hermes will use the ${label} — no API key required.
+`));
+      return;
+    }
+    const apiProviders = provider ? [provider] : ["anthropic", "openai", "gemini"];
     const keyPrompts = {
       anthropic: { field: "anthropicApiKey", envVar: "ANTHROPIC_API_KEY", hint: "sk-ant-..." },
       openai: { field: "openaiApiKey", envVar: "OPENAI_API_KEY", hint: "sk-..." },
       gemini: { field: "geminiApiKey", envVar: "GEMINI_API_KEY", hint: "AIza..." }
     };
-    for (const p of askProviders) {
+    for (const p of apiProviders) {
       const { field, envVar, hint } = keyPrompts[p];
       const existing = globalConfig[field];
       const fromEnv = process.env[envVar];
       if (fromEnv) {
-        console.log(source_default.dim(`  ${envVar} already set in environment, skipping.`));
+        console.log(source_default.dim(`  ${envVar} already set in environment — skipping.`));
         continue;
       }
-      const { key: key2 } = await esm_default12.prompt([
-        {
-          type: "password",
-          name: "key",
-          message: `${p.charAt(0).toUpperCase() + p.slice(1)} API key (${hint}):`,
-          default: existing ? "(keep existing)" : "",
-          mask: "*"
-        }
-      ]);
+      const { key: key2 } = await esm_default12.prompt([{
+        type: "password",
+        name: "key",
+        message: `${p.charAt(0).toUpperCase() + p.slice(1)} API key (${hint}):`,
+        default: existing ? "(keep existing)" : "",
+        mask: "*"
+      }]);
       if (key2 && key2 !== "(keep existing)") {
         globalConfig[field] = key2;
       }
     }
     await saveGlobalConfig(globalConfig);
     console.log(`
-${source_default.green("✓")} Configuration saved to ${source_default.dim(GLOBAL_CONFIG_PATH)}`);
+  ${source_default.green("✓")} Configuration saved to ${source_default.dim(GLOBAL_CONFIG_PATH)}`);
     console.log(source_default.dim(`  File permissions set to 600 (owner read/write only)
 `));
     console.log(`  Run ${source_default.cyan("hermes config list")} to verify your setup.`);
@@ -38167,15 +39025,15 @@ Valid keys:`));
 }
 
 // src/commands/guard.ts
-import { writeFile as writeFile5, readFile as readFile5, chmod as chmod2, mkdir as mkdir4 } from "fs/promises";
-import { existsSync as existsSync5 } from "fs";
-import { exec as exec4 } from "child_process";
-import { promisify as promisify4 } from "util";
+import { writeFile as writeFile6, readFile as readFile8, chmod as chmod2, mkdir as mkdir5 } from "fs/promises";
+import { existsSync as existsSync7 } from "fs";
+import { exec as exec9 } from "child_process";
+import { promisify as promisify9 } from "util";
 
 // src/lib/secrets.ts
-import { exec as exec3 } from "child_process";
-import { promisify as promisify3 } from "util";
-var execAsync3 = promisify3(exec3);
+import { exec as exec8 } from "child_process";
+import { promisify as promisify8 } from "util";
+var execAsync8 = promisify8(exec8);
 var BLOCKED_FILENAMES = [
   { pattern: /^\.env$/, description: "Environment variable file" },
   { pattern: /^\.env\..+/, description: "Environment variable file" },
@@ -38304,13 +39162,13 @@ var SECRET_PATTERNS = [
   }
 ];
 async function getStagedFiles() {
-  const { stdout } = await execAsync3("git diff --cached --name-only --diff-filter=ACMR");
+  const { stdout } = await execAsync8("git diff --cached --name-only --diff-filter=ACMR");
   return stdout.trim().split(`
 `).filter(Boolean);
 }
 async function readStagedFile(file) {
   try {
-    const { stdout } = await execAsync3(`git show ":${file}"`, {
+    const { stdout } = await execAsync8(`git show ":${file}"`, {
       maxBuffer: 2 * 1024 * 1024
     });
     return stdout;
@@ -38408,7 +39266,7 @@ async function scanStagedFiles() {
 }
 
 // src/commands/guard.ts
-var execAsync4 = promisify4(exec4);
+var execAsync9 = promisify9(exec9);
 function guardCommand(program2) {
   const guard = program2.command("guard").description("Scan staged files for secrets and sensitive content before committing");
   guard.option("--hook", "Run in non-interactive hook mode (exit 1 on blockers)").action(async (options) => {
@@ -38416,13 +39274,13 @@ function guardCommand(program2) {
   });
   guard.command("install-hook").description("Install hermes guard as a git pre-commit hook").action(async () => {
     try {
-      const gitDir = await execAsync4("git rev-parse --git-dir").then((r) => r.stdout.trim()).catch(() => null);
+      const gitDir = await execAsync9("git rev-parse --git-dir").then((r) => r.stdout.trim()).catch(() => null);
       if (!gitDir) {
         console.error(source_default.red("❌ Not a git repository"));
         process.exit(1);
       }
       const hooksDir = `${gitDir}/hooks`;
-      await mkdir4(hooksDir, { recursive: true });
+      await mkdir5(hooksDir, { recursive: true });
       const hookPath = `${hooksDir}/pre-commit`;
       const hookScript = [
         "#!/bin/sh",
@@ -38431,19 +39289,19 @@ function guardCommand(program2) {
       ].join(`
 `) + `
 `;
-      if (existsSync5(hookPath)) {
-        const existing = await readFile5(hookPath, "utf-8");
+      if (existsSync7(hookPath)) {
+        const existing = await readFile8(hookPath, "utf-8");
         if (existing.includes("hermes guard")) {
           console.log(source_default.dim("Hook already installed."));
           return;
         }
-        await writeFile5(hookPath, existing.trimEnd() + `
+        await writeFile6(hookPath, existing.trimEnd() + `
 
 ` + hookScript.split(`
 `).slice(1).join(`
 `));
       } else {
-        await writeFile5(hookPath, hookScript);
+        await writeFile6(hookPath, hookScript);
       }
       await chmod2(hookPath, 493);
       console.log(`${source_default.green("✓")} Pre-commit hook installed at ${source_default.dim(hookPath)}`);
@@ -38455,17 +39313,17 @@ function guardCommand(program2) {
   });
   guard.command("uninstall-hook").description("Remove hermes guard from the git pre-commit hook").action(async () => {
     try {
-      const gitDir = await execAsync4("git rev-parse --git-dir").then((r) => r.stdout.trim()).catch(() => null);
+      const gitDir = await execAsync9("git rev-parse --git-dir").then((r) => r.stdout.trim()).catch(() => null);
       if (!gitDir) {
         console.error(source_default.red("❌ Not a git repository"));
         process.exit(1);
       }
       const hookPath = `${gitDir}/hooks/pre-commit`;
-      if (!existsSync5(hookPath)) {
+      if (!existsSync7(hookPath)) {
         console.log(source_default.dim("No pre-commit hook found."));
         return;
       }
-      const content = await readFile5(hookPath, "utf-8");
+      const content = await readFile8(hookPath, "utf-8");
       if (!content.includes("hermes guard")) {
         console.log(source_default.dim("hermes guard is not in the pre-commit hook."));
         return;
@@ -38482,7 +39340,7 @@ function guardCommand(program2) {
         await unlink(hookPath);
         console.log(`${source_default.green("✓")} Pre-commit hook removed.`);
       } else {
-        await writeFile5(hookPath, cleaned);
+        await writeFile6(hookPath, cleaned);
         console.log(`${source_default.green("✓")} hermes guard removed from pre-commit hook.`);
       }
     } catch (error3) {
@@ -38555,7 +39413,7 @@ async function runScan(hookMode) {
         }
         if (action === "unstage") {
           for (const f of result.blocked) {
-            await execAsync4(`git restore --staged "${f.file}"`);
+            await execAsync9(`git restore --staged "${f.file}"`);
             console.log(source_default.dim(`  Unstaged: ${f.file}`));
           }
           console.log(source_default.yellow(`
@@ -38672,9 +39530,14 @@ Be direct and specific. 3-4 sentences per finding max. No preamble.`);
 }
 
 // src/commands/update.ts
-import { exec as exec5 } from "child_process";
-import { promisify as promisify5 } from "util";
-var execAsync5 = promisify5(exec5);
+import { exec as exec10 } from "child_process";
+import { promisify as promisify10 } from "util";
+import { writeFile as writeFile7, mkdir as mkdir6 } from "fs/promises";
+import { homedir as homedir3 } from "os";
+import path8 from "path";
+var CACHE_DIR = path8.join(homedir3(), ".hermes", "cache");
+var CACHE_FILE = path8.join(CACHE_DIR, "update-check.json");
+var execAsync10 = promisify10(exec10);
 var PACKAGE_NAME = "hermes-git";
 function updateCommand(program2, currentVersion) {
   program2.command("update").description("Update hermes to the latest version").option("--check", "Check for updates without installing").option("--bun", "Use bun instead of npm to install").action(async (options) => {
@@ -38704,7 +39567,7 @@ function updateCommand(program2, currentVersion) {
       const installCmd = buildInstallCommand(pm);
       console.log(`  Running: ${source_default.cyan(installCmd)}
 `);
-      const { stdout, stderr } = await execAsync5(installCmd, { timeout: 120000 });
+      const { stdout, stderr } = await execAsync10(installCmd, { timeout: 120000 });
       const output = (stdout + stderr).trim();
       if (output) {
         output.split(`
@@ -38713,6 +39576,10 @@ function updateCommand(program2, currentVersion) {
         });
         console.log();
       }
+      try {
+        await mkdir6(CACHE_DIR, { recursive: true });
+        await writeFile7(CACHE_FILE, JSON.stringify({ lastChecked: Date.now(), latestVersion: latest }));
+      } catch {}
       console.log(source_default.green("  ✓ Updated to ") + source_default.bold(`v${latest}`) + source_default.dim("  Restart your terminal if the version does not change."));
     } catch (error3) {
       console.error(source_default.red(`
@@ -38751,20 +39618,20 @@ async function detectPackageManager() {
     return "bun";
   }
   try {
-    const { stdout } = await execAsync5("bun --version", { timeout: 3000 });
+    const { stdout } = await execAsync10("bun --version", { timeout: 3000 });
     if (stdout.trim()) {
       try {
-        const { stdout: list } = await execAsync5("bun pm ls -g 2>/dev/null", { timeout: 3000 });
+        const { stdout: list } = await execAsync10("bun pm ls -g 2>/dev/null", { timeout: 3000 });
         if (list.includes(PACKAGE_NAME))
           return "bun";
       } catch {}
     }
   } catch {}
   try {
-    const { stdout } = await execAsync5("pnpm --version", { timeout: 3000 });
+    const { stdout } = await execAsync10("pnpm --version", { timeout: 3000 });
     if (stdout.trim()) {
       try {
-        const { stdout: list } = await execAsync5("pnpm list -g --depth=0 2>/dev/null", { timeout: 3000 });
+        const { stdout: list } = await execAsync10("pnpm list -g --depth=0 2>/dev/null", { timeout: 3000 });
         if (list.includes(PACKAGE_NAME))
           return "pnpm";
       } catch {}
@@ -38784,12 +39651,13 @@ function buildInstallCommand(pm) {
 }
 
 // src/commands/commit.ts
-import { exec as exec6 } from "child_process";
-import { promisify as promisify6 } from "util";
-var execAsync6 = promisify6(exec6);
+import { exec as exec11, execFile } from "child_process";
+import { promisify as promisify11 } from "util";
+var execAsync11 = promisify11(exec11);
+var execFileAsync = promisify11(execFile);
 async function getStagedFiles2() {
   try {
-    const { stdout } = await execAsync6("git diff --cached --name-status");
+    const { stdout } = await execAsync11("git diff --cached --name-status");
     return stdout.trim().split(`
 `).filter(Boolean).map((line) => {
       const [status, ...rest] = line.split("\t");
@@ -38801,12 +39669,12 @@ async function getStagedFiles2() {
 }
 async function getUnstagedFiles() {
   try {
-    const { stdout } = await execAsync6("git status --porcelain");
+    const { stdout } = await execAsync11("git status --porcelain");
     return stdout.trim().split(`
 `).filter(Boolean).map((line) => {
       const status = line.slice(0, 2).trim();
-      const path5 = line.slice(3).trim();
-      return { status, path: path5 };
+      const path9 = line.slice(3).trim();
+      return { status, path: path9 };
     }).filter(({ status }) => status === "??" || status[0] === " " || status.length === 1);
   } catch {
     return [];
@@ -38814,7 +39682,7 @@ async function getUnstagedFiles() {
 }
 async function getRecentBranchCommits(n = 5) {
   try {
-    const { stdout } = await execAsync6(`git log --oneline -${n} --no-merges 2>/dev/null`);
+    const { stdout } = await execAsync11(`git log --oneline -${n} --no-merges 2>/dev/null`);
     return stdout.trim();
   } catch {
     return "";
@@ -38884,8 +39752,8 @@ function commitCommand(program2) {
     try {
       const repoState = await getRepoState();
       if (options.all) {
-        displayStep("git add -u");
-        await execAsync6("git add -u");
+        displayStep("git add -A");
+        await execAsync11("git add -A");
       }
       const staged = await getStagedFiles2();
       if (staged.length === 0) {
@@ -38916,8 +39784,8 @@ function commitCommand(program2) {
       console.log();
       console.log(`  Analyzing... ${source_default.dim(`[${name} / ${model}]`)}`);
       const [stagedDiff, stagedStat] = await Promise.all([
-        execAsync6("git diff --cached").then((r) => r.stdout),
-        execAsync6("git diff --cached --stat").then((r) => r.stdout)
+        execAsync11("git diff --cached").then((r) => r.stdout),
+        execAsync11("git diff --cached --stat").then((r) => r.stdout)
       ]);
       const analysis = await analyzeChanges(repoState.currentBranch, stagedDiff, stagedStat, recentCommits);
       console.log();
@@ -39044,14 +39912,14 @@ function commitCommand(program2) {
             for (const f of files) {
               const cmd = `git add ${JSON.stringify(f)}`;
               displayStep(cmd);
-              await execAsync6(cmd);
+              await execAsync11(cmd);
             }
             console.log(source_default.dim(`
   Staged ${files.length} file(s). Re-running analysis...
 `));
             const [newDiff, newStat] = await Promise.all([
-              execAsync6("git diff --cached").then((r) => r.stdout),
-              execAsync6("git diff --cached --stat").then((r) => r.stdout)
+              execAsync11("git diff --cached").then((r) => r.stdout),
+              execAsync11("git diff --cached --stat").then((r) => r.stdout)
             ]);
             const newAnalysis = await analyzeChanges(repoState.currentBranch, newDiff, newStat, recentCommits);
             analysis.summary = newAnalysis.summary;
@@ -39084,9 +39952,9 @@ function commitCommand(program2) {
 
 ${finalBody}` : finalMessage;
           displayStep(`git commit -m "${finalMessage}"${finalBody ? " (with body)" : ""}`);
-          await execAsync6(`git commit -m ${JSON.stringify(fullMessage)}`);
+          await execFileAsync("git", ["commit", "-m", fullMessage]);
           displaySuccess("Committed!");
-          const { stdout: hash } = await execAsync6("git rev-parse --short HEAD");
+          const { stdout: hash } = await execAsync11("git rev-parse --short HEAD");
           console.log(source_default.dim(`  ${hash.trim()} ${finalMessage}
 `));
           await recordCommand("commit", [], Date.now() - start, true);
@@ -39102,14 +39970,14 @@ ${finalBody}` : finalMessage;
 }
 
 // src/lib/update-notifier.ts
-import { readFile as readFile6, writeFile as writeFile6, mkdir as mkdir5 } from "fs/promises";
-import { existsSync as existsSync6 } from "fs";
-import { homedir as homedir2 } from "os";
-import path5 from "path";
+import { readFile as readFile9, writeFile as writeFile8, mkdir as mkdir7 } from "fs/promises";
+import { existsSync as existsSync8 } from "fs";
+import { homedir as homedir4 } from "os";
+import path9 from "path";
 var PACKAGE_NAME2 = "hermes-git";
 var CHECK_INTERVAL = 12 * 60 * 60 * 1000;
-var CACHE_DIR = path5.join(homedir2(), ".hermes", "cache");
-var CACHE_FILE = path5.join(CACHE_DIR, "update-check.json");
+var CACHE_DIR2 = path9.join(homedir4(), ".hermes", "cache");
+var CACHE_FILE2 = path9.join(CACHE_DIR2, "update-check.json");
 async function fetchDistTags() {
   try {
     const res = await fetch(`https://registry.npmjs.org/-/package/${PACKAGE_NAME2}/dist-tags`, { signal: AbortSignal.timeout(5000) });
@@ -39122,17 +39990,17 @@ async function fetchDistTags() {
 }
 async function readCache() {
   try {
-    if (!existsSync6(CACHE_FILE))
+    if (!existsSync8(CACHE_FILE2))
       return null;
-    return JSON.parse(await readFile6(CACHE_FILE, "utf-8"));
+    return JSON.parse(await readFile9(CACHE_FILE2, "utf-8"));
   } catch {
     return null;
   }
 }
 async function writeCache(cache) {
   try {
-    await mkdir5(CACHE_DIR, { recursive: true });
-    await writeFile6(CACHE_FILE, JSON.stringify(cache, null, 2));
+    await mkdir7(CACHE_DIR2, { recursive: true });
+    await writeFile8(CACHE_FILE2, JSON.stringify(cache, null, 2));
   } catch {}
 }
 function compareVersions2(a, b) {
@@ -39201,7 +40069,7 @@ async function checkForUpdates(currentVersion) {
 }
 
 // src/lib/banner.ts
-import { readFileSync, existsSync as existsSync7 } from "fs";
+import { readFileSync, existsSync as existsSync9 } from "fs";
 var ART_LINES = [
   "██╗  ██╗███████╗██████╗ ███╗   ███╗███████╗███████╗",
   "██║  ██║██╔════╝██╔══██╗████╗ ████║██╔════╝██╔════╝",
@@ -39243,7 +40111,7 @@ var BUILTIN_WORKFLOWS = [
 ];
 function loadProjectWorkflows() {
   try {
-    if (!existsSync7(".hermes/config.json"))
+    if (!existsSync9(".hermes/config.json"))
       return [];
     const config = JSON.parse(readFileSync(".hermes/config.json", "utf-8"));
     const workflows = config?.workflows;
@@ -39280,8 +40148,10 @@ function printWorkflows() {
 }
 
 // src/index.ts
+import { createRequire as createRequire2 } from "module";
 var program2 = new Command;
-var CURRENT_VERSION = "0.3.6";
+var __require2 = createRequire2(import.meta.url);
+var { version: CURRENT_VERSION } = __require2("../package.json");
 program2.name("hermes").description("Intent-driven Git, guided by AI").version(CURRENT_VERSION).action(() => {
   printBanner(CURRENT_VERSION);
   printWorkflows();