polygram 0.8.0-rc.4 → 0.8.0-rc.41

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.4",
+  "version": "0.8.0-rc.41",
   "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/abort-detector.js

@@ -2,35 +2,72 @@
  * Detect "stop working on the current turn" signals in natural language.
  *
  * Mirrors OpenClaw's isAbortRequestText semantics: users should be able to
- * say "stop" / "подожди" / "cancel" / or just `/stop` and have polygram
+ * say "stop" / "стоп" / "cancel" / or just `/stop` and have polygram
  * interrupt the in-flight turn instead of queueing the message behind it.
  *
  * Conservative on purpose. False positives hijack user intent — "stop using
  * emoji" should NOT abort. So we require ONE of:
  *   1. The whole message (after stripping leading @-mention + trailing
- *      punctuation) is an exact match against a known abort phrase, OR
+ *      punctuation) is an exact match against a known abort phrase
+ *      (HARD or SOFT phrases — see below), OR
  *   2. It starts with an explicit slash command: /stop, /abort, /cancel, OR
- *   3. The FIRST SENTENCE (split on . ! ?) is an exact abort phrase. This
- *      catches "Stop. I'll ask in another session." — clear abort intent
- *      with continuation explaining what comes next. Comma is not a split
- *      character ("Stop, look here" is ambiguous and stays non-abort).
+ *   3. The FIRST SENTENCE (split on . ! ?) is an exact match against the
+ *      HARD phrases ONLY. Catches "Stop. I'll ask in another session." —
+ *      clear abort intent with continuation. Does NOT trigger on
+ *      "Wait? Something is off..." (rc.41 false-positive fix — soft words
+ *      like "wait" / "hold on" are too conversational to abort on
+ *      first-sentence alone).
+ *
+ * Hard phrases (whole-message OR first-sentence trigger):
+ *   English: stop, cancel, abort, halt
+ *   Russian: стоп, остановись, остановить, отмена, прекрати, прекращай,
+ *            хватит, отставить
+ *
+ * Soft phrases (whole-message ONLY):
+ *   English: wait, hold on, hold up, nevermind, never mind, nvm,
+ *            forget it, forget that
+ *   Russian: подожди, подожди-ка, забей, не надо, отмени
+ *
+ * The split exists because "wait", "hold on", "подожди" are commonly used
+ * as conversational openers ("Wait? There is something wrong..." — Ivan DM
+ * 2026-05-01 19:01) where the user is NOT asking the bot to stop, they're
+ * flagging an issue. Hard phrases ("stop", "cancel", "abort") are
+ * unambiguously about ending the current task.
  *
  * Not detected (on purpose):
  *   - "stop using markdown" → first sentence is the whole thing, not exact
  *   - "I said stop" → not at start / not exact match
+ *   - "Wait? Something is wrong..." (rc.41) — soft word, multi-sentence
+ *   - "Hold on, let me think" — same shape
  */
 
-const ABORT_PHRASES = new Set([
+'use strict';
+
+// HARD phrases: unambiguous abort intent. Trigger on whole-message OR
+// first-sentence match.
+const HARD_ABORT_PHRASES = new Set([
   // English
-  'stop', 'wait', 'cancel', 'abort', 'halt',
-  'hold on', 'hold up', 'nevermind', 'never mind', 'nvm',
+  'stop', 'cancel', 'abort', 'halt',
+  // Russian
+  'стоп', 'остановись', 'остановить',
+  'отмена', 'прекрати', 'прекращай', 'хватит', 'отставить',
+]);
+
+// SOFT phrases: conversational filler that COULD mean abort but commonly
+// doesn't. Whole-message match only.
+const SOFT_ABORT_PHRASES = new Set([
+  // English
+  'wait', 'hold on', 'hold up', 'nevermind', 'never mind', 'nvm',
   'forget it', 'forget that',
   // Russian
-  'стоп', 'подожди', 'подожди-ка', 'остановись', 'остановить',
-  'отмена', 'отставить', 'прекрати', 'прекращай', 'хватит',
-  'забей', 'не надо', 'отмени',
+  'подожди', 'подожди-ка', 'забей', 'не надо', 'отмени',
 ]);
 
+// Combined set for whole-message matching. Kept exported as ABORT_PHRASES
+// for backward compatibility with any callers / tests that import it
+// directly.
+const ABORT_PHRASES = new Set([...HARD_ABORT_PHRASES, ...SOFT_ABORT_PHRASES]);
+
 const ABORT_SLASH_RE = /^\/(stop|abort|cancel)(\s|$|@)/i;
 
 // Strip leading @botname mentions ("@shumobot stop" → "stop"). Matches any
@@ -58,20 +95,28 @@ function isAbortRequest(text) {
   const n = normalize(text);
   if (!n) return false;
   // Whole-message exact match (capped — a long message that happens to
-  // start with "stop" is real content, not an abort).
+  // start with "stop" is real content, not an abort). HARD or SOFT
+  // phrases both qualify here — the user typed JUST that word, which is
+  // unambiguous regardless of category.
   if (n.length <= 40 && ABORT_PHRASES.has(n)) return true;
 
   // First-sentence exact match. Splits on . ! ? (NOT comma — "Stop, look
-  // here" is ambiguous and stays non-abort). The leading @-mention has
-  // already been stripped by normalize but only on the whole string, so
-  // we strip it again on the raw text before splitting.
+  // here" is ambiguous and stays non-abort). HARD phrases ONLY — soft
+  // phrases like "wait" or "hold on" are conversational openers ("Wait?
+  // There is something wrong...") and shouldn't hijack a message where
+  // the rest contains real content.
   const head = text.trim().replace(LEADING_MENTION_RE, '');
   const firstSentence = head.split(/[.!?]/, 1)[0]?.trim().toLowerCase();
-  if (firstSentence && firstSentence.length <= 40 && ABORT_PHRASES.has(firstSentence)) {
+  if (firstSentence && firstSentence.length <= 40 && HARD_ABORT_PHRASES.has(firstSentence)) {
     return true;
   }
 
   return false;
 }
 
-module.exports = { isAbortRequest, ABORT_PHRASES };
+module.exports = {
+  isAbortRequest,
+  ABORT_PHRASES,
+  HARD_ABORT_PHRASES,
+  SOFT_ABORT_PHRASES,
+};

package/lib/abort-grace.js

@@ -0,0 +1,62 @@
+/**
+ * Abort-grace tracker — per-session timestamps marking "user just
+ * /stop'd this session, suppress the next batch of generic error
+ * replies".
+ *
+ * Why this exists: when the user types /stop (or natural-language
+ * "стоп"), polygram calls pm.kill(sessionKey). The kill SIGTERM's
+ * the in-flight process — every pending in the queue rejects with
+ * "Process killed" or INTERRUPTED. WITHOUT abort-grace, polygram
+ * would post "💥 Hit a snag" for each rejected pending, even though
+ * the user already saw the /stop ack and these errors are caused
+ * by their own action.
+ *
+ * Timestamp model (vs the earlier "delete after first read" Set):
+ * a single /stop can drain many pendings, so we mark a TS and let
+ * every error within ABORT_GRACE_MS see "yes, aborted, stay quiet".
+ *
+ * Closes v6 plan §7.1 G11 unit gate.
+ */
+
+'use strict';
+
+const DEFAULT_ABORT_GRACE_MS = 15_000;
+
+/**
+ * @param {object} [opts]
+ * @param {number} [opts.windowMs]   — grace window (default 15s)
+ * @param {() => number} [opts.now]  — clock injection for tests
+ */
+function createAbortGrace({ windowMs = DEFAULT_ABORT_GRACE_MS, now = () => Date.now() } = {}) {
+  const aborted = new Map();        // sessionKey → ts of abort
+
+  function mark(sessionKey) {
+    if (!sessionKey) return;
+    const ts = now();
+    aborted.set(sessionKey, ts);
+    // Sweep old entries opportunistically. Use 2× window so a
+    // session that's marked-and-checked at the boundary doesn't
+    // disappear before the check completes.
+    for (const [k, t] of aborted) {
+      if (ts - t > windowMs * 2) aborted.delete(k);
+    }
+  }
+
+  function isRecent(sessionKey) {
+    const ts = aborted.get(sessionKey);
+    return ts != null && (now() - ts) < windowMs;
+  }
+
+  function clear(sessionKey) {
+    aborted.delete(sessionKey);
+  }
+
+  return {
+    mark,
+    isRecent,
+    clear,
+    get size() { return aborted.size; },
+  };
+}
+
+module.exports = { createAbortGrace, DEFAULT_ABORT_GRACE_MS };

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,245 @@
 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.
+// Restrict agent names to a conservative charset so they can't
+// path-traverse out of the `.claude/agents/` directory. Pre-fix, an
+// agent name like `../../etc/passwd` silently resolved to whatever
+// existed at that path, loading arbitrary file content as the
+// system prompt. Chat configs are operator-controlled (not user
+// input), so the practical threat is operator typos — but pinning
+// the contract removes the foot-gun.
+//
+// Allowed: alphanumerics, hyphen, underscore, single dots inside
+// (e.g. "shumabit-finance.v2"). Forbidden: leading/trailing dot,
+// consecutive dots, slashes, NUL.
+const AGENT_NAME_RE = /^[A-Za-z0-9_]+(?:[.-][A-Za-z0-9_]+)*$/;
+
+function resolveAgentLocation(agentName, homeDir, cwd) {
+  if (typeof agentName !== 'string' || !AGENT_NAME_RE.test(agentName)) {
+    return null;
+  }
+  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);
+}
+
+// Recursively expand Claude Code @<file> import directives. A line
+// starting with `@<path>` is replaced with the file's contents
+// (frontmatter stripped, imports recursively expanded). Paths
+// resolve relative to the importing file's directory FIRST, then
+// fall back to cwd. Cycle detection via visited Set.
+//
+// rc.15: pre-rc.15 the literal "@_shumabit-base.md" reached the
+// model verbatim because polygram's loader didn't process imports.
+// Symptom: agent appeared loaded but the system prompt was
+// effectively empty (just an unresolved import directive).
+function expandImports(content, importingFile, cwd, visited, logger) {
+  if (typeof content !== 'string' || !content) return content;
+  const lines = content.split('\n');
+  const out = [];
+  for (const line of lines) {
+    const m = /^@(\S+)\s*$/.exec(line);
+    if (!m) {
+      out.push(line);
+      continue;
+    }
+    const ref = m[1];
+    const importingDir = path.dirname(importingFile);
+    // Resolution order: relative to importing file's dir; relative
+    // to cwd; absolute path as-is.
+    const candidates = [];
+    if (path.isAbsolute(ref)) {
+      candidates.push(ref);
+    } else {
+      candidates.push(path.join(importingDir, ref));
+      if (cwd) candidates.push(path.join(cwd, ref));
+    }
+    let resolved = null;
+    for (const c of candidates) {
+      if (fs.existsSync(c)) { resolved = c; break; }
+    }
+    if (!resolved) {
+      logger?.warn?.(`[agent-loader] @-import not found: ${ref} (in ${importingFile})`);
+      out.push(line);
+      continue;
+    }
+    if (visited.has(resolved)) {
+      logger?.warn?.(`[agent-loader] @-import cycle: ${resolved}`);
+      continue;
+    }
+    visited.add(resolved);
+    let imported = '';
+    try {
+      imported = fs.readFileSync(resolved, 'utf8');
+    } catch (err) {
+      logger?.error?.(`[agent-loader] reading @-import ${resolved}: ${err.message}`);
+      out.push(line);
+      continue;
+    }
+    // Strip frontmatter from imported file (same convention as
+    // top-level agent file) and recursively expand its imports.
+    imported = stripFrontmatter(imported);
+    imported = expandImports(imported, resolved, cwd, visited, logger);
+    out.push(imported);
+  }
+  return out.join('\n');
+}
+
+// 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);
+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 agentDir = path.join(homeDir, '.claude', 'agents', agentName);
-  if (!fs.existsSync(agentDir)) {
+  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. Then expand
+    // any @<file> import directives recursively (rc.15).
+    try {
+      const raw = fs.readFileSync(loc.path, 'utf8');
+      frontmatter = parseFrontmatter(raw);
+      const stripped = stripFrontmatter(raw);
+      const visited = new Set([loc.path]);
+      systemPrompt = expandImports(stripped, loc.path, cwd, visited, logger);
+    } 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 {
+          const raw = fs.readFileSync(p, 'utf8');
+          // Expand @-imports for directory-layout agents too —
+          // their content might also reference shared base files.
+          const visited = new Set([p]);
+          systemPrompt = expandImports(raw, p, cwd, visited, logger);
+          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 +327,14 @@ 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,
+  _expandImports: expandImports,
+  _cache: cache,
+};