@meistrari/tela-cli 1.12.0 → 1.12.1

package/dist/index.js

@@ -77680,56 +77680,69 @@ Run \`tela skills install ${slug} --force\` to replace it, or remove it by hand.
             return { upgraded, unchanged, replaced, diagnostics };
           const targets = normalizeTargets(upgradeOptions.targets ?? paths.targets, paths.installRoot);
           const client = await resolveClient();
-          for (const current of selected) {
-            const { ingredient, snapshot } = await (0, skills_1.fetchSkillFile)(client, current.slug);
-            const replacementSlug = await resolveReplacementSlug(client, current.slug, ingredient);
-            if (replacementSlug) {
-              const installedReplacement = (await (0, tela_local_config_1.listInstalledSkills)(inventoryFile)).find((entry2) => entry2.slug === replacementSlug);
-              const replacement = await installOne({
+          const signal = upgradeOptions.signal;
+          let currentSlug = "";
+          try {
+            for (const current of selected) {
+              currentSlug = current.slug;
+              signal?.throwIfAborted();
+              const { ingredient, snapshot } = await (0, skills_1.fetchSkillFile)(client, current.slug);
+              const replacementSlug = await resolveReplacementSlug(client, current.slug, ingredient);
+              if (replacementSlug) {
+                const installedReplacement = (await (0, tela_local_config_1.listInstalledSkills)(inventoryFile)).find((entry2) => entry2.slug === replacementSlug);
+                const replacement = await installOne({
+                  client,
+                  diagnostics: emit,
+                  ...installedReplacement ? { expectedCurrent: installedReplacement, operation: "upgrade" } : {},
+                  force: upgradeOptions.force ?? false,
+                  ignoreScripts: upgradeOptions.ignoreScripts ?? false,
+                  inventoryFile,
+                  paths,
+                  progress: options2.onInstallProgress,
+                  signal,
+                  slug: replacementSlug,
+                  targets
+                });
+                if (!replacement)
+                  continue;
+                signal?.throwIfAborted();
+                if (await uninstallOne({
+                  diagnostics: emit,
+                  entry: current,
+                  ignoreScripts: upgradeOptions.ignoreScripts ?? false,
+                  inventoryFile,
+                  operation: "upgrade",
+                  paths
+                })) {
+                  replaced.push({ from: current.slug, to: replacement });
+                }
+                continue;
+              }
+              if (snapshot.sha === current.sha) {
+                unchanged.push(current.slug);
+                continue;
+              }
+              const entry = await installOne({
                 client,
                 diagnostics: emit,
-                ...installedReplacement ? { expectedCurrent: installedReplacement, operation: "upgrade" } : {},
+                expectedCurrent: current,
                 force: upgradeOptions.force ?? false,
                 ignoreScripts: upgradeOptions.ignoreScripts ?? false,
                 inventoryFile,
+                operation: "upgrade",
                 paths,
                 progress: options2.onInstallProgress,
-                slug: replacementSlug,
+                signal,
+                slug: current.slug,
                 targets
               });
-              if (!replacement)
-                continue;
-              if (await uninstallOne({
-                diagnostics: emit,
-                entry: current,
-                ignoreScripts: upgradeOptions.ignoreScripts ?? false,
-                inventoryFile,
-                operation: "upgrade",
-                paths
-              })) {
-                replaced.push({ from: current.slug, to: replacement });
-              }
-              continue;
-            }
-            if (snapshot.sha === current.sha) {
-              unchanged.push(current.slug);
-              continue;
+              if (entry)
+                upgraded.push(entry);
             }
-            const entry = await installOne({
-              client,
-              diagnostics: emit,
-              expectedCurrent: current,
-              force: upgradeOptions.force ?? false,
-              ignoreScripts: upgradeOptions.ignoreScripts ?? false,
-              inventoryFile,
-              operation: "upgrade",
-              paths,
-              progress: options2.onInstallProgress,
-              slug: current.slug,
-              targets
-            });
-            if (entry)
-              upgraded.push(entry);
+          } catch (error48) {
+            if (signal?.aborted)
+              throw new SkillInstallCancelledError(currentSlug, upgraded);
+            throw error48;
           }
           return { upgraded, unchanged, replaced, diagnostics };
         },
@@ -386357,7 +386370,11 @@ var require_setup = __commonJS({
     exports2.findAgentSetupOrganization = findAgentSetupOrganization;
     exports2.validatePreparedAgentSetupInput = validatePreparedAgentSetupInput;
     exports2.saveAgentContextSetup = saveAgentContextSetup;
+    exports2.provisionForgejoUserWithSshKey = provisionForgejoUserWithSshKey;
+    exports2.createUniqueSshKeyTitle = createUniqueSshKeyTitle;
     exports2.completeAgentSetup = completeAgentSetup;
+    var node_buffer_1 = require("node:buffer");
+    var node_crypto_1 = require("node:crypto");
     var node_fs_1 = require("node:fs");
     var node_os_1 = require("node:os");
     var node_path_1 = require("node:path");
@@ -386742,6 +386759,28 @@ var require_setup = __commonJS({
       }
       return savedSetup;
     }
+    var SSH_KEY_TITLE_CONFLICT = /ssh key title already belongs to a different key/i;
+    async function provisionForgejoUserWithSshKey(organizationName, sshKey, config2, provisionFn, fetchFn) {
+      try {
+        return {
+          response: await provisionFn({ organizationName, sshKey }, config2, fetchFn),
+          title: sshKey.title
+        };
+      } catch (error48) {
+        if (!(error48 instanceof agent_api_1.AgentApiError) || !SSH_KEY_TITLE_CONFLICT.test(error48.message))
+          throw error48;
+      }
+      const title = createUniqueSshKeyTitle(sshKey);
+      return {
+        response: await provisionFn({ organizationName, sshKey: { ...sshKey, title } }, config2, fetchFn),
+        title
+      };
+    }
+    function createUniqueSshKeyTitle(sshKey, host = (0, node_os_1.hostname)()) {
+      const blob = sshKey.key.split(/\s+/)[1] ?? sshKey.key;
+      const fingerprint = (0, node_crypto_1.createHash)("sha256").update(node_buffer_1.Buffer.from(blob, "base64")).digest("base64").replace(/=+$/, "").slice(0, 12);
+      return `${sshKey.title} (${host}, SHA256:${fingerprint})`;
+    }
     async function completeAgentSetup(input, options2 = {}) {
       const credentials = (0, credentials_1.createAgentCredentialAdapter)(options2.env);
       const config2 = await (0, config_1.resolveAgentConfig)({
@@ -386757,15 +386796,11 @@ var require_setup = __commonJS({
       const sshKey = loadSshPublicKey(input.sshPublicKeyPath);
       const gitSshKey = createGitSshKey(sshKey, input.sshPrivateKeyPath);
       const cloneRoot = input.cloneRoot ? resolveCloneRootPath(input.cloneRoot) : config2.cloneRoot;
-      const provisionFn = options2.provisionFn ?? agent_api_1.provisionForgejoUser;
-      const response = await provisionFn({
-        organizationName: organization.name,
-        sshKey
-      }, config2, options2.fetchFn);
+      const { response, title } = await provisionForgejoUserWithSshKey(organization.name, sshKey, config2, options2.provisionFn ?? agent_api_1.provisionForgejoUser, options2.fetchFn);
       const setup = await saveAgentContextSetup({
         config: config2,
         organization,
-        gitSshKey,
+        gitSshKey: { ...gitSshKey, title },
         cloneRoot
       });
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meistrari/tela-cli",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Tela command line tools for local state and agent workflows.",
   "engines": {
     "node": ">=22"