polygram 0.8.0-rc.12 → 0.8.0-rc.13

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "polygram",
-  "version": "0.8.0-rc.12",
+  "version": "0.8.0-rc.13",
   "description": "Telegram integration for Claude Code that preserves the OpenClaw per-chat session model. Migration target for OpenClaw users. Multi-bot, multi-chat, per-topic isolation; SQLite transcripts; inline-keyboard approvals. Bundles /polygram:status|logs|pair-code|approvals admin commands and a history skill.",
   "keywords": [
     "telegram",

package/lib/agent-loader.js

@@ -3,18 +3,26 @@
  * v4 plan §6.5.5).
  *
  * Background: today's CLI pm passes `--agent <name>` on spawn; the
- * Claude CLI then loads that agent's directory under
- * `~/.claude/agents/<name>/` (system prompt from `CLAUDE.md`,
- * skills, mcpServers from settings.json). Phase 0 gate 15 is DEFER —
- * the SDK's `Options.agents` is for in-memory subagent definitions
- * (the Task tool), NOT a "run THIS query AS this agent" mechanism.
+ * Claude CLI then loads that agent's content. Phase 0 gate 15 was
+ * DEFER — the SDK's `Options.agents` is for in-memory subagent
+ * definitions (the Task tool), NOT a "run THIS query AS this agent"
+ * mechanism. So polygram reads the agent file itself and passes its
+ * content as `systemPrompt`.
  *
- * This module provides a polygram-side loader so buildSdkOptions
- * can compose the per-chat agent's settings into the chat's
- * SdkOptions: read the agent's CLAUDE.md (system prompt), enumerate
- * its skills, pick up its mcpServers from settings.json. Then merge
- * into the per-chat SdkOptions with chat-level overrides taking
- * precedence (chatConfig wins over agent wins over defaults).
+ * Search order (rc.13+ — supports BOTH Claude Code's standard
+ * single-file convention AND polygram's pre-0.8.0 directory layout):
+ *
+ *   1. `<cwd>/.claude/agents/<name>.md`          — Claude Code project-level
+ *   2. `<homeDir>/.claude/agents/<name>.md`      — Claude Code user-level
+ *   3. `<cwd>/.claude/agents/<name>/CLAUDE.md`   — polygram convention
+ *      (also `AGENTS.md`, `system-prompt.txt`)
+ *   4. `<homeDir>/.claude/agents/<name>/CLAUDE.md` — polygram legacy
+ *      (also `AGENTS.md`, `system-prompt.txt`)
+ *
+ * Single-file Claude Code agents may have YAML frontmatter; we strip
+ * it before using the body as systemPrompt. Frontmatter `model` /
+ * `effort` are merged into the bundle.raw so composeSdkOptions can
+ * use them as agent-level defaults.
  *
  * Used by `polygram.js` `buildSdkOptions(sessionKey, ctx)` —
  * Phase 1 step 14.
@@ -31,92 +39,160 @@
 const fs = require('fs');
 const path = require('path');
 
-const cache = new Map();                       // agentName → AgentBundle
+const cache = new Map();                       // cacheKey → AgentBundle
+
+// Resolve agent file by checking each search path in order.
+// Returns { kind: 'file'|'dir', path, dir | null } or null.
+function resolveAgentLocation(agentName, homeDir, cwd) {
+  const fileCandidates = [];
+  if (cwd) fileCandidates.push(path.join(cwd, '.claude', 'agents', agentName + '.md'));
+  fileCandidates.push(path.join(homeDir, '.claude', 'agents', agentName + '.md'));
+  for (const p of fileCandidates) {
+    if (fs.existsSync(p)) return { kind: 'file', path: p, dir: null };
+  }
+  const dirCandidates = [];
+  if (cwd) dirCandidates.push(path.join(cwd, '.claude', 'agents', agentName));
+  dirCandidates.push(path.join(homeDir, '.claude', 'agents', agentName));
+  for (const d of dirCandidates) {
+    if (fs.existsSync(d) && fs.statSync(d).isDirectory()) {
+      return { kind: 'dir', path: d, dir: d };
+    }
+  }
+  return null;
+}
+
+// Strip leading YAML frontmatter (---\n...\n---\n) from markdown.
+function stripFrontmatter(content) {
+  if (typeof content !== 'string' || !content.startsWith('---\n')) return content;
+  const end = content.indexOf('\n---\n', 4);
+  if (end === -1) return content;
+  return content.slice(end + 5);
+}
+
+// Parse a tiny subset of YAML frontmatter (key: value lines).
+function parseFrontmatter(content) {
+  if (typeof content !== 'string' || !content.startsWith('---\n')) return {};
+  const end = content.indexOf('\n---\n', 4);
+  if (end === -1) return {};
+  const block = content.slice(4, end);
+  const out = {};
+  for (const line of block.split('\n')) {
+    const m = /^([A-Za-z_][A-Za-z0-9_-]*)\s*:\s*(.*)$/.exec(line);
+    if (!m) continue;
+    let v = m[2].trim();
+    if ((v.startsWith('"') && v.endsWith('"')) || (v.startsWith("'") && v.endsWith("'"))) {
+      v = v.slice(1, -1);
+    }
+    out[m[1]] = v;
+  }
+  return out;
+}
 
 /**
  * Load an agent bundle from disk.
  *
- * @param {string} agentName — e.g. 'shumabit-finance'
+ * @param {string} agentName
  * @param {object} opts
  * @param {string} [opts.homeDir] — defaults to process.env.HOME.
- *   Resolves agent at `${homeDir}/.claude/agents/${agentName}/`.
+ * @param {string} [opts.cwd] — chat's working directory; checked
+ *   FIRST for Claude Code project-level agent discovery.
  * @param {object} [opts.logger] — error logger.
- *
- * @returns {AgentBundle}
- *   { agentName, agentDir, systemPrompt, skills: string[],
- *     mcpServers: object, raw: settingsJson }
- *
- * Throws `{ code: 'AGENT_NOT_FOUND' }` if the agent dir doesn't
- * exist. Does NOT throw on partial agents (missing CLAUDE.md or
- * skills/ etc — fields just default to null/empty).
  */
-function loadAgent(agentName, { homeDir = process.env.HOME, logger = console } = {}) {
-  if (cache.has(agentName)) return cache.get(agentName);
-
-  const agentDir = path.join(homeDir, '.claude', 'agents', agentName);
-  if (!fs.existsSync(agentDir)) {
+function loadAgent(agentName, { homeDir = process.env.HOME, cwd = null, logger = console } = {}) {
+  // Cache key includes cwd because the same agentName can resolve
+  // to different files when called from different chats with
+  // different cwds (e.g. shumabit-claude vs shumabit-partners).
+  const cacheKey = agentName + '\x00' + (cwd || '');
+  if (cache.has(cacheKey)) return cache.get(cacheKey);
+
+  const loc = resolveAgentLocation(agentName, homeDir, cwd);
+  if (!loc) {
+    const looked = [
+      cwd ? cwd + '/.claude/agents/' + agentName + '.md' : null,
+      homeDir + '/.claude/agents/' + agentName + '.md',
+      cwd ? cwd + '/.claude/agents/' + agentName + '/' : null,
+      homeDir + '/.claude/agents/' + agentName + '/',
+    ].filter(Boolean).join(', ');
     throw Object.assign(
-      new Error(`agent not found: ${agentName} (looked in ${agentDir})`),
-      { code: 'AGENT_NOT_FOUND', agentDir },
+      new Error('agent not found: ' + agentName + ' (looked in ' + looked + ')'),
+      { code: 'AGENT_NOT_FOUND', searchPaths: looked },
     );
   }
 
-  // System prompt: prefer CLAUDE.md (the standard polygram convention),
-  // fall back to AGENTS.md (OpenClaw legacy), then to a single-line
-  // file `system-prompt.txt` if either of the markdown files is
-  // absent. Whichever is present, read as UTF-8 string.
   let systemPrompt = null;
-  for (const fname of ['CLAUDE.md', 'AGENTS.md', 'system-prompt.txt']) {
-    const p = path.join(agentDir, fname);
-    if (fs.existsSync(p)) {
-      try {
-        systemPrompt = fs.readFileSync(p, 'utf8');
-        break;
-      } catch (err) {
-        logger.error?.(`[agent-loader] reading ${p}: ${err.message}`);
+  let frontmatter = {};
+  let agentPath = loc.path;
+
+  if (loc.kind === 'file') {
+    // Claude Code single-file format. Read whole file, parse and
+    // strip frontmatter, body becomes systemPrompt.
+    try {
+      const raw = fs.readFileSync(loc.path, 'utf8');
+      frontmatter = parseFrontmatter(raw);
+      systemPrompt = stripFrontmatter(raw);
+    } catch (err) {
+      logger.error?.('[agent-loader] reading ' + loc.path + ': ' + err.message);
+    }
+  } else {
+    // polygram directory layout. CLAUDE.md > AGENTS.md > system-prompt.txt.
+    for (const fname of ['CLAUDE.md', 'AGENTS.md', 'system-prompt.txt']) {
+      const p = path.join(loc.dir, fname);
+      if (fs.existsSync(p)) {
+        try {
+          systemPrompt = fs.readFileSync(p, 'utf8');
+          agentPath = p;
+          break;
+        } catch (err) {
+          logger.error?.('[agent-loader] reading ' + p + ': ' + err.message);
+        }
       }
     }
   }
 
-  // Settings: optional `settings.json` for per-agent overrides
-  // (mcpServers, model, effort defaults, etc.).
+  // Settings.json — only meaningful for directory-layout agents.
   let settings = {};
-  const settingsPath = path.join(agentDir, 'settings.json');
-  if (fs.existsSync(settingsPath)) {
-    try {
-      settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
-    } catch (err) {
-      logger.error?.(`[agent-loader] parsing ${settingsPath}: ${err.message}`);
+  if (loc.dir) {
+    const settingsPath = path.join(loc.dir, 'settings.json');
+    if (fs.existsSync(settingsPath)) {
+      try {
+        settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+      } catch (err) {
+        logger.error?.('[agent-loader] parsing ' + settingsPath + ': ' + err.message);
+      }
     }
   }
 
-  // Skills: enumerate `${agentDir}/skills/*` directories. SDK's
-  // `Options.skills` accepts a string[] of skill names.
-  const skillsDir = path.join(agentDir, 'skills');
+  // Skills (only for directory layout).
   let skills = [];
-  if (fs.existsSync(skillsDir)) {
-    try {
-      skills = fs.readdirSync(skillsDir, { withFileTypes: true })
-        .filter((d) => d.isDirectory())
-        .map((d) => d.name);
-    } catch (err) {
-      logger.error?.(`[agent-loader] enumerating ${skillsDir}: ${err.message}`);
+  if (loc.dir) {
+    const skillsDir = path.join(loc.dir, 'skills');
+    if (fs.existsSync(skillsDir)) {
+      try {
+        skills = fs.readdirSync(skillsDir, { withFileTypes: true })
+          .filter((d) => d.isDirectory())
+          .map((d) => d.name);
+      } catch (err) {
+        logger.error?.('[agent-loader] enumerating ' + skillsDir + ': ' + err.message);
+      }
     }
   }
 
   const mcpServers = settings.mcpServers ?? {};
 
+  // Frontmatter merged with settings — composeSdkOptions can pick up
+  // model/effort overrides from either source.
+  const raw = { ...frontmatter, ...settings };
+
   const bundle = {
     agentName,
-    agentDir,
+    agentPath,
+    agentDir: loc.dir,
     systemPrompt,
     skills,
     mcpServers,
-    // Pass through extra settings for callers that want them
-    // (e.g. agent-level model/effort defaults).
-    raw: settings,
+    raw,
   };
-  cache.set(agentName, bundle);
+  cache.set(cacheKey, bundle);
   return bundle;
 }
 
@@ -166,4 +242,13 @@ function clearCache() {
   cache.clear();
 }
 
-module.exports = { loadAgent, composeSdkOptions, clearCache, _cache: cache };
+module.exports = {
+  loadAgent,
+  composeSdkOptions,
+  clearCache,
+  // Internals for tests.
+  _resolveAgentLocation: resolveAgentLocation,
+  _stripFrontmatter: stripFrontmatter,
+  _parseFrontmatter: parseFrontmatter,
+  _cache: cache,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polygram",
-  "version": "0.8.0-rc.12",
+  "version": "0.8.0-rc.13",
   "description": "Telegram daemon for Claude Code that preserves the OpenClaw per-chat session model. Migration path for OpenClaw users moving to Claude Code.",
   "main": "lib/ipc-client.js",
   "bin": {

package/polygram.js

@@ -793,6 +793,10 @@ function buildSdkOptions(sessionKey, ctx) {
     try {
       agentBundle = agentLoader.loadAgent(chatConfig.agent, {
         homeDir: CHILD_HOME,
+        // Pass cwd so the loader checks Claude Code's project-level
+        // path (`<cwd>/.claude/agents/<name>.md`) before the
+        // user-level path or polygram's directory convention.
+        cwd: chatConfig.cwd,
         logger: console,
       });
     } catch (err) {
@@ -2782,7 +2786,13 @@ async function handleMessage(sessionKey, chatId, msg, bot) {
     const abortedByUser = isSessionRecentlyAborted(sessionKey);
     if (abortedByUser) {
       await streamer.finalize('').catch(() => {});
-      // Leave reaction as-is — no 🤯 / 😨; user asked for stop.
+      // 0.8.0-rc.13: clear the in-flight emoji on abort so the user
+      // sees a clean message after their /stop ack — pre-rc.13 the
+      // last 👀 / 🤔 / ✍ stayed stuck on the message indefinitely
+      // because reactor.stop() (in finally) only kills timers, not
+      // the visible reaction. We DON'T set 🤯/😨 (those are for
+      // unexpected errors); the user just wants their stop honored.
+      await reactor.clear().catch(() => {});
     } else {
       await streamer.finalize('', { errorSuffix: 'stream interrupted' }).catch(() => {});
       if (/wall-clock ceiling|idle with no Claude activity/i.test(err?.message || '')) {
@@ -2992,6 +3002,11 @@ function createBot(token) {
         await stopTarget.kill(sessionKey).catch((err) =>
           console.error(`[${BOT_NAME}] abort kill failed: ${err.message}`));
       }
+      // 0.8.0-rc.13: drop any buffered autosteer follow-ups for this
+      // session — otherwise they'd be injected into the NEXT turn
+      // (stale steer leak across abort boundary, which is what the
+      // user just asked us not to do).
+      autosteerBuffer.clear(sessionKey);
       logEvent('abort-requested', {
         chat_id: chatId, user_id: msg.from?.id || null,
         had_active: hadActive,