ultrahope 0.1.4 → 0.1.6

package/README.md

@@ -41,16 +41,49 @@ git diff --staged | ultrahope translate --target vcs-commit-message --models mis
 
 ### Guide context for commit/message generation
 
-`git ultrahope commit` と `ultrahope jj describe` では `--guide <text>` を使って、差分だけでは分からない生成意図を補足できます。
+In `git ultrahope commit` and `ultrahope jj describe`, you can use `--guide <text>` to provide intent that is not obvious from the diff alone.
 
 ```bash
-# git commit の生成補足
+# Additional guidance for git commit generation
 git add -A && git ultrahope commit --guide "GHSA-gq3j-xvxp-8hrf: override reason"
 
-# jj describe の生成補足
+# Additional guidance for jj describe generation
 jj ultrahope describe --guide "GHSA-gq3j-xvxp-8hrf: override reason"
 ```
 
+If you run `git ultrahope commit` with no staged files, interactive mode now asks whether to stage all changes:
+
+```bash
+# With staged changes:
+git add packages/cli/commands/commit.ts
+git ultrahope commit
+
+# Without staged changes:
+git ultrahope commit
+# prompts: No staged changes. Stage all files with `git add -A` and continue? (y/N)
+```
+
+If you answer `y`, Ultrahope runs `git add -A` and continues with staged changes.
+If you answer `n` (or leave the default), it exits with the existing staged-changes error.
+In `--no-interactive` mode, no prompt is shown and it exits immediately when no staged changes exist.
+
+In interactive mode for `git ultrahope commit`, `ultrahope jj describe`, and `ultrahope translate --target vcs-commit-message`, use `r` to reroll and `R` (Shift+r) to reroll with additional instructions.
+
+#### Difference Between `guide` And Refine Instructions
+
+- `--guide`:
+  - Supplemental intent outside the diff (for example: ticket ID, background, change intent)
+- `R refine`:
+  - Review generated results and enter inline instructions for the next reroll
+  - Examples: "more formal", "shorter"
+  - Press `Enter` with empty input to clear the previous refine instructions
+  - If specified multiple times, the last one overwrites previous values
+- `R` means reroll with additional instructions (`refine`)
+- At request time, refine instructions are merged into `guide` and sent to the API:
+  - `--guide` only: `guide = "<guide>"`
+  - `R refine` only: `guide = "<refine>"`
+  - both: `guide = "<guide>\n\nRefinement: <refine>"`
+
 #### Targets
 
 - `vcs-commit-message` - Generate a commit message

package/dist/git-ultrahope.js

@@ -2,6 +2,9 @@
 
 // commands/commit.ts
 import { execSync as execSync2 } from "child_process";
+import * as fs3 from "fs";
+import * as readline4 from "readline";
+import * as tty3 from "tty";
 
 // lib/api-client.ts
 import createClient from "openapi-fetch";
@@ -921,7 +924,19 @@ async function* generateCommitMessages(options) {
     try {
       if (signal?.aborted) return;
       let lastCommitMessage = "";
+      const generationStartedAtMs = Date.now();
+      let lastCommitMessageAtMs;
+      let providerMetadataAtMs;
       let providerMetadata;
+      const parseEventAtMs = (event) => {
+        if (typeof event.atMs !== "number" || !Number.isFinite(event.atMs)) {
+          return void 0;
+        }
+        if (event.atMs < 0) {
+          return 0;
+        }
+        return Math.round(event.atMs);
+      };
       for await (const event of generateWithRetry({
         cliSessionId: requiredCliSessionId,
         input: diff,
@@ -930,6 +945,7 @@ async function* generateCommitMessages(options) {
       })) {
         if (event.type === "commit-message") {
           lastCommitMessage = event.commitMessage;
+          lastCommitMessageAtMs = parseEventAtMs(event) ?? lastCommitMessageAtMs;
           if (useStream) {
             yield {
               content: lastCommitMessage,
@@ -940,6 +956,7 @@ async function* generateCommitMessages(options) {
             };
           }
         } else if (event.type === "provider-metadata") {
+          providerMetadataAtMs = parseEventAtMs(event) ?? providerMetadataAtMs;
           providerMetadata = event.providerMetadata;
         } else if (event.type === "error") {
           throw new Error(event.message);
@@ -947,11 +964,13 @@ async function* generateCommitMessages(options) {
       }
       if (lastCommitMessage) {
         const { generationId, cost } = extractGatewayMetadata(providerMetadata);
+        const generationMs = (providerMetadataAtMs ?? lastCommitMessageAtMs) != null ? providerMetadataAtMs ?? lastCommitMessageAtMs : Math.max(0, Date.now() - generationStartedAtMs);
         yield {
           content: lastCommitMessage,
           slotId: model,
           model,
           cost,
+          generationMs,
           generationId,
           ...useStream ? { isPartial: false } : {},
           slotIndex
@@ -1141,7 +1160,7 @@ import {
   mkdtempSync,
   openSync as openSync2,
   readFileSync as readFileSync2,
-  unlinkSync,
+  rmSync,
   writeFileSync
 } from "fs";
 import { tmpdir } from "os";
@@ -1275,7 +1294,17 @@ function formatSlot(slot, selected) {
   }
   const candidate = slot.candidate;
   const title = candidate.content.split("\n")[0]?.trim() || "";
-  const modelInfo = candidate.model ? candidate.cost ? `${formatModelName(candidate.model)} ${formatCost(candidate.cost)}` : formatModelName(candidate.model) : "";
+  const formatDuration = (ms) => {
+    const safeMs = Math.max(0, Math.round(ms));
+    if (safeMs < 1e3) {
+      return `${safeMs}ms`;
+    }
+    const seconds = (safeMs / 1e3).toFixed(1).replace(/\.0$/, "");
+    return `${seconds}s`;
+  };
+  const formattedModel = candidate.model ? formatModelName(candidate.model) : "";
+  const formattedDuration = candidate.generationMs == null ? "" : ` ${formatDuration(candidate.generationMs)}`;
+  const modelInfo = candidate.model ? candidate.cost ? `${formattedModel} ${formatCost(candidate.cost)}${formattedDuration}` : `${formattedModel}${formattedDuration}` : "";
   if (selected) {
     const radio2 = "\u25CF";
     const line2 = `  ${radio2}  ${theme.bold}${title}${theme.reset}`;
@@ -1287,7 +1316,7 @@ function formatSlot(slot, selected) {
   const meta = modelInfo ? `${theme.dim}     ${modelInfo}${theme.reset}` : "";
   return meta ? [line, meta] : [line];
 }
-function renderSelector(state, nowMs, renderer) {
+function renderSelector(state, nowMs, renderer, editedSelections) {
   const { slots, selectedIndex, isGenerating, totalSlots } = state;
   const lines = [];
   const readyCount = getReadyCount(slots);
@@ -1304,10 +1333,18 @@ function renderSelector(state, nowMs, renderer) {
     const label = readyCount === 1 ? `1 commit message generated${costSuffix}` : `${readyCount} commit messages generated${costSuffix}`;
     lines.push(ui.success(label));
   }
+  const selectedSlot = slots[selectedIndex];
+  const isEditedSelection = selectedSlot?.status === "ready" && editedSelections?.has(selectedSlot.candidate.slotId) === true;
   const hasReady = readyCount > 0;
   if (hasReady) {
-    const hint = ui.hint("\u2191\u2193 navigate  \u23CE confirm  e edit  r reroll  q quit");
-    lines.push(ui.prompt(`Select a commit message ${hint}`));
+    if (isEditedSelection) {
+      lines.push(ui.success("Select a commit message"));
+    } else {
+      const hint = ui.hint(
+        "\u2191\u2193 navigate  \u23CE confirm  e edit  r reroll  R refine  q quit"
+      );
+      lines.push(ui.prompt(`Select a commit message ${hint}`));
+    }
   } else {
     lines.push(ui.hint("  q quit"));
   }
@@ -1321,6 +1358,14 @@ function renderSelector(state, nowMs, renderer) {
       lines.push("");
     }
   }
+  if (selectedSlot?.status === "ready") {
+    const edited = editedSelections?.get(selectedSlot.candidate.slotId);
+    if (edited) {
+      const editedSummary = edited.split("\n")[0]?.slice(0, 120);
+      lines.push(ui.success(`Edited: ${editedSummary}`));
+      lines.push("");
+    }
+  }
   renderer.render(`${lines.join("\n")}
 `);
 }
@@ -1342,25 +1387,40 @@ function openEditor(content) {
     const editor = process.env.GIT_EDITOR || process.env.EDITOR || "vi";
     const tmpDir = mkdtempSync(join4(tmpdir(), "ultrahope-"));
     const tmpFile = join4(tmpDir, "EDIT_MESSAGE");
-    writeFileSync(tmpFile, content);
-    const child = spawn(editor, [tmpFile], { stdio: "inherit" });
-    child.on("close", (code) => {
-      if (code !== 0) {
-        unlinkSync(tmpFile);
-        reject(new Error(`Editor exited with code ${code}`));
-        return;
-      }
-      const result = readFileSync2(tmpFile, "utf-8").trim();
-      unlinkSync(tmpFile);
-      resolve3(result);
-    });
-    child.on("error", (err) => {
+    let cleanupDone = false;
+    const cleanupTempArtifacts = () => {
+      if (cleanupDone) return;
+      cleanupDone = true;
       try {
-        unlinkSync(tmpFile);
+        rmSync(tmpDir, { recursive: true, force: true });
       } catch {
       }
+    };
+    try {
+      writeFileSync(tmpFile, content);
+      const child = spawn(editor, [tmpFile], { stdio: "inherit" });
+      child.on("close", (code) => {
+        try {
+          if (code !== 0) {
+            reject(new Error(`Editor exited with code ${code}`));
+            return;
+          }
+          const result = readFileSync2(tmpFile, "utf-8").trim();
+          resolve3(result);
+        } catch (err) {
+          reject(err);
+        } finally {
+          cleanupTempArtifacts();
+        }
+      });
+      child.on("error", (err) => {
+        cleanupTempArtifacts();
+        reject(err);
+      });
+    } catch (err) {
+      cleanupTempArtifacts();
       reject(err);
-    });
+    }
   });
 }
 async function selectCandidate(options) {
@@ -1380,8 +1440,12 @@ async function selectCandidate(options) {
   let ttyOutput = null;
   try {
     accessSync2(TTY_PATH, constants2.R_OK | constants2.W_OK);
-    const inputFd = openSync2(TTY_PATH, "r");
-    ttyInput = new tty2.ReadStream(inputFd);
+    if (process.stdin.isTTY) {
+      ttyInput = process.stdin;
+    } else {
+      const inputFd = openSync2(TTY_PATH, "r");
+      ttyInput = new tty2.ReadStream(inputFd);
+    }
     if (process.stdout.isTTY) {
       ttyOutput = process.stdout;
     } else {
@@ -1420,6 +1484,7 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
       resolve3(result);
     };
     const slots = [...initialSlots];
+    const editedSelections = /* @__PURE__ */ new Map();
     const state = {
       slots,
       selectedIndex: 0,
@@ -1428,19 +1493,21 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
     };
     let renderInterval = null;
     let cleanedUp = false;
+    let isEditorOpen = false;
     const ttyInput = ttyIo.input;
     const ttyOutput = ttyIo.output;
     const renderer = createRenderer(ttyOutput);
-    const rl = readline3.createInterface({
-      input: ttyInput,
-      output: ttyOutput,
-      terminal: true
-    });
-    readline3.emitKeypressEvents(ttyInput, rl);
+    readline3.emitKeypressEvents(ttyInput);
     ttyInput.setRawMode(true);
+    const setRawModeSafe = (enabled) => {
+      try {
+        ttyInput.setRawMode(enabled);
+      } catch {
+      }
+    };
     const doRender = () => {
-      if (!cleanedUp) {
-        renderSelector(state, Date.now(), renderer);
+      if (!cleanedUp && !isEditorOpen) {
+        renderSelector(state, Date.now(), renderer, editedSelections);
       }
     };
     const updateState = (update) => {
@@ -1470,22 +1537,36 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
       if (clearOutput) {
         renderer.clearAll();
       }
-      ttyInput.setRawMode(false);
-      rl.close();
-      ttyInput.destroy();
-      ttyOutput.destroy();
+      ttyInput.removeAllListeners("keypress");
+      setRawModeSafe(false);
+      ttyInput.pause();
+      if (ttyInput !== process.stdin && !ttyInput.destroyed) {
+        ttyInput.destroy();
+      }
+      if (ttyOutput !== process.stdout && ttyOutput !== process.stderr && !ttyOutput.destroyed) {
+        ttyOutput.destroy();
+      }
     };
     const nextCandidate = async (iterator) => {
+      if (!asyncCtx?.abortController) {
+        return iterator.next();
+      }
+      const signal = asyncCtx.abortController.signal;
+      if (signal.aborted) {
+        return { done: true, value: void 0 };
+      }
+      let cleanup2 = () => {
+      };
       const abortPromise = new Promise(
         (resolve4) => {
-          asyncCtx?.abortController.signal.addEventListener(
-            "abort",
-            () => resolve4({ done: true, value: void 0 }),
-            { once: true }
-          );
+          const onAbort = () => resolve4({ done: true, value: void 0 });
+          signal.addEventListener("abort", onAbort);
+          cleanup2 = () => signal.removeEventListener("abort", onAbort);
         }
       );
-      return Promise.race([iterator.next(), abortPromise]);
+      return Promise.race([iterator.next(), abortPromise]).finally(() => {
+        cleanup2();
+      });
     };
     const finalizeGeneration = () => {
       collapseToReady(slots);
@@ -1544,21 +1625,22 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
         }
       })();
     }
-    const confirmSelection = () => {
+    const confirmSelection = (clearOutput = true) => {
       const candidate = getSelectedCandidate(slots, state.selectedIndex);
       if (!candidate) return;
+      const selectedContent = editedSelections.get(candidate.slotId) ?? candidate.content;
       cancelGeneration();
       const totalCost = getTotalCost(slots);
       const quota = getLatestQuota(slots);
       resolveOnce({
         action: "confirm",
-        selected: candidate.content,
+        selected: selectedContent,
         selectedIndex: state.selectedIndex,
         selectedCandidate: candidate,
         totalCost: totalCost > 0 ? totalCost : void 0,
         quota
       });
-      cleanup();
+      cleanup(clearOutput);
     };
     const rerollSelection = () => {
       if (!hasReadySlot(slots)) return;
@@ -1574,23 +1656,68 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
     const editSelection = async () => {
       const candidate = getSelectedCandidate(slots, state.selectedIndex);
       if (!candidate) return;
-      renderer.flush();
-      ttyInput.setRawMode(false);
-      let edited = null;
+      stopRenderLoop();
+      cancelGeneration();
+      isEditorOpen = true;
+      if (state.isGenerating) {
+        finalizeGeneration();
+      }
+      ttyInput.removeListener("keypress", handleKeypress);
+      setRawModeSafe(false);
+      ttyInput.pause();
+      let edited = candidate.content;
       try {
         const result = await openEditor(candidate.content);
-        edited = result ? result : null;
+        edited = result || candidate.content;
       } catch {
+      } finally {
+        isEditorOpen = false;
       }
-      ttyInput.setRawMode(true);
+      editedSelections.set(candidate.slotId, edited);
       renderer.reset();
-      updateState(() => {
-        if (!edited) return;
-        slots[state.selectedIndex] = {
-          status: "ready",
-          candidate: { ...candidate, content: edited }
+      doRender();
+      renderer.flush();
+      setImmediate(() => {
+        if (!cleanedUp) {
+          confirmSelection(false);
+        }
+      });
+    };
+    const refineSelection = async () => {
+      if (!hasReadySlot(slots)) return;
+      ttyInput.off("keypress", handleKeypress);
+      renderer.flush();
+      ttyInput.setRawMode(false);
+      const guide = await new Promise((resolve4) => {
+        const prompt = `${ui.prompt(
+          `Enter refine instructions (e.g., more formal / shorter / Enter to clear): `
+        )}`;
+        const promptReader = readline3.createInterface({
+          input: ttyInput,
+          output: ttyOutput,
+          terminal: true
+        });
+        let resolved2 = false;
+        const finish = (value) => {
+          if (resolved2) return;
+          resolved2 = true;
+          promptReader.close();
+          resolve4(value);
         };
+        promptReader.on("SIGINT", () => {
+          finish(null);
+        });
+        promptReader.question(prompt, (input) => {
+          finish(input.trim());
+        });
       });
+      ttyInput.setRawMode(true);
+      ttyInput.on("keypress", handleKeypress);
+      renderer.reset();
+      if (guide === null) return;
+      cancelGeneration();
+      resolveOnce({ action: "refine", guide });
+      cleanup();
     };
     const handleKeypress = async (_str, key) => {
       if (!key) return;
@@ -1602,10 +1729,14 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
         confirmSelection();
         return;
       }
-      if (key.name === "r") {
+      if (key.name === "r" && !key.shift) {
         rerollSelection();
         return;
       }
+      if (key.name === "r" && (key.shift || key.name === "R" || key.sequence === "R")) {
+        await refineSelection();
+        return;
+      }
       if (key.name === "e") {
         await editSelection();
         return;
@@ -1807,6 +1938,16 @@ function normalizeGuide(value) {
   if (!trimmed) return void 0;
   return trimmed.length > 1024 ? trimmed.slice(0, 1024) : trimmed;
 }
+function composeGuidance(baseGuide, guideHint) {
+  const normalizedBase = baseGuide?.trim() ?? "";
+  const normalizedGuideHint = guideHint?.trim() ?? "";
+  if (!normalizedBase && !normalizedGuideHint) return void 0;
+  if (!normalizedBase) return normalizedGuideHint;
+  if (!normalizedGuideHint) return normalizedBase;
+  return `${normalizedBase}
+
+Refinement: ${normalizedGuideHint}`;
+}
 function exitWithInvalidModelError(error) {
   console.error(`Error: Model '${error.model}' is not supported.`);
   if (error.allowedModels.length > 0) {
@@ -1872,6 +2013,47 @@ function getStagedDiff() {
     process.exit(1);
   }
 }
+function canPromptForStagedChanges() {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    return false;
+  }
+  try {
+    fs3.accessSync("/dev/tty", fs3.constants.R_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function promptStageAllChanges() {
+  return new Promise((resolve3) => {
+    const fd = fs3.openSync("/dev/tty", "r");
+    const ttyInput = new tty3.ReadStream(fd);
+    const rl = readline4.createInterface({
+      input: ttyInput,
+      output: process.stdout,
+      terminal: true
+    });
+    rl.question(
+      ui.prompt(
+        "No staged changes. Stage all files with `git add -A` and continue? (y/N) "
+      ),
+      (answer) => {
+        rl.close();
+        ttyInput.destroy();
+        const normalized = answer.trim().toLowerCase();
+        resolve3(normalized === "y");
+      }
+    );
+  });
+}
+function stageAllChanges() {
+  try {
+    execSync2("git add -A", { stdio: "inherit" });
+  } catch {
+    console.error("Error: Failed to stage changes with `git add -A`.");
+    process.exit(1);
+  }
+}
 function commitWithMessage(message) {
   try {
     execSync2(`git commit -m ${JSON.stringify(message)}`, { stdio: "inherit" });
@@ -1888,12 +2070,29 @@ async function commit(args2) {
     apiPath: "/v1/commit-message/stream"
   });
   const models = resolveModels(options.cliModels);
-  const diff = getStagedDiff();
+  let diff = getStagedDiff();
   if (!diff.trim()) {
-    console.error(
-      "Error: No staged changes. Stage files with `git add` first."
-    );
-    process.exit(1);
+    if (!options.interactive || !canPromptForStagedChanges()) {
+      console.error(
+        "Error: No staged changes. Stage files with `git add` first."
+      );
+      process.exit(1);
+    }
+    const shouldStage = await promptStageAllChanges();
+    if (!shouldStage) {
+      console.error(
+        "Error: No staged changes. Stage files with `git add` first."
+      );
+      process.exit(1);
+    }
+    stageAllChanges();
+    diff = getStagedDiff();
+    if (!diff.trim()) {
+      console.error(
+        "Error: No staged changes. Stage files with `git add` first."
+      );
+      process.exit(1);
+    }
   }
   try {
     const token = await getToken();
@@ -1922,6 +2121,7 @@ async function commit(args2) {
     const commandExecutionSignal = abortController.signal;
     const commandExecutionPromise = promise;
     const apiClient = api;
+    let guideHint;
     commandExecutionPromise.catch(async (error) => {
       abortController.abort(abortReasonForError(error));
       await handleCommandExecutionError(error, {
@@ -1946,7 +2146,7 @@ async function commit(args2) {
     const createCandidates = (signal) => generateCommitMessages({
       diff,
       models,
-      guide: options.guide,
+      guide: composeGuidance(options.guide, guideHint),
       signal: mergeAbortSignals(signal, commandExecutionSignal),
       cliSessionId,
       commandExecutionPromise,
@@ -1956,7 +2156,7 @@ async function commit(args2) {
       const gen = generateCommitMessages({
         diff,
         models: models.slice(0, 1),
-        guide: options.guide,
+        guide: composeGuidance(options.guide, guideHint),
         signal: commandExecutionSignal,
         cliSessionId,
         commandExecutionPromise,
@@ -1995,6 +2195,10 @@ async function commit(args2) {
       if (result.action === "reroll") {
         continue;
       }
+      if (result.action === "refine" && result.guide !== void 0) {
+        guideHint = result.guide.trim() || void 0;
+        continue;
+      }
       if (result.action === "confirm" && result.selected) {
         await recordSelection(result.selectedCandidate?.generationId);
         const costLabel = result.totalCost != null ? ` (total: ${formatTotalCost(result.totalCost)})` : "";
@@ -2045,6 +2249,8 @@ Commit options:
    --guide <text>     Additional context to guide message generation
    --models <list>   Comma-separated model list (overrides config)
    --capture-stream <path>  Save commit-message stream as replay JSON
+   When no staged changes are found in interactive mode, you will be prompted
+   to run \`git add -A\` first.
 
 Examples:
    git ultrahope commit               # interactive selector (default)

package/dist/index.js

@@ -547,9 +547,6 @@ var theme = {
 };
 
 // lib/ui.ts
-function formatTotalCost(cost) {
-  return `$${cost.toFixed(6)}`;
-}
 var ui = {
   success: (msg) => `${theme.success}\u2714${theme.reset} ${theme.primary}${msg}${theme.reset}`,
   progress: (msg) => `${theme.progress}\u25B6${theme.reset} ${theme.primary}${msg}${theme.reset}`,
@@ -931,7 +928,19 @@ async function* generateCommitMessages(options) {
     try {
       if (signal?.aborted) return;
       let lastCommitMessage = "";
+      const generationStartedAtMs = Date.now();
+      let lastCommitMessageAtMs;
+      let providerMetadataAtMs;
       let providerMetadata;
+      const parseEventAtMs = (event) => {
+        if (typeof event.atMs !== "number" || !Number.isFinite(event.atMs)) {
+          return void 0;
+        }
+        if (event.atMs < 0) {
+          return 0;
+        }
+        return Math.round(event.atMs);
+      };
       for await (const event of generateWithRetry({
         cliSessionId: requiredCliSessionId,
         input: diff,
@@ -940,6 +949,7 @@ async function* generateCommitMessages(options) {
       })) {
         if (event.type === "commit-message") {
           lastCommitMessage = event.commitMessage;
+          lastCommitMessageAtMs = parseEventAtMs(event) ?? lastCommitMessageAtMs;
           if (useStream) {
             yield {
               content: lastCommitMessage,
@@ -950,6 +960,7 @@ async function* generateCommitMessages(options) {
             };
           }
         } else if (event.type === "provider-metadata") {
+          providerMetadataAtMs = parseEventAtMs(event) ?? providerMetadataAtMs;
           providerMetadata = event.providerMetadata;
         } else if (event.type === "error") {
           throw new Error(event.message);
@@ -957,11 +968,13 @@ async function* generateCommitMessages(options) {
       }
       if (lastCommitMessage) {
         const { generationId, cost } = extractGatewayMetadata(providerMetadata);
+        const generationMs = (providerMetadataAtMs ?? lastCommitMessageAtMs) != null ? providerMetadataAtMs ?? lastCommitMessageAtMs : Math.max(0, Date.now() - generationStartedAtMs);
         yield {
           content: lastCommitMessage,
           slotId: model,
           model,
           cost,
+          generationMs,
           generationId,
           ...useStream ? { isPartial: false } : {},
           slotIndex
@@ -1166,7 +1179,7 @@ import {
   mkdtempSync,
   openSync as openSync2,
   readFileSync as readFileSync2,
-  unlinkSync,
+  rmSync,
   writeFileSync
 } from "fs";
 import { tmpdir } from "os";
@@ -1300,7 +1313,17 @@ function formatSlot(slot, selected) {
   }
   const candidate = slot.candidate;
   const title = candidate.content.split("\n")[0]?.trim() || "";
-  const modelInfo = candidate.model ? candidate.cost ? `${formatModelName(candidate.model)} ${formatCost(candidate.cost)}` : formatModelName(candidate.model) : "";
+  const formatDuration = (ms) => {
+    const safeMs = Math.max(0, Math.round(ms));
+    if (safeMs < 1e3) {
+      return `${safeMs}ms`;
+    }
+    const seconds = (safeMs / 1e3).toFixed(1).replace(/\.0$/, "");
+    return `${seconds}s`;
+  };
+  const formattedModel = candidate.model ? formatModelName(candidate.model) : "";
+  const formattedDuration = candidate.generationMs == null ? "" : ` ${formatDuration(candidate.generationMs)}`;
+  const modelInfo = candidate.model ? candidate.cost ? `${formattedModel} ${formatCost(candidate.cost)}${formattedDuration}` : `${formattedModel}${formattedDuration}` : "";
   if (selected) {
     const radio2 = "\u25CF";
     const line2 = `  ${radio2}  ${theme.bold}${title}${theme.reset}`;
@@ -1312,7 +1335,7 @@ function formatSlot(slot, selected) {
   const meta = modelInfo ? `${theme.dim}     ${modelInfo}${theme.reset}` : "";
   return meta ? [line, meta] : [line];
 }
-function renderSelector(state, nowMs, renderer) {
+function renderSelector(state, nowMs, renderer, editedSelections) {
   const { slots, selectedIndex, isGenerating, totalSlots } = state;
   const lines = [];
   const readyCount = getReadyCount(slots);
@@ -1329,10 +1352,18 @@ function renderSelector(state, nowMs, renderer) {
     const label = readyCount === 1 ? `1 commit message generated${costSuffix}` : `${readyCount} commit messages generated${costSuffix}`;
     lines.push(ui.success(label));
   }
+  const selectedSlot = slots[selectedIndex];
+  const isEditedSelection = selectedSlot?.status === "ready" && editedSelections?.has(selectedSlot.candidate.slotId) === true;
   const hasReady = readyCount > 0;
   if (hasReady) {
-    const hint = ui.hint("\u2191\u2193 navigate  \u23CE confirm  e edit  r reroll  q quit");
-    lines.push(ui.prompt(`Select a commit message ${hint}`));
+    if (isEditedSelection) {
+      lines.push(ui.success("Select a commit message"));
+    } else {
+      const hint = ui.hint(
+        "\u2191\u2193 navigate  \u23CE confirm  e edit  r reroll  R refine  q quit"
+      );
+      lines.push(ui.prompt(`Select a commit message ${hint}`));
+    }
   } else {
     lines.push(ui.hint("  q quit"));
   }
@@ -1346,6 +1377,14 @@ function renderSelector(state, nowMs, renderer) {
       lines.push("");
     }
   }
+  if (selectedSlot?.status === "ready") {
+    const edited = editedSelections?.get(selectedSlot.candidate.slotId);
+    if (edited) {
+      const editedSummary = edited.split("\n")[0]?.slice(0, 120);
+      lines.push(ui.success(`Edited: ${editedSummary}`));
+      lines.push("");
+    }
+  }
   renderer.render(`${lines.join("\n")}
 `);
 }
@@ -1367,25 +1406,40 @@ function openEditor(content) {
     const editor = process.env.GIT_EDITOR || process.env.EDITOR || "vi";
     const tmpDir = mkdtempSync(join4(tmpdir(), "ultrahope-"));
     const tmpFile = join4(tmpDir, "EDIT_MESSAGE");
-    writeFileSync(tmpFile, content);
-    const child = spawn(editor, [tmpFile], { stdio: "inherit" });
-    child.on("close", (code) => {
-      if (code !== 0) {
-        unlinkSync(tmpFile);
-        reject(new Error(`Editor exited with code ${code}`));
-        return;
-      }
-      const result = readFileSync2(tmpFile, "utf-8").trim();
-      unlinkSync(tmpFile);
-      resolve3(result);
-    });
-    child.on("error", (err) => {
+    let cleanupDone = false;
+    const cleanupTempArtifacts = () => {
+      if (cleanupDone) return;
+      cleanupDone = true;
       try {
-        unlinkSync(tmpFile);
+        rmSync(tmpDir, { recursive: true, force: true });
       } catch {
       }
+    };
+    try {
+      writeFileSync(tmpFile, content);
+      const child = spawn(editor, [tmpFile], { stdio: "inherit" });
+      child.on("close", (code) => {
+        try {
+          if (code !== 0) {
+            reject(new Error(`Editor exited with code ${code}`));
+            return;
+          }
+          const result = readFileSync2(tmpFile, "utf-8").trim();
+          resolve3(result);
+        } catch (err) {
+          reject(err);
+        } finally {
+          cleanupTempArtifacts();
+        }
+      });
+      child.on("error", (err) => {
+        cleanupTempArtifacts();
+        reject(err);
+      });
+    } catch (err) {
+      cleanupTempArtifacts();
       reject(err);
-    });
+    }
   });
 }
 async function selectCandidate(options) {
@@ -1405,8 +1459,12 @@ async function selectCandidate(options) {
   let ttyOutput = null;
   try {
     accessSync2(TTY_PATH, constants2.R_OK | constants2.W_OK);
-    const inputFd = openSync2(TTY_PATH, "r");
-    ttyInput = new tty2.ReadStream(inputFd);
+    if (process.stdin.isTTY) {
+      ttyInput = process.stdin;
+    } else {
+      const inputFd = openSync2(TTY_PATH, "r");
+      ttyInput = new tty2.ReadStream(inputFd);
+    }
     if (process.stdout.isTTY) {
       ttyOutput = process.stdout;
     } else {
@@ -1445,6 +1503,7 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
       resolve3(result);
     };
     const slots = [...initialSlots];
+    const editedSelections = /* @__PURE__ */ new Map();
     const state = {
       slots,
       selectedIndex: 0,
@@ -1453,19 +1512,21 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
     };
     let renderInterval = null;
     let cleanedUp = false;
+    let isEditorOpen = false;
     const ttyInput = ttyIo.input;
     const ttyOutput = ttyIo.output;
     const renderer = createRenderer(ttyOutput);
-    const rl = readline3.createInterface({
-      input: ttyInput,
-      output: ttyOutput,
-      terminal: true
-    });
-    readline3.emitKeypressEvents(ttyInput, rl);
+    readline3.emitKeypressEvents(ttyInput);
     ttyInput.setRawMode(true);
+    const setRawModeSafe = (enabled) => {
+      try {
+        ttyInput.setRawMode(enabled);
+      } catch {
+      }
+    };
     const doRender = () => {
-      if (!cleanedUp) {
-        renderSelector(state, Date.now(), renderer);
+      if (!cleanedUp && !isEditorOpen) {
+        renderSelector(state, Date.now(), renderer, editedSelections);
       }
     };
     const updateState = (update) => {
@@ -1495,22 +1556,36 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
       if (clearOutput) {
         renderer.clearAll();
       }
-      ttyInput.setRawMode(false);
-      rl.close();
-      ttyInput.destroy();
-      ttyOutput.destroy();
+      ttyInput.removeAllListeners("keypress");
+      setRawModeSafe(false);
+      ttyInput.pause();
+      if (ttyInput !== process.stdin && !ttyInput.destroyed) {
+        ttyInput.destroy();
+      }
+      if (ttyOutput !== process.stdout && ttyOutput !== process.stderr && !ttyOutput.destroyed) {
+        ttyOutput.destroy();
+      }
     };
     const nextCandidate = async (iterator) => {
+      if (!asyncCtx?.abortController) {
+        return iterator.next();
+      }
+      const signal = asyncCtx.abortController.signal;
+      if (signal.aborted) {
+        return { done: true, value: void 0 };
+      }
+      let cleanup2 = () => {
+      };
       const abortPromise = new Promise(
         (resolve4) => {
-          asyncCtx?.abortController.signal.addEventListener(
-            "abort",
-            () => resolve4({ done: true, value: void 0 }),
-            { once: true }
-          );
+          const onAbort = () => resolve4({ done: true, value: void 0 });
+          signal.addEventListener("abort", onAbort);
+          cleanup2 = () => signal.removeEventListener("abort", onAbort);
         }
       );
-      return Promise.race([iterator.next(), abortPromise]);
+      return Promise.race([iterator.next(), abortPromise]).finally(() => {
+        cleanup2();
+      });
     };
     const finalizeGeneration = () => {
       collapseToReady(slots);
@@ -1569,21 +1644,22 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
         }
       })();
     }
-    const confirmSelection = () => {
+    const confirmSelection = (clearOutput = true) => {
       const candidate = getSelectedCandidate(slots, state.selectedIndex);
       if (!candidate) return;
+      const selectedContent = editedSelections.get(candidate.slotId) ?? candidate.content;
       cancelGeneration();
       const totalCost = getTotalCost(slots);
       const quota = getLatestQuota(slots);
       resolveOnce({
         action: "confirm",
-        selected: candidate.content,
+        selected: selectedContent,
         selectedIndex: state.selectedIndex,
         selectedCandidate: candidate,
         totalCost: totalCost > 0 ? totalCost : void 0,
         quota
       });
-      cleanup();
+      cleanup(clearOutput);
     };
     const rerollSelection = () => {
       if (!hasReadySlot(slots)) return;
@@ -1599,23 +1675,68 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
     const editSelection = async () => {
       const candidate = getSelectedCandidate(slots, state.selectedIndex);
       if (!candidate) return;
-      renderer.flush();
-      ttyInput.setRawMode(false);
-      let edited = null;
+      stopRenderLoop();
+      cancelGeneration();
+      isEditorOpen = true;
+      if (state.isGenerating) {
+        finalizeGeneration();
+      }
+      ttyInput.removeListener("keypress", handleKeypress);
+      setRawModeSafe(false);
+      ttyInput.pause();
+      let edited = candidate.content;
       try {
         const result = await openEditor(candidate.content);
-        edited = result ? result : null;
+        edited = result || candidate.content;
       } catch {
+      } finally {
+        isEditorOpen = false;
       }
-      ttyInput.setRawMode(true);
+      editedSelections.set(candidate.slotId, edited);
       renderer.reset();
-      updateState(() => {
-        if (!edited) return;
-        slots[state.selectedIndex] = {
-          status: "ready",
-          candidate: { ...candidate, content: edited }
+      doRender();
+      renderer.flush();
+      setImmediate(() => {
+        if (!cleanedUp) {
+          confirmSelection(false);
+        }
+      });
+    };
+    const refineSelection = async () => {
+      if (!hasReadySlot(slots)) return;
+      ttyInput.off("keypress", handleKeypress);
+      renderer.flush();
+      ttyInput.setRawMode(false);
+      const guide = await new Promise((resolve4) => {
+        const prompt = `${ui.prompt(
+          `Enter refine instructions (e.g., more formal / shorter / Enter to clear): `
+        )}`;
+        const promptReader = readline3.createInterface({
+          input: ttyInput,
+          output: ttyOutput,
+          terminal: true
+        });
+        let resolved2 = false;
+        const finish = (value) => {
+          if (resolved2) return;
+          resolved2 = true;
+          promptReader.close();
+          resolve4(value);
         };
+        promptReader.on("SIGINT", () => {
+          finish(null);
+        });
+        promptReader.question(prompt, (input) => {
+          finish(input.trim());
+        });
       });
+      ttyInput.setRawMode(true);
+      ttyInput.on("keypress", handleKeypress);
+      renderer.reset();
+      if (guide === null) return;
+      cancelGeneration();
+      resolveOnce({ action: "refine", guide });
+      cleanup();
     };
     const handleKeypress = async (_str, key) => {
       if (!key) return;
@@ -1627,10 +1748,14 @@ async function selectFromSlots(initialSlots, asyncCtx, ttyIo) {
         confirmSelection();
         return;
       }
-      if (key.name === "r") {
+      if (key.name === "r" && !key.shift) {
         rerollSelection();
         return;
       }
+      if (key.name === "r" && (key.shift || key.name === "R" || key.sequence === "R")) {
+        await refineSelection();
+        return;
+      }
       if (key.name === "e") {
         await editSelection();
         return;
@@ -1848,6 +1973,16 @@ function normalizeGuide(value) {
   if (!trimmed) return void 0;
   return trimmed.length > 1024 ? trimmed.slice(0, 1024) : trimmed;
 }
+function composeGuidance(baseGuide, guideHint) {
+  const normalizedBase = baseGuide?.trim() ?? "";
+  const normalizedGuideHint = guideHint?.trim() ?? "";
+  if (!normalizedBase && !normalizedGuideHint) return void 0;
+  if (!normalizedBase) return normalizedGuideHint;
+  if (!normalizedGuideHint) return normalizedBase;
+  return `${normalizedBase}
+
+Refinement: ${normalizedGuideHint}`;
+}
 function parseDescribeArgs(args2) {
   let revision = "@";
   let interactive = true;
@@ -1962,11 +2097,11 @@ async function recordSelection(apiClient, generationId) {
     console.error(`Warning: Failed to record selection. ${message}`);
   }
 }
-function createCandidateFactory(diff, models, context, captureRecorder, guide) {
+function createCandidateFactory(diff, models, context, captureRecorder, getGuide) {
   return (signal) => generateCommitMessages({
     diff,
     models,
-    guide,
+    guide: getGuide(),
     signal: mergeAbortSignals(signal, context.commandExecutionSignal),
     cliSessionId: context.cliSessionId,
     commandExecutionPromise: context.commandExecutionPromise,
@@ -1995,7 +2130,7 @@ async function runNonInteractiveDescribe(revision, models, diff, context, captur
   const message = first.value?.content ?? "";
   describeRevision(revision, message);
 }
-async function runInteractiveDescribe(options, models, createCandidates, context) {
+async function runInteractiveDescribe(options, models, createCandidates, context, onGuideHintChange) {
   const stats = getJjDiffStats(options.revision);
   console.log(ui.success(`Found ${formatDiffStats(stats)}`));
   while (true) {
@@ -2018,13 +2153,16 @@ async function runInteractiveDescribe(options, models, createCandidates, context
     if (result.action === "reroll") {
       continue;
     }
+    if (result.action === "refine" && result.guide !== void 0) {
+      const nextGuideHint = result.guide.trim() || void 0;
+      onGuideHintChange(nextGuideHint);
+      continue;
+    }
     if (result.action === "confirm" && result.selected) {
       await recordSelection(
         context.apiClient,
         result.selectedCandidate?.generationId
       );
-      const costLabel = result.totalCost != null ? ` (total: ${formatTotalCost(result.totalCost)})` : "";
-      console.log(ui.success(`Message selected${costLabel}`));
       console.log(
         `${ui.success(`Running jj describe -r ${options.revision}`)}
 `
@@ -2049,18 +2187,20 @@ async function describe(args2) {
     apiPath: "/v1/commit-message/stream"
   });
   try {
+    let guideHint;
     const context = await initCommandExecutionContext(
       args2,
       models,
       diff,
       options.guide
     );
+    const resolveGuide = () => composeGuidance(options.guide, guideHint);
     const createCandidates = createCandidateFactory(
       diff,
       models,
       context,
       captureRecorder,
-      options.guide
+      resolveGuide
     );
     if (!options.interactive) {
       await runNonInteractiveDescribe(
@@ -2069,11 +2209,19 @@ async function describe(args2) {
         diff,
         context,
         captureRecorder,
-        options.guide
+        resolveGuide()
       );
       return;
     }
-    await runInteractiveDescribe(options, models, createCandidates, context);
+    await runInteractiveDescribe(
+      options,
+      models,
+      createCandidates,
+      context,
+      (value) => {
+        guideHint = value;
+      }
+    );
   } finally {
     const capturePath = captureRecorder.flush();
     if (capturePath) {
@@ -2220,6 +2368,10 @@ function exitWithInvalidModelError2(error) {
   }
   process.exit(1);
 }
+function composeGuidance2(guideHint) {
+  const normalizedGuideHint = guideHint?.trim() ?? "";
+  return normalizedGuideHint || void 0;
+}
 async function translate(args2) {
   const options = parseArgs(args2);
   const input = await stdin();
@@ -2271,6 +2423,7 @@ async function handleVcsCommitMessage(input, options, args2) {
     const commandExecutionSignal = abortController.signal;
     const commandExecutionPromise = promise;
     const apiClient = api;
+    let guideHint;
     commandExecutionPromise.catch(async (error) => {
       abortController.abort(abortReasonForError(error));
       await handleCommandExecutionError(error, {
@@ -2295,6 +2448,7 @@ async function handleVcsCommitMessage(input, options, args2) {
     const createCandidates = (signal) => generateCommitMessages({
       diff: input,
       models,
+      guide: composeGuidance2(guideHint),
       signal: mergeAbortSignals(signal, commandExecutionSignal),
       cliSessionId,
       commandExecutionPromise,
@@ -2304,6 +2458,7 @@ async function handleVcsCommitMessage(input, options, args2) {
       const gen = generateCommitMessages({
         diff: input,
         models: models.slice(0, 1),
+        guide: composeGuidance2(guideHint),
         signal: commandExecutionSignal,
         cliSessionId,
         commandExecutionPromise,
@@ -2336,6 +2491,10 @@ async function handleVcsCommitMessage(input, options, args2) {
         console.error("Aborted.");
         process.exit(1);
       }
+      if (result.action === "refine" && result.guide !== void 0) {
+        guideHint = result.guide.trim() || void 0;
+        continue;
+      }
       if (result.action === "reroll") {
         continue;
       }
@@ -2571,7 +2730,7 @@ function parseArgs(args2) {
 // package.json
 var package_default = {
   name: "ultrahope",
-  version: "0.1.4",
+  version: "0.1.6",
   description: "LLM-powered development workflow assistant",
   type: "module",
   license: "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ultrahope",
-	"version": "0.1.4",
+	"version": "0.1.6",
 	"description": "LLM-powered development workflow assistant",
 	"type": "module",
 	"license": "MIT",