convene-cli 1.4.2 → 1.4.3

package/dist/commands/init.js

@@ -552,15 +552,29 @@ function writeCoordinationBlocks(top, slug, member, baseUrl) {
  */
 function commitConveneFiles(top, message, label) {
     const paths = exports.CONVENE_PATHS.filter((p) => node_fs_1.default.existsSync(node_path_1.default.join(top, p)));
-    if (paths.length && (0, git_1.gitAddPaths)(paths, top)) {
-        const res = (0, git_1.gitCommit)(message, paths, top);
-        if (res.ok)
-            log(`✓ committed ${label} as one isolated commit${res.sha ? ` (${res.sha})` : ''} — only the convene files were staged.`);
-        else
-            log('· nothing committed (no staged changes).');
-    }
-    else if (paths.length) {
+    if (!paths.length)
+        return;
+    // Decide up front whether anything under the managed paths is actually pending
+    // (staged/unstaged/untracked). This makes `--commit` deterministic and TRANSPARENT:
+    // a clean re-render says "already up to date" instead of a vague no-op, and a tree
+    // dirtied by an EARLIER `--refresh-docs` (without `--commit`) still gets committed
+    // — the gotcha that previously left changes stranded.
+    const pending = (0, git_1.gitPendingPaths)(paths, top);
+    if (!pending.length) {
+        log(`· ${label}: managed files already committed — nothing to commit.`);
+        return;
+    }
+    if (!(0, git_1.gitAddPaths)(paths, top)) {
         log('⚠ could not stage the convene files — commit them manually.');
+        return;
+    }
+    const res = (0, git_1.gitCommit)(message, paths, top);
+    if (res.ok) {
+        log(`✓ committed ${label} as one isolated commit${res.sha ? ` (${res.sha})` : ''} — ${pending.length} convene file(s) staged, nothing else.`);
+    }
+    else {
+        // pending changes existed but the commit did not land — never silent.
+        log(`⚠ ${pending.length} convene file(s) are staged but the commit did not land — commit them manually (\`git commit\`).`);
     }
 }
 /**

package/dist/git.js

@@ -26,6 +26,7 @@ exports.gitConfigUnsetLocal = gitConfigUnsetLocal;
 exports.pathIsTracked = pathIsTracked;
 exports.hasStagedChanges = hasStagedChanges;
 exports.gitAddPaths = gitAddPaths;
+exports.gitPendingPaths = gitPendingPaths;
 exports.gitCommit = gitCommit;
 exports.gitPathIsIgnored = gitPathIsIgnored;
 /** Cross-platform git helpers. No shell strings — spawn git directly (P0-XPLAT). */
@@ -305,6 +306,30 @@ function gitAddPaths(paths, cwd = process.cwd()) {
         return false;
     }
 }
+/**
+ * The subset of `paths` that have PENDING changes (staged, unstaged, or untracked),
+ * via `git status --porcelain -- <paths>`. Lets a caller decide whether there is
+ * anything to commit BEFORE running `git commit` — so an isolated-commit helper can
+ * say "already up to date" plainly instead of relying on a non-zero `git commit`
+ * exit. Returns [] on any error / clean tree (never throws).
+ */
+function gitPendingPaths(paths, cwd = process.cwd()) {
+    if (paths.length === 0)
+        return [];
+    try {
+        const r = (0, node_child_process_1.spawnSync)('git', ['status', '--porcelain', '--', ...paths], { cwd, encoding: 'utf8', timeout: 5000 });
+        if (r.status !== 0 || !r.stdout)
+            return [];
+        // Porcelain v1 line: "XY <path>"; we only need the count/names, not the status.
+        return r.stdout
+            .split('\n')
+            .map((l) => l.slice(3).trim())
+            .filter(Boolean);
+    }
+    catch {
+        return [];
+    }
+}
 /**
  * Commit ONLY the given pathspecs (`git commit -m <msg> -- <paths>`), leaving any
  * other staged changes untouched — the isolated-commit guarantee. Returns the short

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "convene-cli",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Convene CLI — AI development coordination bus client + UserPromptSubmit hook. Install: npm i -g convene-cli; then `convene setup`.",
   "license": "MIT",
   "homepage": "https://dev.convene.live",