@integrity-labs/agt-cli 0.14.12 → 0.14.14

package/dist/lib/manager-worker.js

@@ -19,7 +19,7 @@ import {
   resolveChannels,
   resolveDmTarget,
   wrapScheduledTaskPrompt
-} from "../chunk-NSHSUWZQ.js";
+} from "../chunk-VWCF6BOZ.js";
 import {
   findTaskByTemplate,
   getProjectDir,
@@ -45,6 +45,7 @@ import {
 import { createHash } from "crypto";
 import { readFileSync, writeFileSync, appendFileSync, mkdirSync, chmodSync, existsSync, rmSync, readdirSync, statSync, unlinkSync, copyFileSync } from "fs";
 import https from "https";
+import { execFileSync as syncExecFile } from "child_process";
 import { join as join2, dirname } from "path";
 import { homedir as homedir2 } from "os";
 import { fileURLToPath } from "url";
@@ -81,6 +82,116 @@ ${trimmedOverrides}
 `;
 }
 
+// src/lib/plugin-skill-layout.ts
+function extractDescription(content) {
+  const match = content.match(/^---\s*([\s\S]*?)---/);
+  if (!match) return null;
+  const frontmatter = match[1] ?? "";
+  const descMatch = frontmatter.match(/^\s*description:\s*(?:"((?:\\.|[^"\\])*)"|([^\n]+))\s*$/m);
+  if (!descMatch) return null;
+  const quoted = descMatch[1];
+  if (quoted !== void 0) {
+    return quoted.replace(/\\(["\\])/g, "$1").trim();
+  }
+  return descMatch[2]?.trim() ?? null;
+}
+function sanitizeScopeSlug(skillId, pluginSlug) {
+  const normalized = skillId.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-");
+  const prefix = pluginSlug.replace(/-/g, "");
+  const stripped = normalized.startsWith(`${prefix}-`) ? normalized.slice(prefix.length + 1) : normalized;
+  return stripped.replace(/^-|-$/g, "") || normalized || "scope";
+}
+function buildPluginBundle(skills) {
+  if (skills.length === 0) {
+    throw new Error("buildPluginBundle: empty skills list");
+  }
+  const pluginSlug = skills[0].plugin_slug;
+  const ordered = [...skills].sort((a, b) => a.skill_id.localeCompare(b.skill_id));
+  const entries = ordered.map((s) => {
+    const scopeSlug = sanitizeScopeSlug(s.skill_id, pluginSlug);
+    const description = extractDescription(s.content);
+    return {
+      skillId: s.skill_id,
+      skillName: s.skill_name,
+      description,
+      scopeSlug,
+      scopePath: `scopes/${scopeSlug}.md`,
+      content: s.content
+    };
+  });
+  const scopePathGroups = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const bucket = scopePathGroups.get(entry.scopePath);
+    if (bucket) bucket.push(entry);
+    else scopePathGroups.set(entry.scopePath, [entry]);
+  }
+  for (const [scopePath, group] of scopePathGroups) {
+    if (group.length > 1) {
+      const conflicts = group.map((e) => `${e.skillId} (${e.skillName})`).join(", ");
+      throw new Error(
+        `buildPluginBundle: duplicate scope path '${scopePath}' for plugin '${pluginSlug}' \u2014 conflicting skills: ${conflicts}`
+      );
+    }
+  }
+  const pluginName = slugToTitle(pluginSlug);
+  const umbrellaDescription = entries.map((e) => e.description ?? `Use for ${e.skillName}.`).join(" ");
+  const scopeList = entries.map((e) => {
+    const label = e.skillName || slugToTitle(e.scopeSlug);
+    const desc = e.description ? ` \u2014 ${e.description}` : "";
+    return `- **${label}** ([${e.scopePath}](${e.scopePath}))${desc}`;
+  }).join("\n");
+  const umbrella = [
+    "---",
+    `name: "${pluginName}"`,
+    `description: "${escapeYamlDouble(umbrellaDescription)}"`,
+    "---",
+    "",
+    `# ${pluginName}`,
+    "",
+    `This skill bundles ${entries.length === 1 ? "one scope" : `${entries.length} scopes`} for the ${pluginSlug} plugin. Each scope has a dedicated reference under \`scopes/\` that you should load on demand when the user's intent maps to it.`,
+    "",
+    "## Scopes",
+    "",
+    scopeList,
+    "",
+    "## How to use",
+    "",
+    `Identify which scope matches the user's request, then read the matching file under \`scopes/\` for the exact tool names and usage details. Do not guess tool names from this umbrella file alone.`,
+    ""
+  ].join("\n");
+  const files = [
+    { relativePath: "SKILL.md", content: umbrella },
+    ...entries.map((e) => ({
+      relativePath: e.scopePath,
+      content: e.content
+    }))
+  ];
+  return {
+    pluginSlug,
+    files,
+    scopePaths: entries.map((e) => e.scopePath)
+  };
+}
+function slugToTitle(slug) {
+  return slug.split(/[-_]/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
+}
+function escapeYamlDouble(value) {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+function groupSkillsByPlugin(skills) {
+  const map = /* @__PURE__ */ new Map();
+  for (const s of skills) {
+    const bucket = map.get(s.plugin_slug);
+    if (bucket) bucket.push(s);
+    else map.set(s.plugin_slug, [s]);
+  }
+  return map;
+}
+function bundleFingerprint(files) {
+  const sorted = [...files].sort((a, b) => a.relativePath.localeCompare(b.relativePath));
+  return sorted.map((f) => `${f.relativePath}\0${f.content}`).join("
");
+}
+
 // src/lib/gateway-client.ts
 import { EventEmitter } from "events";
 import WebSocket from "ws";
@@ -691,11 +802,23 @@ function appendScheduleLinkFooter(body, url, medium) {
 
 ${footer}`;
 }
+var warnedNullConsoleUrl = false;
 function withScheduleLinkFooter(opts) {
   if (!opts.taskId) return opts.body;
   if (!scheduleLinkFooterEnabled(opts.codeName, opts.env)) return opts.body;
   const consoleUrl = getConsoleUrl(opts.env);
-  if (!consoleUrl) return opts.body;
+  if (!consoleUrl) {
+    if (!warnedNullConsoleUrl && opts.log) {
+      warnedNullConsoleUrl = true;
+      try {
+        opts.log(
+          "[schedule-link] AGT_CONSOLE_URL unset and NEXT_PUBLIC_APP_URL unset \u2014 schedule-edit deep-link footer disabled. Run `agt setup` again or export AGT_CONSOLE_URL (e.g. https://app.augmented.team) to restore it."
+        );
+      } catch {
+      }
+    }
+    return opts.body;
+  }
   const url = buildScheduleEditLink(consoleUrl, opts.agentId, opts.taskId);
   return appendScheduleLinkFooter(opts.body, url, opts.medium);
 }
@@ -2608,44 +2731,74 @@ async function processAgent(agent, agentStates) {
       for (const ctx of refreshData.plugin_contexts ?? []) {
         contextBySlug.set(ctx.plugin_slug, { values: ctx.values ?? {}, overrides: (ctx.overrides ?? "").trim() });
       }
-      for (const ps of refreshData.plugin_skills ?? []) {
+      const pluginGroups = groupSkillsByPlugin(
+        refreshData.plugin_skills ?? []
+      );
+      for (const [pluginSlug, scopes] of pluginGroups) {
         try {
-          const skillId = `plugin-${ps.plugin_slug}-${ps.skill_id}`.replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
-          currentPluginSkillIds.add(skillId);
-          const ctx = contextBySlug.get(ps.plugin_slug);
-          const renderedContent = renderPluginSkillContent(
-            ps.content,
-            ctx?.values ?? {},
-            ctx?.overrides ?? "",
-            (warning) => log(`[plugin-context] ${ps.plugin_slug}/${ps.skill_id}: ${warning}`)
-          );
-          const contentHash = createHash2("sha256").update(renderedContent).digest("hex").slice(0, 12);
-          const hashKey = `plugin-skill:${agent.code_name}:${skillId}`;
+          const pluginSkillId = `plugin-${pluginSlug}`.replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+          currentPluginSkillIds.add(pluginSkillId);
+          const ctx = contextBySlug.get(pluginSlug);
+          const renderedScopes = scopes.map((s) => ({
+            plugin_slug: s.plugin_slug,
+            skill_id: s.skill_id,
+            skill_name: s.skill_name,
+            content: renderPluginSkillContent(
+              s.content,
+              ctx?.values ?? {},
+              ctx?.overrides ?? "",
+              (warning) => log(`[plugin-context] ${s.plugin_slug}/${s.skill_id}: ${warning}`)
+            )
+          }));
+          const bundle = buildPluginBundle(renderedScopes);
+          const contentHash = createHash2("sha256").update(bundleFingerprint(bundle.files)).digest("hex").slice(0, 12);
+          const hashKey = `plugin-skill:${agent.agent_id}:${pluginSkillId}`;
           if (knownSkillHashes.get(hashKey) === contentHash) continue;
-          frameworkAdapter.installSkillFiles(agent.code_name, skillId, [
-            { relativePath: "SKILL.md", content: renderedContent }
-          ]);
+          frameworkAdapter.installSkillFiles(agent.code_name, pluginSkillId, bundle.files);
           knownSkillHashes.set(hashKey, contentHash);
-          installedPluginSkills.push(ps.skill_name);
-          log(`Installed plugin skill '${skillId}' for '${agent.code_name}'`);
+          for (const s of scopes) installedPluginSkills.push(s.skill_name);
+          log(`Installed plugin '${pluginSkillId}' for '${agent.code_name}' (${scopes.length} scope(s))`);
         } catch (err) {
-          log(`Plugin skill install failed for '${agent.code_name}' / '${ps.skill_id}': ${err.message}`);
+          log(`Plugin install failed for '${agent.code_name}' / '${pluginSlug}': ${err.message}`);
         }
       }
       try {
-        const agentSkillsDir = join2(config.configDir, agent.code_name, "project", ".claude", "skills");
-        if (existsSync(agentSkillsDir)) {
-          const { readdirSync: readdirSync2, rmSync: rmSync2 } = await import("fs");
-          for (const entry of readdirSync2(agentSkillsDir)) {
-            if (entry.startsWith("plugin-") && !currentPluginSkillIds.has(entry)) {
-              const orphanPath = join2(agentSkillsDir, entry);
-              rmSync2(orphanPath, { recursive: true, force: true });
-              log(`Removed orphaned plugin skill '${entry}' for '${agent.code_name}'`);
-              const provisionSkillPath = join2(config.configDir, agent.code_name, "skills", entry);
-              if (existsSync(provisionSkillPath)) {
-                rmSync2(provisionSkillPath, { recursive: true, force: true });
-              }
+        const { readdirSync: readdirSync2, rmSync: rmSync2 } = await import("fs");
+        const { homedir: homedir3 } = await import("os");
+        const frameworkId2 = frameworkAdapter.id;
+        const candidateSkillDirs = [
+          // Claude Code — framework runtime tree
+          join2(homedir3(), ".augmented", agent.code_name, "skills"),
+          // Claude Code — project tree
+          join2(homedir3(), ".augmented", agent.code_name, "project", ".claude", "skills"),
+          // OpenClaw — framework runtime tree
+          join2(homedir3(), `.openclaw-${agent.code_name}`, "skills"),
+          // Defensive: legacy provision-side path, not currently an
+          // install target but cheap to sweep.
+          join2(agentDir, ".claude", "skills")
+        ];
+        const existingDirs = candidateSkillDirs.filter((d) => existsSync(d));
+        const discoveredEntries = /* @__PURE__ */ new Set();
+        for (const dir of existingDirs) {
+          try {
+            for (const entry of readdirSync2(dir)) {
+              if (entry.startsWith("plugin-")) discoveredEntries.add(entry);
             }
+          } catch {
+          }
+        }
+        const removeSkillFolder = (entry, reason) => {
+          for (const dir of existingDirs) {
+            const p = join2(dir, entry);
+            if (existsSync(p)) {
+              rmSync2(p, { recursive: true, force: true });
+            }
+          }
+          log(`Removed ${reason} '${entry}' for '${agent.code_name}' (framework=${frameworkId2})`);
+        };
+        for (const entry of discoveredEntries) {
+          if (!currentPluginSkillIds.has(entry)) {
+            removeSkillFolder(entry, "orphaned plugin skill");
           }
         }
       } catch (err) {
@@ -3739,7 +3892,7 @@ function ensureRealtimePluginContextStarted(agentStates) {
         const agent = agentStates.find((a) => a.agentId === payload.agent_id);
         if (agent) {
           for (const key of knownSkillHashes.keys()) {
-            if (key.startsWith(`plugin-skill:${agent.codeName}:`)) {
+            if (key.startsWith(`plugin-skill:${agent.agentId}:`)) {
               knownSkillHashes.delete(key);
             }
           }
@@ -4487,7 +4640,7 @@ ${a.detail}`;
 ${blocks.join("\n\n")}`);
 }
 async function deliverScheduledTaskOutput(agentCodeName, agentId, rawTarget, body, taskId) {
-  const withLink = (b, medium) => withScheduleLinkFooter({ body: b, medium, codeName: agentCodeName, agentId, taskId });
+  const withLink = (b, medium) => withScheduleLinkFooter({ body: b, medium, codeName: agentCodeName, agentId, taskId, log });
   if (typeof rawTarget === "string") {
     if (rawTarget.startsWith("channel:")) {
       const result = await sendTaskNotification(agentCodeName, "slack", rawTarget, withLink(body, "slack"));
@@ -5124,6 +5277,42 @@ async function ensureHostFrameworkBinaries() {
     log(`[framework-install] failed: ${err.message}`);
   }
 }
+function restartRunningChannelMcps(basenames) {
+  try {
+    const psOutput = syncExecFile(
+      "ps",
+      ["-eo", "pid=,command="],
+      { encoding: "utf-8", timeout: 5e3 }
+    );
+    const lines = psOutput.split("\n").filter((l) => l.trim());
+    const selfPid = process.pid;
+    let signalled = 0;
+    for (const line of lines) {
+      const match = line.match(/^\s*(\d+)\s+(.*)$/);
+      if (!match) continue;
+      const pid = Number(match[1]);
+      const command = match[2];
+      if (pid === selfPid) continue;
+      const hit = basenames.find((b) => new RegExp(`/${b}\\.js(\\s|$)`).test(command));
+      if (!hit) continue;
+      try {
+        process.kill(pid, "SIGTERM");
+        signalled++;
+        log(`[manager]   sent SIGTERM to pid=${pid} (${hit}.js) \u2014 will respawn on next message`);
+      } catch (err) {
+        const code = err.code;
+        if (code && code !== "ESRCH") {
+          log(`[manager]   failed to signal pid=${pid}: ${code}`);
+        }
+      }
+    }
+    if (signalled === 0) {
+      log(`[manager]   no running instances to restart (deploy still applies to future spawns)`);
+    }
+  } catch (err) {
+    log(`[manager] restartRunningChannelMcps failed: ${err.message}`);
+  }
+}
 function deployMcpAssets() {
   const targetDir = join2(homedir2(), ".augmented", "_mcp");
   mkdirSync(targetDir, { recursive: true });
@@ -5144,17 +5333,40 @@ function deployMcpAssets() {
     log("[manager] MCP assets not found in CLI package \u2014 skipping deployment");
     return;
   }
+  const changedBasenames = [];
+  const fileHash = (p) => {
+    try {
+      if (!existsSync(p)) return null;
+      return createHash("sha256").update(readFileSync(p)).digest("hex");
+    } catch {
+      return null;
+    }
+  };
+  const RESTARTABLE_CHANNEL_FILES = /* @__PURE__ */ new Set([
+    "slack-channel.js",
+    "direct-chat-channel.js",
+    "telegram-channel.js"
+  ]);
   for (const file of ["index.js", "slack-channel.js", "direct-chat-channel.js", "telegram-channel.js"]) {
     const src = join2(mcpSourceDir, file);
     const dst = join2(targetDir, file);
     if (!existsSync(src)) continue;
+    const before = fileHash(dst);
     try {
       copyFileSync(src, dst);
+      const after = fileHash(dst);
+      if (before !== after && RESTARTABLE_CHANNEL_FILES.has(file)) {
+        changedBasenames.push(file.replace(/\.js$/, ""));
+      }
     } catch (err) {
       log(`[manager] Failed to deploy ${file}: ${err.message}`);
     }
   }
   log(`[manager] MCP assets deployed to ${targetDir}`);
+  if (changedBasenames.length > 0) {
+    log(`[manager] Bundle(s) updated: ${changedBasenames.join(", ")} \u2014 signalling running instances to restart`);
+    restartRunningChannelMcps(changedBasenames);
+  }
   const localMcpPath = join2(targetDir, "index.js");
   try {
     const agentsDir = join2(homedir2(), ".augmented", "agents");