skillwiki 0.10.2 → 0.10.4

package/dist/{chunk-SCGC7YNM.js → chunk-GEKJG4F7.js}

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import {
+  FLEET_REL_PATH,
   findReviewRequiredOp,
   git,
   hasActiveGitSequencer,
@@ -14,6 +15,10 @@ import {
   ok
 } from "./chunk-C5OLZRRM.js";
 
+// src/utils/managed-write-preflight.ts
+import { existsSync, readFileSync as readFileSync2 } from "fs";
+import { join as join2, resolve } from "path";
+
 // src/utils/managed-write-lock.ts
 import { randomBytes } from "crypto";
 import { mkdirSync, readFileSync, unlinkSync, writeFileSync } from "fs";
@@ -78,19 +83,52 @@ function preflightBlocker(vault) {
   if (op) return { reason: "review-required", operation_id: op };
   return null;
 }
+function fleetManifestBytes(vault) {
+  const path = join2(vault, FLEET_REL_PATH);
+  if (!existsSync(path)) return null;
+  return readFileSync2(path);
+}
+function isGitVault(vault) {
+  return Boolean(git(vault, ["rev-parse", "--absolute-git-dir"]));
+}
 async function runManagedWritePreflight(input, deps = DEFAULT_DEPS) {
   const vault = input.vault;
-  const blocker = preflightBlocker(vault);
-  if (blocker) {
+  const convergenceVault = input.convergenceVault && resolve(input.convergenceVault) !== resolve(vault) ? resolve(input.convergenceVault) : void 0;
+  const gitVault = convergenceVault ?? vault;
+  const mutationBlocker = preflightBlocker(vault);
+  if (mutationBlocker) {
     return {
       exitCode: ExitCode.PREFLIGHT_FAILED,
       result: err("PREFLIGHT_FAILED", {
-        reason: blocker.reason,
-        operation_id: blocker.operation_id,
-        unmerged_paths: blocker.unmerged_paths
+        reason: mutationBlocker.reason,
+        operation_id: mutationBlocker.operation_id,
+        unmerged_paths: mutationBlocker.unmerged_paths
       })
     };
   }
+  if (convergenceVault) {
+    if (!isGitVault(convergenceVault)) {
+      return {
+        exitCode: ExitCode.PREFLIGHT_FAILED,
+        result: err("PREFLIGHT_FAILED", {
+          reason: "convergence-vault-not-git",
+          convergence_vault: convergenceVault
+        })
+      };
+    }
+    const gitBlocker = preflightBlocker(convergenceVault);
+    if (gitBlocker) {
+      return {
+        exitCode: ExitCode.PREFLIGHT_FAILED,
+        result: err("PREFLIGHT_FAILED", {
+          reason: gitBlocker.reason,
+          operation_id: gitBlocker.operation_id,
+          unmerged_paths: gitBlocker.unmerged_paths,
+          convergence_vault: convergenceVault
+        })
+      };
+    }
+  }
   const fleet = await loadFleetManifestAndHost({
     vault,
     hostId: input.hostId,
@@ -98,14 +136,16 @@ async function runManagedWritePreflight(input, deps = DEFAULT_DEPS) {
     home: input.home,
     osHostname: input.osHostname
   });
+  const dualPathMeta = convergenceVault ? { convergence_vault: convergenceVault } : {};
   if (!fleet) {
-    const head = git(vault, ["rev-parse", "HEAD"]) || null;
+    const head = git(gitVault, ["rev-parse", "HEAD"]) || null;
     return {
       exitCode: ExitCode.OK,
       result: ok({
         mode: "standalone",
         base_oid: head,
-        converged: false
+        converged: false,
+        ...dualPathMeta
       })
     };
   }
@@ -119,6 +159,27 @@ async function runManagedWritePreflight(input, deps = DEFAULT_DEPS) {
       })
     };
   }
+  if (convergenceVault && fleetManifestBytes(convergenceVault)) {
+    const convergeFleetCtx = await loadFleetManifestAndHost({
+      vault: convergenceVault,
+      hostId: input.hostId ?? fleet.hostId,
+      env: input.env,
+      home: input.home,
+      osHostname: input.osHostname
+    });
+    if (!convergeFleetCtx || convergeFleetCtx.identityStatus !== "known" || convergeFleetCtx.hostId !== fleet.hostId) {
+      return {
+        exitCode: ExitCode.PREFLIGHT_FAILED,
+        result: err("PREFLIGHT_FAILED", {
+          reason: "convergence-vault-identity-mismatch",
+          host_id: fleet.hostId,
+          convergence_host_id: convergeFleetCtx?.hostId,
+          convergence_identity_status: convergeFleetCtx?.identityStatus,
+          convergence_vault: convergenceVault
+        })
+      };
+    }
+  }
   const host = fleet.manifest.hosts[fleet.hostId];
   if (!host) {
     return {
@@ -134,13 +195,14 @@ async function runManagedWritePreflight(input, deps = DEFAULT_DEPS) {
         mode: "immutable-record",
         host_id: fleet.hostId,
         base_oid: null,
-        converged: false
+        converged: false,
+        ...dualPathMeta
       })
     };
   }
   const converge = await deps.converge({
-    vault,
-    lockToken: input.lockToken,
+    vault: gitVault,
+    lockToken: convergenceVault ? void 0 : input.lockToken,
     env: input.env,
     home: input.home
   });
@@ -148,11 +210,14 @@ async function runManagedWritePreflight(input, deps = DEFAULT_DEPS) {
     const exitCode = converge.error === "PREFLIGHT_FAILED" ? ExitCode.PREFLIGHT_FAILED : ExitCode.SYNC_PULL_FAILED;
     return { exitCode, result: converge };
   }
-  const baseOid = git(vault, ["rev-parse", "HEAD"]);
+  const baseOid = git(gitVault, ["rev-parse", "HEAD"]);
   if (!baseOid) {
     return {
       exitCode: ExitCode.PREFLIGHT_FAILED,
-      result: err("PREFLIGHT_FAILED", { reason: "missing-head-after-converge" })
+      result: err("PREFLIGHT_FAILED", {
+        reason: "missing-head-after-converge",
+        ...dualPathMeta
+      })
     };
   }
   return {
@@ -162,7 +227,8 @@ async function runManagedWritePreflight(input, deps = DEFAULT_DEPS) {
       host_id: fleet.hostId,
       base_oid: baseOid,
       converged: true,
-      helper_path: converge.data.helper_path
+      helper_path: converge.data.helper_path,
+      ...dualPathMeta
     })
   };
 }
@@ -177,6 +243,7 @@ async function runManagedWriteTransaction(input, deps = DEFAULT_DEPS) {
       {
         vault: input.vault,
         command: input.command,
+        convergenceVault: input.convergenceVault,
         hostId: input.hostId,
         lockToken: handle.ownerToken,
         env: input.env,

package/dist/cli.js

@@ -94,7 +94,7 @@ import {
   releaseManagedWriteLock,
   runManagedWritePreflight,
   runManagedWriteTransaction
-} from "./chunk-SCGC7YNM.js";
+} from "./chunk-GEKJG4F7.js";
 import {
   FLEET_REL_PATH,
   git,
@@ -6749,11 +6749,12 @@ async function emitManagedVaultWrite(vault, command, mutate, opts) {
   if (guard.blocked) {
     return emit({ exitCode: guard.exitCode, result: guard.result }, void 0, { postCommit: false });
   }
-  const { runManagedWriteTransaction: runManagedWriteTransaction2 } = await import("./managed-write-preflight-PW4OOOMV.js");
+  const { runManagedWriteTransaction: runManagedWriteTransaction2 } = await import("./managed-write-preflight-DGIE2FE2.js");
   const run = await runManagedWriteTransaction2({
     vault,
     command,
     allowImmutableRecord: opts?.allowImmutableRecord === true,
+    convergenceVault: opts?.convergenceVault,
     mutate: async (receipt) => await mutate(receipt)
   });
   return emit(run, vault, opts);
@@ -6982,26 +6983,28 @@ logCmd.command("materialize [vault]").description("preview or write root log.md
     );
   } else emit(await runLogMaterialize({ vault: v.vault, write: false }), v.vault);
 });
-logCmd.command("migrate-legacy [vault]").description("backfill immutable events from historical root log.md blocks").option("--write", "write events", false).option("--wiki <name>", "wiki profile name").action(async (vault, opts) => {
+logCmd.command("migrate-legacy [vault]").description("backfill immutable events from historical root log.md blocks").option("--write", "write events", false).option("--converge-vault <dir>", "Git vault used for managed pull and base-OID proof").option("--wiki <name>", "wiki profile name").action(async (vault, opts) => {
   const v = await resolveVaultArg(vault, opts.wiki);
   if (!v.ok) emit({ exitCode: v.exitCode, result: v.payload });
   else if (opts.write) {
     return emitManagedVaultWrite(
       v.vault,
       "log migrate-legacy",
-      () => runLogMigrateLegacy({ vault: v.vault, write: true })
+      () => runLogMigrateLegacy({ vault: v.vault, write: true }),
+      { convergenceVault: opts.convergeVault }
     );
   } else emit(await runLogMigrateLegacy({ vault: v.vault, write: false }), v.vault);
 });
 var projectionsCmd = program.command("projections").description("root index/log projection materialization");
-projectionsCmd.command("materialize [vault]").description("preview or write root index.md and log.md as a pair").option("--write", "write projections", false).option("--wiki <name>", "wiki profile name").action(async (vault, opts) => {
+projectionsCmd.command("materialize [vault]").description("preview or write root index.md and log.md as a pair").option("--write", "write projections", false).option("--converge-vault <dir>", "Git vault used for managed pull and base-OID proof").option("--wiki <name>", "wiki profile name").action(async (vault, opts) => {
   const v = await resolveVaultArg(vault, opts.wiki);
   if (!v.ok) emit({ exitCode: v.exitCode, result: v.payload });
   else if (opts.write) {
     return emitManagedVaultWrite(
       v.vault,
       "projections materialize",
-      () => runProjectionsMaterialize({ vault: v.vault, write: true })
+      () => runProjectionsMaterialize({ vault: v.vault, write: true }),
+      { convergenceVault: opts.convergeVault }
     );
   } else emit(await runProjectionsMaterialize({ vault: v.vault, write: false }), v.vault);
 });

package/dist/{managed-write-preflight-PW4OOOMV.js → managed-write-preflight-DGIE2FE2.js}

@@ -2,7 +2,7 @@
 import {
   runManagedWritePreflight,
   runManagedWriteTransaction
-} from "./chunk-SCGC7YNM.js";
+} from "./chunk-GEKJG4F7.js";
 import "./chunk-R6BKJWVC.js";
 import "./chunk-C5OLZRRM.js";
 export {

package/dist/vault-sync/scripts/wiki-snapshot.sh

@@ -308,9 +308,35 @@ fi
 
 refresh_git_baseline
 
+# Dual-path requires distinct live mutation vs Git convergence roots.
+# Same-path would materialize projections then immediately rclone-overwrite them.
+if [ "$(cd "$WIKI_DIR" 2>/dev/null && pwd -P)" = "$(cd "$SNAPSHOT_WORKTREE" 2>/dev/null && pwd -P)" ]; then
+    log "ERROR: WIKI_DIR and WIKI_GIT_WORKTREE must be distinct paths for dual-path projection (got: $WIKI_DIR)"
+    exit 1
+fi
+
 # Single-authority root projections before FUSE/S3 pull promotion.
-if command -v skillwiki >/dev/null 2>&1; then
-    if ! skillwiki projections materialize "$WIKI_DIR" --write >>"$LOG_FILE" 2>&1; then
+# Mutation target is the live vault ($WIKI_DIR); Git pull/base-OID use
+# $SNAPSHOT_WORKTREE so FUSE/S3 hosts without a local Git HEAD still work.
+SKILLWIKI_BIN="${WIKI_SNAPSHOT_SKILLWIKI_BIN:-skillwiki}"
+if command -v "$SKILLWIKI_BIN" >/dev/null 2>&1; then
+    case "${WIKI_SNAPSHOT_MIGRATE_LEGACY:-0}" in
+        0) ;;
+        1)
+            if ! "$SKILLWIKI_BIN" log migrate-legacy "$WIKI_DIR" --write \
+                --converge-vault "$SNAPSHOT_WORKTREE" >>"$LOG_FILE" 2>&1; then
+                log "FAIL legacy log migration; snapshot promotion refused"
+                exit 1
+            fi
+            log "OK legacy log migration before projection (attended one-run)"
+            ;;
+        *)
+            log "ERROR: WIKI_SNAPSHOT_MIGRATE_LEGACY must be 0 or 1 (got: ${WIKI_SNAPSHOT_MIGRATE_LEGACY})"
+            exit 1
+            ;;
+    esac
+    if ! "$SKILLWIKI_BIN" projections materialize "$WIKI_DIR" --write \
+        --converge-vault "$SNAPSHOT_WORKTREE" >>"$LOG_FILE" 2>&1; then
         log "FAIL root projection materialization; snapshot promotion refused"
         exit 1
     fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillwiki",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "type": "module",
   "bin": {
     "skillwiki": "dist/cli.js",

package/skills/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "skillwiki",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "skills": "./",
   "description": "Project-aware Karpathy-style knowledge base for Claude Code: 19 prompt-only skills (wiki-*, proj-*, using-skillwiki) backed by the deterministic `skillwiki` CLI.",
   "author": {

package/skills/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "skillwiki",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "Project-aware Karpathy-style knowledge base for Codex with 19 prompt-only skills backed by the deterministic skillwiki CLI.",
   "author": {
     "name": "karlorz",

package/skills/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skillwiki/skills",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "private": true,
   "files": [
     "wiki-*",