@meistrari/tela-cli 1.11.0 → 1.12.0

package/dist/commands/skills.js

@@ -177,15 +177,21 @@ async function installSkills(args, options, io) {
         ignoreScripts: flags.ignoreScripts,
         ...(flags.symlink ? {} : { targets: [] }),
     });
+    // A failed install script rolls back only its own skill, so report the rest and still fail.
+    const installedSlugs = new Set(installed.map(entry => entry.slug));
+    const failed = flags.rest.filter(slug => !installedSlugs.has(slug));
     if (options.json) {
-        (0, output_1.writeJson)(io, { installed });
-        return 0;
+        (0, output_1.writeJson)(io, failed.length > 0 ? { installed, failed } : { installed });
+        return failed.length > 0 ? 1 : 0;
     }
     for (const entry of installed)
         (0, output_1.writeLine)(io, `Installed ${entry.slug}@${entry.sha.slice(0, 7)} to ${entry.dir}`);
-    return 0;
+    return failed.length > 0 ? 1 : 0;
 }
 function writeSkillManagerDiagnostic(io, diagnostic) {
+    // A failed uninstall script throws, and the command prints that error.
+    if (diagnostic.type === 'lifecycle-failed' && diagnostic.phase === 'uninstall')
+        return;
     (0, output_1.writeError)(io, diagnostic.message);
 }
 async function upgradeSkills(args, options, io) {

package/dist/index.js

@@ -77236,9 +77236,7 @@ var require_skill_filesystem = __commonJS({
     var node_os_1 = require("node:os");
     var node_path_1 = __importDefault(require("node:path"));
     var node_process_1 = __importDefault(require("node:process"));
-    var node_util_1 = require("node:util");
     var archive_1 = require_archive();
-    var run = (0, node_util_1.promisify)(node_child_process_1.execFile);
     function resolveDefaultSkillManagerPaths(home = (0, node_os_1.homedir)()) {
       return {
         installRoot: node_path_1.default.join(home, ".agents", "skills"),
@@ -77425,14 +77423,72 @@ There is now nothing at ${target}. The previous installation is intact at ${back
         return { removed: false, reason: `Skipped ${linkPath}: ${describeError(error48)}` };
       }
     }
-    async function runSkillScript(script, cwd) {
+    var SCRIPT_KILL_GRACE_MS = 3e3;
+    var SCRIPT_GROUP_POLL_MS = 50;
+    var MAX_SCRIPT_OUTPUT_LENGTH = 64 * 1024;
+    async function runSkillScript(script, cwd, onOutput, signal) {
+      if (signal?.aborted)
+        return { ok: false, cancelled: true, output: "" };
+      return await new Promise((resolve) => {
+        const child = (0, node_child_process_1.spawn)("sh", ["-c", script], { cwd, detached: node_process_1.default.platform !== "win32" });
+        let output = "";
+        let settled = false;
+        let cancelled = false;
+        const append2 = (chunk) => {
+          if (settled)
+            return;
+          const text2 = chunk.toString();
+          output = `${output}${text2}`.slice(-MAX_SCRIPT_OUTPUT_LENGTH);
+          onOutput?.(text2);
+        };
+        const finish = (ok) => {
+          if (settled)
+            return;
+          settled = true;
+          signal?.removeEventListener("abort", cancel2);
+          resolve({ ok: ok && !cancelled, cancelled, output: output.trimEnd() });
+        };
+        function cancel2() {
+          cancelled = true;
+          killProcessTree(child, "SIGTERM");
+          setTimeout(() => killProcessTree(child, "SIGKILL"), SCRIPT_KILL_GRACE_MS).unref();
+        }
+        signal?.addEventListener("abort", cancel2, { once: true });
+        child.stdout.on("data", append2);
+        child.stderr.on("data", append2);
+        child.on("error", (error48) => {
+          append2(`${describeError(error48)}
+`);
+          finish(false);
+        });
+        child.on("exit", () => {
+          if (cancelled)
+            void waitForProcessGroupExit(child).then(() => finish(false));
+        });
+        child.on("close", (code) => finish(code === 0));
+      });
+    }
+    async function waitForProcessGroupExit(child) {
+      if (child.pid === void 0 || node_process_1.default.platform === "win32")
+        return;
+      while (true) {
+        try {
+          node_process_1.default.kill(-child.pid, 0);
+        } catch {
+          return;
+        }
+        await new Promise((resolve) => setTimeout(resolve, SCRIPT_GROUP_POLL_MS));
+      }
+    }
+    function killProcessTree(child, signal) {
+      if (child.pid === void 0)
+        return;
       try {
-        const { stdout: stdout2, stderr } = await run("sh", ["-c", script], { cwd });
-        return { ok: true, output: [stdout2, stderr].map((text2) => text2.trimEnd()).filter(Boolean).join("\n") };
-      } catch (error48) {
-        const shell = error48;
-        const output = [shell.stdout ?? "", shell.stderr ?? "", describeError(error48)].map((text2) => text2.trimEnd()).filter(Boolean).join("\n");
-        return { ok: false, output };
+        if (node_process_1.default.platform === "win32")
+          (0, node_child_process_1.spawn)("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
+        else
+          node_process_1.default.kill(-child.pid, signal);
+      } catch {
       }
     }
     function describeError(error48) {
@@ -77489,8 +77545,8 @@ var require_skills = __commonJS({
         ...path2 ? { queries: { path: path2 } } : {}
       }));
     }
-    async function downloadSkillArchive(archiveUrl) {
-      const response = await fetch(archiveUrl);
+    async function downloadSkillArchive(archiveUrl, signal) {
+      const response = await fetch(archiveUrl, { signal });
       if (!response.ok) {
         (0, http_1.assertHttpOk)(response, await response.text().catch(() => ""), "Failed to download skill archive");
       }
@@ -77507,7 +77563,7 @@ var require_skill_manager = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SkillInstallDirectoryConflictError = exports2.SkillLifecycleError = exports2.resolveDefaultSkillManagerPaths = void 0;
+    exports2.SkillInstallDirectoryConflictError = exports2.SkillInstallCancelledError = exports2.SkillLifecycleError = exports2.resolveDefaultSkillManagerPaths = void 0;
     exports2.createSkillManager = createSkillManager2;
     var promises_1 = require("node:fs/promises");
     var node_path_1 = __importDefault(require("node:path"));
@@ -77529,10 +77585,22 @@ var require_skill_manager = __commonJS({
         this.phase = phase;
         this.name = "SkillLifecycleError";
         this.slug = entry.slug;
-        this.retainedState = phase === "install" ? "installed" : "unchanged";
+        this.retainedState = "unchanged";
       }
     };
     exports2.SkillLifecycleError = SkillLifecycleError;
+    var SkillInstallCancelledError = class extends Error {
+      slug;
+      installed;
+      code = "skill-install-cancelled";
+      constructor(slug, installed) {
+        super(`Installation was cancelled before ${slug} finished.`);
+        this.slug = slug;
+        this.installed = installed;
+        this.name = "SkillInstallCancelledError";
+      }
+    };
+    exports2.SkillInstallCancelledError = SkillInstallCancelledError;
     var SkillInstallDirectoryConflictError = class extends Error {
       code = "skill-install-directory-conflict";
       path;
@@ -77567,17 +77635,31 @@ Run \`tela skills install ${slug} --force\` to replace it, or remove it by hand.
           const diagnostics = [];
           const installed = [];
           const emit = createDiagnosticEmitter(options2, diagnostics);
+          const signal = installOptions.signal;
           for (const slug of slugs) {
-            const entry = await installOne({
-              client,
-              diagnostics: emit,
-              force: installOptions.force ?? false,
-              ignoreScripts: installOptions.ignoreScripts ?? false,
-              inventoryFile,
-              paths,
-              slug,
-              targets
-            });
+            if (signal?.aborted)
+              throw new SkillInstallCancelledError(slug, installed);
+            let entry;
+            try {
+              entry = await installOne({
+                client,
+                diagnostics: emit,
+                force: installOptions.force ?? false,
+                ignoreScripts: installOptions.ignoreScripts ?? false,
+                inventoryFile,
+                paths,
+                progress: options2.onInstallProgress,
+                signal,
+                slug,
+                targets
+              });
+            } catch (error48) {
+              if (signal?.aborted)
+                throw new SkillInstallCancelledError(slug, installed);
+              if (error48 instanceof SkillLifecycleError && error48.phase === "install")
+                continue;
+              throw error48;
+            }
             if (!entry)
               throw new Error(`Skill install for ${slug} did not produce an inventory entry.`);
             installed.push(entry);
@@ -77611,6 +77693,7 @@ Run \`tela skills install ${slug} --force\` to replace it, or remove it by hand.
                 ignoreScripts: upgradeOptions.ignoreScripts ?? false,
                 inventoryFile,
                 paths,
+                progress: options2.onInstallProgress,
                 slug: replacementSlug,
                 targets
               });
@@ -77641,6 +77724,7 @@ Run \`tela skills install ${slug} --force\` to replace it, or remove it by hand.
               inventoryFile,
               operation: "upgrade",
               paths,
+              progress: options2.onInstallProgress,
               slug: current.slug,
               targets
             });
@@ -77739,30 +77823,68 @@ Run \`tela skills install ${slug} --force\` to replace it, or remove it by hand.
       };
     }
     async function installOne(options2) {
+      options2.progress?.({
+        type: "phase",
+        slug: options2.slug,
+        phase: "fetching-metadata",
+        message: "Fetching skill metadata"
+      });
       const { ingredient, snapshot } = await (0, skills_1.fetchSkillFile)(options2.client, options2.slug);
-      const archive = await (0, skills_1.downloadSkillArchive)(snapshot.archiveUrl);
+      options2.progress?.({
+        type: "phase",
+        slug: options2.slug,
+        phase: "downloading",
+        message: "Downloading skill files"
+      });
+      const archive = await (0, skills_1.downloadSkillArchive)(snapshot.archiveUrl, options2.signal);
+      options2.signal?.throwIfAborted();
+      options2.progress?.({
+        type: "phase",
+        slug: options2.slug,
+        phase: "extracting",
+        message: "Verifying and extracting files"
+      });
       const files = (0, archive_1.verifySnapshotFiles)((0, archive_1.parseTarGz)(archive), snapshot.manifest);
       const target = (0, skill_filesystem_1.resolveInstallDir)(options2.paths, options2.slug);
-      const stagedInstalls = [];
+      const reportConcurrentChange = () => options2.diagnostics({
+        type: "concurrent-change",
+        slug: options2.slug,
+        operation: options2.operation ?? "install",
+        message: `Skipped ${options2.slug}: it was changed while this ${options2.operation ?? "install"} ran`
+      });
+      const before = (await (0, tela_local_config_1.listInstalledSkills)(options2.inventoryFile)).find((entry2) => entry2.slug === options2.slug) ?? null;
+      if (options2.expectedCurrent && !isSameRegistration(before, options2.expectedCurrent)) {
+        reportConcurrentChange();
+        return null;
+      }
+      if ((0, skill_filesystem_1.isUnownedInstallDir)(target, before?.dir ?? null) && !options2.force)
+        throw new SkillInstallDirectoryConflictError(options2.slug, target);
+      const staged = await (0, skill_filesystem_1.stageSkillFiles)(target, files);
       let concurrentChange = false;
       let entry = null;
       try {
+        const lifecycleEntry = {
+          slug: options2.slug,
+          dir: target,
+          sha: snapshot.sha,
+          bundle: ingredient.bundle,
+          symlinks: [],
+          scripts: ingredient.scripts,
+          installedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        await runLifecycle(lifecycleEntry, "install", options2.ignoreScripts, options2.diagnostics, options2.progress, options2.signal);
+        options2.signal?.throwIfAborted();
+        options2.progress?.({
+          type: "phase",
+          slug: options2.slug,
+          phase: "finalizing",
+          message: "Linking and finalizing installation"
+        });
         entry = await (0, tela_local_config_1.updateInstalledSkill)(options2.slug, async (registered) => {
-          if (options2.expectedCurrent && (registered === null || !isSameInstall(registered, options2.expectedCurrent))) {
+          if (!isSameRegistration(registered, before)) {
             concurrentChange = true;
-            options2.diagnostics({
-              type: "concurrent-change",
-              slug: options2.slug,
-              operation: options2.operation ?? "install",
-              message: `Skipped ${options2.slug}: it was changed while this upgrade ran`
-            });
             return registered;
           }
-          if ((0, skill_filesystem_1.isUnownedInstallDir)(target, registered?.dir ?? null) && !options2.force) {
-            throw new SkillInstallDirectoryConflictError(options2.slug, target);
-          }
-          const staged = await (0, skill_filesystem_1.stageSkillFiles)(target, files);
-          stagedInstalls.push(staged);
           const desiredLinkPaths = new Set(options2.targets.map((linkTarget) => node_path_1.default.join(linkTarget.root, options2.slug)));
           for (const linkPath of registered?.symlinks ?? []) {
             if (desiredLinkPaths.has(linkPath))
@@ -77791,25 +77913,27 @@ Run \`tela skills install ${slug} --force\` to replace it, or remove it by hand.
             }
           }
           return {
-            slug: options2.slug,
-            dir: target,
-            sha: snapshot.sha,
-            bundle: ingredient.bundle,
-            symlinks,
-            scripts: ingredient.scripts,
-            installedAt: (/* @__PURE__ */ new Date()).toISOString()
+            ...lifecycleEntry,
+            symlinks
           };
         }, options2.inventoryFile);
       } catch (error48) {
-        await rollbackStagedInstall(stagedInstalls.at(-1) ?? null, error48);
+        options2.progress?.({
+          type: "phase",
+          slug: options2.slug,
+          phase: "rolling-back",
+          message: "Rolling back failed installation"
+        });
+        await rollbackStagedInstall(staged, error48);
       }
-      if (concurrentChange)
+      if (concurrentChange) {
+        await staged.rollback();
+        reportConcurrentChange();
         return null;
-      for (const staged of stagedInstalls)
-        await staged.commit();
+      }
+      await staged.commit();
       if (!entry)
         throw new Error(`Skill install for ${options2.slug} did not produce an inventory entry.`);
-      await runLifecycle(entry, "install", options2.ignoreScripts, options2.diagnostics);
       return entry;
     }
     function selectUpgradeTargets(installed, slugs) {
@@ -77828,6 +77952,11 @@ Run \`tela skills install ${slug} --force\` to replace it, or remove it by hand.
         throw new Error(`${missing.join(", ")} not installed by tela. Nothing to remove.`);
       return slugs.map((slug) => bySlug.get(slug));
     }
+    function isSameRegistration(left, right) {
+      if (left === null || right === null)
+        return left === right;
+      return isSameInstall(left, right);
+    }
     function isSameInstall(left, right) {
       return left.installedAt === right.installedAt && left.sha === right.sha && left.dir === right.dir;
     }
@@ -77848,7 +77977,7 @@ Cleanup failed: ${describeError(cleanupError)}`);
       }
       throw error48;
     }
-    async function runLifecycle(entry, phase, ignoreScripts, emit) {
+    async function runLifecycle(entry, phase, ignoreScripts, emit, progress2, signal) {
       const script = entry.scripts?.[phase];
       if (!script)
         return;
@@ -77869,7 +77998,17 @@ Cleanup failed: ${describeError(cleanupError)}`);
         script,
         message: `Running ${phase} script for ${entry.slug}: ${script}`
       });
-      const outcome = await (0, skill_filesystem_1.runSkillScript)(script, entry.dir);
+      if (phase === "install") {
+        progress2?.({
+          type: "phase",
+          slug: entry.slug,
+          phase: "running-install-script",
+          message: "Running install script"
+        });
+      }
+      const outcome = await (0, skill_filesystem_1.runSkillScript)(script, entry.dir, phase === "install" ? (output) => progress2?.({ type: "script-output", slug: entry.slug, output }) : void 0, signal);
+      if (outcome.cancelled)
+        signal?.throwIfAborted();
       if (outcome.output) {
         emit({
           type: "lifecycle-output",
@@ -77880,7 +78019,14 @@ Cleanup failed: ${describeError(cleanupError)}`);
         });
       }
       if (!outcome.ok) {
-        throw new SkillLifecycleError(entry, phase);
+        const error48 = new SkillLifecycleError(entry, phase);
+        emit({
+          type: "lifecycle-failed",
+          slug: entry.slug,
+          phase,
+          message: error48.message
+        });
+        throw error48;
       }
     }
     function lifecycleFailureMessage(entry, phase) {
@@ -77889,8 +78035,8 @@ Cleanup failed: ${describeError(cleanupError)}`);
         return `${opener}
 ${entry.slug} was left in place. Re-run with --ignore-scripts to remove it anyway.`;
       return `${opener}
-${entry.slug} was installed to ${entry.dir} and recorded, but its install script did not finish, so the skill may not work.
-Remove it with \`tela skills uninstall ${entry.slug}\`, or reinstall without the script: \`tela skills install ${entry.slug} --ignore-scripts\`.`;
+${entry.slug} was not installed because its files and inventory entry were rolled back.
+Retry without the script with \`tela skills install ${entry.slug} --ignore-scripts\`.`;
     }
     function normalizePaths(paths) {
       const installRoot = normalizeAbsolutePath(paths.installRoot, "installRoot");
@@ -389332,15 +389478,19 @@ async function installSkills(args, options2, io) {
     ignoreScripts: flags.ignoreScripts,
     ...flags.symlink ? {} : { targets: [] }
   });
+  const installedSlugs = new Set(installed.map((entry) => entry.slug));
+  const failed = flags.rest.filter((slug) => !installedSlugs.has(slug));
   if (options2.json) {
-    writeJson(io, { installed });
-    return 0;
+    writeJson(io, failed.length > 0 ? { installed, failed } : { installed });
+    return failed.length > 0 ? 1 : 0;
   }
   for (const entry of installed)
     writeLine(io, `Installed ${entry.slug}@${entry.sha.slice(0, 7)} to ${entry.dir}`);
-  return 0;
+  return failed.length > 0 ? 1 : 0;
 }
 function writeSkillManagerDiagnostic(io, diagnostic) {
+  if (diagnostic.type === "lifecycle-failed" && diagnostic.phase === "uninstall")
+    return;
   writeError(io, diagnostic.message);
 }
 async function upgradeSkills(args, options2, io) {

package/package.json

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