gwqadd 0.3.0 → 0.3.2

package/README.md

@@ -135,6 +135,11 @@ question. At that point the sentence, the repository name, its branch names and
 your modified file *paths* (never contents) go to that CLI. Nothing is created
 until you confirm.
 
+The CLI is run in an **empty temporary directory**, not in your repository.
+These tools are agents: given a repo they will read `CLAUDE.md`, your source and
+your git log, and then name the branch after what they found instead of what you
+asked for. Everything they should know is already in the prompt.
+
 None of this happens when you pass a branch name on the command line, or when
 there is no terminal. Scripts and agents keep the plain, silent contract.
 

package/bin/gwqadd.mjs

@@ -2,7 +2,12 @@
 import { spawnSync, spawn } from 'node:child_process';
 import { parseArgs } from 'node:util';
 import { Buffer } from 'node:buffer';
-import { readFileSync, existsSync, readdirSync, renameSync, realpathSync } from 'node:fs';
+import {
+  readFileSync, existsSync, readdirSync, renameSync, realpathSync,
+  mkdtempSync, rmSync,
+} from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join as joinPath } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createInterface } from 'node:readline/promises';
 
@@ -627,6 +632,7 @@ function namingPrompt(ctx, description, rejected) {
       ? `Files already modified in the working tree, which is what the work touches:\n${ctx.dirty.map((f) => `  ${f}`).join('\n')}`
       : '',
     'Include the prefix and a slash. After it use lowercase ASCII words joined by hyphens. Under 40 characters. Be specific about this change, not generic.',
+    'The description below is the only thing the branch is about. Do not name it after anything else you can see.',
     rejected.length
       ? `These were rejected — do not propose them or close variants:\n${rejected.map((r) => `  ${r}`).join('\n')}`
       : '',
@@ -662,15 +668,42 @@ function detectAi() {
   return AI_CLIS.find((c) => commandExists(c.bin)) ?? null;
 }
 
-// spawnSync would freeze the terminal for the 6-8 seconds these CLIs take to
-// boot, with no sign of life. Async plus an elapsed counter is the difference
+// These CLIs are agents, not text transformers: run one inside a repository and
+// it reads CLAUDE.md, the source and the git history, then names the branch
+// after what it found instead of what the user asked for. Measured in this very
+// repository — description "uiのバグの修正", three runs each:
+//
+//   cwd = the repo   feat/ui-bug-fix, fix/ui-display-bug, feat/ui-bug-fix
+//   cwd = empty dir  fix/ui-display-bug, fix/ui-display-bug, fix/ui-display-bug
+//
+// In-repo it both wavered and picked `feat/` for a bug fix twice. It once
+// answered `feat/naming-prompt-repo-context`, which is a phrase straight out of
+// this repo's CLAUDE.md. Everything the model legitimately needs is already in
+// the prompt, so it runs in an empty directory and is given nothing else.
+//
+// spawnSync would also freeze the terminal for the 6-8 seconds these CLIs take
+// to boot, with no sign of life; async plus an elapsed counter is the difference
 // between "working" and "hung".
 function runAi(ai, prompt) {
   return new Promise((resolve) => {
+    let sandbox = '';
+    try {
+      sandbox = mkdtempSync(joinPath(tmpdir(), 'gwqadd-ai-'));
+    } catch { /* fall back to inheriting cwd rather than not answering at all */ }
+    const cleanup = () => {
+      if (!sandbox) return;
+      try { rmSync(sandbox, { recursive: true, force: true }); } catch { /* ignore */ }
+      sandbox = '';
+    };
+
     let child;
     try {
-      child = spawn(ai.bin, [...ai.args, prompt], { stdio: ['ignore', 'pipe', 'pipe'] });
+      child = spawn(ai.bin, [...ai.args, prompt], {
+        stdio: ['ignore', 'pipe', 'pipe'],
+        ...(sandbox ? { cwd: sandbox } : {}),
+      });
     } catch (err) {
+      cleanup();
       return resolve({ ok: false, out: '', err: String(err?.message ?? err) });
     }
     let out = '';
@@ -680,10 +713,12 @@ function runAi(ai, prompt) {
     const kill = setTimeout(() => { try { child.kill('SIGKILL'); } catch { /* gone */ } }, 60_000);
     child.on('error', (e) => {
       clearTimeout(kill);
+      cleanup();
       resolve({ ok: false, out: '', err: String(e?.message ?? e) });
     });
     child.on('close', (code) => {
       clearTimeout(kill);
+      cleanup();
       resolve({ ok: code === 0, out, err });
     });
   });
@@ -906,9 +941,36 @@ function copyToClipboard(text) {
 
 // ── worktree creation ────────────────────────────────────────────────────────
 
-// gwq reports the git command it ran, so a collision's destination can be read
-// back out of its error text.
-const COLLISION = /git worktree add (?:-b [^ ]* )?(\/[^ :]*)/;
+// A collision's destination has to be recovered from gwq's error text. Two
+// sources, in order of reliability:
+//
+//   fatal: '<path>' already exists            <- git, quoted, unambiguous
+//   ...: git worktree add [-b <branch>] <path>: ...
+//
+// The quoted form is preferred because the command echo is not parseable in
+// general: `-b` swaps the argument order (`add -b <branch> <path>` versus
+// `add <path> <branch>`), and a path containing a space silently truncated the
+// old pattern — a gwq basedir under a directory with a space made `-f` do
+// nothing at all, without saying so.
+const COLLISION_QUOTED = /fatal: '([^']+)' already exists/;
+
+// The command echo needs to know which form was used, because `-b` swaps the
+// argument order and both a path and a branch can follow `add`:
+//
+//   gwq add -b <branch>      ->  git worktree add -b <branch> <path>: …
+//   gwq add <branch>         ->  git worktree add <path> <branch>: …
+//
+// Guessing cost real time once already: a pattern that stopped at the first
+// space read the path-first form correctly by accident, and a pattern that ran
+// to the colon swallowed the branch with it.
+const collisionFromCmd = (out, withB) => (withB
+  ? out.match(/git worktree add -b \S+ (.+?): /)
+  : out.match(/git worktree add (.+?) \S+: /))?.[1];
+
+function collisionPath(out, withB) {
+  const quoted = out.match(COLLISION_QUOTED)?.[1];
+  return (quoted ?? collisionFromCmd(out, withB) ?? '').trim();
+}
 
 function timestamp() {
   const d = new Date();
@@ -1019,7 +1081,7 @@ async function main() {
   };
 
   if (status !== 0) {
-    const collide = out.match(COLLISION)?.[1] ?? '';
+    const collide = collisionPath(out, addArgs[0] === '-b');
     // gwq's own -f does not reach `git worktree add` (verified against v0.1.1),
     // so a collision has to be cleared here or not at all.
     if (collide && existsSync(collide) && force) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gwqadd",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Create a branch and its gwq worktree in the repository you are in, and cd there.",
   "type": "module",
   "bin": {