polygram 0.36.0 → 0.37.0

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "polygram",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "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/config.example.json

@@ -18,6 +18,8 @@
       "replayWindowMs": 180000,
       "_comment_resumeInterruptedCliTurns": "Temporary staged-rollout flag. Default false. When true, a deliberate clean restart may strictly resume an interrupted CLI session and send one tracked literal `continue`; crashes still replay the original message. Enable only after the exact pinned-CLI recovery gate passes for the installed Orchestra version.",
       "resumeInterruptedCliTurns": false,
+      "_comment_resumeInterruptedCodexTurns": "Independent staged-rollout flag for exact native Codex clean-restart resume plus one literal `continue`. Default false; crashes and reboot never authorize continuation.",
+      "resumeInterruptedCodexTurns": false,
       "_comment_chrome": "Opt-in to Claude Code's Chrome-extension browser-automation integration. Default false. Requires the 'Claude in Chrome' extension installed in the daemon-user's Chrome browser AND a live GUI session (Chrome must be running). See https://code.claude.com/docs/en/chrome. Per-chat override via `config.chats.<id>.chrome`.",
       "chrome": false,
       "_comment_pairedChatDefaults": "When a user sends /pair <CODE> from a private chat that isn't in config.chats yet, polygram auto-creates a chat entry using these defaults (merged over top-level `defaults`). Leave out `cwd` at your peril — without it, auto-onboarded DMs have no working directory and pairing will fail.",

package/lib/codex/runtime-controller.js

@@ -186,6 +186,7 @@ function createCodexRuntimeController({
   config,
   db,
   processEnv = process.env,
+  sessionLauncher = null,
   defaultDaemonSecretRoots = [],
   resolveHostIdentity = resolveCodexHostIdentity,
   resolveBinary = resolvePinnedCodexBinary,
@@ -235,6 +236,14 @@ function createCodexRuntimeController({
     || !Number.isSafeInteger(catalogMaxAgeMs)
     || catalogMaxAgeMs <= 0
     || typeof now !== 'function'
+    || (
+      sessionLauncher !== null
+      && (
+        typeof sessionLauncher !== 'string'
+        || sessionLauncher.length === 0
+        || /[\u0000-\u001f\u007f]/u.test(sessionLauncher)
+      )
+    )
   ) {
     throw new TypeError('Codex runtime controller dependencies are incomplete');
   }
@@ -358,6 +367,7 @@ function createCodexRuntimeController({
     return {
       codexHome,
       binaryPath: configured.binary ?? processEnv.POLYGRAM_CODEX_BIN,
+      sessionLauncher,
       daemonSecretRoots: [
         ...new Set([...defaultDaemonSecretRoots, ...configuredSecretRoots]),
       ],
@@ -466,6 +476,7 @@ function createCodexRuntimeController({
       request,
       codexHome: configured.codexHome,
       binaryPath: configured.binaryPath,
+      sessionLauncher: configured.sessionLauncher,
       daemonSecretRoots: configured.daemonSecretRoots,
     });
     if (preparingByKey.has(key)) return preparingByKey.get(key);
@@ -483,6 +494,7 @@ function createCodexRuntimeController({
         model: request.model,
         effort: request.effort,
         processEnv,
+        sessionLauncher: configured.sessionLauncher,
       });
       const homeAttestation = await attestCodexHome(
         expectedStaticProfile.codexHome,
@@ -666,6 +678,11 @@ function createCodexRuntimeController({
       cwd: expectedStaticProfile.cwd,
       env: expectedStaticProfile.env,
       expectedConfigSha256: expectedStaticProfile.ownedConfigSha256,
+      ...(expectedStaticProfile.sessionLauncher == null ? {} : {
+        sessionLauncher: expectedStaticProfile.sessionLauncher,
+        expectedSessionLauncherSha256:
+          expectedStaticProfile.sessionLauncherSha256,
+      }),
       onNotification,
       onFault,
     });
@@ -1206,7 +1223,10 @@ function createCodexRuntimeController({
       for (const waiter of record.retirementWaiters.splice(0)) {
         waiter.resolve(Object.freeze({
           committed: true,
-          disposition: 'retired',
+          disposition: record.stopCancellation
+            ? 'stop-cancelled'
+            : 'retired',
+          ...(record.stopCancellation ?? {}),
         }));
       }
       return true;
@@ -1309,6 +1329,7 @@ function createCodexRuntimeController({
           attemptId: attempt.attempt_id,
           providerSessionId: attempt.thread_id,
           providerTurnId: attempt.turn_id,
+          sourceMsgId: attempt.telegram_source_message_id,
         });
       }
       if (maybeRetire(record)) {
@@ -1317,6 +1338,7 @@ function createCodexRuntimeController({
           disposition: settlement.disposition === 'stop-cancelled'
             ? 'stop-cancelled'
             : 'retired',
+          ...(record.stopCancellation ?? {}),
         });
       }
       if (settlement.disposition !== 'pending-delivery') {

package/lib/codex/runtime-profile.js

@@ -18,6 +18,7 @@ const {
   buildCodexAppServerEnv,
   CodexAppServerClient,
   codexProtocolSchema,
+  characterizePinnedSessionLauncher,
   resolveCodexTargetPin,
 } = require('@shumkov/orchestra');
 
@@ -832,11 +833,14 @@ async function collectPermissionProfiles(client, workspace) {
 
 async function characterizeRuntime(materialized, {
   binaryReceipt,
+  sessionLauncherReceipt,
   clientFactory,
 }) {
   let latchedFault = null;
   const client = clientFactory({
     binary: binaryReceipt.path,
+    sessionLauncher: sessionLauncherReceipt?.path ?? null,
+    expectedSessionLauncherSha256: sessionLauncherReceipt?.sha256 ?? null,
     cwd: materialized.workspace,
     codexHome: materialized.codexHome,
     env: materialized.env,
@@ -937,11 +941,13 @@ function createCodexRuntimeProfileBuilder({
   clientFactory = (options) => new CodexAppServerClient(options),
   protocolSchema = codexProtocolSchema,
   resolveTargetPin = resolveCodexTargetPin,
+  attestSessionLauncher = characterizePinnedSessionLauncher,
 } = {}) {
   if (
     !Array.isArray(temporaryRoots)
     || typeof clientFactory !== 'function'
     || typeof resolveTargetPin !== 'function'
+    || !['undefined', 'function'].includes(typeof attestSessionLauncher)
   ) {
     throw new TypeError('Codex runtime profile builder options are invalid');
   }
@@ -950,9 +956,38 @@ function createCodexRuntimeProfileBuilder({
     async prepare(options = {}) {
       const targetPin = resolveTargetPin();
       validateBinaryReceipt(options.binaryReceipt, protocolSchema, targetPin);
+      if (
+        options.sessionLauncher != null
+        && typeof attestSessionLauncher !== 'function'
+      ) {
+        throw fail(
+          'Codex session launcher attestation is unavailable.',
+          'CODEX_SESSION_LAUNCHER_MISMATCH',
+          'Install the Orchestra release that attests the session launcher.',
+        );
+      }
+      const sessionLauncherReceipt = options.sessionLauncher == null
+        ? null
+        : await attestSessionLauncher(
+          requiredString(options.sessionLauncher, 'session launcher'),
+        );
+      if (
+        sessionLauncherReceipt !== null
+        && (
+          sessionLauncherReceipt.path !== options.sessionLauncher
+          || !SHA256_RE.test(sessionLauncherReceipt.sha256)
+        )
+      ) {
+        throw fail(
+          'Codex session launcher attestation was inconsistent.',
+          'CODEX_SESSION_LAUNCHER_MISMATCH',
+          'Restore the exact root-owned session launcher before enabling Codex.',
+        );
+      }
       const materialized = provisionRuntimeFiles(options, temporaryRoots);
       const characterized = await characterizeRuntime(materialized, {
         binaryReceipt: options.binaryReceipt,
+        sessionLauncherReceipt,
         clientFactory,
       });
       const model = requiredString(options.model, 'model');
@@ -979,6 +1014,8 @@ function createCodexRuntimeProfileBuilder({
         permissionProfileId: CODEX_PERMISSION_PROFILE_ID,
         model,
         effort,
+        sessionLauncher: sessionLauncherReceipt?.path ?? null,
+        sessionLauncherSha256: sessionLauncherReceipt?.sha256 ?? null,
       });
     },
   });

package/lib/codex/spawn-context.js

@@ -6,6 +6,9 @@ const {
 const {
   processMatchesRuntime,
 } = require('../runtime-config');
+const {
+  validateStrictResumeSpawn,
+} = require('../ops/clean-resume');
 
 async function buildCodexSpawnContext({
   sessionKey,
@@ -18,6 +21,7 @@ async function buildCodexSpawnContext({
   getSessionLabel,
   logEvent,
   mutateSessionOnDrift = true,
+  strictResume = null,
 }) {
   const prepared = await runtimeController.prepareSession({
     sessionKey,
@@ -31,6 +35,38 @@ async function buildCodexSpawnContext({
     'codex',
     'codex',
   );
+  if (strictResume) {
+    const stored = db.getProviderSession(sessionKey, 'codex:app-server');
+    const existingSessionId = validateStrictResumeSpawn({
+      strictResume,
+      promptBackend: 'codex',
+      liveProcess,
+      runtime: stored,
+      resolved: {
+        runtime: 'codex',
+        backend: 'codex',
+        cwd: runtime.cwd,
+        model: runtime.model,
+        effort: runtime.effort,
+        spawnProfileId: runtime.spawnProfileId,
+      },
+    });
+    return {
+      runtime: 'codex',
+      spawnProfileId: runtime.spawnProfileId,
+      modelSettings: {
+        model: runtime.model,
+        effort: runtime.effort,
+      },
+      chatId,
+      threadId,
+      label: getSessionLabel(chatConfig, threadId),
+      existingSessionId,
+      resumePolicy: 'require-interrupted-turn',
+      expectedInterruptedTurnId: strictResume.expectedInterruptedTurnId,
+      noWaitForCapacity: true,
+    };
+  }
   const replacementReason = (
     liveCodexProcess
   ) ? runtimeController.processReplacementReason(

package/lib/db.js

@@ -42,7 +42,7 @@ const {
 //
 // 0.15: bumped 13 → 14. Adds migration 014-secret-redactions.sql
 // (secret_redactions audit table + messages.secret_scanned_at).
-const SCHEMA_VERSION = 18;
+const SCHEMA_VERSION = 19;
 
 // Sentinel `error` value for outbound rows whose API call may or may not
 // have reached Telegram. markStalePending writes it; hasOutboundReplyTo
@@ -248,11 +248,11 @@ function wrap(db) {
     INSERT INTO agent_runtime_sessions (
       session_key, namespace, provider, provider_session_id,
       app_server_session_id, agent, cwd, model, effort, pm_backend,
-      created_ts, last_active_ts, generation_id
+      created_ts, last_active_ts, generation_id, spawn_profile_id
     ) VALUES (
       @session_key, @namespace, @provider, @provider_session_id,
       @app_server_session_id, @agent, @cwd, @model, @effort, @pm_backend,
-      @ts, @ts, @generation_id
+      @ts, @ts, @generation_id, @spawn_profile_id
     )
     ON CONFLICT(session_key, namespace) DO UPDATE SET
       provider = excluded.provider,
@@ -263,9 +263,21 @@ function wrap(db) {
       model = excluded.model,
       effort = excluded.effort,
       pm_backend = excluded.pm_backend,
+      spawn_profile_id = excluded.spawn_profile_id,
       last_active_ts = excluded.last_active_ts,
       generation_id = CASE
         WHEN agent_runtime_sessions.provider_session_id = excluded.provider_session_id
+             AND agent_runtime_sessions.provider = excluded.provider
+             AND (
+               excluded.provider = 'claude'
+               OR (
+                 agent_runtime_sessions.cwd IS excluded.cwd
+                 AND agent_runtime_sessions.model IS excluded.model
+                 AND agent_runtime_sessions.effort IS excluded.effort
+                 AND agent_runtime_sessions.pm_backend IS excluded.pm_backend
+                 AND agent_runtime_sessions.spawn_profile_id IS excluded.spawn_profile_id
+               )
+             )
              AND agent_runtime_sessions.generation_id IS NOT NULL
              AND agent_runtime_sessions.generation_id != ''
           THEN agent_runtime_sessions.generation_id
@@ -321,6 +333,7 @@ function wrap(db) {
       model: row.model || null,
       effort: row.effort || null,
       pm_backend: row.pm_backend || null,
+      spawn_profile_id: row.spawn_profile_id || null,
       generation_id: crypto.randomUUID(),
       ts: row.ts || Date.now(),
     };
@@ -551,8 +564,10 @@ function wrap(db) {
   const insertCleanRestartIntentStmt = db.prepare(`
     INSERT INTO clean_restart_resume_intents (
       bot_name, session_key, session_generation_id,
-      source_message_id, shutdown_at, policy_version
-    ) VALUES (?, ?, ?, ?, ?, ?)
+      source_message_id, shutdown_at, policy_version,
+      interrupted_provider_turn_id, interrupted_spawn_profile_id,
+      continuation_authorized
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1)
   `);
 
   function normalizeResumeIntent(intent) {
@@ -565,7 +580,54 @@ function wrap(db) {
     if (!Number.isSafeInteger(intent.policyVersion) || intent.policyVersion <= 0) {
       throw new TypeError('clean restart intent policy version is invalid');
     }
-    return intent;
+    const interruptedProviderTurnId =
+      intent.interruptedProviderTurnId ?? null;
+    const interruptedSpawnProfileId =
+      intent.interruptedSpawnProfileId ?? null;
+    if (
+      (interruptedProviderTurnId === null)
+        !== (interruptedSpawnProfileId === null)
+      || (
+        interruptedProviderTurnId !== null
+        && (
+          typeof interruptedProviderTurnId !== 'string'
+          || interruptedProviderTurnId.length === 0
+          || typeof interruptedSpawnProfileId !== 'string'
+          || interruptedSpawnProfileId.length === 0
+        )
+      )
+    ) {
+      throw new TypeError(
+        'clean restart Codex turn and spawn-profile IDs must be paired',
+      );
+    }
+    if (interruptedProviderTurnId !== null && intent.policyVersion !== 2) {
+      throw new TypeError('clean restart Codex intents require policy version 2');
+    }
+    const expectedCodexIdentity = interruptedProviderTurnId === null
+      ? null
+      : {
+          providerSessionId: intent.expectedProviderSessionId,
+          cwd: intent.expectedCwd,
+          model: intent.expectedModel,
+          effort: intent.expectedEffort,
+        };
+    if (
+      expectedCodexIdentity !== null
+      && Object.values(expectedCodexIdentity).some(
+        (value) => typeof value !== 'string' || value.length === 0,
+      )
+    ) {
+      throw new TypeError(
+        'clean restart Codex intent requires exact retired runtime identity',
+      );
+    }
+    return {
+      ...intent,
+      interruptedProviderTurnId,
+      interruptedSpawnProfileId,
+      expectedCodexIdentity,
+    };
   }
 
   function recordShutdown({
@@ -574,7 +636,11 @@ function wrap(db) {
     since,
     clean,
     resumeIntents = [],
+    continuationAuthorized = false,
   }) {
+    if (resumeIntents.length > 0 && continuationAuthorized !== true) {
+      throw new TypeError('clean restart intents require deploy authorization');
+    }
     const cutoff = since ?? now - 30 * 60 * 1000;
     const txn = db.transaction(() => {
       const marked = markReplayPendingStmt.run(botName, cutoff);
@@ -597,7 +663,9 @@ function wrap(db) {
           }
           const session = getProviderSessionStmt.get(
             intent.sessionKey,
-            CLAUDE_CHANNELS_NAMESPACE,
+            intent.interruptedProviderTurnId === null
+              ? CLAUDE_CHANNELS_NAMESPACE
+              : CODEX_APP_SERVER_NAMESPACE,
           );
           if (
             !session
@@ -608,6 +676,28 @@ function wrap(db) {
               `clean restart intent session generation is unavailable for ${intent.sessionKey}`,
             );
           }
+          if (
+            intent.interruptedSpawnProfileId !== null
+            && session.spawn_profile_id !== intent.interruptedSpawnProfileId
+          ) {
+            throw new Error(
+              `clean restart intent spawn profile changed for ${intent.sessionKey}`,
+            );
+          }
+          if (
+            intent.expectedCodexIdentity !== null
+            && (
+              session.provider_session_id
+                !== intent.expectedCodexIdentity.providerSessionId
+              || session.cwd !== intent.expectedCodexIdentity.cwd
+              || session.model !== intent.expectedCodexIdentity.model
+              || session.effort !== intent.expectedCodexIdentity.effort
+            )
+          ) {
+            throw new Error(
+              `clean restart intent provider session changed for ${intent.sessionKey}`,
+            );
+          }
           insertCleanRestartIntentStmt.run(
             botName,
             intent.sessionKey,
@@ -615,6 +705,8 @@ function wrap(db) {
             intent.sourceMessageId,
             now,
             intent.policyVersion,
+            intent.interruptedProviderTurnId,
+            intent.interruptedSpawnProfileId,
           );
         }
         db.prepare(`
@@ -4199,6 +4291,7 @@ function wrap(db) {
       now = Date.now(),
       since,
       resumeIntents = [],
+      continuationAuthorized = false,
     } = {}) {
       return recordShutdown({
         botName,
@@ -4206,6 +4299,7 @@ function wrap(db) {
         since,
         clean: true,
         resumeIntents,
+        continuationAuthorized,
       });
     },
 
@@ -4264,13 +4358,18 @@ function wrap(db) {
                      runtime.generation_id AS current_generation_id,
                      runtime.provider_session_id,
                      runtime.namespace AS provider_namespace,
-                     runtime.pm_backend
+                     runtime.pm_backend,
+                     runtime.spawn_profile_id AS current_spawn_profile_id
                 FROM clean_restart_resume_intents AS intent
                 LEFT JOIN messages AS source
                   ON source.id = intent.source_message_id
                 LEFT JOIN agent_runtime_sessions AS runtime
                   ON runtime.session_key = intent.session_key
-                 AND runtime.namespace = '${CLAUDE_CHANNELS_NAMESPACE}'
+                 AND runtime.namespace = CASE
+                   WHEN intent.interrupted_provider_turn_id IS NULL
+                     THEN '${CLAUDE_CHANNELS_NAMESPACE}'
+                   ELSE '${CODEX_APP_SERVER_NAMESPACE}'
+                 END
                WHERE intent.bot_name = ?
                  AND intent.shutdown_at = ?
                ORDER BY intent.session_key
@@ -4295,8 +4394,28 @@ function wrap(db) {
           }
 
           let reason = null;
+          const hasInterruptedTurn =
+            typeof row.interrupted_provider_turn_id === 'string'
+            && row.interrupted_provider_turn_id.length > 0;
+          const hasInterruptedProfile =
+            typeof row.interrupted_spawn_profile_id === 'string'
+            && row.interrupted_spawn_profile_id.length > 0;
+          const codexShaped = row.interrupted_provider_turn_id != null
+            || row.interrupted_spawn_profile_id != null
+            || row.provider_namespace === CODEX_APP_SERVER_NAMESPACE;
           if (!sourceMatches) {
             reason = 'source-message-missing';
+          } else if (row.continuation_authorized !== 1) {
+            reason = 'unauthorized-restart';
+          } else if (
+            codexShaped
+            && (
+              row.policy_version !== 2
+              || !hasInterruptedTurn
+              || !hasInterruptedProfile
+            )
+          ) {
+            reason = 'unsupported-codex-policy';
           } else if (!supported.has(row.policy_version)) {
             reason = 'unsupported-policy-version';
           } else if (
@@ -4305,6 +4424,12 @@ function wrap(db) {
             || row.current_generation_id !== row.session_generation_id
           ) {
             reason = 'session-generation-replaced';
+          } else if (
+            row.interrupted_spawn_profile_id != null
+            && row.current_spawn_profile_id
+              !== row.interrupted_spawn_profile_id
+          ) {
+            reason = 'spawn-profile-replaced';
           }
 
           return {
@@ -4317,6 +4442,13 @@ function wrap(db) {
             provider_namespace: reason == null ? row.provider_namespace : null,
             provider_session_id: reason == null ? row.provider_session_id : null,
             pm_backend: reason == null ? row.pm_backend : null,
+            interrupted_provider_turn_id:
+              row.interrupted_provider_turn_id,
+            interrupted_spawn_profile_id:
+              row.interrupted_spawn_profile_id,
+            current_spawn_profile_id: reason == null
+              ? row.current_spawn_profile_id
+              : null,
             executable: reason == null,
             reason,
           };

package/lib/ipc/handlers.js

@@ -16,8 +16,14 @@ const { buildBusySnapshot } = require('../queue-utils');
  *   captured: the dispatcher's map is assigned during boot and replaced on
  *   reload, so a value bound at wiring time can go stale.
  * @param {(req) => any} opts.handleSendOverIpc
+ * @param {(req) => any} opts.requestDeployRestart
  */
-function createIpcHandlers({ botName, getInFlightHandlers, handleSendOverIpc } = {}) {
+function createIpcHandlers({
+  botName,
+  getInFlightHandlers,
+  handleSendOverIpc,
+  requestDeployRestart,
+} = {}) {
   return {
     ping: async () => ({ pong: true, bot: botName }),
 
@@ -28,6 +34,8 @@ function createIpcHandlers({ botName, getInFlightHandlers, handleSendOverIpc } =
       botName,
     }),
 
+    deploy_restart: (req) => requestDeployRestart(req),
+
     send: (req) => handleSendOverIpc(req),
   };
 }

package/lib/ops/clean-resume.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const EXPECTED_NAMESPACE = 'claude:channels';
-const CLEAN_RESUME_POLICY_VERSION = 1;
+const CLAUDE_NAMESPACE = 'claude:channels';
+const CODEX_NAMESPACE = 'codex:app-server';
+const CLEAN_RESUME_POLICY_VERSION = 2;
+const SUPPORTED_CLEAN_RESUME_POLICY_VERSIONS = Object.freeze([1, 2]);
 
 function recoveryNoticeText({ ambiguous = false } = {}) {
   if (ambiguous) {
@@ -10,11 +12,23 @@ function recoveryNoticeText({ ambiguous = false } = {}) {
   return '↺ Restarted — I couldn\'t safely resume this message. If it still needs a reply, send it again.';
 }
 
-function attestsExactResume(attestation, expectedSessionId) {
-  return attestation?.namespace === EXPECTED_NAMESPACE
+function isCodexClaim(claim) {
+  return claim?.interrupted_provider_turn_id != null
+    || claim?.interrupted_spawn_profile_id != null
+    || claim?.provider_namespace === CODEX_NAMESPACE;
+}
+
+function attestsExactResume(attestation, expectedSessionId, claim = null) {
+  const codex = isCodexClaim(claim);
+  return attestation?.namespace === (codex ? CODEX_NAMESPACE : CLAUDE_NAMESPACE)
     && attestation.sessionId === expectedSessionId
     && attestation.resumed === true
-    && attestation.freshFallback === false;
+    && attestation.freshFallback === false
+    && (!codex || (
+      attestation.interruptedTurnId
+        === claim.interrupted_provider_turn_id
+      && attestation.idle === true
+    ));
 }
 
 function validateStrictResumeSpawn({
@@ -24,17 +38,45 @@ function validateStrictResumeSpawn({
   runtime,
   resolved,
 } = {}) {
-  if (promptBackend === 'codex') {
-    const error = new Error('strict Claude resume cannot cross a backend change');
-    error.code = 'CLEAN_RESUME_CONFIG_DRIFT';
-    throw error;
-  }
   if (liveProcess && !liveProcess.closed) {
     const error = new Error('strict clean resume requires an unspawned session');
     error.code = 'CLEAN_RESUME_SESSION_ALREADY_SPAWNED';
     throw error;
   }
 
+  if (promptBackend === 'codex') {
+    const providerDrift = runtime?.namespace !== CODEX_NAMESPACE
+      || resolved?.runtime !== 'codex'
+      || resolved?.backend !== 'codex';
+    const driftFields = [
+      ['cwd', 'cwd'],
+      ['model', 'model'],
+      ['effort', 'effort'],
+      ['spawn_profile_id', 'spawnProfileId'],
+    ].filter(([stored, current]) => (
+      (runtime?.[stored] || null) !== (resolved?.[current] || null)
+    ));
+    if (
+      !runtime
+      || runtime.namespace !== CODEX_NAMESPACE
+      || runtime.generation_id !== strictResume?.expectedGenerationId
+      || runtime.provider_session_id !== strictResume?.expectedSessionId
+      || runtime.spawn_profile_id !== strictResume?.expectedSpawnProfileId
+      || resolved?.runtime !== 'codex'
+      || resolved?.backend !== 'codex'
+      || driftFields.length > 0
+    ) {
+      const error = new Error(
+        'strict Codex resume session identity or config changed',
+      );
+      error.code = providerDrift || driftFields.length > 0
+        ? 'CLEAN_RESUME_CONFIG_DRIFT'
+        : 'CLEAN_RESUME_SESSION_CHANGED';
+      throw error;
+    }
+    return strictResume.expectedSessionId;
+  }
+
   const driftFields = ['agent', 'cwd'].filter(
     (field) => (runtime?.[field] || null) !== (resolved?.[field] || null),
   );
@@ -86,6 +128,7 @@ async function executeCleanResumeClaim(claim, {
   discardSpawn,
   sendContinue,
   deliverResult,
+  settleProviderDelivery,
   sendNotice,
   complete,
   logEvent = () => {},
@@ -103,6 +146,7 @@ async function executeCleanResumeClaim(claim, {
     source_message_id: claim?.source_message_id ?? null,
     policy_version: claim?.policy_version ?? null,
   };
+  const codex = isCodexClaim(claim);
   const source = typeof loadSource === 'function'
     ? loadSource(claim.source_message_id)
     : null;
@@ -150,6 +194,20 @@ async function executeCleanResumeClaim(claim, {
   if (claim?.executable !== true) {
     return fallback(claim?.reason || 'claim-not-executable');
   }
+  const hasInterruptedTurn = typeof claim?.interrupted_provider_turn_id === 'string'
+    && claim.interrupted_provider_turn_id.length > 0;
+  const hasInterruptedProfile = typeof claim?.interrupted_spawn_profile_id === 'string'
+    && claim.interrupted_spawn_profile_id.length > 0;
+  if (
+    codex
+    && (
+      claim?.policy_version !== 2
+      || !hasInterruptedTurn
+      || !hasInterruptedProfile
+    )
+  ) {
+    return rejected('unsupported-codex-policy');
+  }
 
   if (
     !source
@@ -161,14 +219,22 @@ async function executeCleanResumeClaim(claim, {
     return fallback('source-message-mismatch');
   }
 
-  const runtime = loadRuntimeSession(claim.session_key);
+  const runtime = loadRuntimeSession(claim.session_key, claim);
+  const expectedNamespace = codex ? CODEX_NAMESPACE : CLAUDE_NAMESPACE;
   if (
     !runtime
-    || runtime.namespace !== EXPECTED_NAMESPACE
+    || runtime.namespace !== expectedNamespace
     || runtime.generation_id !== claim.session_generation_id
     || typeof runtime.provider_session_id !== 'string'
     || runtime.provider_session_id.length === 0
-    || !['cli', 'channels'].includes(runtime.pm_backend)
+    || (codex
+      ? runtime.pm_backend !== 'codex'
+      : !['cli', 'channels'].includes(runtime.pm_backend))
+    || (codex && (
+      runtime.spawn_profile_id !== claim.interrupted_spawn_profile_id
+      || typeof claim.interrupted_provider_turn_id !== 'string'
+      || claim.interrupted_provider_turn_id.length === 0
+    ))
   ) {
     return rejected(
       runtime?.generation_id !== claim.session_generation_id
@@ -202,7 +268,11 @@ async function executeCleanResumeClaim(claim, {
   }
   if (
     !spawned?.process
-    || !attestsExactResume(spawned.attestation, runtime.provider_session_id)
+    || !attestsExactResume(
+      spawned.attestation,
+      runtime.provider_session_id,
+      claim,
+    )
   ) {
     if (spawned?.process) {
       if (typeof discardSpawn !== 'function') {
@@ -223,7 +293,7 @@ async function executeCleanResumeClaim(claim, {
     result = await sendContinue({
       sessionKey: claim.session_key,
       text: 'continue',
-      sourceMsgId: source.msg_id,
+      sourceMsgId: codex ? null : source.msg_id,
       expectedProcess: spawned.process,
       onDispatched: markReady,
     });
@@ -237,40 +307,60 @@ async function executeCleanResumeClaim(claim, {
     );
   }
 
+  const settleCodexDelivery = async (disposition) => {
+    if (!codex) return;
+    if (typeof settleProviderDelivery !== 'function') {
+      throw new TypeError('Codex clean resume requires delivery settlement');
+    }
+    await settleProviderDelivery({ claim, result, disposition });
+  };
+
   if (result?.deliveryAmbiguous === true) {
+    await settleCodexDelivery('failed');
     return failed('continuation-delivery-ambiguous', { ambiguous: true });
   }
   if (result?.error) {
+    await settleCodexDelivery('failed');
     return failed('continuation-failed');
   }
+  if (codex && result?.alreadyDelivered) {
+    await settleCodexDelivery('failed');
+    return failed('continuation-delivery-incompatible');
+  }
   if (!result?.alreadyDelivered) {
     if (typeof result?.text !== 'string' || result.text.trim().length === 0) {
+      await settleCodexDelivery('failed');
       return failed('continuation-empty');
     }
+    let delivered;
     try {
-      const delivered = await deliverResult({
+      delivered = await deliverResult({
         claim,
         source,
         text: result.text,
         result,
       });
-      if (delivered?.ok !== true) {
-        return failed(
-          delivered?.ambiguous
-            ? 'continuation-delivery-ambiguous'
-            : 'continuation-delivery-failed',
-          { ambiguous: delivered?.ambiguous === true },
-        );
-      }
     } catch (error) {
+      await settleCodexDelivery('failed');
       const ambiguous = error?.deliveryAmbiguous === true;
       return failed(
         ambiguous ? 'continuation-delivery-ambiguous' : 'continuation-delivery-failed',
         { ambiguous },
       );
     }
+    if (delivered?.ok !== true) {
+      await settleCodexDelivery('failed');
+      return failed(
+        delivered?.ambiguous
+          ? 'continuation-delivery-ambiguous'
+          : 'continuation-delivery-failed',
+        { ambiguous: delivered?.ambiguous === true },
+      );
+    }
   }
 
+  await settleCodexDelivery('delivered');
+
   await complete({
     sourceMessageId: claim.source_message_id,
     status: 'replied',
@@ -284,7 +374,7 @@ async function startCleanRestartRecovery({
   botName,
   maxAgeMs,
   olderThanMs,
-  supportedPolicyVersions = [CLEAN_RESUME_POLICY_VERSION],
+  supportedPolicyVersions = SUPPORTED_CLEAN_RESUME_POLICY_VERSIONS,
   sessionKeyForSource,
   executeClaim,
   trackTask = (task) => task,
@@ -349,6 +439,7 @@ async function startCleanRestartRecovery({
 
 module.exports = {
   CLEAN_RESUME_POLICY_VERSION,
+  SUPPORTED_CLEAN_RESUME_POLICY_VERSIONS,
   executeCleanResumeClaim,
   recoveryNoticeText,
   attestsExactResume,

package/lib/ops/clean-shutdown.js

@@ -49,6 +49,34 @@ function buildResumeIntents({
       reason: snapshot?.reason ?? null,
     };
     if (!result.eligible) return result;
+    const codex = result.runtime === 'codex'
+      || result.namespace === 'codex:app-server';
+    if (
+      codex
+      && (
+        result.runtime !== 'codex'
+        || result.namespace !== 'codex:app-server'
+        || typeof result.providerSessionId !== 'string'
+        || result.providerSessionId.length === 0
+        || typeof result.providerTurnId !== 'string'
+        || result.providerTurnId.length === 0
+        || typeof result.cwd !== 'string'
+        || result.cwd.length === 0
+        || typeof result.model !== 'string'
+        || result.model.length === 0
+        || typeof result.effort !== 'string'
+        || result.effort.length === 0
+        || typeof result.spawnProfileId !== 'string'
+        || result.spawnProfileId.length === 0
+        || policyVersion !== 2
+      )
+    ) {
+      return {
+        ...result,
+        eligible: false,
+        reason: 'codex-retirement-binding-missing',
+      };
+    }
     if (seenSessions.has(result.sessionKey)) {
       throw new Error(`duplicate retirement snapshot for ${result.sessionKey}`);
     }
@@ -69,6 +97,14 @@ function buildResumeIntents({
       sessionKey: result.sessionKey,
       sourceMessageId,
       policyVersion,
+      ...(codex ? {
+        interruptedProviderTurnId: result.providerTurnId,
+        interruptedSpawnProfileId: result.spawnProfileId,
+        expectedProviderSessionId: result.providerSessionId,
+        expectedCwd: result.cwd,
+        expectedModel: result.model,
+        expectedEffort: result.effort,
+      } : {}),
     });
     return {
       ...result,

package/lib/ops/shutdown-disposition.js

@@ -21,6 +21,7 @@ function persistShutdownDisposition({
   since,
   observation,
   resumeIntents = [],
+  continuationAuthorized = false,
   forceCrashReason = null,
 } = {}) {
   const oomDetected = observation?.detected === true;
@@ -32,6 +33,7 @@ function persistShutdownDisposition({
       now,
       since,
       resumeIntents,
+      continuationAuthorized,
     });
   return {
     clean: !crashLike,

package/lib/sdk/callbacks.js

@@ -108,6 +108,7 @@ function createSdkCallbacks({
           model: entry.model,
           effort: entry.effort,
           pm_backend: 'codex',
+          spawn_profile_id: entry.spawnProfileId,
         }), `upsert Codex session ${sessionKey}`);
         return;
       }

package/lib/telegram/rich.js

@@ -52,6 +52,12 @@ function resolveRichTextEnabled(config, chatId, threadId = null) {
 // crafted string. See tests/rich.test.js for the ReDoS regression guard.
 
 const TASK_ITEM_RE = /^[ \t]{0,3}[-*+][ \t]+\[[ xX]\][ \t]+/m;
+// Any markdown list is structure: plain stays for a paragraph or two of
+// prose, and a reply organized as bullets or numbered items renders as a
+// rich document. Line-anchored, marker + space + content — a dash inside a
+// sentence or a lone '-' line (divider territory) does not match. Matches
+// marked's own list tokenization, so the gate and the renderer agree.
+const LIST_ITEM_RE = /^[ \t]{0,3}(?:[-*+]|\d{1,9}[.)])[ \t]+\S/m;
 const TABLE_ROW_RE = /^[ \t]{0,3}\|?[ \t]*:?-{2,}:?[ \t]*\|/m;
 const DETAILS_RE = /<details[ \t>]/i;
 const HEADING_RE = /^#{1,6}[ \t]+\S/m;
@@ -109,6 +115,7 @@ function stripFencedCodeBlocks(markdown) {
 // than rendering prose-only rich blocks (the oversized-prose problem).
 function hasNonMediaTrigger(scoped) {
   return TASK_ITEM_RE.test(scoped)
+      || LIST_ITEM_RE.test(scoped)
       || TABLE_ROW_RE.test(scoped)
       || DETAILS_RE.test(scoped)
       || HEADING_RE.test(scoped)

package/migrations/019-codex-clean-restart-resume.sql

@@ -0,0 +1,13 @@
+ALTER TABLE agent_runtime_sessions ADD COLUMN spawn_profile_id TEXT;
+
+ALTER TABLE clean_restart_resume_intents
+  ADD COLUMN interrupted_provider_turn_id TEXT;
+
+ALTER TABLE clean_restart_resume_intents
+  ADD COLUMN interrupted_spawn_profile_id TEXT;
+
+-- Rows written by a pre-v19 daemon during the one-time upgrade restart use
+-- the default and therefore cannot authorize provider continuation.
+ALTER TABLE clean_restart_resume_intents
+  ADD COLUMN continuation_authorized INTEGER NOT NULL DEFAULT 0
+    CHECK (continuation_authorized IN (0, 1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polygram",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "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": {
@@ -63,7 +63,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.2.123",
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@shumkov/orchestra": "0.10.11",
+    "@shumkov/orchestra": "0.10.13",
     "better-sqlite3": "^12.9.0",
     "grammy": "^1.42.0",
     "markdown-it": "^14.1.1",

package/polygram.js

@@ -191,6 +191,7 @@ const {
 } = require('./lib/ops/clean-shutdown');
 const {
   CLEAN_RESUME_POLICY_VERSION,
+  SUPPORTED_CLEAN_RESUME_POLICY_VERSIONS,
   createCleanResumeTurnContext,
   executeCleanResumeClaim,
   startCleanRestartRecovery,
@@ -800,12 +801,6 @@ async function buildSpawnContext(
     threadId: threadId || null,
   });
 
-  if (strictResume && promptBackend === 'codex') {
-    validateStrictResumeSpawn({
-      strictResume,
-      promptBackend,
-    });
-  }
   if (promptBackend === 'codex') {
     if (!codexRuntimeController) {
       const error = new Error('Codex runtime controller is not initialized');
@@ -823,6 +818,7 @@ async function buildSpawnContext(
       getSessionLabel,
       logEvent,
       mutateSessionOnDrift,
+      strictResume,
     });
   }
 
@@ -3443,6 +3439,7 @@ let startPollWatchdog = null;
 async function main() {
   const cgroupOomObserver = createCgroupOomObserver();
   const invocationId = parseSystemdInvocationId();
+  let abnormalProviderTermination = null;
   let codexManagerOptions = Object.freeze({
     codexHostIdentity: null,
     codexBootSessionIdentity: null,
@@ -3572,6 +3569,7 @@ async function main() {
       codexRuntimeController = createCodexRuntimeController({
         config,
         db,
+        sessionLauncher,
         defaultDaemonSecretRoots: [
           DATA_DIR,
           ipcRuntimeDir,
@@ -3887,6 +3885,18 @@ async function main() {
     renderQuestion: (payload) => questionHandlers?.renderAsk(payload),
     logger: console,
   });
+  sdkCallbacks.onAbnormalTermination = (_sessionKey, evidence) => {
+    if (abnormalProviderTermination !== null) return;
+    abnormalProviderTermination = Object.freeze({
+      backend: evidence?.backend ?? null,
+      event: evidence?.event ?? null,
+      exitCode: evidence?.exitCode ?? null,
+    });
+    logEvent('abnormal-provider-termination', {
+      bot: BOT_NAME,
+      ...abnormalProviderTermination,
+    });
+  };
   // 0.10.0: sdkCallbacks (the polygram-side lifecycle handlers — status
   // reactor, stream chunk → bubble edit, etc.) move from the underlying
   // SDK pm to the generic ProcessManager. The SDK pm gets legacyCallbacks
@@ -4409,7 +4419,7 @@ 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 () => {
+  const shutdown = async ({ continuationAuthorized = false, trigger = 'signal' } = {}) => {
     if (isShuttingDown) return;
     const shutdownObservation = cgroupOomObserver.sample();
     // Sample in-flight work at SIGNAL time, alongside the OOM observation and
@@ -4419,7 +4429,7 @@ async function main() {
     // idle, and cannot answer "how much work did this restart cost?".
     const inFlightAtSignal = countInFlight(inFlightHandlers);
     isShuttingDown = true;
-    console.log('\nShutting down...');
+    console.log(`\nShutting down (${trigger})...`);
     // 1. Stop accepting new inbound first so nothing new queues behind the drain.
     if (bot && bot._stop) bot._stop();
 
@@ -4508,7 +4518,9 @@ async function main() {
     //    which CLI turn was still active; replay rows alone cannot establish
     //    that fact.
     let pmRetired = false;
-    let forceCrashReason = null;
+    let forceCrashReason = abnormalProviderTermination
+      ? 'provider-process-terminated'
+      : null;
     let resumeIntents = [];
     if (shutdownObservation?.detected !== true) {
       try {
@@ -4519,7 +4531,7 @@ async function main() {
           settlementTimeoutMs: SHUTDOWN_DRAIN_MS,
         });
         pmRetired = true;
-        const projected = buildResumeIntents({
+        const projected = continuationAuthorized ? buildResumeIntents({
           snapshots: retirement.snapshots,
           policyVersion: CLEAN_RESUME_POLICY_VERSION,
           resolveSourceMessageId: ({ sessionKey, sourceMsgId }) => {
@@ -4542,10 +4554,12 @@ async function main() {
               ? messageId
               : null;
           },
-        });
-        if (config.bot?.resumeInterruptedCliTurns === true) {
-          resumeIntents = projected.resumeIntents;
-        }
+        }) : { resumeIntents: [], snapshots: retirement.snapshots };
+        resumeIntents = projected.resumeIntents.filter((intent) => (
+          intent.interruptedProviderTurnId == null
+            ? config.bot?.resumeInterruptedCliTurns === true
+            : config.bot?.resumeInterruptedCodexTurns === true
+        ));
         for (const snapshot of projected.snapshots) {
           logEvent('clean-retirement-snapshot', {
             bot: BOT_NAME,
@@ -4576,6 +4590,7 @@ async function main() {
           botName: BOT_NAME,
           observation: shutdownObservation,
           resumeIntents,
+          continuationAuthorized,
           forceCrashReason,
         });
         if (res.clean) {
@@ -4642,8 +4657,8 @@ async function main() {
     if (PID_PATH) processGuard.releasePidFile(PID_PATH);
     setTimeout(() => process.exit(0), 100);
   };
-  process.on('SIGINT', shutdown);
-  process.on('SIGTERM', shutdown);
+  process.on('SIGINT', () => shutdown());
+  process.on('SIGTERM', () => shutdown());
   // rc.28: also catch SIGHUP. The shumabit deploy path runs polygram
   // inside `tmux new-session`; on `launchctl kickstart -k` the
   // shumabit-start launcher does `tmux kill-session -t polygram`
@@ -4655,7 +4670,7 @@ async function main() {
   // been mid-tool-use longer than the replayWindowMs gets silently
   // dropped. Surface symptom: bot stops responding after deploy on
   // long agent runs (the §7.4 incident).
-  process.on('SIGHUP', shutdown);
+  process.on('SIGHUP', () => shutdown());
 
   try {
     // Fresh per-boot secret, persisted 0600 for same-UID readers (cron
@@ -4669,6 +4684,21 @@ async function main() {
         botName: BOT_NAME,
         getInFlightHandlers: () => inFlightHandlers,
         handleSendOverIpc: (req) => handleSendOverIpc(req),
+        requestDeployRestart: () => {
+          if (isShuttingDown) {
+            const error = new Error('shutdown already in progress');
+            error.code = 'SHUTDOWN_IN_PROGRESS';
+            throw error;
+          }
+          const oldPid = process.pid;
+          shutdown({
+            continuationAuthorized: true,
+            trigger: 'deploy-ipc',
+          }).catch((error) => {
+            console.error(`[shutdown] deploy restart failed: ${error.message}`);
+          });
+          return { accepted: true, old_pid: oldPid };
+        },
       }),
       logger: console,
     });
@@ -4721,7 +4751,7 @@ async function main() {
           botName: BOT_NAME,
           maxAgeMs: 2 * (replayWindowMs || 3 * 60 * 1000),
           olderThanMs: replayWindowMs || 30 * 60 * 1000,
-          supportedPolicyVersions: [CLEAN_RESUME_POLICY_VERSION],
+          supportedPolicyVersions: SUPPORTED_CLEAN_RESUME_POLICY_VERSIONS,
           sessionKeyForSource: sourceSessionKey,
           trackTask: trackHandlerTask,
           onClaim: (kind, claim) => {
@@ -4739,11 +4769,18 @@ async function main() {
             );
           },
           executeClaim: (claim, { onReady }) => executeCleanResumeClaim(claim, {
-            enabled: config.bot?.resumeInterruptedCliTurns === true,
+            enabled: claim.interrupted_provider_turn_id == null
+              ? config.bot?.resumeInterruptedCliTurns === true
+              : config.bot?.resumeInterruptedCodexTurns === true,
             loadSource: (messageId) => db.getInboundMessageById(messageId),
             sessionKeyForSource: sourceSessionKey,
-            loadRuntimeSession: (sessionKey) => (
-              db.getProviderSession(sessionKey, 'claude:channels')
+            loadRuntimeSession: (sessionKey, activeClaim) => (
+              db.getProviderSession(
+                sessionKey,
+                activeClaim.interrupted_provider_turn_id == null
+                  ? 'claude:channels'
+                  : 'codex:app-server',
+              )
             ),
             resolveStrictSpawnContext: async ({ claim: activeClaim, runtime }) => {
               try {
@@ -4753,6 +4790,14 @@ async function main() {
                     strictResume: {
                       expectedGenerationId: activeClaim.session_generation_id,
                       expectedSessionId: runtime.provider_session_id,
+                      ...(activeClaim.interrupted_provider_turn_id == null
+                        ? {}
+                        : {
+                            expectedInterruptedTurnId:
+                              activeClaim.interrupted_provider_turn_id,
+                            expectedSpawnProfileId:
+                              activeClaim.interrupted_spawn_profile_id,
+                          }),
                     },
                   }),
                 };
@@ -4818,6 +4863,15 @@ async function main() {
                 ambiguous: failures > 0 || delivered.deliveryAmbiguous,
               };
             },
+            settleProviderDelivery: ({
+              claim: activeClaim,
+              result,
+              disposition,
+            }) => codexRuntimeController.settleTelegramDelivery(
+              activeClaim.session_key,
+              result,
+              { disposition },
+            ),
             sendNotice: async ({ source, text, ambiguous }) => {
               if (!source) throw new Error('clean resume source message is missing');
               await tg(bot, 'sendMessage', {
@@ -5159,6 +5213,9 @@ async function main() {
     console.error(`[compact-orphan-handler] failed: ${err.message}`);
   }
 
+  logEvent('polygram-admission-open', lifecycleDetail({
+    bot: BOT_NAME,
+  }, invocationId));
   console.log(`[${BOT_NAME}] Starting...`);
   const pollPromise = pollBot(bot).catch(err => {
     console.error(`[${BOT_NAME}] Fatal:`, err.message);

package/scripts/ipc-smoke.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * Quick IPC round-trip probe.
- * Usage: node scripts/ipc-smoke.js <bot-name> [busy]
+ * Usage: node scripts/ipc-smoke.js <bot-name> [busy|restart]
  */
 
 const { call, readSecret, socketPathFor } = require('../lib/ipc/client');
@@ -32,6 +32,29 @@ const { call, readSecret, socketPathFor } = require('../lib/ipc/client');
     return;
   }
 
+  if (command === 'restart') {
+    const result = await call({
+      path,
+      op: 'deploy_restart',
+      secret: readSecret(bot),
+      callTimeoutMs: 60_000,
+    });
+    if (
+      result.ok !== true
+      || result.accepted !== true
+      || !Number.isSafeInteger(result.old_pid)
+      || result.old_pid <= 1
+    ) {
+      throw new Error(result.error || 'invalid deploy restart response');
+    }
+    console.log(JSON.stringify({
+      bot,
+      accepted: true,
+      old_pid: result.old_pid,
+    }));
+    return;
+  }
+
   console.log('path:', path);
   console.log('ping:', JSON.stringify(await call({ path, op: 'ping' })));
   console.log('DONE');