polygram 0.37.1 → 0.37.2

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "polygram",
-  "version": "0.37.1",
+  "version": "0.37.2",
   "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/db.js

@@ -553,6 +553,13 @@ function wrap(db) {
        AND bot_name = ?
        AND ts > ?
   `);
+  const completeAcceptedClaudeAutosteerStmt = db.prepare(`
+    UPDATE messages SET handler_status = 'replied'
+     WHERE chat_id = ?
+       AND msg_id = ?
+       AND direction = 'in'
+       AND handler_status IN ('dispatched', 'replay-attempted')
+  `);
   const clearCleanShutdownMarkerStmt = db.prepare(`
     UPDATE polling_state SET clean_shutdown_at = NULL
      WHERE bot_name = ?
@@ -4174,6 +4181,27 @@ function wrap(db) {
           AND handler_status NOT IN ('codex-ambiguous', 'failed')
       `).run(status, chat_id, msg_id);
     },
+    completeAcceptedClaudeAutosteer({ chat_id, msg_id }) {
+      let result;
+      try {
+        result = completeAcceptedClaudeAutosteerStmt.run(chat_id, msg_id);
+      } catch (cause) {
+        const error = new Error(
+          'accepted Claude follow-up handler status could not be persisted',
+          { cause },
+        );
+        error.code = 'CLAUDE_AUTOSTEER_STATUS_PERSIST_FAILED';
+        throw error;
+      }
+      if (result.changes !== 1) {
+        const error = new Error(
+          'accepted Claude follow-up did not own one live inbound row',
+        );
+        error.code = 'CLAUDE_AUTOSTEER_STATUS_CONFLICT';
+        throw error;
+      }
+      return result;
+    },
 
     // 0.9.0: True when a specific inbound msg is still being processed
     // by the SDK turn loop (handler_status in dispatched/processing).

package/lib/handlers/claude-autosteer-ownership.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const PRIMARY_BLOCKING_CODEX_DECISIONS = new Set([
+  'duplicate',
+  'ambiguous',
+  'unavailable',
+]);
+
+/**
+ * Complete ownership of a follow-up that the Claude injection path accepted.
+ *
+ * Codex acceptance is deliberately a no-op here: its linked target turn and
+ * Telegram delivery checkpoint own the eventual terminal status.
+ */
+function settleAcceptedAutosteerOwnership({
+  selectedProvider,
+  steered,
+  db,
+  chatId,
+  msgId,
+  sessionKey,
+  logLabel = sessionKey,
+  logEvent = () => {},
+  logger = console,
+} = {}) {
+  if (selectedProvider !== 'claude' || steered?.autosteered !== true) {
+    return steered;
+  }
+
+  try {
+    db.completeAcceptedClaudeAutosteer({
+      chat_id: chatId,
+      msg_id: msgId,
+    });
+    return steered;
+  } catch (error) {
+    const errorCode = error?.code || error?.name || 'unknown';
+    logger.error(
+      `[${logLabel}] accepted Claude follow-up persistence failed: ${errorCode}`,
+    );
+    logEvent('autosteer-handler-status-failed', {
+      chat_id: chatId,
+      msg_id: msgId,
+      session_key: sessionKey,
+      code: errorCode,
+    });
+    return {
+      ...steered,
+      autosteered: false,
+      outcome: 'accepted-persistence-ambiguous',
+      errorCode,
+    };
+  }
+}
+
+function shouldDispatchPrimaryAfterAutosteer({
+  steered,
+  codexDispatchDecision = null,
+} = {}) {
+  return (
+    steered?.autosteered !== true
+    && steered?.outcome !== 'accepted-persistence-ambiguous'
+    && !PRIMARY_BLOCKING_CODEX_DECISIONS.has(codexDispatchDecision)
+  );
+}
+
+module.exports = {
+  settleAcceptedAutosteerOwnership,
+  shouldDispatchPrimaryAfterAutosteer,
+};

package/lib/ipc/restart-request-id.js

@@ -0,0 +1,17 @@
+'use strict';
+
+function requireRestartRequestId(value) {
+  if (
+    typeof value !== 'string'
+    || value.length === 0
+    || Buffer.byteLength(value, 'utf8') > 128
+    || /[\x00-\x1f\x7f]/.test(value)
+  ) {
+    const error = new Error('deploy restart request ID is invalid');
+    error.code = 'INVALID_DEPLOY_RESTART_REQUEST_ID';
+    throw error;
+  }
+  return value;
+}
+
+module.exports = { requireRestartRequestId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polygram",
-  "version": "0.37.1",
+  "version": "0.37.2",
   "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

@@ -31,6 +31,9 @@ const {
 const { buildPrompt, resolvePromptBackend } = require('./lib/prompt');
 const { countInFlight } = require('./lib/queue-utils');
 const { createIpcHandlers } = require('./lib/ipc/handlers');
+const {
+  requireRestartRequestId,
+} = require('./lib/ipc/restart-request-id');
 const { classifyOrphanSweep } = require('./lib/ops/tmux-preflight');
 const {
   parseSystemdInvocationId,
@@ -98,6 +101,10 @@ const { createDownloadAttachments } = require('./lib/handlers/download');
 const { createHandleConfigCallback } = require('./lib/handlers/config-callback');
 const { createHandleAbort } = require('./lib/handlers/abort');
 const { createAutosteerHandlers } = require('./lib/handlers/autosteer');
+const {
+  settleAcceptedAutosteerOwnership,
+  shouldDispatchPrimaryAfterAutosteer,
+} = require('./lib/handlers/claude-autosteer-ownership');
 const { createEditCorrectionInjector } = require('./lib/handlers/edit-correction');
 const { createEditRedelivery } = require('./lib/handlers/edit-redelivery');
 const { createGateInbound, ADMIN_CMD_RE, PAIR_CLAIM_RE } = require('./lib/handlers/gate-inbound');
@@ -2024,6 +2031,7 @@ async function handleMessage(sessionKey, chatId, msg, bot) {
   let sendPromise = null;
   let codexDispatch = null;
   let codexDispatchDecision = null;
+  let acceptedAutosteerProvider = null;
   try {
     const current = pm.get(sessionKey);
     const liveCodexGeneration = Boolean(
@@ -2070,6 +2078,7 @@ async function handleMessage(sessionKey, chatId, msg, bot) {
               msg,
               prompt,
             });
+            acceptedAutosteerProvider = 'codex';
             if (steered.outcome === 'accepted') {
               try {
                 codexRuntimeController.finalizeAcceptedSteer({
@@ -2196,12 +2205,23 @@ async function handleMessage(sessionKey, chatId, msg, bot) {
         msg,
         prompt,
       });
+      acceptedAutosteerProvider = 'claude';
     }
-    if (
-      !steered.autosteered
-      && !['duplicate', 'ambiguous', 'unavailable']
-        .includes(codexDispatchDecision)
-    ) {
+    steered = settleAcceptedAutosteerOwnership({
+      selectedProvider: acceptedAutosteerProvider,
+      steered,
+      db,
+      chatId,
+      msgId: msg.message_id,
+      sessionKey,
+      logLabel: label,
+      logEvent,
+      logger: console,
+    });
+    if (shouldDispatchPrimaryAfterAutosteer({
+      steered,
+      codexDispatchDecision,
+    })) {
       if (codexDispatchDecision === 'queue') {
         reactor.setState('THINKING');
       }
@@ -2279,6 +2299,31 @@ async function handleMessage(sessionKey, chatId, msg, bot) {
     }
     return;
   }
+  if (steered.outcome === 'accepted-persistence-ambiguous') {
+    stopTyping();
+    await finishStreamer();
+    await reactor.clear().catch(() => {});
+    reactor.stop();
+    await tg(bot, 'sendMessage', {
+      chat_id: chatId,
+      text: 'This follow-up may have been incorporated. Please wait for the current turn to finish before retrying it.',
+      ...replyOpts(threadId),
+    }, {
+      source: 'claude-autosteer-notice',
+      botName: BOT_NAME,
+    }).catch((error) => {
+      console.error(
+        `[${label}] failed to send Claude autosteer ambiguity notice: ${error.message}`,
+      );
+      logEvent('autosteer-ambiguity-notice-failed', {
+        chat_id: chatId,
+        msg_id: msg.message_id,
+        session_key: sessionKey,
+        code: error?.code || error?.name || 'unknown',
+      });
+    });
+    return;
+  }
   if (['ambiguous', 'unavailable'].includes(codexDispatchDecision)) {
     stopTyping();
     await finishStreamer();
@@ -4419,7 +4464,11 @@ async function main() {
   // replay picks it up. Prevents "Sorry, I couldn't process that message"
   // from showing on every restart.
   const SHUTDOWN_DRAIN_MS = 30_000;
-  const shutdown = async ({ continuationAuthorized = false, trigger = 'signal' } = {}) => {
+  const shutdown = async ({
+    continuationAuthorized = false,
+    trigger = 'signal',
+    restartRequestId = null,
+  } = {}) => {
     if (isShuttingDown) return;
     const shutdownObservation = cgroupOomObserver.sample();
     // Sample in-flight work at SIGNAL time, alongside the OOM observation and
@@ -4611,6 +4660,12 @@ async function main() {
           elapsed_ms: drainElapsed,
           clean: res.clean,
           shutdown_reason: res.shutdownReason,
+          restart_trigger: trigger,
+          continuation_authorized: continuationAuthorized === true,
+          resume_intents_recorded: res.intentsRecorded ?? 0,
+          restart_request_id: trigger === 'deploy-ipc'
+            ? restartRequestId
+            : null,
           ...(res.oomKillDelta != null ? { oom_kill_delta: res.oomKillDelta } : {}),
         }, invocationId));
         console.log(`[shutdown] ${res.clean ? 'clean' : 'crash-like'} shutdown recorded (${res.shutdownReason}); ${inFlightAtSignal} in-flight at signal, drained ${drainElapsed}ms, ${remaining} still in-flight, ${res.replayMarked} marked replay-pending`);
@@ -4684,16 +4739,18 @@ async function main() {
         botName: BOT_NAME,
         getInFlightHandlers: () => inFlightHandlers,
         handleSendOverIpc: (req) => handleSendOverIpc(req),
-        requestDeployRestart: () => {
+        requestDeployRestart: (req) => {
           if (isShuttingDown) {
             const error = new Error('shutdown already in progress');
             error.code = 'SHUTDOWN_IN_PROGRESS';
             throw error;
           }
+          const restartRequestId = requireRestartRequestId(req.id);
           const oldPid = process.pid;
           shutdown({
             continuationAuthorized: true,
             trigger: 'deploy-ipc',
+            restartRequestId,
           }).catch((error) => {
             console.error(`[shutdown] deploy restart failed: ${error.message}`);
           });

package/scripts/ipc-smoke.js

@@ -1,10 +1,18 @@
 #!/usr/bin/env node
 /**
  * Quick IPC round-trip probe.
- * Usage: node scripts/ipc-smoke.js <bot-name> [busy|restart]
+ * Usage: node scripts/ipc-smoke.js <bot-name> [busy|restart] [restart-request-id]
  */
 
+const crypto = require('node:crypto');
 const { call, readSecret, socketPathFor } = require('../lib/ipc/client');
+const {
+  requireRestartRequestId,
+} = require('../lib/ipc/restart-request-id');
+
+function restartRequestId(value) {
+  return requireRestartRequestId(value || crypto.randomUUID());
+}
 
 (async () => {
   const bot = process.argv[2] || 'shumabit';
@@ -33,15 +41,18 @@ const { call, readSecret, socketPathFor } = require('../lib/ipc/client');
   }
 
   if (command === 'restart') {
+    const requestId = restartRequestId(process.argv[4]);
     const result = await call({
       path,
       op: 'deploy_restart',
+      id: requestId,
       secret: readSecret(bot),
       callTimeoutMs: 60_000,
     });
     if (
       result.ok !== true
       || result.accepted !== true
+      || result.id !== requestId
       || !Number.isSafeInteger(result.old_pid)
       || result.old_pid <= 1
     ) {
@@ -51,6 +62,7 @@ const { call, readSecret, socketPathFor } = require('../lib/ipc/client');
       bot,
       accepted: true,
       old_pid: result.old_pid,
+      restart_request_id: requestId,
     }));
     return;
   }