very-happy-cli 0.2.189 → 0.2.191

package/dist/{runClaude-hoepv-0X.mjs → runClaude-C3rii_S6.mjs}

@@ -1,62 +1,67 @@
 import os from 'node:os';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, e as exitCursorStamp } from './sessionLock-tEFvFXLD.mjs';
-import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-0INrP3aB.mjs';
-import { D as DEFAULT_CLAUDE_PERMISSION_MODE, H as HibernationProbe, c as commitHibernation } from './defaultPermissionMode-e2bIIJG4.mjs';
+import { A as AUTO_RESTART_CAPABILITY, c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, e as exitCursorStamp } from './sessionLock-G2PMqvsh.mjs';
+import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-Cpw4yJs8.mjs';
+import { c as createSessionForStartup, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-BtR4iYEC.mjs';
 import { randomUUID } from 'node:crypto';
-import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-B0yN68XH.mjs';
-import { l as logger } from './logger-DOKH3Zbh.mjs';
-import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-CG6Klinp.mjs';
-import { p as packageJson } from './package-DTcaIhjW.mjs';
-import { P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY } from './index-WKyN-bNy.mjs';
+import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-jfeMRg5R.mjs';
+import { l as logger } from './logger-GcbI0eg2.mjs';
+import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-B0eT_Kfj.mjs';
+import { p as packageJson } from './package-BsUHyqWe.mjs';
+import { P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, R as RUN_INTENT_CAPABILITY, C as CLAUDE_CONFIG_MODEL_CAPABILITY, r as restoredEffort, b as restoredModel } from './index-Bq8NKSCF.mjs';
+import { D as DEFAULT_CLAUDE_PERMISSION_MODE, r as registerRunIntentRpc, a as recordRunIntents, w as withoutEffort } from './defaultPermissionMode-m6z2QVyP.mjs';
 import { F as FORK_BACKFILL_CAPABILITY, p as publishForkBackfillWhenCommitted } from './forkBackfill-DYIjlN1Z.mjs';
-import { c as configuration } from './configuration-1FabKklB.mjs';
+import { c as configuration } from './configuration-ECqXu34R.mjs';
 import { l as loadSessionProvider, a as applyProviderEnv } from './providerBinding-CYubGg-Z.mjs';
-import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-DwNnNAUx.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-D-5qeIqd.mjs';
+import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-ClI7A0qE.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-CXRmFNOV.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { resolve, join } from 'node:path';
-import { c as createSessionForStartup } from './startupSessionCreate-npXe2TdN.mjs';
 import { a as applySandboxPermissionPolicy, r as resolveInitialClaudePermissionMode, m as mapToClaudeMode, b as reconcilePublishedPermissionMode } from './permissionMode-CH4FoZfU.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
 import { readFile } from 'node:fs/promises';
-import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-CcIdMfAx.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-Dm_RIs5L.mjs';
 import { T as TranscriptPathHints } from './transcriptCursor-B7T_gkQ0.mjs';
 import { p as planClaudeStartup } from './startupPlan-DFMyNgAs.mjs';
+import './cliUpdate-Y34VGe9Y.mjs';
 import 'node:fs';
 import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'node:child_process';
 import 'zod';
 import 'axios';
-import './lidState-q5Its2Hm.mjs';
+import './lidState-CD81ryTy.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-Cq1s8YVK.mjs';
+import './pushNotifications-XAM8__Pg.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-CUK37wiV.mjs';
-import './registerCommonHandlers-DWkTysjD.mjs';
+import './time-D0jvDRhn.mjs';
+import './registerCommonHandlers-DRRfinzK.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
-import './sync-BvDMkKAN.mjs';
+import './sync-C0PRuTMj.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import 'chalk';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-C_G5u5lY.mjs';
+import './localHappyAgentAuth-Cg-m1lwm.mjs';
 import 'tweetnacl';
 import './fsMkdir-DumgLTzR.mjs';
 import 'url';
 
 const DEFAULT_CLAUDE_MODEL = void 0;
 const DEFAULT_CLAUDE_EFFORT = void 0;
-const importRunClaudeDeps = () => import('./runClaudeDeps-D_v8t2SK.mjs');
+const CLAUDE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
+function restoredClaudeEffort(effort) {
+  return CLAUDE_EFFORTS.includes(effort ?? "") ? effort : void 0;
+}
+const importRunClaudeDeps = () => import('./runClaudeDeps-DlVfMG4F.mjs');
 async function runClaude(credentials, options = {}) {
   logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -70,7 +75,7 @@ async function runClaude(credentials, options = {}) {
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await import('./bootstrap-DfXwkUQb.mjs');
+      const { bootstrapAssistantHome } = await import('./bootstrap-rLaL3kTa.mjs');
       await bootstrapAssistantHome();
     } catch (error) {
       logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -145,7 +150,12 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
-    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, PROJECT_SESSION_CAPABILITY],
+    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, AUTO_RESTART_CAPABILITY, PROJECT_SESSION_CAPABILITY, RUN_INTENT_CAPABILITY, CLAUDE_CONFIG_MODEL_CAPABILITY],
+    // B-849b: this session's model / thinking choice (wrapper is the sole
+    // writer; a reconnect keeps the server copy). A spawn-time model is a choice.
+    modelIntent: options.model ?? null,
+    effortIntent: null,
+    stickyModel: options.model ?? null,
     // Effective mode this process enforces. Kept current by
     // publishPermissionMode below; the web renders it instead of guessing.
     permissionMode: mapToClaudeMode(initialPermissionMode ?? "default"),
@@ -190,7 +200,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await import('./claudeLocal-Bid_rC_v.mjs');
+    const { claudeLocal } = await import('./claudeLocal-Bgb5GGsq.mjs');
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = startOfflineReconnection({
       serverUrl: configuration.serverUrl,
@@ -255,6 +265,7 @@ async function runClaude(credentials, options = {}) {
       logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
     }
   }
+  const restoredRun = reconnectSeeded ? { model: restoredModel(response.metadata), effort: restoredEffort(response.metadata) } : null;
   const earlySession = startupPlan.sessionClientBeforeWebhook ? api.sessionSyncClient(response) : null;
   try {
     logger.debug(`[START] Reporting session ${response.id} to daemon`);
@@ -543,13 +554,14 @@ async function runClaude(credentials, options = {}) {
     }
   };
   let lastExplicitModeSwitchAt = 0;
-  let currentModel = options.model ?? DEFAULT_CLAUDE_MODEL;
+  let currentModel = restoredRun?.model !== void 0 ? restoredRun.model ?? void 0 : options.model ?? DEFAULT_CLAUDE_MODEL;
   let currentFallbackModel = void 0;
   let currentCustomSystemPrompt = void 0;
   let currentAppendSystemPrompt = void 0;
   let currentAllowedTools = void 0;
   let currentDisallowedTools = withAssistantDenylist(void 0, isAssistantVariant);
-  let currentEffort = DEFAULT_CLAUDE_EFFORT;
+  let currentEffort = restoredClaudeEffort(restoredRun?.effort) ?? DEFAULT_CLAUDE_EFFORT;
+  if (restoredRun) logger.debug(`[START] Restored run intent: model=${currentModel ?? "default"} effort=${currentEffort ?? "default"}`);
   registerSideQuestionHandler(session.rpcHandlerManager, {
     getClaudeSessionId: () => {
       const id = currentSession?.sessionId ?? null;
@@ -564,15 +576,20 @@ async function runClaude(credentials, options = {}) {
     getLiveQuery: () => currentSession?.getSideQuestionLive() ?? null
   });
   const resetCurrentModeDefaults = () => {
-    currentModel = options.model ?? DEFAULT_CLAUDE_MODEL;
     currentFallbackModel = void 0;
     currentCustomSystemPrompt = void 0;
     currentAppendSystemPrompt = void 0;
     currentAllowedTools = void 0;
     currentDisallowedTools = withAssistantDenylist(void 0, isAssistantVariant);
-    currentEffort = DEFAULT_CLAUDE_EFFORT;
     logger.debug("[loop] Reset current mode defaults after abort");
   };
+  registerRunIntentRpc(session.rpcHandlerManager, session, (request) => {
+    const resolved = resolveMessageMode(currentModeState(), request, { sandboxEnabled, isAssistantVariant, staleModeSnapshot: true, pinnedModel: providerPinnedModel });
+    currentModel = resolved.next.model;
+    currentEffort = resolved.next.effort;
+    logger.debug(`[loop] Run intent set: model=${currentModel ?? "default"} effort=${currentEffort ?? "default"}`);
+    return { facts: { stickyModel: currentModel ?? null }, effortRefused: resolved.ignoredEffort !== void 0 };
+  });
   const currentModeState = () => ({
     permissionMode: currentPermissionMode,
     model: currentModel,
@@ -710,6 +727,7 @@ async function runClaude(credentials, options = {}) {
     if (resolved.ignoredEffort !== void 0) {
       logger.debug(`[loop] Ignoring invalid effort from user message: ${resolved.ignoredEffort}`);
     }
+    recordRunIntents(session, resolved.ignoredEffort !== void 0 ? withoutEffort(message.meta) : message.meta, { stickyModel: currentModel ?? null });
     logger.debug(`[loop] Message mode: permission=${resolved.mode.permissionMode} model=${resolved.mode.model || "default"} effort=${resolved.mode.effort ?? "default"} appendSystemPrompt=${resolved.mode.appendSystemPrompt ? "set" : "none"} customSystemPrompt=${resolved.mode.customSystemPrompt ? "set" : "none"}`);
     scoreFirstMessage(message.meta, predictedFirstMode, resolved.mode);
     const resolvedMode = resolved.mode;
@@ -919,6 +937,8 @@ async function runClaude(credentials, options = {}) {
     });
     hibernationProbe.start();
   }
+  const autoUpdated = takeAutoRestartedEvent(process.env);
+  if (autoUpdated) session.sendSessionEvent(autoUpdated);
   const exitCode = await loop({
     path: workingDirectory,
     model: options.model,

package/dist/{runClaude-ClQQcgoO.cjs → runClaude-CBEpYO4S.cjs}

@@ -1,64 +1,69 @@
 'use strict';
 
 var os = require('node:os');
-var sessionLock = require('./sessionLock-DSqiP2lH.cjs');
-var persistence = require('./persistence-CrzC7yr_.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-5EvgRq38.cjs');
+var sessionLock = require('./sessionLock-BmLA2S8K.cjs');
+var persistence = require('./persistence-A2NeERZJ.cjs');
+var startupSessionCreate = require('./startupSessionCreate-CcF7rGGB.cjs');
 var node_crypto = require('node:crypto');
-var api = require('./api-BDuuyys8.cjs');
-var logger = require('./logger-BP1SW7Cs.cjs');
-var createSessionMetadata = require('./createSessionMetadata-DezS33OM.cjs');
-var _package = require('./package-CYDdLA6R.cjs');
-var index = require('./index-BOe6dKnL.cjs');
+var api = require('./api-BBxZ7y2z.cjs');
+var logger = require('./logger-Ct2zvaq0.cjs');
+var createSessionMetadata = require('./createSessionMetadata-Cf78KHtt.cjs');
+var _package = require('./package-9n7wd2dT.cjs');
+var index = require('./index-CLUHaPU8.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-oqTupStc.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
-var configuration = require('./configuration-C0ctLGW2.cjs');
+var configuration = require('./configuration-DfPBa-9d.cjs');
 var providerBinding = require('./providerBinding-B-Qbx9W2.cjs');
-var controlClient = require('./controlClient-F7hAEEy2.cjs');
-var machineMetadata = require('./machineMetadata-BKX3ov9g.cjs');
+var controlClient = require('./controlClient-C13_pSKG.cjs');
+var machineMetadata = require('./machineMetadata-DDCVWb_x.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var startupSessionCreate = require('./startupSessionCreate-CYc8mra-.cjs');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var promises = require('node:fs/promises');
-var attachmentContent = require('./attachmentContent-Cc5b7TPr.cjs');
+var attachmentContent = require('./attachmentContent-BO2njyza.cjs');
 var transcriptCursor = require('./transcriptCursor-DcXGLeSc.cjs');
 var startupPlan = require('./startupPlan-BLMbfQIH.cjs');
+require('./cliUpdate-DsKXPFYp.cjs');
 require('node:fs');
 require('./processTreeSnapshot-mDbnuojn.cjs');
 require('node:child_process');
 require('zod');
 require('axios');
-require('./lidState-B4dHJCeS.cjs');
+require('./lidState-C9_DoF9i.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
-require('./pushNotifications-CalIS9sq.cjs');
+require('./pushNotifications-23YSd-0l.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-XwEZxKGc.cjs');
-require('./registerCommonHandlers-DZPozYxc.cjs');
+require('./time-Cy0a-7YX.cjs');
+require('./registerCommonHandlers-D1MiSfcB.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
-require('./sync-CoChLEIg.cjs');
+require('./sync-Ba8N6xba.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('chalk');
 require('node:util');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-CG2nPD_H.cjs');
+require('./localHappyAgentAuth-CCjUvOfi.cjs');
 require('tweetnacl');
 require('./fsMkdir-0K3yENml.cjs');
 require('url');
 
 const DEFAULT_CLAUDE_MODEL = void 0;
 const DEFAULT_CLAUDE_EFFORT = void 0;
-const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-ck5_GYlP.cjs'); });
+const CLAUDE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
+function restoredClaudeEffort(effort) {
+  return CLAUDE_EFFORTS.includes(effort ?? "") ? effort : void 0;
+}
+const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-CYuozSC6.cjs'); });
 async function runClaude(credentials, options = {}) {
   logger.logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -72,7 +77,7 @@ async function runClaude(credentials, options = {}) {
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-CDY-Vz8q.cjs'); });
+      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-sly4qPPY.cjs'); });
       await bootstrapAssistantHome();
     } catch (error) {
       logger.logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -147,7 +152,12 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...attachmentContent.CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
-    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, index.PROJECT_SESSION_CAPABILITY],
+    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, sessionLock.AUTO_RESTART_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.RUN_INTENT_CAPABILITY, index.CLAUDE_CONFIG_MODEL_CAPABILITY],
+    // B-849b: this session's model / thinking choice (wrapper is the sole
+    // writer; a reconnect keeps the server copy). A spawn-time model is a choice.
+    modelIntent: options.model ?? null,
+    effortIntent: null,
+    stickyModel: options.model ?? null,
     // Effective mode this process enforces. Kept current by
     // publishPermissionMode below; the web renders it instead of guessing.
     permissionMode: permissionMode.mapToClaudeMode(initialPermissionMode ?? "default"),
@@ -192,7 +202,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-2dJIiTIq.cjs'); });
+    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-1vuTFcL8.cjs'); });
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = api.startOfflineReconnection({
       serverUrl: configuration.configuration.serverUrl,
@@ -257,6 +267,7 @@ async function runClaude(credentials, options = {}) {
       logger.logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
     }
   }
+  const restoredRun = reconnectSeeded ? { model: index.restoredModel(response.metadata), effort: index.restoredEffort(response.metadata) } : null;
   const earlySession = startupPlan$1.sessionClientBeforeWebhook ? api$1.sessionSyncClient(response) : null;
   try {
     logger.logger.debug(`[START] Reporting session ${response.id} to daemon`);
@@ -545,13 +556,14 @@ async function runClaude(credentials, options = {}) {
     }
   };
   let lastExplicitModeSwitchAt = 0;
-  let currentModel = options.model ?? DEFAULT_CLAUDE_MODEL;
+  let currentModel = restoredRun?.model !== void 0 ? restoredRun.model ?? void 0 : options.model ?? DEFAULT_CLAUDE_MODEL;
   let currentFallbackModel = void 0;
   let currentCustomSystemPrompt = void 0;
   let currentAppendSystemPrompt = void 0;
   let currentAllowedTools = void 0;
   let currentDisallowedTools = withAssistantDenylist(void 0, isAssistantVariant);
-  let currentEffort = DEFAULT_CLAUDE_EFFORT;
+  let currentEffort = restoredClaudeEffort(restoredRun?.effort) ?? DEFAULT_CLAUDE_EFFORT;
+  if (restoredRun) logger.logger.debug(`[START] Restored run intent: model=${currentModel ?? "default"} effort=${currentEffort ?? "default"}`);
   registerSideQuestionHandler(session.rpcHandlerManager, {
     getClaudeSessionId: () => {
       const id = currentSession?.sessionId ?? null;
@@ -566,15 +578,20 @@ async function runClaude(credentials, options = {}) {
     getLiveQuery: () => currentSession?.getSideQuestionLive() ?? null
   });
   const resetCurrentModeDefaults = () => {
-    currentModel = options.model ?? DEFAULT_CLAUDE_MODEL;
     currentFallbackModel = void 0;
     currentCustomSystemPrompt = void 0;
     currentAppendSystemPrompt = void 0;
     currentAllowedTools = void 0;
     currentDisallowedTools = withAssistantDenylist(void 0, isAssistantVariant);
-    currentEffort = DEFAULT_CLAUDE_EFFORT;
     logger.logger.debug("[loop] Reset current mode defaults after abort");
   };
+  defaultPermissionMode.registerRunIntentRpc(session.rpcHandlerManager, session, (request) => {
+    const resolved = resolveMessageMode(currentModeState(), request, { sandboxEnabled, isAssistantVariant, staleModeSnapshot: true, pinnedModel: providerPinnedModel });
+    currentModel = resolved.next.model;
+    currentEffort = resolved.next.effort;
+    logger.logger.debug(`[loop] Run intent set: model=${currentModel ?? "default"} effort=${currentEffort ?? "default"}`);
+    return { facts: { stickyModel: currentModel ?? null }, effortRefused: resolved.ignoredEffort !== void 0 };
+  });
   const currentModeState = () => ({
     permissionMode: currentPermissionMode,
     model: currentModel,
@@ -712,6 +729,7 @@ async function runClaude(credentials, options = {}) {
     if (resolved.ignoredEffort !== void 0) {
       logger.logger.debug(`[loop] Ignoring invalid effort from user message: ${resolved.ignoredEffort}`);
     }
+    defaultPermissionMode.recordRunIntents(session, resolved.ignoredEffort !== void 0 ? defaultPermissionMode.withoutEffort(message.meta) : message.meta, { stickyModel: currentModel ?? null });
     logger.logger.debug(`[loop] Message mode: permission=${resolved.mode.permissionMode} model=${resolved.mode.model || "default"} effort=${resolved.mode.effort ?? "default"} appendSystemPrompt=${resolved.mode.appendSystemPrompt ? "set" : "none"} customSystemPrompt=${resolved.mode.customSystemPrompt ? "set" : "none"}`);
     scoreFirstMessage(message.meta, predictedFirstMode, resolved.mode);
     const resolvedMode = resolved.mode;
@@ -894,11 +912,11 @@ async function runClaude(credentials, options = {}) {
     };
   };
   if (options.startedBy === "daemon" && options.startingMode === "remote" && !isAssistantVariant) {
-    hibernationProbe = new defaultPermissionMode.HibernationProbe({
+    hibernationProbe = new startupSessionCreate.HibernationProbe({
       checkMs: persistence.resolveCheckMs(),
       snapshot: hibernationSnapshot,
       ask: (report) => controlClient.checkDaemonHibernation({ sessionId: session.sessionId, pid: process.pid, report }),
-      commit: (idleMs) => defaultPermissionMode.commitHibernation({
+      commit: (idleMs) => startupSessionCreate.commitHibernation({
         client: session,
         claimExit: () => exitGate.claim("hibernate") !== null,
         exitRequested: () => exitGate.exitRequested,
@@ -921,6 +939,8 @@ async function runClaude(credentials, options = {}) {
     });
     hibernationProbe.start();
   }
+  const autoUpdated = sessionLock.takeAutoRestartedEvent(process.env);
+  if (autoUpdated) session.sendSessionEvent(autoUpdated);
   const exitCode = await loop({
     path: workingDirectory,
     model: options.model,