abtars 0.2.1-alpha.9 → 0.2.2

package/bundle/chunk-NIYVCGBC.js

@@ -0,0 +1,330 @@
+#!/usr/bin/env node
+ import { createRequire as __bundleCreateRequire } from 'node:module'; import { fileURLToPath as __bundleFileURLToPath } from 'node:url'; import { dirname as __bundleDirname } from 'node:path'; const require = __bundleCreateRequire(import.meta.url); const __chunk_filename = __bundleFileURLToPath(import.meta.url); const __chunk_dirname = __bundleDirname(__chunk_filename);
+import {
+  init_log_and_swallow,
+  logAndSwallow
+} from "./chunk-CYSGXNBY.js";
+import {
+  init_logger,
+  logInfo,
+  logWarn
+} from "./chunk-GUTRAMK3.js";
+import {
+  abtarsHome,
+  init_paths
+} from "./chunk-WW5F2DCO.js";
+import {
+  __esm,
+  __export,
+  __require
+} from "./chunk-7K2YZTLD.js";
+
+// src/components/skill-watcher.ts
+import { readdirSync, readFileSync, writeFileSync, existsSync } from "node:fs";
+import { join, basename, dirname, resolve } from "node:path";
+import { execFileSync } from "node:child_process";
+import { homedir } from "node:os";
+function parseYamlValue(raw) {
+  if (raw.startsWith("[") && raw.endsWith("]")) {
+    return raw.slice(1, -1).split(",").map((s) => s.trim().replace(/^["']|["']$/g, "")).filter(Boolean);
+  }
+  return raw;
+}
+function toStringArray(val) {
+  if (Array.isArray(val)) return val.map(String);
+  if (typeof val === "string") return [val];
+  return [];
+}
+var TAG, SkillWatcher;
+var init_skill_watcher = __esm({
+  "src/components/skill-watcher.ts"() {
+    "use strict";
+    init_log_and_swallow();
+    init_logger();
+    TAG = "skill-reloader";
+    SkillWatcher = class {
+      constructor(skillsDir, catalogPath) {
+        this.skillsDir = skillsDir;
+        this.catalogPath = catalogPath;
+      }
+      /** Per-instance cache of `which <bin>` results. Avoids repeated execFileSync on heartbeat ticks (#369). */
+      binaryCache = /* @__PURE__ */ new Map();
+      /** Cached skill list from last generateCatalog() call. */
+      _skillCache = [];
+      /** Get cached skill info (populated after generateCatalog). */
+      get skills() {
+        return this._skillCache;
+      }
+      /** Generate skills_catalog.md from all skill files. Called on startup + when skills change. */
+      generateCatalog() {
+        const files = this.scanMdFiles(this.skillsDir);
+        const entries = [];
+        const skipped = [];
+        const cache = [];
+        const skillsCfg = this.loadSkillsConfig();
+        for (const filepath of files) {
+          const header = this.parseSkillHeader(filepath);
+          if (!header.name) continue;
+          if (header.primaryEnv && !process.env[header.primaryEnv]) {
+            const entry2 = skillsCfg.entries?.[header.name];
+            if (entry2?.apiKey) process.env[header.primaryEnv] = entry2.apiKey;
+          }
+          const entry = skillsCfg.entries?.[header.name];
+          if (entry?.env) {
+            for (const [k, v] of Object.entries(entry.env)) {
+              if (!process.env[k]) process.env[k] = v;
+            }
+          }
+          const group = this.getSourceDir(filepath).split("/")[0] ?? "core";
+          if (header.requires) {
+            const { eligible, missing } = this.checkEligibility(header.requires);
+            if (!eligible) {
+              skipped.push(`${header.name} (missing: ${missing.join(", ")})`);
+              cache.push({ name: header.name, group, skipped: missing.join(", ") });
+              continue;
+            }
+          }
+          cache.push({ name: header.name, group });
+          entries.push(`- [${this.getSourceDir(filepath)}] ${header.name}: ${header.description}`);
+        }
+        const guidance = [
+          "",
+          "## Skill maintenance",
+          "- If you solved something non-trivial (multi-step, error-prone, or likely to recur), save it as a skill with skill_create.",
+          "- If a skill you just used was wrong or incomplete, fix it with skill_patch before moving on.",
+          ""
+        ].join("\n");
+        const content = `# Skills Catalog
+
+When a user request matches a skill below, read its SKILL.md at ~/.abtars/skills/<dir>/SKILL.md for detailed instructions before acting.
+
+${entries.join("\n")}
+${guidance}`;
+        try {
+          writeFileSync(this.catalogPath, content, "utf-8");
+          const skippedStr = skipped.length > 0 ? `, ${skipped.length} skipped \u2014 ${skipped.join(", ")}` : "";
+          logInfo(TAG, `Generated skills_catalog.md (${entries.length} skills${skippedStr})`);
+        } catch (err) {
+          logWarn(TAG, `Failed to write skills_catalog.md: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        this._skillCache = cache;
+        return entries.length;
+      }
+      /** Check all requirements. Returns eligible=true only if ALL pass. */
+      checkEligibility(requires) {
+        const missing = [];
+        for (const bin of requires.bins ?? []) {
+          if (!this.binaryAvailable(bin)) missing.push(`bin:${bin}`);
+        }
+        for (const pkg of requires.npm ?? []) {
+          if (!this.npmAvailable(pkg)) missing.push(`npm:${pkg}`);
+        }
+        for (const key of requires.env ?? []) {
+          if (!process.env[key]) missing.push(`env:${key}`);
+        }
+        for (const file of requires.files ?? []) {
+          const resolved = resolve(file.replace(/^~/, homedir()));
+          if (!existsSync(resolved)) missing.push(`file:${file}`);
+        }
+        return { eligible: missing.length === 0, missing };
+      }
+      /** Check if an npm package is resolvable from the abtars node_modules. */
+      npmAvailable(pkg) {
+        try {
+          __require.resolve(pkg);
+          return true;
+        } catch (err) {
+          logAndSwallow(TAG, `require.resolve ${pkg}`, err);
+          return false;
+        }
+      }
+      /** Check if a binary is on PATH. Cached per-instance so hot-reload ticks don't respawn `which`. */
+      binaryAvailable(bin) {
+        if (!this.binaryCache.has(bin)) {
+          try {
+            execFileSync("which", [bin], { timeout: 1e3, stdio: "pipe" });
+            this.binaryCache.set(bin, true);
+          } catch (err) {
+            logAndSwallow(TAG, `which ${bin}`, err);
+            this.binaryCache.set(bin, false);
+          }
+        }
+        return this.binaryCache.get(bin);
+      }
+      getSourceDir(filepath) {
+        const rel = filepath.slice(this.skillsDir.length + 1);
+        const first = rel.split("/")[0] ?? "core";
+        if (["core", "custom", "downloaded", "self"].includes(first)) return first;
+        return "core";
+      }
+      scanMdFiles(dir) {
+        const results = [];
+        try {
+          for (const entry of readdirSync(dir, { withFileTypes: true })) {
+            const full = join(dir, entry.name);
+            if (entry.isDirectory()) results.push(...this.scanMdFiles(full));
+            else if (entry.name === "SKILL.md") results.push(full);
+          }
+        } catch (err) {
+          logAndSwallow("skill_watcher", "op", err);
+        }
+        return results;
+      }
+      /**
+       * Parse a skill file's header.
+       *
+       * Preferred: YAML-style frontmatter block at the top of the file:
+       *   ---
+       *   name: mcporter
+       *   description: Call external MCP servers via the mcporter CLI.
+       *   requires: mcporter
+       *   ---
+       *
+       * Supports only single-line `key: value` pairs. No arrays, no nested
+       * objects, no multi-line strings, no comments. Values are trimmed.
+       *
+       * Fallback (no frontmatter): first `#` heading → name, first non-heading
+       * line > 10 chars → description. Preserves pre-#369 behavior for any
+       * skills that don't yet have frontmatter.
+       */
+      parseSkillHeader(filepath) {
+        try {
+          const content = readFileSync(filepath, "utf-8");
+          const fm = this.parseFrontmatter(content);
+          if (fm) {
+            return {
+              name: String(fm["name"] ?? "") || basename(dirname(filepath)),
+              description: String(fm["description"] ?? "").slice(0, 120),
+              ...fm["requires"] ? { requires: this.parseRequires(fm["requires"]) } : {},
+              ...fm["primaryEnv"] ? { primaryEnv: String(fm["primaryEnv"]) } : {}
+            };
+          }
+          const lines = content.split("\n").filter((l) => l.trim());
+          const heading = lines.find((l) => l.startsWith("#"));
+          const name = heading?.replace(/^#+\s*/, "").trim() ?? basename(dirname(filepath));
+          const desc = lines.find((l) => !l.startsWith("#") && l.trim().length > 10)?.trim() ?? "";
+          return { name, description: desc.slice(0, 120) };
+        } catch (err) {
+          logAndSwallow(TAG, "parseSkillMeta", err);
+          return { name: basename(dirname(filepath)), description: "" };
+        }
+      }
+      /** Load ~/.abtars/config/skills.json (per-skill secrets). */
+      loadSkillsConfig() {
+        try {
+          const p = join(homedir(), ".abtars", "config", "skills.json");
+          if (!existsSync(p)) return {};
+          return JSON.parse(readFileSync(p, "utf-8"));
+        } catch (err) {
+          logAndSwallow("skill_watcher", "op", err);
+          return {};
+        }
+      }
+      /** Parse requires field: string → { bins: [str] }, object → SkillRequires. */
+      parseRequires(raw) {
+        if (typeof raw === "string") return { bins: [raw] };
+        if (typeof raw === "object" && raw !== null) {
+          const obj = raw;
+          return {
+            ...obj["bins"] ? { bins: toStringArray(obj["bins"]) } : {},
+            ...obj["npm"] ? { npm: toStringArray(obj["npm"]) } : {},
+            ...obj["env"] ? { env: toStringArray(obj["env"]) } : {},
+            ...obj["files"] ? { files: toStringArray(obj["files"]) } : {}
+          };
+        }
+        return {};
+      }
+      /**
+       * Extract frontmatter key/value pairs. Returns null if the file doesn't
+       * start with a `---` fence.
+       *
+       * Supports: flat `key: value`, inline arrays `key: [a, b]`, and one level
+       * of nesting via indented keys under a parent.
+       */
+      parseFrontmatter(content) {
+        const lines = content.split("\n");
+        let i = 0;
+        while (i < lines.length && lines[i].trim() === "") i++;
+        if (i >= lines.length || lines[i].trim() !== "---") return null;
+        const start = i + 1;
+        let end = -1;
+        for (let j = start; j < lines.length; j++) {
+          if (lines[j].trim() === "---") {
+            end = j;
+            break;
+          }
+        }
+        if (end === -1) return null;
+        const result = {};
+        let currentParent = null;
+        let currentObj = {};
+        for (let j = start; j < end; j++) {
+          const line = lines[j];
+          if (line.trim() === "") continue;
+          const indent = line.length - line.trimStart().length;
+          const colonIdx = line.indexOf(":");
+          if (colonIdx < 1) continue;
+          const key = line.slice(0, colonIdx).trim().toLowerCase();
+          const rawValue = line.slice(colonIdx + 1).trim();
+          if (indent > 0 && currentParent) {
+            currentObj[key] = parseYamlValue(rawValue);
+          } else {
+            if (currentParent) {
+              result[currentParent] = currentObj;
+              currentParent = null;
+              currentObj = {};
+            }
+            if (rawValue === "" || rawValue === "|" || rawValue === ">") {
+              currentParent = key;
+              currentObj = {};
+            } else {
+              result[key] = parseYamlValue(rawValue);
+            }
+          }
+        }
+        if (currentParent) result[currentParent] = currentObj;
+        return result;
+      }
+    };
+  }
+});
+
+// src/capabilities/hotskills/index.ts
+var hotskills_exports = {};
+__export(hotskills_exports, {
+  getSkillCache: () => getSkillCache,
+  register: () => register
+});
+import { join as join2 } from "node:path";
+function getSkillCache() {
+  return _instance?.skills ?? [];
+}
+function register(api) {
+  const skillWatcher = new SkillWatcher(
+    join2(abtarsHome(), "skills"),
+    join2(abtarsHome(), "core", "skills_catalog.md")
+  );
+  _instance = skillWatcher;
+  skillWatcher.generateCatalog();
+  api.registerCommand("skill", async (_text, ctx) => {
+    const count = skillWatcher.generateCatalog();
+    await ctx.reply(`Reloaded \u2014 ${count} skills available.`);
+    return true;
+  });
+}
+var _instance;
+var init_hotskills = __esm({
+  "src/capabilities/hotskills/index.ts"() {
+    init_skill_watcher();
+    init_paths();
+    _instance = null;
+  }
+});
+
+export {
+  getSkillCache,
+  register,
+  hotskills_exports,
+  init_hotskills
+};
+//# sourceMappingURL=chunk-NIYVCGBC.js.map

package/bundle/chunk-NIYVCGBC.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/components/skill-watcher.ts", "../src/capabilities/hotskills/index.ts"],
+  "sourcesContent": ["/**\n * SkillWatcher \u2014 generates skills_catalog.md on startup and on-demand via /skill reload.\n *\n * #369 \u2014 Parses YAML-style frontmatter to extract name/description/requires.\n * #412 \u2014 Structured requires: bins/npm/env/files.\n *        Skills declare their own deps; loader checks eligibility at boot.\n */\n\nimport { logAndSwallow } from \"./log-and-swallow.js\";\nimport { readdirSync, readFileSync, writeFileSync, existsSync } from \"node:fs\";\nimport { join, basename, dirname, resolve } from \"node:path\";\nimport { execFileSync } from \"node:child_process\";\nimport { homedir } from \"node:os\";\nimport { logInfo, logWarn } from \"./logger.js\";\n\nimport type { ISkillSlot } from \"./skeleton.js\";\n\nconst TAG = \"skill-reloader\";\n\n/** Structured skill requirements (#412). */\ninterface SkillRequires {\n  bins?: string[];\n  npm?: string[];\n  env?: string[];\n  files?: string[];\n}\n\ninterface SkillHeader {\n  name: string;\n  description: string;\n  requires?: SkillRequires;\n  primaryEnv?: string;\n}\n\n/** Per-skill config from ~/.abtars/config/skills.json */\ninterface SkillsConfig {\n  entries?: Record<string, { apiKey?: string; env?: Record<string, string> }>;\n}\n\nexport interface SkillInfo { name: string; group: string; skipped?: string }\n\nexport class SkillWatcher implements ISkillSlot {\n  /** Per-instance cache of `which <bin>` results. Avoids repeated execFileSync on heartbeat ticks (#369). */\n  private binaryCache = new Map<string, boolean>();\n  /** Cached skill list from last generateCatalog() call. */\n  private _skillCache: SkillInfo[] = [];\n\n  constructor(private skillsDir: string, private catalogPath: string) {}\n\n  /** Get cached skill info (populated after generateCatalog). */\n  get skills(): readonly SkillInfo[] { return this._skillCache; }\n\n  /** Generate skills_catalog.md from all skill files. Called on startup + when skills change. */\n  generateCatalog(): number {\n    const files = this.scanMdFiles(this.skillsDir);\n    const entries: string[] = [];\n    const skipped: string[] = [];\n    const cache: SkillInfo[] = [];\n    const skillsCfg = this.loadSkillsConfig();\n    for (const filepath of files) {\n      const header = this.parseSkillHeader(filepath);\n      if (!header.name) continue;\n      // Inject per-skill env from skills.json before eligibility check\n      if (header.primaryEnv && !process.env[header.primaryEnv]) {\n        const entry = skillsCfg.entries?.[header.name];\n        if (entry?.apiKey) process.env[header.primaryEnv] = entry.apiKey;\n      }\n      const entry = skillsCfg.entries?.[header.name];\n      if (entry?.env) {\n        for (const [k, v] of Object.entries(entry.env)) {\n          if (!process.env[k]) process.env[k] = v;\n        }\n      }\n      const group = this.getSourceDir(filepath).split(\"/\")[0] ?? \"core\";\n      if (header.requires) {\n        const { eligible, missing } = this.checkEligibility(header.requires);\n        if (!eligible) {\n          skipped.push(`${header.name} (missing: ${missing.join(\", \")})`);\n          cache.push({ name: header.name, group, skipped: missing.join(\", \") });\n          continue;\n        }\n      }\n      cache.push({ name: header.name, group });\n      entries.push(`- [${this.getSourceDir(filepath)}] ${header.name}: ${header.description}`);\n    }\n    const guidance = [\n      \"\",\n      \"## Skill maintenance\",\n      \"- If you solved something non-trivial (multi-step, error-prone, or likely to recur), save it as a skill with skill_create.\",\n      \"- If a skill you just used was wrong or incomplete, fix it with skill_patch before moving on.\",\n      \"\",\n    ].join(\"\\n\");\n    const content = `# Skills Catalog\\n\\nWhen a user request matches a skill below, read its SKILL.md at ~/.abtars/skills/<dir>/SKILL.md for detailed instructions before acting.\\n\\n${entries.join(\"\\n\")}\\n${guidance}`;\n    try {\n      writeFileSync(this.catalogPath, content, \"utf-8\");\n      const skippedStr = skipped.length > 0 ? `, ${skipped.length} skipped \u2014 ${skipped.join(\", \")}` : \"\";\n      logInfo(TAG, `Generated skills_catalog.md (${entries.length} skills${skippedStr})`);\n    } catch (err) {\n      logWarn(TAG, `Failed to write skills_catalog.md: ${err instanceof Error ? err.message : String(err)}`);\n    }\n    this._skillCache = cache;\n    return entries.length;\n  }\n\n  /** Check all requirements. Returns eligible=true only if ALL pass. */\n  private checkEligibility(requires: SkillRequires): { eligible: boolean; missing: string[] } {\n    const missing: string[] = [];\n    for (const bin of requires.bins ?? []) {\n      if (!this.binaryAvailable(bin)) missing.push(`bin:${bin}`);\n    }\n    for (const pkg of requires.npm ?? []) {\n      if (!this.npmAvailable(pkg)) missing.push(`npm:${pkg}`);\n    }\n    for (const key of requires.env ?? []) {\n      if (!process.env[key]) missing.push(`env:${key}`);\n    }\n    for (const file of requires.files ?? []) {\n      const resolved = resolve(file.replace(/^~/, homedir()));\n      if (!existsSync(resolved)) missing.push(`file:${file}`);\n    }\n    return { eligible: missing.length === 0, missing };\n  }\n\n  /** Check if an npm package is resolvable from the abtars node_modules. */\n  private npmAvailable(pkg: string): boolean {\n    try {\n      require.resolve(pkg);\n      return true;\n    } catch (err) {\n      logAndSwallow(TAG, `require.resolve ${pkg}`, err);\n      return false;\n    }\n  }\n\n  /** Check if a binary is on PATH. Cached per-instance so hot-reload ticks don't respawn `which`. */\n  private binaryAvailable(bin: string): boolean {\n    if (!this.binaryCache.has(bin)) {\n      try {\n        // execFileSync (not execSync) \u2014 no shell interpolation on untrusted `requires:` values.\n        execFileSync(\"which\", [bin], { timeout: 1000, stdio: \"pipe\" });\n        this.binaryCache.set(bin, true);\n      } catch (err) {\n        logAndSwallow(TAG, `which ${bin}`, err);\n        this.binaryCache.set(bin, false);\n      }\n    }\n    return this.binaryCache.get(bin)!;\n  }\n\n  private getSourceDir(filepath: string): string {\n    const rel = filepath.slice(this.skillsDir.length + 1);\n    const first = rel.split(\"/\")[0] ?? \"core\";\n    if ([\"core\", \"custom\", \"downloaded\", \"self\"].includes(first)) return first;\n    return \"core\";\n  }\n\n  private scanMdFiles(dir: string): string[] {\n    const results: string[] = [];\n    try {\n      for (const entry of readdirSync(dir, { withFileTypes: true })) {\n        const full = join(dir, entry.name);\n        if (entry.isDirectory()) results.push(...this.scanMdFiles(full));\n        else if (entry.name === \"SKILL.md\") results.push(full);\n      }\n    } catch (err) { logAndSwallow(\"skill_watcher\", \"op\", err); }\n    return results;\n  }\n\n  /**\n   * Parse a skill file's header.\n   *\n   * Preferred: YAML-style frontmatter block at the top of the file:\n   *   ---\n   *   name: mcporter\n   *   description: Call external MCP servers via the mcporter CLI.\n   *   requires: mcporter\n   *   ---\n   *\n   * Supports only single-line `key: value` pairs. No arrays, no nested\n   * objects, no multi-line strings, no comments. Values are trimmed.\n   *\n   * Fallback (no frontmatter): first `#` heading \u2192 name, first non-heading\n   * line > 10 chars \u2192 description. Preserves pre-#369 behavior for any\n   * skills that don't yet have frontmatter.\n   */\n  private parseSkillHeader(filepath: string): SkillHeader {\n    try {\n      const content = readFileSync(filepath, \"utf-8\");\n      const fm = this.parseFrontmatter(content);\n      if (fm) {\n        return {\n          name: String(fm[\"name\"] ?? \"\") || basename(dirname(filepath)),\n          description: String(fm[\"description\"] ?? \"\").slice(0, 120),\n          ...(fm[\"requires\"] ? { requires: this.parseRequires(fm[\"requires\"]) } : {}),\n          ...(fm[\"primaryEnv\"] ? { primaryEnv: String(fm[\"primaryEnv\"]) } : {}),\n        };\n      }\n\n      // Fallback for skill files without frontmatter\n      const lines = content.split(\"\\n\").filter(l => l.trim());\n      const heading = lines.find(l => l.startsWith(\"#\"));\n      const name = heading?.replace(/^#+\\s*/, \"\").trim() ?? basename(dirname(filepath));\n      const desc = lines.find(l => !l.startsWith(\"#\") && l.trim().length > 10)?.trim() ?? \"\";\n      return { name, description: desc.slice(0, 120) };\n    } catch (err) {\n      logAndSwallow(TAG, \"parseSkillMeta\", err);\n      return { name: basename(dirname(filepath)), description: \"\" };\n    }\n  }\n\n  /** Load ~/.abtars/config/skills.json (per-skill secrets). */\n  private loadSkillsConfig(): SkillsConfig {\n    try {\n      const p = join(homedir(), \".abtars\", \"config\", \"skills.json\");\n      if (!existsSync(p)) return {};\n      return JSON.parse(readFileSync(p, \"utf-8\")) as SkillsConfig;\n    } catch (err) {\n      logAndSwallow(\"skill_watcher\", \"op\", err);\n      return {};\n    }\n  }\n\n  /** Parse requires field: string \u2192 { bins: [str] }, object \u2192 SkillRequires. */\n  private parseRequires(raw: unknown): SkillRequires {\n    if (typeof raw === \"string\") return { bins: [raw] };\n    if (typeof raw === \"object\" && raw !== null) {\n      const obj = raw as Record<string, unknown>;\n      return {\n        ...(obj[\"bins\"] ? { bins: toStringArray(obj[\"bins\"]) } : {}),\n        ...(obj[\"npm\"] ? { npm: toStringArray(obj[\"npm\"]) } : {}),\n        ...(obj[\"env\"] ? { env: toStringArray(obj[\"env\"]) } : {}),\n        ...(obj[\"files\"] ? { files: toStringArray(obj[\"files\"]) } : {}),\n      };\n    }\n    return {};\n  }\n\n  /**\n   * Extract frontmatter key/value pairs. Returns null if the file doesn't\n   * start with a `---` fence.\n   *\n   * Supports: flat `key: value`, inline arrays `key: [a, b]`, and one level\n   * of nesting via indented keys under a parent.\n   */\n  private parseFrontmatter(content: string): Record<string, unknown> | null {\n    const lines = content.split(\"\\n\");\n    let i = 0;\n    while (i < lines.length && lines[i]!.trim() === \"\") i++;\n    if (i >= lines.length || lines[i]!.trim() !== \"---\") return null;\n\n    const start = i + 1;\n    let end = -1;\n    for (let j = start; j < lines.length; j++) {\n      if (lines[j]!.trim() === \"---\") { end = j; break; }\n    }\n    if (end === -1) return null;\n\n    const result: Record<string, unknown> = {};\n    let currentParent: string | null = null;\n    let currentObj: Record<string, unknown> = {};\n\n    for (let j = start; j < end; j++) {\n      const line = lines[j]!;\n      if (line.trim() === \"\") continue;\n\n      const indent = line.length - line.trimStart().length;\n      const colonIdx = line.indexOf(\":\");\n      if (colonIdx < 1) continue;\n\n      const key = line.slice(0, colonIdx).trim().toLowerCase();\n      const rawValue = line.slice(colonIdx + 1).trim();\n\n      if (indent > 0 && currentParent) {\n        // Nested key under parent\n        currentObj[key] = parseYamlValue(rawValue);\n      } else {\n        // Top-level key\n        if (currentParent) {\n          result[currentParent] = currentObj;\n          currentParent = null;\n          currentObj = {};\n        }\n        if (rawValue === \"\" || rawValue === \"|\" || rawValue === \">\") {\n          // Start of nested object\n          currentParent = key;\n          currentObj = {};\n        } else {\n          result[key] = parseYamlValue(rawValue);\n        }\n      }\n    }\n    if (currentParent) result[currentParent] = currentObj;\n\n    return result;\n  }\n}\n\n/** Parse a YAML value: inline array [a, b] \u2192 string[], otherwise string. */\nfunction parseYamlValue(raw: string): unknown {\n  if (raw.startsWith(\"[\") && raw.endsWith(\"]\")) {\n    return raw.slice(1, -1).split(\",\").map(s => s.trim().replace(/^[\"']|[\"']$/g, \"\")).filter(Boolean);\n  }\n  return raw;\n}\n\n/** Coerce unknown to string[]. */\nfunction toStringArray(val: unknown): string[] {\n  if (Array.isArray(val)) return val.map(String);\n  if (typeof val === \"string\") return [val];\n  return [];\n}\n", "/**\n * Skills capability \u2014 on-demand skill catalog reload via /skill command.\n */\n\nimport { join } from \"node:path\";\nimport { SkillWatcher, type SkillInfo } from \"../../components/skill-watcher.js\";\nimport { abtarsHome } from \"../../paths.js\";\nimport type { CapabilityApi } from \"../capability.js\";\n\nlet _instance: SkillWatcher | null = null;\n\n/** Get cached skill info from the last catalog generation. */\nexport function getSkillCache(): readonly SkillInfo[] { return _instance?.skills ?? []; }\n\nexport function register(api: CapabilityApi): void {\n  const skillWatcher = new SkillWatcher(\n    join(abtarsHome(), \"skills\"),\n    join(abtarsHome(), \"core\", \"skills_catalog.md\"),\n  );\n  _instance = skillWatcher;\n\n  // Generate catalog on startup\n  skillWatcher.generateCatalog();\n\n  api.registerCommand(\"skill\", async (_text, ctx) => {\n    const count = skillWatcher.generateCatalog();\n    await ctx.reply(`Reloaded \u2014 ${count} skills available.`);\n    return true;\n  });\n}\n"],
+  "mappings": "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",
+  "names": ["entry", "join"]
+}

package/bundle/{chunk-TOUZC6NR.js → chunk-OKMN6J4Z.js}

@@ -6,12 +6,12 @@ import {
 import {
   getEnv,
   init_env_schema
-} from "./chunk-PZE3J7ER.js";
+} from "./chunk-3OXQWII3.js";
 import {
   init_logger,
   logInfo,
   logWarn
-} from "./chunk-2BY6I4P5.js";
+} from "./chunk-GUTRAMK3.js";
 
 // src/components/transport/delegation-tools.ts
 init_logger();
@@ -212,4 +212,4 @@ export {
   consumePendingInstruction,
   getDelegationTools
 };
-//# sourceMappingURL=chunk-TOUZC6NR.js.map
+//# sourceMappingURL=chunk-OKMN6J4Z.js.map

package/bundle/{chunk-RV54J75Q.js → chunk-PKHYCNTT.js}

@@ -2,22 +2,22 @@
  import { createRequire as __bundleCreateRequire } from 'node:module'; import { fileURLToPath as __bundleFileURLToPath } from 'node:url'; import { dirname as __bundleDirname } from 'node:path'; const require = __bundleCreateRequire(import.meta.url); const __chunk_filename = __bundleFileURLToPath(import.meta.url); const __chunk_dirname = __bundleDirname(__chunk_filename);
 import {
   writeRestartReason
-} from "./chunk-UDZIZB5F.js";
-import {
-  init_log_and_swallow,
-  logAndSwallow
-} from "./chunk-EX2SRTUE.js";
+} from "./chunk-RTL7HO3N.js";
 import {
   getEnv,
   init_env_schema
-} from "./chunk-PZE3J7ER.js";
+} from "./chunk-3OXQWII3.js";
+import {
+  init_log_and_swallow,
+  logAndSwallow
+} from "./chunk-CYSGXNBY.js";
 import {
   init_logger,
   logDebug,
   logError,
   logInfo,
   logWarn
-} from "./chunk-2BY6I4P5.js";
+} from "./chunk-GUTRAMK3.js";
 import {
   __export
 } from "./chunk-7K2YZTLD.js";
@@ -15289,7 +15289,7 @@ var TransportStateError = class extends Error {
 var VALID_TRANSITIONS = {
   idle: ["prompting", "reinitializing", "destroyed"],
   prompting: ["idle", "tool-active", "reinitializing", "destroyed"],
-  "tool-active": ["prompting", "reinitializing", "destroyed"],
+  "tool-active": ["prompting", "idle", "reinitializing", "destroyed"],
   reinitializing: ["idle", "stalled", "destroyed"],
   stalled: ["idle", "destroyed"],
   // only manual /restart recovers
@@ -15610,7 +15610,7 @@ var AcpTransport = class {
       return chunks.join("") || "(no response)";
     } finally {
       const durationMs = Date.now() - this.promptStartedAt;
-      import("./hook-system-POI5VRIX.js").then(({ hasHooks, fire }) => {
+      import("./hook-system-ZCVOFFRD.js").then(({ hasHooks, fire }) => {
         if (!hasHooks("AfterPrompt")) return;
         fire("AfterPrompt", {
           event: "AfterPrompt",
@@ -15701,7 +15701,7 @@ var AcpTransport = class {
   }
   async resetSession(_sessionKey) {
     try {
-      const { clearTransportCache, loadTransport, resolveAgent } = await import("./transport-config-G5NKQXPJ.js");
+      const { clearTransportCache, loadTransport, resolveAgent } = await import("./transport-config-JIKHB7GT.js");
       clearTransportCache();
       const tc = loadTransport();
       if (tc) {
@@ -15867,8 +15867,9 @@ var AcpTransport = class {
       const dur = Math.round((now - this.toolMeta.startedAt) / 1e3);
       logWarn(this.tag, `[transport-health] Tool "${title}" hung ${dur}s \u2014 interrupting`);
       this._watchdogLastActionAt = now;
-      await this.sendInterrupt();
       this.toolMeta = null;
+      if (this.sm.state === "tool-active") this.sm.transition("idle", "toolTimeout");
+      await this.sendInterrupt();
       if (!this._watchdogL1Done) {
         await this.sendPrompt(this.lastSessionKey, `[SYSTEM] Your tool call "${title}" was interrupted after ${dur} seconds. Try a different approach.`);
         this._watchdogL1Done = true;
@@ -15900,4 +15901,4 @@ export {
   ModelNotFoundError,
   AcpTransport
 };
-//# sourceMappingURL=chunk-RV54J75Q.js.map
+//# sourceMappingURL=chunk-PKHYCNTT.js.map