arbella 0.1.0 → 0.1.1

package/dist/index.js

@@ -908,7 +908,7 @@ function splitPluginId(id) {
   if (at <= 0) return { name: id };
   return { name: id.slice(0, at), marketplace: id.slice(at + 1) };
 }
-function parseInstalledPlugins(json) {
+function parseInstalledPlugins(json, foldPath = (p) => p) {
   if (!isRecord(json)) return [];
   const plugins = json.plugins;
   if (!isRecord(plugins)) return [];
@@ -921,7 +921,7 @@ function parseInstalledPlugins(json) {
       if (!isRecord(rec)) continue;
       const scope = rec.scope === "project" ? "project" : "user";
       const version = typeof rec.version === "string" ? rec.version : void 0;
-      const projectPath = typeof rec.projectPath === "string" ? rec.projectPath : void 0;
+      const projectPath = typeof rec.projectPath === "string" ? foldPath(rec.projectPath) : void 0;
       const entry = {
         id,
         name,
@@ -1119,7 +1119,10 @@ async function capture(ctx, opts) {
   const installedJson = await readJson(ctx, p.installedPlugins, warnings, "installed_plugins.json");
   const marketplacesJson = await readJson(ctx, p.knownMarketplaces, warnings, "known_marketplaces.json");
   const settingsJson = await readJson(ctx, p.settings, warnings, "settings.json");
-  const plugins = parseInstalledPlugins(installedJson);
+  const plugins = parseInstalledPlugins(
+    installedJson,
+    (p2) => ctx.templater.toTemplate(p2, ctx.vars)
+  );
   const marketplaces = parseKnownMarketplaces(marketplacesJson);
   const enabledPlugins = extractEnabledPlugins(settingsJson);
   for (const entry of plugins) {
@@ -2060,8 +2063,11 @@ async function planActions2(ctx, data) {
       description: `Register marketplace ${m.id} (${m.source})`
     });
   }
-  for (const plugin of data.manifest.plugins) {
-    if (plugin.scope !== "user") continue;
+  const { installable } = partitionPluginsForRestore(
+    data.manifest.marketplaces,
+    data.manifest.plugins.filter((p) => p.scope === "user")
+  );
+  for (const plugin of installable) {
     actions.push({
       type: "install-plugin",
       tool: "codex",
@@ -2117,6 +2123,19 @@ async function writeCapturedFile(ctx, file, overwriteAllowed) {
   const content = isConfigToml(rel) ? rehydrateConfigToml(file.content, ctx.templater, ctx.vars) : ctx.templater.fromTemplate(file.content, ctx.vars);
   await ctx.fs.write(targetPath, content, file.mode);
 }
+function partitionPluginsForRestore(marketplaces, userPlugins) {
+  const known = new Set(marketplaces.map((m) => m.id));
+  const installable = [];
+  const deferred = [];
+  for (const p of userPlugins) {
+    if (p.marketplace !== void 0 && !known.has(p.marketplace)) {
+      deferred.push(p);
+    } else {
+      installable.push(p);
+    }
+  }
+  return { installable, deferred };
+}
 async function reinstallPluginsAndMarketplaces(ctx, marketplaces, plugins) {
   const userPlugins = plugins.filter((p) => p.scope === "user");
   if (marketplaces.length === 0 && userPlugins.length === 0) return;
@@ -2137,7 +2156,13 @@ async function reinstallPluginsAndMarketplaces(ctx, marketplaces, plugins) {
       ctx.log.warn(`codex: 'codex ${args.join(" ")}' failed (${msg}); config.toml retains it.`);
     }
   }
-  for (const plugin of userPlugins) {
+  const { installable, deferred } = partitionPluginsForRestore(marketplaces, userPlugins);
+  for (const plugin of deferred) {
+    ctx.log.step(
+      `codex: ${plugin.id} uses a built-in marketplace (${plugin.marketplace}); left to config.toml for Codex to re-sync.`
+    );
+  }
+  for (const plugin of installable) {
     const args = pluginInstallArgs2(plugin);
     try {
       await execa3("codex", args, { stdout: "ignore", stderr: "ignore", stdin: "ignore" });
@@ -2169,7 +2194,7 @@ function marketplaceAddArgs2(m) {
   return ["plugin", "marketplace", "add", m.source];
 }
 function pluginInstallArgs2(p) {
-  return ["plugin", "install", p.id];
+  return ["plugin", "add", p.id];
 }
 var PREFIX_WITH_SLASH;
 var init_restore2 = __esm({