commandmate 0.20.0 → 0.21.0

package/dist/server/src/lib/skills/operation-audit.js

@@ -61,11 +61,10 @@ const SELECT_COLUMNS = `
  * The journal already holds the actor, target, source and typed error.
  *
  * The version transition (#1248) is derived from the journal rather than passed
- * in, because for the two operations that exist today the journal fully
- * determines it: an install ends at its target version and starts nowhere, an
- * uninstall starts at the version it removes and ends nowhere. An `update` is
- * the one case where `fromVersion` is not derivable — it has no writer yet
- * (#1243/#1244), and whoever adds one has to supply the replaced version here.
+ * in, because the journal fully determines it: an install ends at its target
+ * version and starts nowhere, an uninstall starts at the version it removes and
+ * ends nowhere, and an update (#1244) records the version it replaces on its
+ * own target (`fromVersion`) precisely so this derivation stays total.
  */
 function buildSkillOperationAuditInput(entry, result, recordedAt) {
     const isUninstall = entry.operation === 'uninstall';
@@ -81,7 +80,7 @@ function buildSkillOperationAuditInput(entry, result, recordedAt) {
         worktreeId: entry.target.worktreeId,
         skillId: entry.target.skillId,
         skillVersion: entry.target.version,
-        fromVersion: isUninstall ? entry.target.version : null,
+        fromVersion: isUninstall ? entry.target.version : (entry.target.fromVersion ?? null),
         toVersion: isUninstall ? null : entry.target.version,
         sourceOrigin: entry.source?.origin ?? null,
         sourceRepository: entry.source?.repository ?? null,

package/dist/server/src/lib/skills/startup-reconcile.js

@@ -32,6 +32,7 @@ const integrity_1 = require("../../lib/skills/integrity");
 const install_plan_1 = require("../../lib/skills/install-plan");
 const install_apply_1 = require("../../lib/skills/install-apply");
 const uninstall_apply_1 = require("../../lib/skills/uninstall-apply");
+const updater_1 = require("../../lib/skills/updater");
 const installed_state_1 = require("../../lib/skills/installed-state");
 const operation_audit_1 = require("../../lib/skills/operation-audit");
 const operation_journal_1 = require("../../lib/skills/operation-journal");
@@ -65,6 +66,19 @@ function buildSkillReconcilerPorts(db, options = {}) {
                 // and an uninstall's payload is by definition no longer present.
                 return isRemovalOperation(entry);
             }
+            if (entry.operation === 'update') {
+                // An interrupted two-rename switch can leave the root empty (old in
+                // the aside directory, or a verified staged payload unpublished), so
+                // the probe first converges the root to old-complete or new-complete
+                // (#1244) and only then answers whether the *new* receipt landed. The
+                // pre-existing old receipt is why the install probe would misread this
+                // entry: with no recorded digest it accepts any parseable receipt.
+                return (0, updater_1.reconcileSkillUpdateTarget)(worktreePath, entry.target.skillId, {
+                    operationId: entry.operationId,
+                    toVersion: entry.target.version,
+                    receiptDigest: entry.receiptDigest,
+                }).committed;
+            }
             return isRemovalOperation(entry)
                 ? (0, uninstall_apply_1.hasRemovedSkillPayload)(worktreePath, entry.target.skillId, entry.receiptDigest)
                 : (0, install_apply_1.hasCommittedSkillPayload)(worktreePath, entry.target.skillId, entry.receiptDigest);
@@ -80,12 +94,19 @@ function buildSkillReconcilerPorts(db, options = {}) {
             if (worktreePath === null) {
                 throw new Error('worktree path is unavailable for reindex');
             }
-            // Converge any secondary root a partial multi-root install did not reach,
-            // copying the byte-identical payload forward from the committed primary
-            // (#1460). Best-effort: a root blocked by a user file must not stall the
-            // index write, which is what actually makes the install visible.
+            // Converge any secondary root the operation did not reach, forward from
+            // the committed primary (#1460). An install only fills absent roots; an
+            // update (#1244) additionally switches a secondary that still holds the
+            // provably clean previous version. Best-effort: a root blocked by a user
+            // file must not stall the index write, which is what actually makes the
+            // operation visible.
             try {
-                (0, install_apply_1.completeSecondarySkillInstallRoots)(worktreePath, (0, fs_1.realpathSync)(worktreePath), entry.target.skillId);
+                if (entry.operation === 'update') {
+                    (0, updater_1.completeSecondarySkillUpdateRoots)(worktreePath, (0, fs_1.realpathSync)(worktreePath), entry.target.skillId);
+                }
+                else {
+                    (0, install_apply_1.completeSecondarySkillInstallRoots)(worktreePath, (0, fs_1.realpathSync)(worktreePath), entry.target.skillId);
+                }
             }
             catch (error) {
                 reconcileLogger.warn('skill-secondary-root-convergence-failed', {