toga-ai 1.0.479 → 1.0.480

package/knowledge.js

@@ -48,6 +48,17 @@ function fail(msg) {
     process.exitCode = 1;
 }
 
+/* Blocking sleep, for backing off between push retries. This script is a
+ * short-lived synchronous CLI, so there is no event loop to yield to and an
+ * async sleep would mean threading promises through every git call. */
+function sleepSync(ms) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+/* stderr of the last failed push attempt, so reportSession() can say WHY
+ * instead of only that it failed. */
+let lastPushError = '';
+
 function parseArgs(argv) {
     const out = {};
     for (const arg of argv) {
@@ -433,15 +444,23 @@ function cmdPublish(args) {
     const msg = String(args.msg || 'knowledge: capture session updates').replace(/["\\]/g, "'").slice(0, 200);
     run(`git commit -m "${msg}"`);
 
-    // 6. rebase-before-push, retrying the CI version-bump race up to 3x
+    // 6. rebase-before-push, retrying the CI version-bump race up to 3x.
+    //    --autostash is REQUIRED, not a nicety: plain `git rebase` aborts with
+    //    "cannot rebase: You have unstaged changes" if ANY tracked file is dirty,
+    //    even one unrelated to knowledge/ (.claude/settings.json is the usual
+    //    culprit — the harness edits it). That failure is not a conflict and not a
+    //    race, so it fails identically on all 3 attempts and every capture ends in
+    //    a manual push. --autostash stashes the unrelated edits, rebases, restores.
+    let lastError = '';
     for (let attempt = 1; attempt <= 3; attempt++) {
         try {
             run('git fetch origin');
-            run(`git rebase origin/${branch}`);
+            run(`git rebase --autostash origin/${branch}`);
             run(`git push origin HEAD:${branch}`);
             console.log(`PUBLISH: PUSHED to ${branch} — CI publishes a new npm version; teammates get it on \`npx toga-ai\``);
             return;
         } catch (e) {
+            lastError = String((e && (e.stderr || e.stdout)) || (e && e.message) || '').trim();
             let status = '';
             try { status = run('git status --porcelain'); } catch { /* ignore */ }
             if (/^(UU|AA|DD|AU|UA|DU|UD) /m.test(status)) {
@@ -449,10 +468,15 @@ function cmdPublish(args) {
                 console.log(`PUBLISH: CONFLICT — rebase onto origin/${branch} hit a real conflict; resolve manually, then re-run publish`);
                 process.exitCode = 1; return;
             }
-            // else: almost certainly a fresh CI bump (non-fast-forward) — loop and retry
+            // else: most likely a fresh CI bump (non-fast-forward). Back off before
+            // retrying — an instant retry loses the same race three times over.
+            if (attempt < 3) sleepSync(2000 * attempt);
         }
     }
+    // Always surface WHY. Swallowing stderr here is what disguised the dirty-tree
+    // bug above as a flaky CI race for months.
     console.log(`PUBLISH: PUSH_FAILED after 3 attempts — run manually: git -C "${TEAM}" push origin HEAD:${branch}`);
+    if (lastError) console.log('PUBLISH: last git error — ' + lastError.split('\n').slice(0, 5).join(' | '));
     process.exitCode = 1;
 }
 
@@ -766,20 +790,25 @@ function pushStaged(opts) {
     }
     const msg = String((opts && opts.msg) || 'sessions: update').replace(/["\\]/g, "'").slice(0, 200);
     gitRun(`git commit -m "${msg}"`);
+    // --autostash is REQUIRED: plain `git rebase` refuses to run while ANY tracked
+    // file is dirty, even one unrelated to what we staged, which fails identically
+    // on every attempt and forces a manual push. See cmdPublish() for the detail.
     for (let attempt = 1; attempt <= 3; attempt++) {
         try {
             gitRun('git fetch origin');
-            gitRun(`git rebase origin/${branch}`);
+            gitRun(`git rebase --autostash origin/${branch}`);
             gitRun(`git push origin HEAD:${branch}`);
             return 'PUSHED';
         } catch (e) {
+            lastPushError = String((e && (e.stderr || e.stdout)) || (e && e.message) || '').trim();
             let status = '';
             try { status = gitRun('git status --porcelain'); } catch { /* ignore */ }
             if (/^(UU|AA|DD|AU|UA|DU|UD) /m.test(status)) {
                 try { gitRun('git rebase --abort'); } catch { /* ignore */ }
                 return 'CONFLICT';
             }
-            // else: almost certainly a fresh CI bump (non-fast-forward) — retry
+            // else: most likely a fresh CI bump (non-fast-forward) — back off, retry
+            if (attempt < 3) sleepSync(2000 * attempt);
         }
     }
     return 'PUSH_FAILED';
@@ -792,7 +821,9 @@ function reportSession(status, branch) {
     if (status === 'NO_CHANGES') { console.log('SESSION: NO_CHANGES — nothing new to push'); return; }
     if (status === 'CONFLICT') { console.log(`SESSION: CONFLICT — rebase onto origin/${br} hit a real conflict; resolve manually, then retry`); process.exitCode = 1; return; }
     if (status && status.startsWith('ABORT_OUTSIDE')) { console.log('SESSION: ABORT_OUTSIDE_SESSIONS — refusing to commit non-session files: ' + status.slice('ABORT_OUTSIDE:'.length)); process.exitCode = 1; return; }
-    console.log(`SESSION: PUSH_FAILED after 3 attempts — run manually: git -C "${__dirname}" push origin HEAD:${br}`); process.exitCode = 1;
+    console.log(`SESSION: PUSH_FAILED after 3 attempts — run manually: git -C "${__dirname}" push origin HEAD:${br}`);
+    if (lastPushError) console.log('SESSION: last git error — ' + lastPushError.split('\n').slice(0, 5).join(' | '));
+    process.exitCode = 1;
 }
 
 function fetchQuiet() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toga-ai",
-  "version": "1.0.479",
+  "version": "1.0.480",
   "description": "TOGA Technology Team Claude Knowledge System — shared AI coding harness with skills, knowledge base CLI, and project installer for Claude Code.",
   "keywords": [
     "claude",