claudekit-cli 4.0.0-dev.3 → 4.0.0-dev.4

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.0.0-dev.3",
-	"generatedAt": "2026-05-09T03:16:37.030Z",
+	"version": "4.0.0-dev.4",
+	"generatedAt": "2026-05-09T14:28:30.285Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -12552,6 +12552,100 @@ async function migrateRegistryV2ToV3(v2Registry) {
     appliedManifestVersion: undefined
   };
 }
+function getStringField(item, field) {
+  const record = item;
+  if (!(field in record) || record[field] === undefined) {
+    return;
+  }
+  const value = record[field];
+  if (typeof value !== "string") {
+    throw new Error("portable-registry.json has unsupported schema/version");
+  }
+  return value;
+}
+function getOwnedSections(item) {
+  const record = item;
+  if (!("ownedSections" in record) || record.ownedSections === undefined) {
+    return;
+  }
+  const value = record.ownedSections;
+  if (!Array.isArray(value) || !value.every((section) => typeof section === "string")) {
+    throw new Error("portable-registry.json has unsupported schema/version");
+  }
+  return value;
+}
+function getInstallSource(item) {
+  const installSource = getStringField(item, "installSource");
+  if (installSource === undefined) {
+    return "kit";
+  }
+  if (installSource !== "kit" && installSource !== "manual") {
+    throw new Error("portable-registry.json has unsupported schema/version");
+  }
+  return installSource;
+}
+async function repairStaleRegistryV3(registry) {
+  const installations = [];
+  for (const item of registry.installations) {
+    let targetChecksum = normalizeChecksum(getStringField(item, "targetChecksum")) || UNKNOWN_CHECKSUM;
+    if (targetChecksum === UNKNOWN_CHECKSUM && existsSync2(item.path)) {
+      try {
+        targetChecksum = await computeFileChecksum(item.path);
+      } catch {
+        targetChecksum = UNKNOWN_CHECKSUM;
+      }
+    }
+    installations.push({
+      ...item,
+      sourceChecksum: normalizeChecksum(getStringField(item, "sourceChecksum")) || UNKNOWN_CHECKSUM,
+      targetChecksum,
+      installSource: getInstallSource(item),
+      ownedSections: getOwnedSections(item)
+    });
+  }
+  return normalizePortableRegistryChecksums({
+    ...registry,
+    version: "3.0",
+    installations,
+    lastReconciled: registry.lastReconciled,
+    appliedManifestVersion: registry.appliedManifestVersion
+  });
+}
+async function persistCurrentStaleRegistryV3Repair(preparedRepair) {
+  return withRegistryLock(async () => {
+    let content;
+    try {
+      content = await readFile2(REGISTRY_PATH, "utf-8");
+    } catch (error) {
+      if (isErrnoCode(error, "ENOENT")) {
+        return readPortableRegistryInternal({ persistStaleV3Repair: false });
+      }
+      throw error;
+    }
+    let data;
+    try {
+      data = JSON.parse(content);
+    } catch (error) {
+      throw new Error(`portable-registry.json is not valid JSON: ${error instanceof Error ? error.message : "Unknown parse error"}`);
+    }
+    const v3Result = PortableRegistrySchemaV3.safeParse(data);
+    if (v3Result.success) {
+      return normalizePortableRegistryChecksums(v3Result.data);
+    }
+    const repairableV3Result = RepairablePortableRegistrySchemaV3.safeParse(data);
+    if (!repairableV3Result.success) {
+      return readPortableRegistryInternal({ persistStaleV3Repair: false });
+    }
+    const repairedRegistry = preparedRepair && preparedRepair.sourceContent === content ? preparedRepair.repairedRegistry : await repairStaleRegistryV3(repairableV3Result.data);
+    if (await isMigrationLocked()) {
+      logger.verbose("Migration in progress by another process, using repaired v3 view");
+      return repairedRegistry;
+    }
+    logger.verbose("Repairing stale portable registry v3.0 fields");
+    await writePortableRegistry(repairedRegistry);
+    return repairedRegistry;
+  });
+}
 async function isMigrationLocked() {
   try {
     const lockContent = await readFile2(MIGRATION_LOCK_PATH, "utf-8");
@@ -12589,6 +12683,9 @@ async function removeMigrationLock() {
   } catch {}
 }
 async function readPortableRegistry() {
+  return readPortableRegistryInternal({ persistStaleV3Repair: true });
+}
+async function readPortableRegistryInternal(options2) {
   try {
     const content = await readFile2(REGISTRY_PATH, "utf-8");
     let data;
@@ -12601,6 +12698,21 @@ async function readPortableRegistry() {
     if (v3Result.success) {
       return normalizePortableRegistryChecksums(v3Result.data);
     }
+    const repairableV3Result = RepairablePortableRegistrySchemaV3.safeParse(data);
+    if (repairableV3Result.success) {
+      const repairedRegistry = await repairStaleRegistryV3(repairableV3Result.data);
+      if (!options2.persistStaleV3Repair) {
+        return repairedRegistry;
+      }
+      if (await isMigrationLocked()) {
+        logger.verbose("Migration in progress by another process, using repaired v3 view");
+        return repairedRegistry;
+      }
+      return persistCurrentStaleRegistryV3Repair({
+        sourceContent: content,
+        repairedRegistry
+      });
+    }
     const v2Result = PortableRegistrySchema.safeParse(data);
     if (!v2Result.success) {
       throw new Error("portable-registry.json has unsupported schema/version");
@@ -12640,6 +12752,9 @@ async function readPortableRegistry() {
   }
   return { version: "3.0", installations: [] };
 }
+async function readPortableRegistryWithinRegistryLock() {
+  return readPortableRegistryInternal({ persistStaleV3Repair: false });
+}
 async function writePortableRegistry(registry) {
   const dir = dirname(REGISTRY_PATH);
   if (!existsSync2(dir)) {
@@ -12682,7 +12797,7 @@ async function withRegistryLock(operation) {
 }
 async function addPortableInstallation(item, type, provider, global2, path, sourcePath, options2) {
   await withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     registry.installations = registry.installations.filter((i) => !(i.item === item && i.type === type && i.provider === provider && i.global === global2));
     registry.installations.push({
       item,
@@ -12703,7 +12818,7 @@ async function addPortableInstallation(item, type, provider, global2, path, sour
 }
 async function removePortableInstallation(item, type, provider, global2) {
   return withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     const index = registry.installations.findIndex((i) => i.item === item && i.type === type && i.provider === provider && i.global === global2);
     if (index === -1)
       return null;
@@ -12727,14 +12842,14 @@ function findPortableInstallations(registry, item, type, provider, global2) {
 }
 async function updateAppliedManifestVersion(version) {
   await withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     registry.appliedManifestVersion = version;
     await writePortableRegistry(registry);
   });
 }
 async function removeInstallationsByFilter(predicate) {
   return withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     const removed = [];
     registry.installations = registry.installations.filter((entry) => {
       if (predicate(entry)) {
@@ -12751,7 +12866,7 @@ async function removeInstallationsByFilter(predicate) {
 }
 async function syncPortableRegistry() {
   return withRegistryLock(async () => {
-    const registry = await readPortableRegistry();
+    const registry = await readPortableRegistryWithinRegistryLock();
     const removed = [];
     registry.installations = registry.installations.filter((i) => {
       if (!existsSync2(i.path)) {
@@ -12766,7 +12881,7 @@ async function syncPortableRegistry() {
     return { removed };
   });
 }
-var import_proper_lockfile, home2, REGISTRY_PATH, REGISTRY_LOCK_PATH, LEGACY_REGISTRY_PATH, MIGRATION_LOCK_PATH, PortableInstallationSchema, PortableRegistrySchema, PortableInstallationSchemaV3, PortableRegistrySchemaV3, LegacyInstallationSchema, LegacyRegistrySchema;
+var import_proper_lockfile, home2, REGISTRY_PATH, REGISTRY_LOCK_PATH, LEGACY_REGISTRY_PATH, MIGRATION_LOCK_PATH, PortableInstallationSchema, PortableRegistrySchema, PortableInstallationSchemaV3, PortableRegistrySchemaV3, RepairablePortableRegistrySchemaV3, LegacyInstallationSchema, LegacyRegistrySchema;
 var init_portable_registry = __esm(() => {
   init_zod();
   init_logger();
@@ -12811,6 +12926,12 @@ var init_portable_registry = __esm(() => {
     lastReconciled: exports_external.string().optional(),
     appliedManifestVersion: exports_external.string().optional()
   });
+  RepairablePortableRegistrySchemaV3 = exports_external.object({
+    version: exports_external.literal("3.0"),
+    installations: exports_external.array(PortableInstallationSchema),
+    lastReconciled: exports_external.string().optional(),
+    appliedManifestVersion: exports_external.string().optional()
+  }).passthrough();
   LegacyInstallationSchema = exports_external.object({
     skill: exports_external.string(),
     agent: exports_external.string(),
@@ -62359,7 +62480,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.0.0-dev.3",
+    version: "4.0.0-dev.4",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "4.0.0-dev.3",
+	"version": "4.0.0-dev.4",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {