polygram 0.11.0-rc.6 → 0.11.0-rc.8

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "polygram",
-  "version": "0.11.0-rc.6",
+  "version": "0.11.0-rc.8",
   "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 plus history (transcript queries) and polygram-send (out-of-turn IPC sends with file-upload validation) skills.",
   "keywords": [
     "telegram",

package/lib/process/channels-process.js

@@ -365,33 +365,62 @@ class ChannelsProcess extends Process {
       '--dangerously-load-development-channels', 'server:polygram-bridge',
     ];
 
-    // Parity audit P8: branch on existingSessionId. `--session-id <id>`
-    // creates a NEW claude session with that id; `--resume <id>` resumes the
-    // EXISTING conversation. Lazy-respawn after bridge-disconnect must use
-    // --resume so conversation history is preserved. Mirrors
-    // tmux-process.js:514-518.
+    // Resolve config FIRST so the --resume file-check below has the correct
+    // cwd (it picks up topic precedence). Other flags get pushed in order
+    // after this.
+    const topicConfig = opts.threadId && opts.chatConfig?.topics?.[opts.threadId];
+    const agent  = topicConfig?.agent  || opts.chatConfig?.agent  || opts.agent;
+    const model  = topicConfig?.model  || opts.chatConfig?.model  || opts.model;
+    const effort = topicConfig?.effort || opts.chatConfig?.effort || opts.effort;
+    const resolvedCwd = topicConfig?.cwd || opts.chatConfig?.cwd || opts.cwd;
+
+    // Parity audit P8 + rc.8 fs-guard (2026-05-26 shumorobot Music topic):
+    // `--session-id <id>` creates a NEW claude session with that id;
+    // `--resume <id>` resumes the EXISTING conversation. Lazy-respawn after
+    // bridge-disconnect must use --resume so conversation history is
+    // preserved. Mirrors tmux-process.js:514-518.
     //
-    // rc.6 note: pre-channels session ids (created by sdk/tmux backends and
-    // persisted in polygram's DB) are NOT cross-backend compatible — claude
-    // indexes session files under a cwd-derived projects dir that may not
-    // match what channels-mode passes, leading to silent "No conversation
-    // found" exit. The fix lives at the data layer, not here: operator
-    // clears pre-channels session ids from polygram's sessions table before
-    // flipping a chat to channels (see ops/migrate-to-channels.sql).
-    if (opts.existingSessionId) {
+    // rc.8 ghost-session guard: polygram persists claude_session_id to its
+    // DB as soon as the bridge handshakes (onInit), but claude only writes
+    // the JSONL after a successful turn. If an early channels attempt fails
+    // before claude completes any turn, polygram's DB ends up with a
+    // claude_session_id that has NO corresponding file under claude's
+    // projects dir. Subsequent `--resume <ghost-id>` makes claude exit
+    // clean with "No conversation found" — exactly the Music topic stall
+    // observed at 04:04:29 (session_id=567c72db never persisted; rc.4
+    // pane snapshot proved it).
+    //
+    // Fix: before passing --resume, verify the session JSONL actually
+    // exists under the launch cwd. If not, drop the ghost id and use
+    // --session-id with the freshly-generated uuid — claude creates a
+    // fresh session and onInit re-upserts the DB row.
+    //
+    // Resume cases preserved:
+    //   - in-daemon lazy respawn (file written after first successful turn)
+    //   - daemon restart on a chat that completed at least one turn
+    // Resume cases correctly dropped:
+    //   - cross-backend stale ids (different cwd → different projects dir)
+    //   - ghost ids from failed-before-first-turn attempts
+    let canResume = false;
+    let resumePath = null;
+    if (opts.existingSessionId && resolvedCwd) {
+      // claude's projects dir naming: cwd with '/' → '-'.
+      // Verified live at ~/.claude/projects/-Users-ivanshumkov-Music-rekordbox/
+      const cwdMangled = resolvedCwd.replace(/\//g, '-');
+      resumePath = path.join(os.homedir(), '.claude', 'projects', cwdMangled, `${opts.existingSessionId}.jsonl`);
+      try { canResume = fs.statSync(resumePath).isFile(); } catch { canResume = false; }
+    }
+    if (canResume) {
       claudeArgs.push('--resume', opts.existingSessionId);
     } else {
       claudeArgs.push('--session-id', this.claudeSessionId);
+      if (opts.existingSessionId) {
+        this.logger.warn?.(
+          `[${this.label}] channels: dropping DB session ${opts.existingSessionId} — ` +
+          `no local file at ${resumePath || '<unknown cwd>'}. Starting fresh with ${this.claudeSessionId}.`,
+        );
+      }
     }
-
-    // Parity audit P4: per-chat / per-topic agent flag. Without this, chats
-    // configured with agent='music-curation' / 'shumabit' silently fall back
-    // to claude's default. Mirrors tmux-process.js:527.
-    // Topic precedence over chat — same as tmux pattern (parity audit P7).
-    const topicConfig = opts.threadId && opts.chatConfig?.topics?.[opts.threadId];
-    const agent  = topicConfig?.agent  || opts.chatConfig?.agent  || opts.agent;
-    const model  = topicConfig?.model  || opts.chatConfig?.model  || opts.model;
-    const effort = topicConfig?.effort || opts.chatConfig?.effort || opts.effort;
     if (agent)  claudeArgs.push('--agent', agent);
     if (model)  claudeArgs.unshift('--model', model);
     if (effort) claudeArgs.push('--effort', effort);
@@ -416,25 +445,19 @@ class ChannelsProcess extends Process {
       claudeArgs.push('--dangerously-skip-permissions');
     }
 
-    // Parity audit P3: append display-hint so Claude knows it's replying
-    // through Telegram. Prevents canned strings like "No response requested."
-    // from leaking as user-visible messages (shumorobot 2026-05-15 incident).
-    claudeArgs.push('--append-system-prompt', POLYGRAM_DISPLAY_HINT);
-
-    // rc.6 (2026-05-25 shumorobot diagnosis): channels-mode contract is
-    // NOT obvious to the agent. The bridge's MCP `instructions:` field tells
-    // claude to use the reply tool, but that's seen only during MCP init and
-    // gets buried under the agent's own system prompt. Observed live: the
-    // music-curator agent received user messages via the channel and wrote
-    // replies INLINE to its TUI instead of calling `mcp__polygram-bridge__reply`,
-    // so polygram never saw them and every turn timed out after 3 minutes.
-    //
-    // Append a SECOND, explicit directive that overrides the agent's default
-    // conversational behavior. Phrased as a hard rule so it survives whatever
-    // the agent's system prompt says. Future tuning may move this to a
-    // shared lib/telegram/channels-protocol-hint.js if it grows; for now
-    // inline is fine since it's tied to the channels backend implementation.
+    // Parity audit P3 + rc.7 (2026-05-26 shumorobot diagnosis): combined
+    // system-prompt suffix carrying BOTH the Telegram display rules AND the
+    // channels-mode reply-tool contract. Merged into a single
+    // --append-system-prompt block — passing two separate
+    // --append-system-prompt flags caused MCP server registration to fail
+    // (live shumorobot tmux banner: "server:polygram-bridge · no MCP server
+    // configured with that name"; claude received no channel messages).
+    // Suspected: --append-system-prompt is variadic in claude's CLI and the
+    // second flag was eating the subsequent --setting-sources / --mcp-config
+    // arguments. Single combined block sidesteps the issue.
     claudeArgs.push('--append-system-prompt', [
+      POLYGRAM_DISPLAY_HINT,
+      '',
       '## polygram channels mode — HARD CONTRACT',
       '',
       'You are running inside polygram with the channels backend. Your stdout/TUI',
@@ -472,8 +495,8 @@ class ChannelsProcess extends Process {
     // --mcp-config MUST be last (variadic flag)
     claudeArgs.push('--mcp-config', this.mcpConfigPath);   // P0 #1: file path, not inline JSON
 
-    const cwd = topicConfig?.cwd || opts.chatConfig?.cwd || opts.cwd;
-    if (cwd) claudeArgs.unshift('--add-dir', cwd);
+    // resolvedCwd was computed above (line ~375) for the --resume file-check.
+    if (resolvedCwd) claudeArgs.unshift('--add-dir', resolvedCwd);
 
     // rc.5 (2026-05-25 shumorobot diagnosis): the launch cwd MUST be the
     // resolved topic/chat cwd, not just opts.cwd. claude's TUI indexes
@@ -492,7 +515,7 @@ class ChannelsProcess extends Process {
     // Real tmuxRunner.spawn signature: {name, cwd, command, args, envExtras, paneWidth}
     await this.runner.spawn({
       name: tmuxName,
-      cwd: cwd || opts.cwd || process.cwd(),
+      cwd: resolvedCwd || opts.cwd || process.cwd(),
       command: this.claudeBin,
       args: claudeArgs,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polygram",
-  "version": "0.11.0-rc.6",
+  "version": "0.11.0-rc.8",
   "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": {