codiedev 0.7.2 → 0.7.4

package/dist/commands/reverseTicket.js

@@ -36,6 +36,7 @@ function parseArgs(args) {
     let base;
     let forcedKey;
     let noTruncate = false;
+    let dirty = false;
     for (let i = 0; i < args.length; i++) {
         const a = args[i];
         if ((a === "--with" || a === "-w") && i + 1 < args.length) {
@@ -53,17 +54,20 @@ function parseArgs(args) {
         else if (a === "--full") {
             noTruncate = true;
         }
+        else if (a === "--dirty") {
+            dirty = true;
+        }
         else if (!a.startsWith("--") && !prUrl) {
             prUrl = a;
         }
     }
-    return { prUrl, base, forcedKey, noTruncate };
+    return { prUrl, base, forcedKey, noTruncate, dirty };
 }
 async function runReverseTicket(args) {
-    const { prUrl, base, forcedKey, noTruncate } = parseArgs(args);
+    const { prUrl, base, forcedKey, noTruncate, dirty } = parseArgs(args);
     // No PR URL → branch mode (mid-session, no PR exists yet).
     if (!prUrl) {
-        return runBranchMode({ explicitBase: base, forcedKey });
+        return runBranchMode({ explicitBase: base, forcedKey, dirty });
     }
     const parsed = parsePrUrl(prUrl);
     if (!parsed) {
@@ -211,10 +215,6 @@ async function runBranchMode(opts) {
     }
     const baseSha = git(`merge-base HEAD ${baseRef}`);
     const headSha = git("rev-parse HEAD");
-    if (baseSha === headSha) {
-        console.error(`No commits on ${branch} ahead of ${baseRef} — make a commit first.`);
-        process.exit(1);
-    }
     // Filter generated/lockfile noise from the diff body. The --stat (collected
     // separately) still includes every file untouched, so excluded files still
     // surface in the ticket's "Other files touched" section.
@@ -227,29 +227,78 @@ async function runBranchMode(opts) {
         /(^|\/)Gemfile\.lock$/.test(p) ||
         /(^|\/)poetry\.lock$/.test(p) ||
         /(^|\/)go\.sum$/.test(p);
-    const filesRaw = git(`diff --name-only ${baseSha}...HEAD`);
-    const filesChanged = filesRaw ? filesRaw.split("\n").filter(Boolean) : [];
+    const shellTolerant = (cmd) => {
+        try {
+            return (0, child_process_1.execSync)(`${cmd} || true`, {
+                stdio: ["pipe", "pipe", "pipe"],
+                maxBuffer: 32 * 1024 * 1024,
+            })
+                .toString("utf8")
+                .trim();
+        }
+        catch {
+            return "";
+        }
+    };
+    const shQuote = (s) => `'${s.replace(/'/g, "'\\''")}'`;
+    // Default scope is committed-only — files and content reachable from HEAD,
+    // not from the working tree. Without `HEAD` as the second arg, `git diff
+    // <ref>` compares <ref> to the working tree, which silently rolls in
+    // uncommitted modifications and (via ls-files --others) untracked leftovers
+    // from prior branches. That produced audit-grade leaks where a one-commit
+    // copy-button branch generated a draft describing an unrelated auth rebrand
+    // that was sitting dirty in the working tree.
+    //
+    // --dirty re-enables the old behavior for the "ticket my current WIP"
+    // intent — explicit opt-in, since the user is asserting the dirty state is
+    // theirs and on-topic.
+    const includeDirty = opts.dirty === true;
+    const trackedRaw = git(`diff --name-only ${baseSha}${includeDirty ? "" : " HEAD"}`);
+    const trackedFiles = trackedRaw ? trackedRaw.split("\n").filter(Boolean) : [];
+    const untrackedRaw = includeDirty
+        ? safeGit(() => git("ls-files --others --exclude-standard"))
+        : undefined;
+    const untrackedFiles = untrackedRaw
+        ? untrackedRaw.split("\n").filter(Boolean)
+        : [];
+    const filesChanged = Array.from(new Set([...trackedFiles, ...untrackedFiles]));
     if (filesChanged.length === 0) {
-        console.error(`No files changed between ${baseRef} and ${branch} — nothing to write up.`);
+        const scope = includeDirty ? "your working tree" : "HEAD";
+        console.error(`No changes detected between ${baseRef} and ${scope} on ${branch}.`);
+        if (!includeDirty) {
+            console.error("Pass --dirty to also include uncommitted + untracked changes.");
+        }
         process.exit(1);
     }
     let stat = "";
     try {
-        stat = git(`diff --stat=200 ${baseSha}...HEAD`).slice(0, 8_000);
+        const trackedStat = git(`diff --stat=200 ${baseSha}${includeDirty ? "" : " HEAD"}`);
+        const untrackedStatLines = untrackedFiles.map((f) => {
+            const wc = shellTolerant(`wc -l < ${shQuote(f)}`);
+            const n = parseInt(wc.split(/\s+/)[0] || "0", 10) || 0;
+            return ` ${f} | ${n} ++++++++++ (new file)`;
+        });
+        stat = [trackedStat, ...untrackedStatLines]
+            .filter(Boolean)
+            .join("\n")
+            .slice(0, 8_000);
     }
     catch {
         // best effort
     }
     let diff = "";
     try {
-        const sourceFiles = filesChanged.filter((f) => !isNoise(f));
-        if (sourceFiles.length > 0) {
-            const pathspecArgs = sourceFiles.map((f) => `'${f.replace(/'/g, "'\\''")}'`).join(" ");
-            diff = git(`diff ${baseSha}...HEAD -- ${pathspecArgs}`).slice(0, 40_000);
-        }
-        else {
-            diff = git(`diff ${baseSha}...HEAD`).slice(0, 40_000);
-        }
+        const sourceTracked = trackedFiles.filter((f) => !isNoise(f));
+        const headRef = includeDirty ? "" : " HEAD";
+        const trackedDiff = sourceTracked.length > 0
+            ? git(`diff ${baseSha}${headRef} -- ${sourceTracked.map(shQuote).join(" ")}`)
+            : git(`diff ${baseSha}${headRef}`);
+        const sourceUntracked = untrackedFiles.filter((f) => !isNoise(f));
+        const untrackedDiffs = sourceUntracked.map((f) => shellTolerant(`git diff --no-index --no-color -- /dev/null ${shQuote(f)}`));
+        diff = [trackedDiff, ...untrackedDiffs]
+            .filter(Boolean)
+            .join("\n")
+            .slice(0, 40_000);
     }
     catch {
         // best effort

package/dist/mcp.js

@@ -52,7 +52,17 @@ const path = __importStar(require("path"));
 const utils_1 = require("./utils");
 const shared_1 = require("./commands/shared");
 const PKG_NAME = "codiedev";
-const PKG_VERSION = "0.5.0";
+// Read version from the bundled package.json so the startup log + tool reports
+// always reflect the actually-installed version, rather than a stale constant.
+const PKG_VERSION = (() => {
+    try {
+        const pkgPath = path.resolve(__dirname, "..", "package.json");
+        return JSON.parse(fs.readFileSync(pkgPath, "utf8")).version ?? "unknown";
+    }
+    catch {
+        return "unknown";
+    }
+})();
 // ─────────────────────────────────────────────────────────────────────────────
 // Tool definitions — descriptions tuned so Claude/Codex resolve natural-language
 // requests into the right tool without manual steering.
@@ -1086,9 +1096,6 @@ async function handleReverseTicket(args, config) {
     }
     const baseSha = git(`merge-base HEAD ${baseRef}`);
     const headSha = git("rev-parse HEAD");
-    if (baseSha === headSha) {
-        throw new Error(`No commits on ${branch} ahead of ${baseRef} — make a commit first.`);
-    }
     // Filter generated/lockfile noise so the LLM's diff budget gets spent on
     // real source. The --stat block (collected separately below) still includes
     // every file untouched, so excluded files still appear in the ticket's
@@ -1102,33 +1109,72 @@ async function handleReverseTicket(args, config) {
         /(^|\/)Gemfile\.lock$/.test(p) ||
         /(^|\/)poetry\.lock$/.test(p) ||
         /(^|\/)go\.sum$/.test(p);
-    const filesRaw = git(`diff --name-only ${baseSha}...HEAD`);
-    const filesChanged = filesRaw ? filesRaw.split("\n").filter(Boolean) : [];
+    // Helper: run a shell command tolerating non-zero exit codes (git diff
+    // --no-index exits 1 when files differ, which is the normal case).
+    // Reuses the execSync already imported above for the git() helper.
+    const shellTolerant = (cmd) => {
+        try {
+            return execSync(`${cmd} || true`, {
+                stdio: ["pipe", "pipe", "pipe"],
+                maxBuffer: 32 * 1024 * 1024,
+            })
+                .toString("utf8")
+                .trim();
+        }
+        catch {
+            return "";
+        }
+    };
+    const shQuote = (s) => `'${s.replace(/'/g, "'\\''")}'`;
+    // Capture all work the developer has done relative to the base ref:
+    //   - committed changes between base and HEAD
+    //   - uncommitted modifications to tracked files
+    //   - new untracked files (path listed + content via synthetic diff)
+    // Matches the user's intent ("ticket my current changes") rather than the
+    // narrower "only what's been committed" interpretation.
+    const trackedRaw = git(`diff --name-only ${baseSha}`);
+    const trackedFiles = trackedRaw ? trackedRaw.split("\n").filter(Boolean) : [];
+    const untrackedRaw = safeGit(() => git("ls-files --others --exclude-standard"));
+    const untrackedFiles = untrackedRaw
+        ? untrackedRaw.split("\n").filter(Boolean)
+        : [];
+    const filesChanged = Array.from(new Set([...trackedFiles, ...untrackedFiles]));
     if (filesChanged.length === 0) {
-        throw new Error(`No files changed between ${baseRef} and ${branch} — nothing to write up.`);
+        throw new Error(`No changes detected between ${baseRef} and your working tree on ${branch}.`);
     }
-    // Always capture --stat — compact (path + line counts), fits even for huge
-    // PRs, and serves as the writer's ground truth for "every file touched"
-    // when the diff body below is truncated.
+    // --stat block: compact ground truth for "every file touched". Tracked
+    // changes from `git diff --stat baseSha`; untracked files appended as
+    // synthesized stat rows so the LLM sees them with line counts.
     let stat = "";
     try {
-        stat = git(`diff --stat=200 ${baseSha}...HEAD`).slice(0, 8_000);
+        const trackedStat = git(`diff --stat=200 ${baseSha}`);
+        const untrackedStatLines = untrackedFiles.map((f) => {
+            const wc = shellTolerant(`wc -l < ${shQuote(f)}`);
+            const n = parseInt(wc.split(/\s+/)[0] || "0", 10) || 0;
+            return ` ${f} | ${n} ++++++++++ (new file)`;
+        });
+        stat = [trackedStat, ...untrackedStatLines]
+            .filter(Boolean)
+            .join("\n")
+            .slice(0, 8_000);
     }
     catch {
         // Best effort.
     }
-    // Diff body: 40k cap, noise-filtered via pathspec exclusions so lockfiles
-    // and generated dirs don't eat the budget.
+    // Diff body: 40k cap, noise-filtered. Tracked changes via `git diff baseSha`,
+    // plus synthetic add-only diffs for untracked files via `git diff --no-index`.
     let diff = "";
     try {
-        const sourceFiles = filesChanged.filter((f) => !isNoise(f));
-        if (sourceFiles.length > 0) {
-            const pathspecArgs = sourceFiles.map((f) => `'${f.replace(/'/g, "'\\''")}'`).join(" ");
-            diff = git(`diff ${baseSha}...HEAD -- ${pathspecArgs}`).slice(0, 40_000);
-        }
-        else {
-            diff = git(`diff ${baseSha}...HEAD`).slice(0, 40_000);
-        }
+        const sourceTracked = trackedFiles.filter((f) => !isNoise(f));
+        const trackedDiff = sourceTracked.length > 0
+            ? git(`diff ${baseSha} -- ${sourceTracked.map(shQuote).join(" ")}`)
+            : git(`diff ${baseSha}`);
+        const sourceUntracked = untrackedFiles.filter((f) => !isNoise(f));
+        const untrackedDiffs = sourceUntracked.map((f) => shellTolerant(`git diff --no-index --no-color -- /dev/null ${shQuote(f)}`));
+        diff = [trackedDiff, ...untrackedDiffs]
+            .filter(Boolean)
+            .join("\n")
+            .slice(0, 40_000);
     }
     catch {
         // Best effort.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codiedev",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "Connect Claude Code, Codex, Cursor, or VS Code Copilot to CodieDev for org-wide session capture and artifact collaboration",
   "bin": {
     "codiedev": "./dist/cli.js",