claudekit-cli 3.36.0-dev.16 → 3.36.0-dev.17

package/dist/index.js

@@ -12972,39 +12972,64 @@ async function cleanupStaleCodexConfigEntries(options2) {
     return [];
   try {
     return await withCodexTargetLock(configTomlPath, async () => {
-      const existing = await readFile3(configTomlPath, "utf-8");
-      const managedEntries = extractManagedAgentEntries(existing);
-      if (managedEntries.size === 0)
-        return [];
-      const staleSlugs = [];
-      const validEntries = new Map;
-      for (const [slug, entry] of managedEntries) {
+      let content = await readFile3(configTomlPath, "utf-8");
+      const allStaleSlugs = [];
+      const managedEntries = extractManagedAgentEntries(content);
+      if (managedEntries.size > 0) {
+        const validEntries = new Map;
+        for (const [slug, entry] of managedEntries) {
+          const tomlPath = join3(agentsDir, `${slug}.toml`);
+          if (existsSync3(tomlPath)) {
+            validEntries.set(slug, entry);
+          } else {
+            allStaleSlugs.push(slug);
+          }
+        }
+        if (allStaleSlugs.length > 0) {
+          if (validEntries.size === 0) {
+            const analysis2 = analyzeConfigToml(content);
+            content = analysis2.unmanagedContent;
+          } else {
+            const sortedEntries = [...validEntries.entries()].sort(([a3], [b3]) => a3.localeCompare(b3)).map(([, entry]) => entry);
+            const managedBlock = sortedEntries.join(`
+
+`);
+            const mergeResult = mergeConfigTomlWithDiagnostics(content, managedBlock);
+            if (mergeResult.error) {
+              logger.verbose(`[codex-cleanup] Phase 1 merge failed: ${mergeResult.error}`);
+            } else {
+              content = mergeResult.content;
+            }
+          }
+        }
+      }
+      const analysis = analyzeConfigToml(content);
+      const unmanagedSlugs = extractUnmanagedAgentSlugs(analysis.unmanagedContent);
+      const legacyStaleSlugs = [];
+      for (const slug of unmanagedSlugs) {
         const tomlPath = join3(agentsDir, `${slug}.toml`);
-        if (existsSync3(tomlPath)) {
-          validEntries.set(slug, entry);
-        } else {
-          staleSlugs.push(slug);
+        if (!isPathWithinBoundary(tomlPath, agentsDir))
+          continue;
+        if (!existsSync3(tomlPath)) {
+          legacyStaleSlugs.push(slug);
         }
       }
-      if (staleSlugs.length === 0)
-        return [];
-      if (validEntries.size === 0) {
-        const analysis = analyzeConfigToml(existing);
-        await writeFile2(configTomlPath, analysis.unmanagedContent, "utf-8");
-      } else {
-        const sortedEntries = [...validEntries.entries()].sort(([a3], [b3]) => a3.localeCompare(b3)).map(([, entry]) => entry);
-        const managedBlock = sortedEntries.join(`
+      if (legacyStaleSlugs.length > 0) {
+        for (const slug of legacyStaleSlugs) {
+          const escapedSlug = slug.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+          const blockRegex = new RegExp(`\\n?^\\[agents\\.(?:"${escapedSlug}"|${escapedSlug})\\]\\s*\\r?\\n(?:(?!\\[)[^\\r\\n]*\\r?\\n?)*`, "gm");
+          content = content.replace(blockRegex, "");
+        }
+        content = content.replace(/\n{3,}/g, `
 
 `);
-        const mergeResult = mergeConfigTomlWithDiagnostics(existing, managedBlock);
-        if (mergeResult.error) {
-          logger.verbose(`[codex-cleanup] Failed to merge config.toml: ${mergeResult.error}`);
-          return [];
-        }
-        await writeFile2(configTomlPath, mergeResult.content, "utf-8");
+        allStaleSlugs.push(...legacyStaleSlugs);
       }
-      logger.verbose(`[codex-cleanup] Removed ${staleSlugs.length} stale config.toml entries: ${staleSlugs.join(", ")}`);
-      return staleSlugs;
+      if (allStaleSlugs.length === 0)
+        return [];
+      await writeFile2(configTomlPath, content, "utf-8");
+      logger.verbose(`[codex-cleanup] Removed ${allStaleSlugs.length} stale config.toml entries: ${allStaleSlugs.join(", ")}`);
+      return allStaleSlugs;
     });
   } catch (error) {
     logger.verbose(`[codex-cleanup] Failed to clean up config.toml: ${error instanceof Error ? error.message : "Unknown"}`);
@@ -52161,6 +52186,35 @@ function registerMigrationRoutes(app) {
           deleteResult.itemName = deleteAction.item;
           allResults.push(deleteResult);
         }
+        for (const provider of allPlanProviders) {
+          if (providers[provider]?.agents?.writeStrategy !== "codex-toml")
+            continue;
+          const providerScopes = [
+            ...new Set(plan.actions.filter((a3) => a3.provider === provider).map((a3) => a3.global).filter((g2) => g2 !== undefined))
+          ];
+          if (providerScopes.length === 0)
+            providerScopes.push(false);
+          for (const scope of providerScopes) {
+            const staleSlugs = await cleanupStaleCodexConfigEntries({
+              global: scope,
+              provider
+            });
+            if (staleSlugs.length > 0) {
+              const staleSlugSet = new Set(staleSlugs.map((s) => `${s}.toml`));
+              await removeInstallationsByFilter((i) => i.type === "agent" && i.provider === provider && i.global === scope && staleSlugSet.has(basename7(i.path)));
+            }
+          }
+        }
+        try {
+          const agentSrc = getAgentSourcePath();
+          const cmdSrc = getCommandSourcePath();
+          const skillSrc = getSkillSourcePath();
+          const kitRoot = (agentSrc ? resolve8(agentSrc, "..") : null) ?? (cmdSrc ? resolve8(cmdSrc, "..") : null) ?? (skillSrc ? resolve8(skillSrc, "..") : null) ?? null;
+          const manifest = kitRoot ? await loadPortableManifest(kitRoot) : null;
+          if (manifest?.cliVersion) {
+            await updateAppliedManifestVersion(manifest.cliVersion);
+          }
+        } catch {}
         const sortedResults2 = sortPortableInstallResults(allResults);
         const counts2 = toExecutionCounts(sortedResults2);
         const planScopes = [
@@ -52338,6 +52392,7 @@ var init_migration_routes = __esm(() => {
   init_commands_discovery();
   init_skill_directory_installer();
   init_checksum_utils();
+  init_codex_toml_installer();
   init_config_discovery();
   init_hooks_settings_merger();
   init_portable_installer();
@@ -56087,7 +56142,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.36.0-dev.16",
+    version: "3.36.0-dev.17",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {

package/package.json

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