claude-threads 1.8.3 → 1.9.0

package/dist/index.js

@@ -11862,7 +11862,7 @@ import * as fs from "fs/promises";
 import { homedir as homedir4 } from "os";
 async function execGit(args, cwd) {
   const cmd = `git ${args.join(" ")}`;
-  log8.debug(`Executing: ${cmd}`);
+  log7.debug(`Executing: ${cmd}`);
   return new Promise((resolve3, reject) => {
     const proc = crossSpawn("git", args, { cwd });
     let stdout = "";
@@ -11875,15 +11875,15 @@ async function execGit(args, cwd) {
     });
     proc.on("close", (code) => {
       if (code === 0) {
-        log8.debug(`${cmd} → success`);
+        log7.debug(`${cmd} → success`);
         resolve3(stdout.trim());
       } else {
-        log8.debug(`${cmd} → failed (code=${code}): ${stderr.substring(0, 100) || stdout.substring(0, 100)}`);
+        log7.debug(`${cmd} → failed (code=${code}): ${stderr.substring(0, 100) || stdout.substring(0, 100)}`);
         reject(new Error(`git ${args.join(" ")} failed: ${stderr || stdout}`));
       }
     });
     proc.on("error", (err) => {
-      log8.warn(`${cmd} → error: ${err}`);
+      log7.warn(`${cmd} → error: ${err}`);
       reject(err);
     });
   });
@@ -11893,7 +11893,7 @@ async function isGitRepository(dir) {
     await execGit(["rev-parse", "--git-dir"], dir);
     return true;
   } catch (err) {
-    log8.debug(`Not a git repository: ${dir} (${err})`);
+    log7.debug(`Not a git repository: ${dir} (${err})`);
     return false;
   }
 }
@@ -12028,7 +12028,7 @@ async function detectWorktreeInfo(workingDir) {
     const branchOutput = await execGit(["rev-parse", "--abbrev-ref", "HEAD"], workingDir);
     const branch = branchOutput?.trim();
     if (!branch) {
-      log8.debug(`Could not detect branch for worktree at ${workingDir}`);
+      log7.debug(`Could not detect branch for worktree at ${workingDir}`);
       return null;
     }
     const gitDirOutput = await execGit(["rev-parse", "--git-common-dir"], workingDir);
@@ -12040,45 +12040,45 @@ async function detectWorktreeInfo(workingDir) {
         repoRoot = repoRoot.slice(0, -4);
       }
     }
-    log8.debug(`Detected worktree: path=${workingDir}, branch=${branch}, repoRoot=${repoRoot}`);
+    log7.debug(`Detected worktree: path=${workingDir}, branch=${branch}, repoRoot=${repoRoot}`);
     return {
       worktreePath: workingDir,
       branch,
       repoRoot: repoRoot || workingDir
     };
   } catch (err) {
-    log8.debug(`Failed to detect worktree info for ${workingDir}: ${err}`);
+    log7.debug(`Failed to detect worktree info for ${workingDir}: ${err}`);
     return null;
   }
 }
 async function createWorktree(repoRoot, branch, targetDir) {
-  log8.info(`Creating worktree for branch '${branch}' at ${targetDir}`);
+  log7.info(`Creating worktree for branch '${branch}' at ${targetDir}`);
   const parentDir = path.dirname(targetDir);
-  log8.debug(`Creating parent directory: ${parentDir}`);
+  log7.debug(`Creating parent directory: ${parentDir}`);
   await fs.mkdir(parentDir, { recursive: true });
   const exists = await branchExists(repoRoot, branch);
   if (exists) {
-    log8.debug(`Branch '${branch}' exists, adding worktree`);
+    log7.debug(`Branch '${branch}' exists, adding worktree`);
     await execGit(["worktree", "add", targetDir, branch], repoRoot);
   } else {
-    log8.debug(`Branch '${branch}' does not exist, creating with worktree`);
+    log7.debug(`Branch '${branch}' does not exist, creating with worktree`);
     await execGit(["worktree", "add", "-b", branch, targetDir], repoRoot);
   }
-  log8.info(`Worktree created successfully: ${targetDir}`);
+  log7.info(`Worktree created successfully: ${targetDir}`);
   return targetDir;
 }
 async function removeWorktree(repoRoot, worktreePath) {
-  log8.info(`Removing worktree: ${worktreePath}`);
+  log7.info(`Removing worktree: ${worktreePath}`);
   try {
     await execGit(["worktree", "remove", worktreePath], repoRoot);
-    log8.debug("Worktree removed cleanly");
+    log7.debug("Worktree removed cleanly");
   } catch (err) {
-    log8.debug(`Clean remove failed (${err}), trying force remove`);
+    log7.debug(`Clean remove failed (${err}), trying force remove`);
     await execGit(["worktree", "remove", "--force", worktreePath], repoRoot);
   }
-  log8.debug("Pruning stale worktree references");
+  log7.debug("Pruning stale worktree references");
   await execGit(["worktree", "prune"], repoRoot);
-  log8.info("Worktree removed and pruned successfully");
+  log7.info("Worktree removed and pruned successfully");
 }
 async function findWorktreeByBranch(repoRoot, branch) {
   const worktrees = await listWorktrees(repoRoot);
@@ -12119,14 +12119,14 @@ async function writeMetadataStore(store) {
     await fs.writeFile(METADATA_STORE_PATH, JSON.stringify(store, null, 2), { encoding: "utf-8", mode: 384 });
     await fs.chmod(METADATA_STORE_PATH, 384);
   } catch (err) {
-    log8.warn(`Failed to write worktree metadata store: ${err}`);
+    log7.warn(`Failed to write worktree metadata store: ${err}`);
   }
 }
 async function writeWorktreeMetadata(worktreePath, metadata) {
   const store = await readMetadataStore();
   store[worktreePath] = metadata;
   await writeMetadataStore(store);
-  log8.debug(`Wrote worktree metadata for: ${worktreePath}`);
+  log7.debug(`Wrote worktree metadata for: ${worktreePath}`);
 }
 async function readWorktreeMetadata(worktreePath) {
   const store = await readMetadataStore();
@@ -12149,14 +12149,14 @@ async function removeWorktreeMetadata(worktreePath) {
   if (store[worktreePath]) {
     delete store[worktreePath];
     await writeMetadataStore(store);
-    log8.debug(`Removed worktree metadata for: ${worktreePath}`);
+    log7.debug(`Removed worktree metadata for: ${worktreePath}`);
   }
 }
-var log8, WORKTREES_DIR, METADATA_STORE_PATH;
+var log7, WORKTREES_DIR, METADATA_STORE_PATH;
 var init_worktree = __esm(() => {
   init_spawn();
   init_logger();
-  log8 = createLogger("git-wt");
+  log7 = createLogger("git-wt");
   WORKTREES_DIR = path.join(homedir4(), ".claude-threads", "worktrees");
   METADATA_STORE_PATH = path.join(homedir4(), ".claude-threads", "worktree-metadata.json");
 });
@@ -19496,7 +19496,7 @@ var require_react_reconciler_development = __commonJS((exports, module) => {
       return hook.checkDCE ? true : false;
     }
     function setIsStrictModeForDevtools(newIsStrictMode) {
-      typeof log31 === "function" && unstable_setDisableYieldValue2(newIsStrictMode);
+      typeof log30 === "function" && unstable_setDisableYieldValue2(newIsStrictMode);
       if (injectedHook && typeof injectedHook.setStrictMode === "function")
         try {
           injectedHook.setStrictMode(rendererID, newIsStrictMode);
@@ -27580,7 +27580,7 @@ Check the render method of %s.`, getComponentNameFromFiber(current) || "Unknown"
     var fiberStack = [];
     var index$jscomp$0 = -1, emptyContextObject = {};
     Object.freeze(emptyContextObject);
-    var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback, log$1 = Math.log, LN2 = Math.LN2, nextTransitionUpdateLane = 256, nextTransitionDeferredLane = 262144, nextRetryLane = 4194304, scheduleCallback$3 = Scheduler.unstable_scheduleCallback, cancelCallback$1 = Scheduler.unstable_cancelCallback, shouldYield = Scheduler.unstable_shouldYield, requestPaint = Scheduler.unstable_requestPaint, now$1 = Scheduler.unstable_now, ImmediatePriority = Scheduler.unstable_ImmediatePriority, UserBlockingPriority = Scheduler.unstable_UserBlockingPriority, NormalPriority$1 = Scheduler.unstable_NormalPriority, IdlePriority = Scheduler.unstable_IdlePriority, log31 = Scheduler.log, unstable_setDisableYieldValue2 = Scheduler.unstable_setDisableYieldValue, rendererID = null, injectedHook = null, hasLoggedError = false, isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined", lastResetTime = 0;
+    var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback, log$1 = Math.log, LN2 = Math.LN2, nextTransitionUpdateLane = 256, nextTransitionDeferredLane = 262144, nextRetryLane = 4194304, scheduleCallback$3 = Scheduler.unstable_scheduleCallback, cancelCallback$1 = Scheduler.unstable_cancelCallback, shouldYield = Scheduler.unstable_shouldYield, requestPaint = Scheduler.unstable_requestPaint, now$1 = Scheduler.unstable_now, ImmediatePriority = Scheduler.unstable_ImmediatePriority, UserBlockingPriority = Scheduler.unstable_UserBlockingPriority, NormalPriority$1 = Scheduler.unstable_NormalPriority, IdlePriority = Scheduler.unstable_IdlePriority, log30 = Scheduler.log, unstable_setDisableYieldValue2 = Scheduler.unstable_setDisableYieldValue, rendererID = null, injectedHook = null, hasLoggedError = false, isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined", lastResetTime = 0;
     if (typeof performance === "object" && typeof performance.now === "function") {
       var localPerformance = performance;
       var getCurrentTime = function() {
@@ -47101,7 +47101,7 @@ var {
   Help
 } = import__.default;
 
-// src/config/migration.ts
+// src/config/index.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from "fs";
 import { resolve, dirname } from "path";
 import { homedir } from "os";
@@ -49799,7 +49799,8 @@ var LIMITS_DEFAULTS = {
   cleanupIntervalMinutes: 60,
   maxWorktreeAgeHours: 24,
   cleanupWorktrees: true,
-  permissionTimeoutSeconds: 120
+  permissionTimeoutSeconds: 120,
+  flushDelayMs: 500
 };
 function resolveLimits(limits) {
   const envMaxSessions = process.env.MAX_SESSIONS ? parseInt(process.env.MAX_SESSIONS, 10) : undefined;
@@ -49811,11 +49812,52 @@ function resolveLimits(limits) {
     cleanupIntervalMinutes: limits?.cleanupIntervalMinutes ?? LIMITS_DEFAULTS.cleanupIntervalMinutes,
     maxWorktreeAgeHours: limits?.maxWorktreeAgeHours ?? LIMITS_DEFAULTS.maxWorktreeAgeHours,
     cleanupWorktrees: limits?.cleanupWorktrees ?? LIMITS_DEFAULTS.cleanupWorktrees,
-    permissionTimeoutSeconds: limits?.permissionTimeoutSeconds ?? LIMITS_DEFAULTS.permissionTimeoutSeconds
+    permissionTimeoutSeconds: limits?.permissionTimeoutSeconds ?? LIMITS_DEFAULTS.permissionTimeoutSeconds,
+    flushDelayMs: limits?.flushDelayMs ?? LIMITS_DEFAULTS.flushDelayMs
   };
 }
+function resolvePermissionMode(opts) {
+  if (opts.permissionMode)
+    return opts.permissionMode;
+  if (opts.skipPermissions === true)
+    return "bypass";
+  if (opts.skipPermissions === false)
+    return "default";
+  return "default";
+}
+var MODE_INFO = {
+  default: {
+    icon: "\uD83D\uDD10",
+    label: "Default",
+    description: "Every tool-use prompts for approval."
+  },
+  auto: {
+    icon: "⚡",
+    label: "Auto",
+    description: "Claude classifier auto-approves low-risk tools; high-risk still prompts."
+  },
+  bypass: {
+    icon: "⚠️",
+    label: "Bypass",
+    description: "No prompts — every tool-use is allowed."
+  }
+};
+function permissionModeDisplay(mode) {
+  const info = MODE_INFO[mode];
+  return { icon: info.icon, label: info.label, chip: `${info.icon} ${info.label}` };
+}
+function permissionModeDescription(mode) {
+  return MODE_INFO[mode].description;
+}
+function effectivePermissionMode(input) {
+  if (input.override)
+    return input.override;
+  if (input.sessionHasInteractiveOverride)
+    return "default";
+  return input.botWideMode;
+}
 
-// src/config/migration.ts
+// src/config/index.ts
 var CONFIG_PATH = resolve(homedir(), ".config", "claude-threads", "config.yaml");
 function loadConfigWithMigration() {
   if (existsSync(CONFIG_PATH)) {
@@ -50034,6 +50076,26 @@ function validateClaudeCli() {
 }
 
 // src/onboarding.ts
+var PERMISSION_MODE_CHOICES = [
+  {
+    title: "Auto (recommended)",
+    value: "auto",
+    description: "Classifier auto-approves low-risk; high-risk tools still prompt via reactions"
+  },
+  {
+    title: "Default",
+    value: "default",
+    description: "Every tool-use prompts — strictest mode, can be noisy for everyday work"
+  },
+  {
+    title: "Bypass",
+    value: "bypass",
+    description: "No prompts, all tools allowed — use only in trusted environments"
+  }
+];
+function permissionModeChoiceIndex(mode) {
+  return PERMISSION_MODE_CHOICES.findIndex((c) => c.value === mode);
+}
 var __dirname2 = dirname2(fileURLToPath(import.meta.url));
 var SLACK_MANIFEST_PATH = join2(__dirname2, "..", "docs", "slack-app-manifest.yaml");
 var onCancel = () => {
@@ -50600,14 +50662,14 @@ async function showConfigSummary(config) {
       console.log(dim(`      Bot: @${mm.botName}`));
       const allowedUsers = mm.allowedUsers.length > 0 ? mm.allowedUsers.join(", ") : "ANYONE (⚠️  no restrictions)";
       console.log(dim(`      Allowed Users: ${allowedUsers}`));
-      console.log(dim(`      Auto-approve: ${mm.skipPermissions ? "Yes" : "No (interactive)"}`));
+      console.log(dim(`      Permission Mode: ${permissionModeDisplay(resolvePermissionMode({ permissionMode: mm.permissionMode, skipPermissions: mm.skipPermissions })).chip}`));
     } else {
       const slack = platform;
       console.log(dim(`      Channel: ${slack.channelId}`));
       console.log(dim(`      Bot: @${slack.botName}`));
       const allowedUsers = slack.allowedUsers.length > 0 ? slack.allowedUsers.join(", ") : "ANYONE (⚠️  no restrictions)";
       console.log(dim(`      Allowed Users: ${allowedUsers}`));
-      console.log(dim(`      Auto-approve: ${slack.skipPermissions ? "Yes" : "No (interactive)"}`));
+      console.log(dim(`      Permission Mode: ${permissionModeDisplay(resolvePermissionMode({ permissionMode: slack.permissionMode, skipPermissions: slack.skipPermissions })).chip}`));
     }
   }
   const hasAdvancedSettings = config.limits || config.threadLogs || config.keepAlive === false;
@@ -50799,7 +50861,10 @@ async function setupMattermostPlatform(id, existing) {
   let lastChannelId = existingMattermost?.channelId || "";
   let lastBotName = existingMattermost?.botName || "claude-code";
   let lastAllowedUsers = existingMattermost?.allowedUsers?.join(",") || "";
-  let lastRequireApproval = existingMattermost ? !existingMattermost.skipPermissions : true;
+  let lastPermissionMode = existingMattermost ? resolvePermissionMode({
+    permissionMode: existingMattermost.permissionMode,
+    skipPermissions: existingMattermost.skipPermissions
+  }) : "auto";
   while (true) {
     console.log("");
     console.log(dim("  Now enter your Mattermost credentials:"));
@@ -50897,12 +50962,12 @@ async function setupMattermostPlatform(id, existing) {
         allowedUsersConfirmed = true;
       }
     }
-    const { requireApproval } = await import_prompts.default({
-      type: "confirm",
-      name: "requireApproval",
-      message: "Require approval for Claude actions?",
-      initial: lastRequireApproval,
-      hint: "Yes = approve via reactions (recommended), No = auto-approve everything"
+    const { permissionMode } = await import_prompts.default({
+      type: "select",
+      name: "permissionMode",
+      message: "Permission mode for Claude tool-uses?",
+      choices: PERMISSION_MODE_CHOICES,
+      initial: permissionModeChoiceIndex(lastPermissionMode)
     }, { onCancel });
     lastUrl = basicSettings.url;
     lastDisplayName = basicSettings.displayName;
@@ -50910,7 +50975,7 @@ async function setupMattermostPlatform(id, existing) {
     lastChannelId = basicSettings.channelId;
     lastBotName = basicSettings.botName;
     lastAllowedUsers = allowedUsers.join(",");
-    lastRequireApproval = requireApproval;
+    lastPermissionMode = permissionMode;
     console.log("");
     console.log(dim("  Validating credentials..."));
     const validationResult = await validateMattermostCredentials(basicSettings.url, finalToken, basicSettings.channelId);
@@ -50969,7 +51034,7 @@ async function setupMattermostPlatform(id, existing) {
       channelId: basicSettings.channelId,
       botName: basicSettings.botName,
       allowedUsers,
-      skipPermissions: !requireApproval
+      permissionMode: lastPermissionMode
     };
   }
 }
@@ -51082,7 +51147,10 @@ async function setupSlackPlatform(id, existing) {
   let lastChannelId = existingSlack?.channelId || "";
   let lastBotName = existingSlack?.botName || "claude";
   let lastAllowedUsers = existingSlack?.allowedUsers?.join(",") || "";
-  let lastRequireApproval = existingSlack ? !existingSlack.skipPermissions : true;
+  let lastPermissionMode = existingSlack ? resolvePermissionMode({
+    permissionMode: existingSlack.permissionMode,
+    skipPermissions: existingSlack.skipPermissions
+  }) : "auto";
   while (true) {
     console.log("");
     console.log(dim("  Now enter your Slack credentials:"));
@@ -51191,12 +51259,12 @@ async function setupSlackPlatform(id, existing) {
         allowedUsersConfirmed = true;
       }
     }
-    const { requireApproval } = await import_prompts.default({
-      type: "confirm",
-      name: "requireApproval",
-      message: "Require approval for Claude actions?",
-      initial: lastRequireApproval,
-      hint: "Yes = approve via reactions (recommended), No = auto-approve everything"
+    const { permissionMode } = await import_prompts.default({
+      type: "select",
+      name: "permissionMode",
+      message: "Permission mode for Claude tool-uses?",
+      choices: PERMISSION_MODE_CHOICES,
+      initial: permissionModeChoiceIndex(lastPermissionMode)
     }, { onCancel });
     lastDisplayName = basicSettings.displayName;
     lastBotToken = finalBotToken;
@@ -51204,7 +51272,7 @@ async function setupSlackPlatform(id, existing) {
     lastChannelId = basicSettings.channelId;
     lastBotName = basicSettings.botName;
     lastAllowedUsers = allowedUsers.join(",");
-    lastRequireApproval = requireApproval;
+    lastPermissionMode = permissionMode;
     console.log("");
     console.log(dim("  Validating credentials..."));
     const validationResult = await validateSlackCredentials(finalBotToken, finalAppToken, basicSettings.channelId);
@@ -51269,7 +51337,7 @@ async function setupSlackPlatform(id, existing) {
       channelId: basicSettings.channelId,
       botName: basicSettings.botName,
       allowedUsers,
-      skipPermissions: !requireApproval
+      permissionMode: lastPermissionMode
     };
   }
 }
@@ -52290,7 +52358,7 @@ class SlackClient extends BasePlatformClient {
     this.channelId = platformConfig.channelId;
     this.botName = platformConfig.botName;
     this.allowedUsers = platformConfig.allowedUsers;
-    this.skipPermissions = platformConfig.skipPermissions;
+    this.skipPermissions = platformConfig.skipPermissions ?? false;
     this.apiUrl = platformConfig.apiUrl || "https://slack.com/api";
   }
   normalizePlatformUser(slackUser) {
@@ -52914,12 +52982,12 @@ class SlackClient extends BasePlatformClient {
     return this.normalizePlatformFile(response.file);
   }
 }
-// src/mattermost/api.ts
+// src/platform/mattermost/permission-api.ts
 init_logger();
-var log4 = createLogger("mm-api");
+var apiLog = createLogger("mm-api");
 async function mattermostApi(config, method, path, body) {
   const url = `${config.url}/api/v4${path}`;
-  log4.debug(`API ${method} ${path}`);
+  apiLog.debug(`API ${method} ${path}`);
   const response = await fetch(url, {
     method,
     headers: {
@@ -52930,10 +52998,10 @@ async function mattermostApi(config, method, path, body) {
   });
   if (!response.ok) {
     const text = await response.text();
-    log4.warn(`API ${method} ${path} failed: ${response.status} ${text.substring(0, 100)}`);
+    apiLog.warn(`API ${method} ${path} failed: ${response.status} ${text.substring(0, 100)}`);
     throw new Error(`Mattermost API error ${response.status}: ${text}`);
   }
-  log4.debug(`API ${method} ${path} → ${response.status}`);
+  apiLog.debug(`API ${method} ${path} → ${response.status}`);
   return response.json();
 }
 async function getMe(config) {
@@ -52943,7 +53011,7 @@ async function getUser(config, userId) {
   try {
     return await mattermostApi(config, "GET", `/users/${userId}`);
   } catch (err) {
-    log4.debug(`Failed to get user ${userId}: ${err}`);
+    apiLog.debug(`Failed to get user ${userId}: ${err}`);
     return null;
   }
 }
@@ -52954,7 +53022,7 @@ async function createPost(config, channelId, message, rootId) {
     root_id: rootId
   });
 }
-async function updatePost(config, postId, message) {
+async function updatePostRaw(config, postId, message) {
   return mattermostApi(config, "PUT", `/posts/${postId}`, {
     id: postId,
     message
@@ -52967,25 +53035,23 @@ async function addReaction(config, postId, userId, emojiName) {
     emoji_name: emojiName
   });
 }
-function isUserAllowed(username, allowList) {
+function isUserInAllowList(username, allowList) {
   if (allowList.length === 0)
     return true;
   return allowList.includes(username);
 }
-async function createInteractivePost(config, channelId, message, reactions, rootId, botUserId) {
+async function createInteractivePostInternal(config, channelId, message, reactions, rootId, botUserId) {
   const post = await createPost(config, channelId, message, rootId);
   for (const emoji of reactions) {
     try {
       await addReaction(config, post.id, botUserId, emoji);
     } catch (err) {
-      log4.warn(`Failed to add reaction ${emoji}: ${err}`);
+      apiLog.warn(`Failed to add reaction ${emoji}: ${err}`);
     }
   }
   return post;
 }
 
-// src/platform/mattermost/permission-api.ts
-init_logger();
 class MattermostPermissionApi {
   apiConfig;
   config;
@@ -53026,18 +53092,18 @@ class MattermostPermissionApi {
     }
   }
   isUserAllowed(username) {
-    return isUserAllowed(username, this.config.allowedUsers);
+    return isUserInAllowList(username, this.config.allowedUsers);
   }
   async createInteractivePost(message, reactions, threadId) {
     mcpLogger.debug(`Creating interactive post with ${reactions.length} reaction options`);
     const botUserId = await this.getBotUserId();
-    const post = await createInteractivePost(this.apiConfig, this.config.channelId, message, reactions, threadId, botUserId);
+    const post = await createInteractivePostInternal(this.apiConfig, this.config.channelId, message, reactions, threadId, botUserId);
     mcpLogger.debug(`Created post ${formatShortId(post.id)}`);
     return { id: post.id };
   }
   async updatePost(postId, message) {
     mcpLogger.debug(`Updating post ${postId.substring(0, 8)}`);
-    await updatePost(this.apiConfig, postId, message);
+    await updatePostRaw(this.apiConfig, postId, message);
   }
   async waitForReaction(postId, botUserId, timeoutMs) {
     return new Promise((resolve3) => {
@@ -53331,7 +53397,7 @@ init_logger();
 import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2, renameSync, chmodSync as chmodSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join3 } from "path";
-var log5 = createLogger("persist");
+var log4 = createLogger("persist");
 var STORE_VERSION = 2;
 var DEFAULT_CONFIG_DIR = join3(homedir2(), ".config", "claude-threads");
 var DEFAULT_SESSIONS_FILE = join3(DEFAULT_CONFIG_DIR, "sessions.json");
@@ -53356,13 +53422,13 @@ class SessionStore {
   load() {
     const sessions = new Map;
     if (!existsSync5(this.sessionsFile)) {
-      log5.debug("No sessions file found");
+      log4.debug("No sessions file found");
       return sessions;
     }
     try {
       const data = this.loadRaw();
       if (data.version === 1) {
-        log5.info("Migrating sessions from v1 to v2 (adding platformId)");
+        log4.info("Migrating sessions from v1 to v2 (adding platformId)");
         const newSessions = {};
         for (const [_oldKey, session] of Object.entries(data.sessions)) {
           const v1Session = session;
@@ -53376,7 +53442,7 @@ class SessionStore {
         data.version = 2;
         this.writeAtomic(data);
       } else if (data.version !== STORE_VERSION) {
-        log5.warn(`Sessions file version ${data.version} not supported, starting fresh`);
+        log4.warn(`Sessions file version ${data.version} not supported, starting fresh`);
         return sessions;
       }
       for (const session of Object.values(data.sessions)) {
@@ -53385,9 +53451,9 @@ class SessionStore {
         const sessionId = `${session.platformId}:${session.threadId}`;
         sessions.set(sessionId, session);
       }
-      log5.debug(`Loaded ${sessions.size} active session(s)`);
+      log4.debug(`Loaded ${sessions.size} active session(s)`);
     } catch (err) {
-      log5.error(`Failed to load sessions: ${err}`);
+      log4.error(`Failed to load sessions: ${err}`);
     }
     return sessions;
   }
@@ -53396,7 +53462,7 @@ class SessionStore {
     data.sessions[sessionId] = session;
     this.writeAtomic(data);
     const shortId = sessionId.substring(0, 20);
-    log5.debug(`Saved session ${shortId}...`);
+    log4.debug(`Saved session ${shortId}...`);
   }
   remove(sessionId) {
     const data = this.loadRaw();
@@ -53404,7 +53470,7 @@ class SessionStore {
       delete data.sessions[sessionId];
       this.writeAtomic(data);
       const shortId = sessionId.substring(0, 20);
-      log5.debug(`Removed session ${shortId}...`);
+      log4.debug(`Removed session ${shortId}...`);
     }
   }
   softDelete(sessionId) {
@@ -53413,7 +53479,7 @@ class SessionStore {
       data.sessions[sessionId].cleanedAt = new Date().toISOString();
       this.writeAtomic(data);
       const shortId = sessionId.substring(0, 20);
-      log5.debug(`Soft-deleted session ${shortId}...`);
+      log4.debug(`Soft-deleted session ${shortId}...`);
     }
   }
   cleanStale(maxAgeMs) {
@@ -53431,7 +53497,7 @@ class SessionStore {
     }
     if (staleIds.length > 0) {
       this.writeAtomic(data);
-      log5.debug(`Soft-deleted ${staleIds.length} stale session(s)`);
+      log4.debug(`Soft-deleted ${staleIds.length} stale session(s)`);
     }
     return staleIds;
   }
@@ -53450,7 +53516,7 @@ class SessionStore {
     }
     if (removedCount > 0) {
       this.writeAtomic(data);
-      log5.debug(`Permanently removed ${removedCount} old session(s) from history`);
+      log4.debug(`Permanently removed ${removedCount} old session(s) from history`);
     }
     return removedCount;
   }
@@ -53477,7 +53543,7 @@ class SessionStore {
   clear() {
     const data = this.loadRaw();
     this.writeAtomic({ version: STORE_VERSION, sessions: {}, stickyPostIds: data.stickyPostIds });
-    log5.debug("Cleared all sessions");
+    log4.debug("Cleared all sessions");
   }
   saveStickyPostId(platformId, postId) {
     const data = this.loadRaw();
@@ -53486,7 +53552,7 @@ class SessionStore {
     }
     data.stickyPostIds[platformId] = postId;
     this.writeAtomic(data);
-    log5.debug(`Saved sticky post ID for ${platformId}: ${postId.substring(0, 8)}...`);
+    log4.debug(`Saved sticky post ID for ${platformId}: ${postId.substring(0, 8)}...`);
   }
   getStickyPostIds() {
     const data = this.loadRaw();
@@ -53497,7 +53563,7 @@ class SessionStore {
     if (data.stickyPostIds && data.stickyPostIds[platformId]) {
       delete data.stickyPostIds[platformId];
       this.writeAtomic(data);
-      log5.debug(`Removed sticky post ID for ${platformId}`);
+      log4.debug(`Removed sticky post ID for ${platformId}`);
     }
   }
   getPlatformEnabledState() {
@@ -53515,7 +53581,7 @@ class SessionStore {
     }
     data.platformEnabledState[platformId] = enabled;
     this.writeAtomic(data);
-    log5.debug(`Set platform ${platformId} enabled state to ${enabled}`);
+    log4.debug(`Set platform ${platformId} enabled state to ${enabled}`);
   }
   findByThread(platformId, threadId) {
     const sessionId = `${platformId}:${threadId}`;
@@ -53566,9 +53632,10 @@ class SessionStore {
     chmodSync2(this.sessionsFile, 384);
   }
 }
+
 // src/claude/account-pool.ts
 init_logger();
-var log6 = createLogger("account-pool");
+var log5 = createLogger("account-pool");
 
 class AccountPool {
   accounts;
@@ -53580,11 +53647,11 @@ class AccountPool {
     this.accounts = (accounts ?? []).filter((acc) => {
       const hasAuth = !!acc.home || !!acc.apiKey;
       if (!hasAuth) {
-        log6.warn(`Claude account ${acc.id} has neither home nor apiKey — ignoring`);
+        log5.warn(`Claude account ${acc.id} has neither home nor apiKey — ignoring`);
         return false;
       }
       if (acc.home && acc.apiKey) {
-        log6.warn(`Claude account ${acc.id} has both home and apiKey set — must choose one; ignoring`);
+        log5.warn(`Claude account ${acc.id} has both home and apiKey set — must choose one; ignoring`);
         return false;
       }
       return true;
@@ -53609,7 +53676,7 @@ class AccountPool {
         this.incrementActive(preferred.id);
         return preferred;
       }
-      log6.warn(`Preferred account "${preferredId}" not in pool — falling back to round-robin`);
+      log5.warn(`Preferred account "${preferredId}" not in pool — falling back to round-robin`);
     }
     const now = Date.now();
     const n = this.accounts.length;
@@ -53623,7 +53690,7 @@ class AccountPool {
         return candidate;
       }
     }
-    log6.warn(`All ${n} accounts are in rate-limit cooldown`);
+    log5.warn(`All ${n} accounts are in rate-limit cooldown`);
     return null;
   }
   release(accountId) {
@@ -53634,14 +53701,14 @@ class AccountPool {
   }
   markCooling(accountId, untilEpochMs) {
     if (!this.byId.has(accountId)) {
-      log6.warn(`markCooling called for unknown account "${accountId}"`);
+      log5.warn(`markCooling called for unknown account "${accountId}"`);
       return;
     }
     const existing = this.coolingUntil.get(accountId) ?? 0;
     if (untilEpochMs > existing) {
       this.coolingUntil.set(accountId, untilEpochMs);
       const minutes = Math.ceil((untilEpochMs - Date.now()) / 60000);
-      log6.info(`Account "${accountId}" cooling for ~${minutes}min`);
+      log5.info(`Account "${accountId}" cooling for ~${minutes}min`);
     }
   }
   get(accountId) {
@@ -53678,7 +53745,7 @@ init_logger();
 import { existsSync as existsSync6, mkdirSync as mkdirSync3, appendFileSync, readdirSync, statSync, unlinkSync, rmdirSync, readFileSync as readFileSync5, chmodSync as chmodSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join4, dirname as dirname4 } from "path";
-var log7 = createLogger("thread-log");
+var log6 = createLogger("thread-log");
 var LOGS_BASE_DIR = join4(homedir3(), ".claude-threads", "logs");
 
 class ThreadLoggerImpl {
@@ -53708,7 +53775,7 @@ class ThreadLoggerImpl {
       this.flushTimer = setInterval(() => {
         this.flushSync();
       }, this.flushIntervalMs);
-      log7.debug(`Thread logger initialized: ${this.logPath}`);
+      log6.debug(`Thread logger initialized: ${this.logPath}`);
     }
   }
   isEnabled() {
@@ -53822,7 +53889,7 @@ class ThreadLoggerImpl {
       this.flushTimer = null;
     }
     this.flushSync();
-    log7.debug(`Thread logger closed: ${this.logPath}`);
+    log6.debug(`Thread logger closed: ${this.logPath}`);
   }
   addEntry(entry) {
     this.buffer.push(entry);
@@ -53844,7 +53911,7 @@ class ThreadLoggerImpl {
       }
       this.buffer = [];
     } catch (err) {
-      log7.error(`Failed to flush thread log: ${err}`);
+      log6.error(`Failed to flush thread log: ${err}`);
     }
   }
 }
@@ -53895,25 +53962,25 @@ function cleanupOldLogs(retentionDays = 30) {
           if (fileStat.mtimeMs < cutoffMs) {
             unlinkSync(filePath);
             deletedCount++;
-            log7.debug(`Deleted old log file: ${filePath}`);
+            log6.debug(`Deleted old log file: ${filePath}`);
           }
         } catch (err) {
-          log7.warn(`Failed to check/delete log file ${filePath}: ${err}`);
+          log6.warn(`Failed to check/delete log file ${filePath}: ${err}`);
         }
       }
       try {
         const remaining = readdirSync(platformDir);
         if (remaining.length === 0) {
           rmdirSync(platformDir);
-          log7.debug(`Removed empty platform log directory: ${platformDir}`);
+          log6.debug(`Removed empty platform log directory: ${platformDir}`);
         }
       } catch {}
     }
     if (deletedCount > 0) {
-      log7.info(`Cleaned up ${deletedCount} old log file(s)`);
+      log6.info(`Cleaned up ${deletedCount} old log file(s)`);
     }
   } catch (err) {
-    log7.error(`Failed to clean up old logs: ${err}`);
+    log6.error(`Failed to clean up old logs: ${err}`);
   }
   return deletedCount;
 }
@@ -53922,16 +53989,16 @@ function getLogFilePath(platformId, sessionId) {
 }
 function readRecentLogEntries(platformId, sessionId, maxLines = 50) {
   const logPath = getLogFilePath(platformId, sessionId);
-  log7.debug(`Reading log entries from: ${logPath}`);
+  log6.debug(`Reading log entries from: ${logPath}`);
   if (!existsSync6(logPath)) {
-    log7.debug(`Log file does not exist: ${logPath}`);
+    log6.debug(`Log file does not exist: ${logPath}`);
     return [];
   }
   try {
     const content = readFileSync5(logPath, "utf8");
     const lines = content.trim().split(`
 `);
-    log7.debug(`Log file has ${lines.length} lines`);
+    log6.debug(`Log file has ${lines.length} lines`);
     const recentLines = lines.slice(-maxLines);
     const entries = [];
     for (const line of recentLines) {
@@ -53941,17 +54008,17 @@ function readRecentLogEntries(platformId, sessionId, maxLines = 50) {
         entries.push(JSON.parse(line));
       } catch {}
     }
-    log7.debug(`Parsed ${entries.length} log entries`);
+    log6.debug(`Parsed ${entries.length} log entries`);
     return entries;
   } catch (err) {
-    log7.error(`Failed to read log file: ${err}`);
+    log6.error(`Failed to read log file: ${err}`);
     return [];
   }
 }
 
 // src/cleanup/scheduler.ts
 init_worktree();
-var log9 = createLogger("cleanup");
+var log8 = createLogger("cleanup");
 var DEFAULT_CLEANUP_INTERVAL_MS = 60 * 60 * 1000;
 var MAX_WORKTREE_AGE_MS = 24 * 60 * 60 * 1000;
 
@@ -53974,17 +54041,17 @@ class CleanupScheduler {
   }
   start() {
     if (this.isRunning) {
-      log9.debug("Cleanup scheduler already running");
+      log8.debug("Cleanup scheduler already running");
       return;
     }
     this.isRunning = true;
-    log9.info(`Cleanup scheduler started (interval: ${Math.round(this.intervalMs / 60000)}min)`);
+    log8.info(`Cleanup scheduler started (interval: ${Math.round(this.intervalMs / 60000)}min)`);
     this.runCleanup().catch((err) => {
-      log9.warn(`Initial cleanup failed: ${err}`);
+      log8.warn(`Initial cleanup failed: ${err}`);
     });
     this.timer = setInterval(() => {
       this.runCleanup().catch((err) => {
-        log9.warn(`Periodic cleanup failed: ${err}`);
+        log8.warn(`Periodic cleanup failed: ${err}`);
       });
     }, this.intervalMs);
   }
@@ -53994,11 +54061,11 @@ class CleanupScheduler {
       this.timer = null;
     }
     this.isRunning = false;
-    log9.debug("Cleanup scheduler stopped");
+    log8.debug("Cleanup scheduler stopped");
   }
   async runCleanup() {
     const startTime = Date.now();
-    log9.debug("Running background cleanup...");
+    log8.debug("Running background cleanup...");
     const stats = {
       logsDeleted: 0,
       worktreesCleaned: 0,
@@ -54024,9 +54091,9 @@ class CleanupScheduler {
     const elapsed = Date.now() - startTime;
     const totalCleaned = stats.logsDeleted + stats.worktreesCleaned + stats.metadataCleaned;
     if (totalCleaned > 0 || stats.errors.length > 0) {
-      log9.info(`Cleanup completed in ${elapsed}ms: ` + `${stats.logsDeleted} logs, ${stats.worktreesCleaned} worktrees, ${stats.metadataCleaned} metadata` + (stats.errors.length > 0 ? ` (${stats.errors.length} errors)` : ""));
+      log8.info(`Cleanup completed in ${elapsed}ms: ` + `${stats.logsDeleted} logs, ${stats.worktreesCleaned} worktrees, ${stats.metadataCleaned} metadata` + (stats.errors.length > 0 ? ` (${stats.errors.length} errors)` : ""));
     } else {
-      log9.debug(`Cleanup completed in ${elapsed}ms (nothing to clean)`);
+      log8.debug(`Cleanup completed in ${elapsed}ms (nothing to clean)`);
     }
     return stats;
   }
@@ -54039,7 +54106,7 @@ class CleanupScheduler {
         const deleted = cleanupOldLogs(this.logRetentionDays);
         resolve3(deleted);
       } catch (err) {
-        log9.warn(`Log cleanup error: ${err}`);
+        log8.warn(`Log cleanup error: ${err}`);
         resolve3(0);
       }
     });
@@ -54048,7 +54115,7 @@ class CleanupScheduler {
     const worktreesDir = getWorktreesDir();
     const result = { cleaned: 0, metadata: 0 };
     if (!existsSync7(worktreesDir)) {
-      log9.debug("No worktrees directory exists, nothing to clean");
+      log8.debug("No worktrees directory exists, nothing to clean");
       return result;
     }
     const persisted = this.sessionStore.load();
@@ -54066,7 +54133,7 @@ class CleanupScheduler {
           continue;
         const worktreePath = join6(worktreesDir, entry.name);
         if (activeWorktrees.has(worktreePath)) {
-          log9.debug(`Worktree in use by persisted session, skipping: ${entry.name}`);
+          log8.debug(`Worktree in use by persisted session, skipping: ${entry.name}`);
           continue;
         }
         const meta = await readWorktreeMetadata(worktreePath);
@@ -54076,7 +54143,7 @@ class CleanupScheduler {
           const lastActivity = new Date(meta.lastActivityAt).getTime();
           const age = now - lastActivity;
           if (meta.sessionId && age < this.maxWorktreeAgeMs) {
-            log9.debug(`Worktree has active session (${Math.round(age / 60000)}min old), skipping: ${entry.name}`);
+            log8.debug(`Worktree has active session (${Math.round(age / 60000)}min old), skipping: ${entry.name}`);
             continue;
           }
           const merged = age >= this.maxWorktreeAgeMs ? await isBranchMerged(meta.repoRoot, meta.branch).catch(() => false) : false;
@@ -54087,7 +54154,7 @@ class CleanupScheduler {
             shouldCleanup = true;
             cleanupReason = `inactive for ${Math.round(age / 3600000)}h`;
           } else {
-            log9.debug(`Worktree recent (${Math.round(age / 60000)}min old), skipping: ${entry.name}`);
+            log8.debug(`Worktree recent (${Math.round(age / 60000)}min old), skipping: ${entry.name}`);
             continue;
           }
         } else {
@@ -54096,7 +54163,7 @@ class CleanupScheduler {
         }
         if (!shouldCleanup)
           continue;
-        log9.info(`Cleaning worktree (${cleanupReason}): ${entry.name}`);
+        log8.info(`Cleaning worktree (${cleanupReason}): ${entry.name}`);
         try {
           if (meta?.repoRoot) {
             await removeWorktree(meta.repoRoot, worktreePath);
@@ -54107,19 +54174,19 @@ class CleanupScheduler {
           await removeWorktreeMetadata(worktreePath);
           result.metadata++;
         } catch (err) {
-          log9.warn(`Failed to clean orphaned worktree ${entry.name}: ${err}`);
+          log8.warn(`Failed to clean orphaned worktree ${entry.name}: ${err}`);
           try {
             await rm(worktreePath, { recursive: true, force: true });
             result.cleaned++;
             await removeWorktreeMetadata(worktreePath);
             result.metadata++;
           } catch (rmErr) {
-            log9.error(`Failed to force remove worktree ${entry.name}: ${rmErr}`);
+            log8.error(`Failed to force remove worktree ${entry.name}: ${rmErr}`);
           }
         }
       }
     } catch (err) {
-      log9.warn(`Failed to scan worktrees directory: ${err}`);
+      log8.warn(`Failed to scan worktrees directory: ${err}`);
     }
     return result;
   }
@@ -54193,7 +54260,7 @@ init_logger();
 import { EventEmitter as EventEmitter2 } from "events";
 import { resolve as resolve3, dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { existsSync as existsSync8, readFileSync as readFileSync6, watchFile, unwatchFile, unlinkSync as unlinkSync2, statSync as statSync2, readdirSync as readdirSync2 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync6, watchFile, unwatchFile, unlinkSync as unlinkSync2, statSync as statSync2, readdirSync as readdirSync2, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir } from "os";
 import { join as join7 } from "path";
 
@@ -54259,7 +54326,7 @@ function extractResetAt(text, now) {
 }
 
 // src/claude/cli.ts
-var log10 = createLogger("claude");
+var log9 = createLogger("claude");
 function cleanupBrowserBridgeSockets() {
   try {
     const tempDir = tmpdir();
@@ -54271,13 +54338,13 @@ function cleanupBrowserBridgeSockets() {
           const stats = statSync2(filePath);
           if (stats.isSocket()) {
             unlinkSync2(filePath);
-            log10.debug(`Removed stale browser bridge socket: ${file}`);
+            log9.debug(`Removed stale browser bridge socket: ${file}`);
           }
         } catch {}
       }
     }
   } catch (err) {
-    log10.debug(`Browser bridge cleanup failed: ${err}`);
+    log9.debug(`Browser bridge cleanup failed: ${err}`);
   }
 }
 function buildClaudeChildEnv(parentEnv, account) {
@@ -54307,6 +54374,64 @@ function isErrorResultEvent(event) {
     return true;
   return false;
 }
+function materializeMcpConfig(config, sessionId, opts = {}) {
+  if (opts.inline ?? process.env.CLAUDE_THREADS_MCP_CONFIG_INLINE === "1") {
+    return { mode: "inline", value: JSON.stringify(config) };
+  }
+  const dir = opts.tmpDirOverride ?? tmpdir();
+  const path2 = join7(dir, `claude-threads-mcp-${sessionId ?? process.pid}-${Date.now()}.json`);
+  writeFileSync3(path2, JSON.stringify(config), { mode: 384 });
+  return { mode: "file", path: path2 };
+}
+function buildPermissionArgs(opts) {
+  const args = [];
+  if (opts.permissionMode === "bypass") {
+    args.push("--dangerously-skip-permissions");
+    return { args, tempFile: null };
+  }
+  if (!opts.platformConfig) {
+    throw new Error(`platformConfig is required when permissionMode is '${opts.permissionMode}'`);
+  }
+  const mcpEnv = {
+    PLATFORM_TYPE: opts.platformConfig.type,
+    PLATFORM_URL: opts.platformConfig.url,
+    PLATFORM_TOKEN: opts.platformConfig.token,
+    PLATFORM_CHANNEL_ID: opts.platformConfig.channelId,
+    PLATFORM_THREAD_ID: opts.threadId || "",
+    ALLOWED_USERS: opts.platformConfig.allowedUsers.join(","),
+    DEBUG: opts.debug ? "1" : "",
+    PERMISSION_TIMEOUT_MS: String(opts.permissionTimeoutMs)
+  };
+  if (opts.platformConfig.appToken) {
+    mcpEnv.PLATFORM_APP_TOKEN = opts.platformConfig.appToken;
+  }
+  const mcpConfig = {
+    mcpServers: {
+      "claude-threads-permissions": {
+        type: "stdio",
+        command: "node",
+        args: [opts.mcpServerPath],
+        env: mcpEnv
+      }
+    }
+  };
+  const materialized = materializeMcpConfig(mcpConfig, opts.sessionId, { inline: opts.inline });
+  let tempFile = null;
+  if (materialized.mode === "file") {
+    tempFile = materialized.path;
+    args.push("--mcp-config", materialized.path);
+  } else {
+    args.push("--mcp-config", materialized.value);
+  }
+  args.push("--permission-prompt-tool", "mcp__claude-threads-permissions__permission_prompt");
+  if (opts.permissionMode === "auto") {
+    args.push("--permission-mode", "auto");
+  }
+  return { args, tempFile };
+}
+var STDERR_PER_INSTANCE_CAP = 10240;
+var STDERR_AGGREGATE_SOFT_CAP = 10 * 1024 * 1024;
+var totalStderrBytes = 0;
 
 class ClaudeCli extends EventEmitter2 {
   process = null;
@@ -54316,6 +54441,7 @@ class ClaudeCli extends EventEmitter2 {
   statusFilePath = null;
   lastStatusData = null;
   stderrBuffer = "";
+  mcpConfigTempFile = null;
   lastEmittedRateLimitDeadline = 0;
   log;
   constructor(options2) {
@@ -54367,6 +54493,7 @@ class ClaudeCli extends EventEmitter2 {
   start() {
     if (this.process)
       throw new Error("Already running");
+    totalStderrBytes -= this.stderrBuffer.length;
     this.stderrBuffer = "";
     this.lastEmittedRateLimitDeadline = 0;
     cleanupBrowserBridgeSockets();
@@ -54385,40 +54512,18 @@ class ClaudeCli extends EventEmitter2 {
         args.push("--session-id", this.options.sessionId);
       }
     }
-    if (this.options.skipPermissions) {
-      args.push("--dangerously-skip-permissions");
-    } else {
-      const mcpServerPath = this.getMcpServerPath();
-      const platformConfig = this.options.platformConfig;
-      if (!platformConfig) {
-        throw new Error("platformConfig is required when skipPermissions is false");
-      }
-      const mcpEnv = {
-        PLATFORM_TYPE: platformConfig.type,
-        PLATFORM_URL: platformConfig.url,
-        PLATFORM_TOKEN: platformConfig.token,
-        PLATFORM_CHANNEL_ID: platformConfig.channelId,
-        PLATFORM_THREAD_ID: this.options.threadId || "",
-        ALLOWED_USERS: platformConfig.allowedUsers.join(","),
-        DEBUG: this.debug ? "1" : "",
-        PERMISSION_TIMEOUT_MS: String(this.options.permissionTimeoutMs ?? 120000)
-      };
-      if (platformConfig.appToken) {
-        mcpEnv.PLATFORM_APP_TOKEN = platformConfig.appToken;
-      }
-      const mcpConfig = {
-        mcpServers: {
-          "claude-threads-permissions": {
-            type: "stdio",
-            command: "node",
-            args: [mcpServerPath],
-            env: mcpEnv
-          }
-        }
-      };
-      args.push("--mcp-config", JSON.stringify(mcpConfig));
-      args.push("--permission-prompt-tool", "mcp__claude-threads-permissions__permission_prompt");
-    }
+    const permissionMode = this.options.permissionMode ?? "default";
+    const permResult = buildPermissionArgs({
+      permissionMode,
+      mcpServerPath: this.getMcpServerPath(),
+      platformConfig: this.options.platformConfig,
+      threadId: this.options.threadId,
+      sessionId: this.options.sessionId,
+      permissionTimeoutMs: this.options.permissionTimeoutMs ?? 120000,
+      debug: this.debug
+    });
+    args.push(...permResult.args);
+    this.mcpConfigTempFile = permResult.tempFile;
     if (this.options.chrome) {
       args.push("--chrome");
     }
@@ -54453,10 +54558,13 @@ class ClaudeCli extends EventEmitter2 {
     });
     this.process.stderr?.on("data", (chunk) => {
       const text = chunk.toString();
+      const before = this.stderrBuffer.length;
       this.stderrBuffer += text;
-      if (this.stderrBuffer.length > 10240) {
-        this.stderrBuffer = this.stderrBuffer.slice(-10240);
+      const cap = totalStderrBytes > STDERR_AGGREGATE_SOFT_CAP ? 1024 : STDERR_PER_INSTANCE_CAP;
+      if (this.stderrBuffer.length > cap) {
+        this.stderrBuffer = this.stderrBuffer.slice(-cap);
       }
+      totalStderrBytes += this.stderrBuffer.length - before;
       this.log.debug(`stderr: ${text.trim()}`);
       if (process.env.INTEGRATION_TEST === "1") {
         process.stderr.write(text);
@@ -54471,6 +54579,14 @@ class ClaudeCli extends EventEmitter2 {
       this.log.debug(`Exited ${code}`);
       this.process = null;
       this.buffer = "";
+      totalStderrBytes -= this.stderrBuffer.length;
+      if (this.mcpConfigTempFile) {
+        const path2 = this.mcpConfigTempFile;
+        this.mcpConfigTempFile = null;
+        try {
+          unlinkSync2(path2);
+        } catch {}
+      }
       this.emit("exit", code);
     });
   }
@@ -54716,8 +54832,8 @@ var COMMAND_REGISTRY = [
   },
   {
     command: "permissions",
-    description: "Toggle permission prompts",
-    args: "interactive|skip",
+    description: "Set permission mode (default prompts; auto lets Claude classify; bypass skips all)",
+    args: "default / auto / bypass",
     category: "settings",
     audience: "user",
     claudeNotes: "User decisions, not yours",
@@ -54832,7 +54948,7 @@ var COMMAND_PATTERNS = [
   ["worktree", /^!worktree\s+(\S+(?:\s+.*)?)$/i],
   ["invite", /^!invite\s+@?([\w.-]+)\s*$/i],
   ["kick", /^!kick\s+@?([\w.-]+)\s*$/i],
-  ["permissions", /^!permissions?\s+(interactive|auto)\s*$/i],
+  ["permissions", /^!permissions?\s+(default|auto|bypass|interactive|skip)\s*$/i],
   ["update", /^!update(?:\s+(now|defer))?\s*$/i],
   ["context", /^!context\s*$/i],
   ["cost", /^!cost\s*$/i],
@@ -54897,7 +55013,7 @@ function removeCommandFromText(text, command) {
 }
 var STACKABLE_PATTERNS = [
   ["cd", /^!cd\s+(\S+)(?:\s+(.*))?$/i, 1, 2],
-  ["permissions", /^!permissions?\s+(interactive)(?:\s+(.*))?$/i, 1, 2],
+  ["permissions", /^!permissions?\s+(default|auto|bypass|interactive|skip)(?:\s+(.*))?$/i, 1, 2],
   ["worktree", /^!worktree\s+(.+)$/i, 1, -1]
 ];
 var IMMEDIATE_PATTERNS = [
@@ -55175,22 +55291,39 @@ var handleCd = async (ctx, args) => {
   await ctx.sessionManager.changeDirectory(ctx.threadId, args, ctx.username);
   return { handled: true };
 };
+function parsePermissionMode(arg) {
+  switch (arg?.toLowerCase()) {
+    case "default":
+    case "interactive":
+      return "default";
+    case "auto":
+      return "auto";
+    case "bypass":
+    case "skip":
+      return "bypass";
+    default:
+      return null;
+  }
+}
 var handlePermissions = async (ctx, args) => {
-  const mode = args?.toLowerCase();
+  const mode = parsePermissionMode(args);
   if (ctx.commandContext === "first-message") {
-    if (mode === "interactive") {
+    if (mode) {
       return {
-        sessionOptions: { forceInteractivePermissions: true },
+        sessionOptions: {
+          permissionMode: mode,
+          forceInteractivePermissions: mode === "default"
+        },
         continueProcessing: true
       };
     }
     return { handled: false };
   }
-  if (mode === "interactive") {
-    await ctx.sessionManager.enableInteractivePermissions(ctx.threadId, ctx.username);
-  } else {
-    await ctx.client.createPost(`⚠️ Cannot upgrade to auto permissions - can only downgrade to interactive`, ctx.threadId);
+  if (!mode) {
+    await ctx.client.createPost(`⚠️ Unknown permission mode. Usage: \`!permissions default|auto|bypass\` (aliases: \`interactive\`, \`skip\`).`, ctx.threadId);
+    return { handled: true };
   }
+  await ctx.sessionManager.setSessionPermissionMode(ctx.threadId, ctx.username, mode);
   return { handled: true };
 };
 var handleWorktree = async (ctx, args) => {
@@ -55447,7 +55580,7 @@ import { existsSync as existsSync11 } from "fs";
 // src/utils/keep-alive.ts
 init_logger();
 import { spawn as spawn2 } from "child_process";
-var log11 = createLogger("keepalive");
+var log10 = createLogger("keepalive");
 
 class KeepAliveManager {
   activeSessionCount = 0;
@@ -55462,7 +55595,7 @@ class KeepAliveManager {
     if (!enabled && this.keepAliveProcess) {
       this.stopKeepAlive();
     }
-    log11.debug(`Keep-alive ${enabled ? "enabled" : "disabled"}`);
+    log10.debug(`Keep-alive ${enabled ? "enabled" : "disabled"}`);
   }
   isEnabled() {
     return this.enabled;
@@ -55472,7 +55605,7 @@ class KeepAliveManager {
   }
   sessionStarted() {
     this.activeSessionCount++;
-    log11.debug(`Session started (${this.activeSessionCount} active)`);
+    log10.debug(`Session started (${this.activeSessionCount} active)`);
     if (this.activeSessionCount === 1) {
       this.startKeepAlive();
     }
@@ -55481,7 +55614,7 @@ class KeepAliveManager {
     if (this.activeSessionCount > 0) {
       this.activeSessionCount--;
     }
-    log11.debug(`Session ended (${this.activeSessionCount} active)`);
+    log10.debug(`Session ended (${this.activeSessionCount} active)`);
     if (this.activeSessionCount === 0) {
       this.stopKeepAlive();
     }
@@ -55495,11 +55628,11 @@ class KeepAliveManager {
   }
   startKeepAlive() {
     if (!this.enabled) {
-      log11.debug("Keep-alive disabled, skipping");
+      log10.debug("Keep-alive disabled, skipping");
       return;
     }
     if (this.keepAliveProcess) {
-      log11.debug("Keep-alive already running");
+      log10.debug("Keep-alive already running");
       return;
     }
     switch (this.platform) {
@@ -55513,12 +55646,12 @@ class KeepAliveManager {
         this.startWindowsKeepAlive();
         break;
       default:
-        log11.warn(`Keep-alive not supported on ${this.platform}`);
+        log10.warn(`Keep-alive not supported on ${this.platform}`);
     }
   }
   stopKeepAlive() {
     if (this.keepAliveProcess) {
-      log11.debug("Stopping keep-alive");
+      log10.debug("Stopping keep-alive");
       this.keepAliveProcess.kill();
       this.keepAliveProcess = null;
     }
@@ -55530,18 +55663,18 @@ class KeepAliveManager {
         detached: false
       });
       this.keepAliveProcess.on("error", (err) => {
-        log11.error(`Failed to start caffeinate: ${err.message}`);
+        log10.error(`Failed to start caffeinate: ${err.message}`);
         this.keepAliveProcess = null;
       });
       this.keepAliveProcess.on("exit", (code) => {
         if (code !== null && code !== 0 && this.activeSessionCount > 0) {
-          log11.debug(`caffeinate exited with code ${code}`);
+          log10.debug(`caffeinate exited with code ${code}`);
         }
         this.keepAliveProcess = null;
       });
-      log11.info("Sleep prevention active (caffeinate)");
+      log10.info("Sleep prevention active (caffeinate)");
     } catch (err) {
-      log11.error(`Failed to start caffeinate: ${err}`);
+      log10.error(`Failed to start caffeinate: ${err}`);
     }
   }
   startLinuxKeepAlive() {
@@ -55557,19 +55690,19 @@ class KeepAliveManager {
         detached: false
       });
       this.keepAliveProcess.on("error", (err) => {
-        log11.debug(`systemd-inhibit not available: ${err.message}`);
+        log10.debug(`systemd-inhibit not available: ${err.message}`);
         this.keepAliveProcess = null;
         this.startLinuxKeepAliveFallback();
       });
       this.keepAliveProcess.on("exit", (code) => {
         if (code !== null && code !== 0 && this.activeSessionCount > 0) {
-          log11.debug(`systemd-inhibit exited with code ${code}`);
+          log10.debug(`systemd-inhibit exited with code ${code}`);
         }
         this.keepAliveProcess = null;
       });
-      log11.info("Sleep prevention active (systemd-inhibit)");
+      log10.info("Sleep prevention active (systemd-inhibit)");
     } catch (err) {
-      log11.debug(`Failed to start systemd-inhibit: ${err}`);
+      log10.debug(`Failed to start systemd-inhibit: ${err}`);
       this.startLinuxKeepAliveFallback();
     }
   }
@@ -55583,15 +55716,15 @@ class KeepAliveManager {
         detached: false
       });
       this.keepAliveProcess.on("error", (err) => {
-        log11.warn(`Linux keep-alive fallback not available: ${err.message}`);
+        log10.warn(`Linux keep-alive fallback not available: ${err.message}`);
         this.keepAliveProcess = null;
       });
       this.keepAliveProcess.on("exit", () => {
         this.keepAliveProcess = null;
       });
-      log11.info("Sleep prevention active (xdg-screensaver)");
+      log10.info("Sleep prevention active (xdg-screensaver)");
     } catch (err) {
-      log11.warn(`Linux keep-alive not available: ${err}`);
+      log10.warn(`Linux keep-alive not available: ${err}`);
     }
   }
   startWindowsKeepAlive() {
@@ -55616,18 +55749,18 @@ class KeepAliveManager {
         windowsHide: true
       });
       this.keepAliveProcess.on("error", (err) => {
-        log11.warn(`Windows keep-alive not available: ${err.message}`);
+        log10.warn(`Windows keep-alive not available: ${err.message}`);
         this.keepAliveProcess = null;
       });
       this.keepAliveProcess.on("exit", (code) => {
         if (code !== null && code !== 0 && this.activeSessionCount > 0) {
-          log11.debug(`PowerShell keep-alive exited with code ${code}`);
+          log10.debug(`PowerShell keep-alive exited with code ${code}`);
         }
         this.keepAliveProcess = null;
       });
-      log11.info("Sleep prevention active (SetThreadExecutionState)");
+      log10.info("Sleep prevention active (SetThreadExecutionState)");
     } catch (err) {
-      log11.warn(`Windows keep-alive not available: ${err}`);
+      log10.warn(`Windows keep-alive not available: ${err}`);
     }
   }
 }
@@ -55635,7 +55768,7 @@ var keepAlive = new KeepAliveManager;
 
 // src/utils/error-handler/index.ts
 init_logger();
-var log12 = createLogger("error");
+var log11 = createLogger("error");
 
 class SessionError extends Error {
   sessionId;
@@ -55661,19 +55794,19 @@ async function handleError(error, context, severity = "recoverable") {
   const sessionPart = sessionId ? ` (${formatShortId(sessionId)})` : "";
   const logMessage = `${context.action}${sessionPart}: ${message}`;
   if (severity === "recoverable") {
-    log12.warn(logMessage);
+    log11.warn(logMessage);
   } else {
-    log12.error(logMessage, error instanceof Error ? error : undefined);
+    log11.error(logMessage, error instanceof Error ? error : undefined);
   }
   if (context.details) {
-    log12.debugJson("Error details", context.details);
+    log11.debugJson("Error details", context.details);
   }
   if (context.notifyUser && context.session) {
     try {
       const fmt = context.session.platform.getFormatter();
       await context.session.platform.createPost(`⚠️ ${fmt.formatBold("Error")}: ${context.action} failed - ${message}`, context.session.threadId);
     } catch (notifyError) {
-      log12.warn(`Could not notify user: ${notifyError}`);
+      log11.warn(`Could not notify user: ${notifyError}`);
     }
   }
   if (severity === "session-fatal" || severity === "system-fatal") {
@@ -55700,7 +55833,7 @@ async function logAndNotify(error, context) {
 }
 function logSilentError(context, error) {
   const message = error instanceof Error ? error.message : String(error);
-  log12.debug(`[${context}] Silently caught: ${message}`);
+  log11.debug(`[${context}] Silently caught: ${message}`);
 }
 
 // src/session/lifecycle.ts
@@ -55720,8 +55853,8 @@ function createSessionLog(baseLog) {
 init_logger();
 init_emoji();
 init_worktree();
-var log13 = createLogger("helpers");
-var sessionLog = createSessionLog(log13);
+var log12 = createLogger("helpers");
+var sessionLog = createSessionLog(log12);
 var POST_TYPES = {
   info: "",
   success: "✅",
@@ -55771,17 +55904,17 @@ async function postInteractiveAndRegister(session, message, reactions, registerP
   registerPost(post2.id, session.threadId);
   return post2;
 }
-async function updatePost2(session, postId, message) {
+async function updatePost(session, postId, message) {
   await withErrorHandling(() => session.platform.updatePost(postId, message), { action: "Update post", session });
 }
 async function updatePostSuccess(session, postId, message) {
-  await updatePost2(session, postId, `✅ ${message}`);
+  await updatePost(session, postId, `✅ ${message}`);
 }
 async function updatePostError(session, postId, message) {
-  await updatePost2(session, postId, `❌ ${message}`);
+  await updatePost(session, postId, `❌ ${message}`);
 }
 async function updatePostCancelled(session, postId, message) {
-  await updatePost2(session, postId, `\uD83D\uDEAB ${message}`);
+  await updatePost(session, postId, `\uD83D\uDEAB ${message}`);
 }
 async function removeReaction(session, postId, emoji) {
   await withErrorHandling(() => session.platform.removeReaction(postId, emoji), { action: `Remove ${emoji} reaction`, session });
@@ -55805,7 +55938,7 @@ function updateLastMessage(session, post2) {
 // src/claude/quick-query.ts
 init_spawn();
 init_logger();
-var log14 = createLogger("query");
+var log13 = createLogger("query");
 async function quickQuery(options2) {
   const {
     prompt,
@@ -55821,7 +55954,7 @@ async function quickQuery(options2) {
     args.push("--system-prompt", systemPrompt);
   }
   args.push(prompt);
-  log14.debug(`Quick query: model=${model}, timeout=${timeout}ms, prompt="${prompt.substring(0, 50)}..."`);
+  log13.debug(`Quick query: model=${model}, timeout=${timeout}ms, prompt="${prompt.substring(0, 50)}..."`);
   return new Promise((resolve5) => {
     let stdout = "";
     let stderr = "";
@@ -55835,7 +55968,7 @@ async function quickQuery(options2) {
       if (!resolved) {
         resolved = true;
         proc.kill("SIGTERM");
-        log14.debug(`Quick query timed out after ${timeout}ms`);
+        log13.debug(`Quick query timed out after ${timeout}ms`);
         resolve5({
           success: false,
           error: "timeout",
@@ -55853,7 +55986,7 @@ async function quickQuery(options2) {
       if (!resolved) {
         resolved = true;
         clearTimeout(timeoutId);
-        log14.debug(`Quick query error: ${err.message}`);
+        log13.debug(`Quick query error: ${err.message}`);
         resolve5({
           success: false,
           error: err.message,
@@ -55867,14 +56000,14 @@ async function quickQuery(options2) {
         clearTimeout(timeoutId);
         const durationMs = Date.now() - startTime;
         if (code === 0 && stdout.trim()) {
-          log14.debug(`Quick query success: ${durationMs}ms, ${stdout.length} chars`);
+          log13.debug(`Quick query success: ${durationMs}ms, ${stdout.length} chars`);
           resolve5({
             success: true,
             response: stdout.trim(),
             durationMs
           });
         } else {
-          log14.debug(`Quick query failed: code=${code}, stderr=${stderr.substring(0, 100)}`);
+          log13.debug(`Quick query failed: code=${code}, stderr=${stderr.substring(0, 100)}`);
           resolve5({
             success: false,
             error: stderr || `exit code ${code}`,
@@ -55889,7 +56022,7 @@ async function quickQuery(options2) {
 
 // src/operations/suggestions/title.ts
 init_logger();
-var log15 = createLogger("title");
+var log14 = createLogger("title");
 var SUGGESTION_TIMEOUT = 15000;
 var MIN_TITLE_LENGTH = 3;
 var MAX_TITLE_LENGTH = 50;
@@ -55953,32 +56086,32 @@ function parseMetadata(response) {
   const titleMatch = response.match(/TITLE:\s*(.+)/i);
   const descMatch = response.match(/DESC:\s*(.+)/i);
   if (!titleMatch || !descMatch) {
-    log15.debug("Failed to parse title/description from response");
+    log14.debug("Failed to parse title/description from response");
     return null;
   }
   let title = titleMatch[1].trim();
   let description = descMatch[1].trim();
   if (title.length < MIN_TITLE_LENGTH) {
-    log15.debug(`Title too short: ${title.length} chars`);
+    log14.debug(`Title too short: ${title.length} chars`);
     return null;
   }
   if (title.length > MAX_TITLE_LENGTH) {
-    log15.debug(`Title too long (${title.length} chars), truncating`);
+    log14.debug(`Title too long (${title.length} chars), truncating`);
     title = truncateAtWord(title, MAX_TITLE_LENGTH);
   }
   if (description.length < MIN_DESC_LENGTH) {
-    log15.debug(`Description too short: ${description.length} chars`);
+    log14.debug(`Description too short: ${description.length} chars`);
     return null;
   }
   if (description.length > MAX_DESC_LENGTH) {
-    log15.debug(`Description too long (${description.length} chars), truncating`);
+    log14.debug(`Description too long (${description.length} chars), truncating`);
     description = truncateAtWord(description, MAX_DESC_LENGTH);
   }
   return { title, description };
 }
 async function suggestSessionMetadata(context) {
   const logContext = typeof context === "string" ? context.substring(0, 50) : context.originalTask.substring(0, 50);
-  log15.debug(`Suggesting title for: "${logContext}..."`);
+  log14.debug(`Suggesting title for: "${logContext}..."`);
   try {
     const result = await quickQuery({
       prompt: buildTitlePrompt(context),
@@ -55986,23 +56119,23 @@ async function suggestSessionMetadata(context) {
       timeout: SUGGESTION_TIMEOUT
     });
     if (!result.success || !result.response) {
-      log15.debug(`Title suggestion failed: ${result.error || "no response"}`);
+      log14.debug(`Title suggestion failed: ${result.error || "no response"}`);
       return null;
     }
     const metadata = parseMetadata(result.response);
     if (metadata) {
-      log15.debug(`Got title: "${metadata.title}" (${result.durationMs}ms)`);
+      log14.debug(`Got title: "${metadata.title}" (${result.durationMs}ms)`);
     }
     return metadata;
   } catch (err) {
-    log15.debug(`Title suggestion error: ${err}`);
+    log14.debug(`Title suggestion error: ${err}`);
     return null;
   }
 }
 
 // src/operations/suggestions/tag.ts
 init_logger();
-var log16 = createLogger("tags");
+var log15 = createLogger("tags");
 var SUGGESTION_TIMEOUT2 = 15000;
 var MAX_TAGS = 3;
 var VALID_TAGS = [
@@ -56034,7 +56167,7 @@ function parseTags(response) {
   return [...new Set(tags)].slice(0, MAX_TAGS);
 }
 async function suggestSessionTags(userMessage) {
-  log16.debug(`Suggesting tags for: "${userMessage.substring(0, 50)}..."`);
+  log15.debug(`Suggesting tags for: "${userMessage.substring(0, 50)}..."`);
   try {
     const result = await quickQuery({
       prompt: buildTagPrompt(userMessage),
@@ -56042,14 +56175,14 @@ async function suggestSessionTags(userMessage) {
       timeout: SUGGESTION_TIMEOUT2
     });
     if (!result.success || !result.response) {
-      log16.debug(`Tag suggestion failed: ${result.error || "no response"}`);
+      log15.debug(`Tag suggestion failed: ${result.error || "no response"}`);
       return [];
     }
     const tags = parseTags(result.response);
-    log16.debug(`Got tags: ${tags.join(", ")} (${result.durationMs}ms)`);
+    log15.debug(`Got tags: ${tags.join(", ")} (${result.durationMs}ms)`);
     return tags;
   } catch (err) {
-    log16.debug(`Tag suggestion error: ${err}`);
+    log15.debug(`Tag suggestion error: ${err}`);
     return [];
   }
 }
@@ -57968,6 +58101,18 @@ class ContentExecutor extends BaseExecutor {
     }
     this.state = this.getInitialState();
   }
+  async tryUpdatePost(ctx, postId, content, logTag, successDetails, failureDetails, onSuccess, onFailure) {
+    try {
+      await ctx.platform.updatePost(postId, content);
+      onSuccess();
+      ctx.threadLogger?.logExecutor("content", "update", postId, successDetails, logTag);
+    } catch (err) {
+      ctx.logger.debug(`Update failed (${logTag}): ${err}`);
+      const resolvedFailureDetails = typeof failureDetails === "function" ? failureDetails(err) : failureDetails;
+      ctx.threadLogger?.logExecutor("content", "error", postId, resolvedFailureDetails, logTag);
+      onFailure();
+    }
+  }
   closeCurrentPost(ctx) {
     const oldPostId = this.state.currentPostId;
     const contentLength = this.state.currentPostContent.length;
@@ -58066,23 +58211,13 @@ class ContentExecutor extends BaseExecutor {
         await this.createNewPost(ctx, content, pendingAtFlushStart);
         return;
       }
-      try {
-        await ctx.platform.updatePost(postId, combinedContent2);
+      await this.tryUpdatePost(ctx, postId, combinedContent2, "flush", { newContentLength: content.length, combinedLength: combinedContent2.length }, (err) => ({ failedOp: "updatePost", error: String(err) }), () => {
         this.state.currentPostContent = combinedContent2;
         this.clearFlushedContent(pendingAtFlushStart);
-        ctx.threadLogger?.logExecutor("content", "update", postId, {
-          newContentLength: content.length,
-          combinedLength: combinedContent2.length
-        }, "flush");
-      } catch (err) {
-        ctx.logger.debug(`Update failed, will create new post on next flush: ${err}`);
-        ctx.threadLogger?.logExecutor("content", "error", postId, {
-          failedOp: "updatePost",
-          error: String(err)
-        }, "flush");
+      }, () => {
         this.state.currentPostId = null;
         this.state.currentPostContent = "";
-      }
+      });
     } else {
       const chunks = splitContentForHeight(content, ctx.contentBreaker);
       ctx.threadLogger?.logExecutor("content", "create_start", "none", {
@@ -58143,21 +58278,13 @@ class ContentExecutor extends BaseExecutor {
         breakPoint = bestBreakPoint;
       } else {
         if (this.state.currentPostId) {
-          try {
-            await ctx.platform.updatePost(this.state.currentPostId, content);
+          const postId = this.state.currentPostId;
+          await this.tryUpdatePost(ctx, postId, content, "handleSplit", { reason: "soft_break_no_breakpoint", contentLength: content.length }, { reason: "soft_break_no_breakpoint_failed" }, () => {
             this.state.currentPostContent = content;
             this.clearFlushedContent(pendingAtFlushStart);
-            ctx.threadLogger?.logExecutor("content", "update", this.state.currentPostId, {
-              reason: "soft_break_no_breakpoint",
-              contentLength: content.length
-            }, "handleSplit");
-          } catch {
-            ctx.logger.debug("Update failed (no breakpoint), will create new post on next flush");
-            ctx.threadLogger?.logExecutor("content", "error", this.state.currentPostId, {
-              reason: "soft_break_no_breakpoint_failed"
-            }, "handleSplit");
+          }, () => {
             this.state.currentPostId = null;
-          }
+          });
         }
         return;
       }
@@ -58165,22 +58292,14 @@ class ContentExecutor extends BaseExecutor {
     if (codeBlockOpenPosition !== undefined) {
       if (codeBlockOpenPosition === 0) {
         if (this.state.currentPostId) {
-          try {
-            await ctx.platform.updatePost(this.state.currentPostId, content);
+          const postId = this.state.currentPostId;
+          await this.tryUpdatePost(ctx, postId, content, "handleSplit", { reason: "code_block_at_start", contentLength: content.length }, { reason: "code_block_at_start_failed" }, () => {
             this.state.currentPostContent = content;
             this.clearFlushedContent(pendingAtFlushStart);
-            ctx.threadLogger?.logExecutor("content", "update", this.state.currentPostId, {
-              reason: "code_block_at_start",
-              contentLength: content.length
-            }, "handleSplit");
-          } catch {
-            ctx.logger.debug("Update failed (code block at start)");
-            ctx.threadLogger?.logExecutor("content", "error", this.state.currentPostId, {
-              reason: "code_block_at_start_failed"
-            }, "handleSplit");
+          }, () => {
             this.state.currentPostId = null;
             this.state.currentPostContent = "";
-          }
+          });
         }
         return;
       }
@@ -58190,22 +58309,14 @@ class ContentExecutor extends BaseExecutor {
         breakPoint = breakBeforeCodeBlock;
       } else {
         if (this.state.currentPostId) {
-          try {
-            await ctx.platform.updatePost(this.state.currentPostId, content);
+          const postId = this.state.currentPostId;
+          await this.tryUpdatePost(ctx, postId, content, "handleSplit", { reason: "no_break_before_code_block", contentLength: content.length }, { reason: "no_break_before_code_block_failed" }, () => {
             this.state.currentPostContent = content;
             this.clearFlushedContent(pendingAtFlushStart);
-            ctx.threadLogger?.logExecutor("content", "update", this.state.currentPostId, {
-              reason: "no_break_before_code_block",
-              contentLength: content.length
-            }, "handleSplit");
-          } catch {
-            ctx.logger.debug("Update failed (no break before code block)");
-            ctx.threadLogger?.logExecutor("content", "error", this.state.currentPostId, {
-              reason: "no_break_before_code_block_failed"
-            }, "handleSplit");
+          }, () => {
             this.state.currentPostId = null;
             this.state.currentPostContent = "";
-          }
+          });
         }
         return;
       }
@@ -58213,19 +58324,8 @@ class ContentExecutor extends BaseExecutor {
     const firstPart = content.substring(0, breakPoint).trim();
     const remainder = content.substring(breakPoint).trim();
     if (this.state.currentPostId) {
-      try {
-        await ctx.platform.updatePost(this.state.currentPostId, firstPart);
-        ctx.threadLogger?.logExecutor("content", "update", this.state.currentPostId, {
-          reason: "split_first_part",
-          firstPartLength: firstPart.length,
-          remainderLength: remainder.length
-        }, "handleSplit");
-      } catch {
-        ctx.logger.debug("Update failed during split, continuing with new post");
-        ctx.threadLogger?.logExecutor("content", "error", this.state.currentPostId, {
-          reason: "split_first_part_failed"
-        }, "handleSplit");
-      }
+      const postId = this.state.currentPostId;
+      await this.tryUpdatePost(ctx, postId, firstPart, "handleSplit", { reason: "split_first_part", firstPartLength: firstPart.length, remainderLength: remainder.length }, { reason: "split_first_part_failed" }, () => {}, () => {});
     }
     this.state.currentPostId = null;
     this.state.currentPostContent = "";
@@ -59591,7 +59691,7 @@ class BugReportExecutor extends BaseExecutor {
 // src/operations/executors/worktree-prompt.ts
 init_emoji();
 init_logger();
-var log17 = createLogger("wt-prompt");
+var log16 = createLogger("wt-prompt");
 // src/operations/message-manager.ts
 init_logger();
 
@@ -59628,7 +59728,7 @@ var import_yauzl = __toESM(require_yauzl(), 1);
 import { createGunzip } from "zlib";
 import { pipeline } from "stream/promises";
 import { Readable, Writable } from "stream";
-var log18 = createLogger("streaming");
+var log17 = createLogger("streaming");
 var MAX_PDF_SIZE = 32 * 1024 * 1024;
 var MAX_TEXT_FILE_SIZE = 1 * 1024 * 1024;
 var MAX_DECOMPRESSED_SIZE = 10 * 1024 * 1024;
@@ -59754,7 +59854,7 @@ async function processImageFile(file, platform, debug = false) {
     const buffer = await platform.downloadFile(file.id);
     const base64 = buffer.toString("base64");
     if (debug) {
-      log18.debug(`Attached image: ${file.name} (${file.mimeType}, ${Math.round(buffer.length / 1024)}KB)`);
+      log17.debug(`Attached image: ${file.name} (${file.mimeType}, ${Math.round(buffer.length / 1024)}KB)`);
     }
     return {
       block: {
@@ -59767,7 +59867,7 @@ async function processImageFile(file, platform, debug = false) {
       }
     };
   } catch (err) {
-    log18.error(`Failed to download image ${file.name}: ${err}`);
+    log17.error(`Failed to download image ${file.name}: ${err}`);
     return {
       skipped: {
         name: file.name,
@@ -59798,7 +59898,7 @@ async function processPdfFile(file, platform, debug = false) {
     }
     const base64 = buffer.toString("base64");
     if (debug) {
-      log18.debug(`Attached PDF: ${file.name} (${Math.round(buffer.length / 1024)}KB)`);
+      log17.debug(`Attached PDF: ${file.name} (${Math.round(buffer.length / 1024)}KB)`);
     }
     return {
       block: {
@@ -59812,7 +59912,7 @@ async function processPdfFile(file, platform, debug = false) {
       }
     };
   } catch (err) {
-    log18.error(`Failed to process PDF ${file.name}: ${err}`);
+    log17.error(`Failed to process PDF ${file.name}: ${err}`);
     return {
       skipped: {
         name: file.name,
@@ -59843,7 +59943,7 @@ async function processTextFile(file, platform, debug = false) {
     }
     const content = buffer.toString("utf-8");
     if (debug) {
-      log18.debug(`Attached text file: ${file.name} (${Math.round(buffer.length / 1024)}KB)`);
+      log17.debug(`Attached text file: ${file.name} (${Math.round(buffer.length / 1024)}KB)`);
     }
     const wrappedContent = formatTextFileContent(file.name, content);
     return {
@@ -59853,7 +59953,7 @@ async function processTextFile(file, platform, debug = false) {
       }
     };
   } catch (err) {
-    log18.error(`Failed to process text file ${file.name}: ${err}`);
+    log17.error(`Failed to process text file ${file.name}: ${err}`);
     return {
       skipped: {
         name: file.name,
@@ -59911,7 +60011,7 @@ async function processGzipFile(file, platform, debug = false) {
       compressedBuffer = await platform.downloadFile(file.id);
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
-      log18.error(`Failed to download gzip file ${file.name}: ${errorMessage}`);
+      log17.error(`Failed to download gzip file ${file.name}: ${errorMessage}`);
       return {
         skipped: {
           name: file.name,
@@ -59921,7 +60021,7 @@ async function processGzipFile(file, platform, debug = false) {
       };
     }
     if (file.size && compressedBuffer.length !== file.size) {
-      log18.warn(`Downloaded size mismatch for ${file.name}: expected ${file.size}, got ${compressedBuffer.length}`);
+      log17.warn(`Downloaded size mismatch for ${file.name}: expected ${file.size}, got ${compressedBuffer.length}`);
     }
     let decompressedBuffer;
     try {
@@ -59957,7 +60057,7 @@ async function processGzipFile(file, platform, debug = false) {
     const innerFilename = file.name.toLowerCase().endsWith(".gz") ? file.name.slice(0, -3) : file.name;
     const contentType = detectDecompressedContentType(decompressedBuffer, innerFilename);
     if (debug) {
-      log18.debug(`Decompressed ${file.name}: ${Math.round(decompressedBuffer.length / 1024)}KB, detected type: ${contentType}`);
+      log17.debug(`Decompressed ${file.name}: ${Math.round(decompressedBuffer.length / 1024)}KB, detected type: ${contentType}`);
     }
     if (contentType === "pdf") {
       const base64 = decompressedBuffer.toString("base64");
@@ -59992,7 +60092,7 @@ async function processGzipFile(file, platform, debug = false) {
     }
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
-    log18.error(`Failed to process gzip file ${file.name}: ${errorMessage}`);
+    log17.error(`Failed to process gzip file ${file.name}: ${errorMessage}`);
     return {
       skipped: {
         name: file.name,
@@ -60044,7 +60144,7 @@ async function processZipFile(file, platform, debug = false) {
     }
     const zipBuffer = await platform.downloadFile(file.id);
     if (debug) {
-      log18.debug(`Processing zip file ${file.name}: ${Math.round(zipBuffer.length / 1024)}KB`);
+      log17.debug(`Processing zip file ${file.name}: ${Math.round(zipBuffer.length / 1024)}KB`);
     }
     const zipfile = await new Promise((resolve5, reject) => {
       import_yauzl.default.fromBuffer(zipBuffer, { lazyEntries: true }, (err, zf) => {
@@ -60118,7 +60218,7 @@ async function processZipFile(file, platform, debug = false) {
           const buffer = await extractZipEntry(zipfile2, entry);
           const contentType = detectDecompressedContentType(buffer, entry.fileName);
           if (debug) {
-            log18.debug(`Extracted ${entry.fileName}: ${Math.round(buffer.length / 1024)}KB, type: ${contentType}`);
+            log17.debug(`Extracted ${entry.fileName}: ${Math.round(buffer.length / 1024)}KB, type: ${contentType}`);
           }
           if (contentType === "pdf") {
             const base64 = buffer.toString("base64");
@@ -60161,11 +60261,11 @@ async function processZipFile(file, platform, debug = false) {
     });
     zipfile2.close();
     if (debug) {
-      log18.debug(`Zip ${file.name}: processed ${processedCount} files, skipped ${skipped.length}`);
+      log17.debug(`Zip ${file.name}: processed ${processedCount} files, skipped ${skipped.length}`);
     }
     return { blocks, skipped };
   } catch (err) {
-    log18.error(`Failed to process zip file ${file.name}: ${err}`);
+    log17.error(`Failed to process zip file ${file.name}: ${err}`);
     return {
       blocks: [],
       skipped: [{
@@ -60262,7 +60362,7 @@ async function processFiles(platform, files, debug = false) {
       blocks.push(...zipResult.blocks);
       for (const s of zipResult.skipped) {
         skipped.push(s);
-        log18.warn(`Skipped file ${s.name}: ${s.reason}`);
+        log17.warn(`Skipped file ${s.name}: ${s.reason}`);
       }
       continue;
     }
@@ -60296,7 +60396,7 @@ async function processFiles(platform, files, debug = false) {
     }
     if (result.skipped) {
       skipped.push(result.skipped);
-      log18.warn(`Skipped file ${result.skipped.name}: ${result.skipped.reason}`);
+      log17.warn(`Skipped file ${result.skipped.name}: ${result.skipped.reason}`);
     }
   }
   return { blocks, skipped };
@@ -60329,7 +60429,7 @@ function stopTyping(session) {
 }
 
 // src/operations/message-manager.ts
-var log19 = createLogger("msg-mgr");
+var log18 = createLogger("msg-mgr");
 
 class MessageManager {
   platform;
@@ -60355,7 +60455,8 @@ class MessageManager {
   emitSessionUpdateCallback;
   toolStartTimes = new Map;
   flushTimer = null;
-  static FLUSH_DELAY_MS = 500;
+  static DEFAULT_FLUSH_DELAY_MS = 500;
+  flushDelayMs;
   events;
   constructor(options2) {
     this.session = options2.session;
@@ -60370,6 +60471,7 @@ class MessageManager {
     this.buildMessageContentCallback = options2.buildMessageContent;
     this.startTypingCallback = options2.startTyping;
     this.emitSessionUpdateCallback = options2.emitSessionUpdate;
+    this.flushDelayMs = options2.flushDelayMs ?? MessageManager.DEFAULT_FLUSH_DELAY_MS;
     this.events = createMessageManagerEvents();
     this.contentBreaker = new DefaultContentBreaker;
     this.contentExecutor = new ContentExecutor({
@@ -60417,7 +60519,7 @@ class MessageManager {
     });
   }
   async handleEvent(event) {
-    const logger = log19.forSession(this.sessionId);
+    const logger = log18.forSession(this.sessionId);
     const transformCtx = {
       sessionId: this.sessionId,
       formatter: this.platform.getFormatter(),
@@ -60467,7 +60569,7 @@ class MessageManager {
     }
   }
   async executeOperation(op) {
-    const logger = log19.forSession(this.sessionId);
+    const logger = log18.forSession(this.sessionId);
     const ctx = this.getExecutorContext();
     try {
       if (isContentOp(op)) {
@@ -60516,7 +60618,7 @@ class MessageManager {
       this.flushTimer = null;
       const flushOp = createFlushOp(this.sessionId, "soft_threshold");
       await this.contentExecutor.executeFlush(flushOp, ctx);
-    }, MessageManager.FLUSH_DELAY_MS);
+    }, this.flushDelayMs);
   }
   cancelScheduledFlush() {
     if (this.flushTimer) {
@@ -60535,7 +60637,7 @@ class MessageManager {
       threadId: this.threadId,
       platform: this.platform,
       formatter: this.platform.getFormatter(),
-      logger: log19.forSession(this.sessionId),
+      logger: log18.forSession(this.sessionId),
       postTracker: this.postTracker,
       contentBreaker: this.contentBreaker,
       threadLogger: this.session.threadLogger,
@@ -60746,13 +60848,13 @@ class MessageManager {
     return this.systemExecutor.postSuccess(message, this.getExecutorContext());
   }
   async prepareForUserMessage() {
-    const logger = log19.forSession(this.sessionId);
+    const logger = log18.forSession(this.sessionId);
     logger.debug("Preparing for new user message");
     await this.closeCurrentPost();
     await this.bumpTaskList();
   }
   async handleUserMessage(message, files, username, displayName) {
-    const logger = log19.forSession(this.sessionId);
+    const logger = log18.forSession(this.sessionId);
     if (!this.session.claude.isRunning()) {
       logger.debug("Claude not running, ignoring user message");
       return false;
@@ -60779,7 +60881,7 @@ class MessageManager {
     return this.session;
   }
   async handleReaction(postId, emoji, user, action) {
-    const logger = log19.forSession(this.sessionId);
+    const logger = log18.forSession(this.sessionId);
     const ctx = this.getExecutorContext();
     logger.debug(`Routing reaction: postId=${postId}, emoji=${emoji}, user=${user}, action=${action}`);
     if (await this.questionApprovalExecutor.handleReaction(postId, emoji, user, action, ctx)) {
@@ -60975,7 +61077,7 @@ function formatPullRequestLink(url, formatter) {
 }
 
 // src/operations/sticky-message/handler.ts
-var log20 = createLogger("sticky");
+var log19 = createLogger("sticky");
 var botStartedAt = new Date;
 function getPendingPrompts(session) {
   const prompts2 = [];
@@ -61050,21 +61152,21 @@ function initialize(store) {
     stickyPostIds.set(platformId, postId);
   }
   if (persistedIds.size > 0) {
-    log20.info(`\uD83D\uDCCC Restored ${persistedIds.size} sticky post ID(s) from persistence`);
+    log19.info(`\uD83D\uDCCC Restored ${persistedIds.size} sticky post ID(s) from persistence`);
   }
 }
 function setPlatformPaused(platformId, paused) {
   if (paused) {
     pausedPlatforms.set(platformId, true);
-    log20.debug(`Platform ${platformId} marked as paused`);
+    log19.debug(`Platform ${platformId} marked as paused`);
   } else {
     pausedPlatforms.delete(platformId);
-    log20.debug(`Platform ${platformId} marked as active`);
+    log19.debug(`Platform ${platformId} marked as active`);
   }
 }
 function setShuttingDown(shuttingDown) {
   isShuttingDown = shuttingDown;
-  log20.debug(`Bot shutdown state: ${shuttingDown}`);
+  log19.debug(`Bot shutdown state: ${shuttingDown}`);
 }
 function getTaskContent(session) {
   const taskState = session.messageManager?.getTaskListState();
@@ -61168,8 +61270,7 @@ async function buildStatusBar(sessionCount, config, formatter, platformId) {
     const label = cooling > 0 ? `\uD83D\uDD11 ${available}/${total} accounts (${cooling} cooling)` : `\uD83D\uDD11 ${total} account${total === 1 ? "" : "s"}`;
     items.push(formatter.formatCode(label));
   }
-  const permMode = config.skipPermissions ? "⚡ Auto" : "\uD83D\uDD10 Interactive";
-  items.push(formatter.formatCode(permMode));
+  items.push(formatter.formatCode(permissionModeDisplay(config.permissionMode).chip));
   if (config.worktreeMode === "require") {
     items.push(formatter.formatCode("\uD83C\uDF3F Worktree: require"));
   } else if (config.worktreeMode === "off") {
@@ -61376,12 +61477,12 @@ async function validateLastMessageIds(platform, sessions) {
     try {
       const post2 = await platform.getPost(lastMessageId);
       if (!post2) {
-        log20.debug(`lastMessageId ${lastMessageId.substring(0, 8)} for session ${session.sessionId} was deleted, clearing`);
+        log19.debug(`lastMessageId ${lastMessageId.substring(0, 8)} for session ${session.sessionId} was deleted, clearing`);
         session.lastMessageId = undefined;
         session.lastMessageTs = undefined;
       }
     } catch (err) {
-      log20.debug(`Failed to validate lastMessageId for session ${session.sessionId}, clearing: ${err}`);
+      log19.debug(`Failed to validate lastMessageId for session ${session.sessionId}, clearing: ${err}`);
       session.lastMessageId = undefined;
       session.lastMessageTs = undefined;
     }
@@ -61390,63 +61491,63 @@ async function validateLastMessageIds(platform, sessions) {
 }
 async function updateStickyMessageImpl(platform, sessions, config) {
   const platformSessions = [...sessions.values()].filter((s) => s.platformId === platform.platformId);
-  log20.debug(`updateStickyMessage for ${platform.platformId}, ${platformSessions.length} sessions`);
+  log19.debug(`updateStickyMessage for ${platform.platformId}, ${platformSessions.length} sessions`);
   for (const s of platformSessions) {
-    log20.debug(`  - ${s.sessionId}: title="${s.sessionTitle}" firstPrompt="${s.firstPrompt?.substring(0, 30)}..."`);
+    log19.debug(`  - ${s.sessionId}: title="${s.sessionTitle}" firstPrompt="${s.firstPrompt?.substring(0, 30)}..."`);
   }
   await validateLastMessageIds(platform, platformSessions);
   const formatter = platform.getFormatter();
   const content = await buildStickyMessage(sessions, platform.platformId, config, formatter, (threadId) => platform.getThreadLink(threadId));
   const existingPostId = stickyPostIds.get(platform.platformId);
   const shouldBump = needsBump.get(platform.platformId) ?? false;
-  log20.debug(`existingPostId: ${existingPostId || "(none)"}, needsBump: ${shouldBump}`);
+  log19.debug(`existingPostId: ${existingPostId || "(none)"}, needsBump: ${shouldBump}`);
   try {
     if (existingPostId && !shouldBump) {
-      log20.debug(`Updating existing post in place...`);
+      log19.debug(`Updating existing post in place...`);
       try {
         await platform.updatePost(existingPostId, content);
         try {
           await platform.pinPost(existingPostId);
-          log20.debug(`Re-pinned post`);
+          log19.debug(`Re-pinned post`);
         } catch (pinErr) {
-          log20.debug(`Re-pin failed (might already be pinned): ${pinErr}`);
+          log19.debug(`Re-pin failed (might already be pinned): ${pinErr}`);
         }
-        log20.debug(`Updated successfully`);
+        log19.debug(`Updated successfully`);
         return;
       } catch (err) {
-        log20.debug(`Update failed, will create new: ${err}`);
+        log19.debug(`Update failed, will create new: ${err}`);
       }
     }
     needsBump.set(platform.platformId, false);
     if (existingPostId) {
-      log20.debug(`Unpinning and deleting existing post ${existingPostId.substring(0, 8)}...`);
+      log19.debug(`Unpinning and deleting existing post ${existingPostId.substring(0, 8)}...`);
       try {
         await platform.unpinPost(existingPostId);
-        log20.debug(`Unpinned successfully`);
+        log19.debug(`Unpinned successfully`);
       } catch (err) {
-        log20.debug(`Unpin failed (probably already unpinned): ${err}`);
+        log19.debug(`Unpin failed (probably already unpinned): ${err}`);
       }
       try {
         await platform.deletePost(existingPostId);
-        log20.debug(`Deleted successfully`);
+        log19.debug(`Deleted successfully`);
       } catch (err) {
-        log20.debug(`Delete failed (probably already deleted): ${err}`);
+        log19.debug(`Delete failed (probably already deleted): ${err}`);
       }
       stickyPostIds.delete(platform.platformId);
     }
-    log20.debug(`Creating new post...`);
+    log19.debug(`Creating new post...`);
     const post2 = await platform.createPost(content);
     stickyPostIds.set(platform.platformId, post2.id);
     try {
       await platform.pinPost(post2.id);
-      log20.debug(`Pinned post successfully`);
+      log19.debug(`Pinned post successfully`);
     } catch (err) {
-      log20.debug(`Failed to pin post: ${err}`);
+      log19.debug(`Failed to pin post: ${err}`);
     }
     if (sessionStore) {
       sessionStore.saveStickyPostId(platform.platformId, post2.id);
     }
-    log20.info(`\uD83D\uDCCC Created sticky message for ${platform.platformId}: ${formatShortId(post2.id)}`);
+    log19.info(`\uD83D\uDCCC Created sticky message for ${platform.platformId}: ${formatShortId(post2.id)}`);
     const excludePostIds = new Set;
     if (sessionStore) {
       for (const session of sessionStore.load().values()) {
@@ -61462,10 +61563,10 @@ async function updateStickyMessageImpl(platform, sessions, config) {
     }
     const botUser = await platform.getBotUser();
     cleanupOldStickyMessages(platform, botUser.id, false, excludePostIds).catch((err) => {
-      log20.debug(`Background cleanup failed: ${err}`);
+      log19.debug(`Background cleanup failed: ${err}`);
     });
   } catch (err) {
-    log20.error(`Failed to update sticky message for ${platform.platformId}`, err instanceof Error ? err : undefined);
+    log19.error(`Failed to update sticky message for ${platform.platformId}`, err instanceof Error ? err : undefined);
   }
 }
 async function updateAllStickyMessages(platforms, sessions, config) {
@@ -61490,7 +61591,7 @@ async function cleanupOldStickyMessages(platform, botUserId, forceRun = false, e
   if (!forceRun) {
     const lastRun = lastCleanupTime.get(platformId) || 0;
     if (now - lastRun < CLEANUP_THROTTLE_MS) {
-      log20.debug(`Cleanup throttled for ${platformId} (last run ${Math.round((now - lastRun) / 1000)}s ago)`);
+      log19.debug(`Cleanup throttled for ${platformId} (last run ${Math.round((now - lastRun) / 1000)}s ago)`);
       return;
     }
   }
@@ -61500,36 +61601,36 @@ async function cleanupOldStickyMessages(platform, botUserId, forceRun = false, e
     const pinnedPostIds = await platform.getPinnedPosts();
     const recentPinnedIds = pinnedPostIds.filter((id) => id !== currentStickyId && !excludePostIds?.has(id) && isRecentPost(id));
     if (recentPinnedIds.length === 0) {
-      log20.debug(`No recent pinned posts to check (${pinnedPostIds.length} total, current: ${currentStickyId?.substring(0, 8) || "(none)"})`);
+      log19.debug(`No recent pinned posts to check (${pinnedPostIds.length} total, current: ${currentStickyId?.substring(0, 8) || "(none)"})`);
       return;
     }
-    log20.debug(`Checking ${recentPinnedIds.length} recent pinned posts (of ${pinnedPostIds.length} total)`);
+    log19.debug(`Checking ${recentPinnedIds.length} recent pinned posts (of ${pinnedPostIds.length} total)`);
     for (const postId of recentPinnedIds) {
       try {
         const post2 = await platform.getPost(postId);
         if (!post2)
           continue;
         if (post2.userId === botUserId) {
-          log20.debug(`Cleaning up old sticky: ${postId.substring(0, 8)}...`);
+          log19.debug(`Cleaning up old sticky: ${postId.substring(0, 8)}...`);
           try {
             await platform.unpinPost(postId);
             await platform.deletePost(postId);
-            log20.info(`\uD83E\uDDF9 Cleaned up old sticky message: ${postId.substring(0, 8)}...`);
+            log19.info(`\uD83E\uDDF9 Cleaned up old sticky message: ${postId.substring(0, 8)}...`);
           } catch (err) {
-            log20.debug(`Failed to cleanup ${postId}: ${err}`);
+            log19.debug(`Failed to cleanup ${postId}: ${err}`);
           }
         }
       } catch (err) {
-        log20.debug(`Could not check post ${postId}: ${err}`);
+        log19.debug(`Could not check post ${postId}: ${err}`);
       }
     }
   } catch (err) {
-    log20.error(`Failed to cleanup old sticky messages`, err instanceof Error ? err : undefined);
+    log19.error(`Failed to cleanup old sticky messages`, err instanceof Error ? err : undefined);
   }
 }
 // src/operations/bug-report/handler.ts
 import { execSync as execSync2 } from "child_process";
-import { writeFileSync as writeFileSync3, unlinkSync as unlinkSync3 } from "fs";
+import { writeFileSync as writeFileSync4, unlinkSync as unlinkSync3 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
 import { join as join8 } from "path";
 
@@ -62113,7 +62214,7 @@ async function createGitHubIssue(title, body, workingDir) {
   }
   const bodyFile = join8(tmpdir2(), `bug-body-${Date.now()}.md`);
   try {
-    writeFileSync3(bodyFile, body, "utf-8");
+    writeFileSync4(bodyFile, body, "utf-8");
     const cmd = `gh issue create --repo "${GITHUB_REPO}" --title "${escapeShell(title)}" --body-file "${bodyFile}"`;
     const result = execSync2(cmd, {
       cwd: workingDir,
@@ -62518,9 +62619,9 @@ node_default(Temp.purgeSyncAll);
 var temp_default = Temp;
 
 // node_modules/atomically/dist/index.js
-function writeFileSync4(filePath, data, options2 = DEFAULT_WRITE_OPTIONS) {
+function writeFileSync5(filePath, data, options2 = DEFAULT_WRITE_OPTIONS) {
   if (isString(options2))
-    return writeFileSync4(filePath, data, { encoding: options2 });
+    return writeFileSync5(filePath, data, { encoding: options2 });
   const timeout = options2.timeout ?? DEFAULT_TIMEOUT_SYNC;
   const retryOptions = { timeout };
   let tempDisposer = null;
@@ -62848,7 +62949,7 @@ class Configstore {
       }
       if (error.name === "SyntaxError") {
         if (this._clearInvalidConfig) {
-          writeFileSync4(this._path, "", writeFileOptions);
+          writeFileSync5(this._path, "", writeFileOptions);
           return {};
         }
         throw error;
@@ -62860,7 +62961,7 @@ class Configstore {
   set all(value) {
     try {
       import_graceful_fs.default.mkdirSync(path5.dirname(this._path), mkdirOptions);
-      writeFileSync4(this._path, JSON.stringify(value, undefined, "\t"), writeFileOptions);
+      writeFileSync5(this._path, JSON.stringify(value, undefined, "\t"), writeFileOptions);
     } catch (error) {
       handlePermissionError(error);
     }
@@ -65587,8 +65688,8 @@ function getUpdateInfo() {
 init_emoji();
 init_logger();
 init_worktree();
-var log21 = createLogger("commands");
-var sessionLog2 = createSessionLog(log21);
+var log20 = createLogger("commands");
+var sessionLog2 = createSessionLog(log20);
 function sessionAccountOption(session, ctx) {
   if (!session.claudeAccountId)
     return;
@@ -65751,7 +65852,11 @@ ${CHAT_PLATFORM_PROMPT}`;
   const cliOptions = {
     workingDir: absoluteDir,
     threadId: session.threadId,
-    skipPermissions: ctx.config.skipPermissions || !session.forceInteractivePermissions,
+    permissionMode: effectivePermissionMode({
+      override: session.permissionModeOverride,
+      sessionHasInteractiveOverride: session.forceInteractivePermissions,
+      botWideMode: ctx.config.permissionMode
+    }),
     sessionId: newSessionId,
     resume: false,
     chrome: ctx.config.chromeEnabled,
@@ -65828,45 +65933,37 @@ async function kickUser(session, kickedUser, kickedBy, ctx) {
     sessionLog2(session).warn(`\uD83D\uDEAB @${kickedUser} was not in session`);
   }
 }
-async function enableInteractivePermissions(session, username, ctx) {
+async function setSessionPermissionMode(session, username, mode, ctx) {
   if (!await requireSessionOwner(session, username, "change permissions")) {
     return;
   }
-  if (!ctx.config.skipPermissions) {
-    await post(session, "info", `Permissions are already interactive for this session`);
-    sessionLog2(session).debug(`\uD83D\uDD10 Permissions already interactive (global setting)`);
-    return;
-  }
-  if (session.forceInteractivePermissions) {
-    await post(session, "info", `Interactive permissions already enabled for this session`);
-    sessionLog2(session).debug(`\uD83D\uDD10 Permissions already interactive (session override)`);
-    return;
-  }
-  session.forceInteractivePermissions = true;
-  sessionLog2(session).info(`\uD83D\uDD10 Enabling interactive permissions`);
-  session.threadLogger?.logCommand("permissions", "interactive", username);
+  session.permissionModeOverride = mode;
+  session.forceInteractivePermissions = mode === "default";
+  sessionLog2(session).info(`\uD83D\uDD10 Setting permission mode to "${mode}"`);
+  session.threadLogger?.logCommand("permissions", mode, username);
+  const canResume = session.lifecycle.hasClaudeResponded;
   const cliOptions = {
     workingDir: session.workingDir,
     threadId: session.threadId,
-    skipPermissions: false,
+    permissionMode: mode,
     sessionId: session.claudeSessionId,
-    resume: true,
+    resume: canResume,
     chrome: ctx.config.chromeEnabled,
     platformConfig: session.platform.getMcpConfig(),
     logSessionId: session.sessionId,
     permissionTimeoutMs: ctx.config.permissionTimeoutMs,
     account: sessionAccountOption(session, ctx)
   };
-  const success = await restartClaudeSession(session, cliOptions, ctx, "Enable interactive permissions");
+  const success = await restartClaudeSession(session, cliOptions, ctx, `Set permission mode to ${mode}`);
   if (!success)
     return;
   await updateSessionHeader(session, ctx);
   const formatter = session.platform.getFormatter();
-  await post(session, "secure", `${formatter.formatBold("Interactive permissions enabled")} for this session by ${formatter.formatUserMention(username)}
-${formatter.formatItalic("Claude Code restarted with permission prompts")}`);
-  sessionLog2(session).info(`\uD83D\uDD10 Interactive permissions enabled by @${username}`);
-  resetSessionActivity(session);
-  ctx.ops.persistSession(session);
+  const display = permissionModeDisplay(mode);
+  await post(session, "secure", `${display.icon} ${formatter.formatBold(`Permission mode: ${display.label}`)} set for this session by ${formatter.formatUserMention(username)}
+` + `${formatter.formatItalic(permissionModeDescription(mode))}
+` + `${formatter.formatItalic("Claude Code restarted.")}`);
+  sessionLog2(session).info(`\uD83D\uDD10 Permission mode set to "${mode}" by @${username}`);
 }
 async function requestMessageApproval(session, username, message, ctx) {
   if (session.messageManager?.getPendingMessageApproval()) {
@@ -65892,8 +65989,12 @@ async function updateSessionHeader(session, ctx) {
   const formatter = session.platform.getFormatter();
   const worktreeContext = session.worktreeInfo ? { path: session.worktreeInfo.worktreePath, branch: session.worktreeInfo.branch } : undefined;
   const shortDir = shortenPath(session.workingDir, undefined, worktreeContext);
-  const isInteractive = !ctx.config.skipPermissions || session.forceInteractivePermissions;
-  const permMode = isInteractive ? "\uD83D\uDD10 Interactive" : "⚡ Auto";
+  const effectiveMode = effectivePermissionMode({
+    override: session.permissionModeOverride,
+    sessionHasInteractiveOverride: session.forceInteractivePermissions,
+    botWideMode: ctx.config.permissionMode
+  });
+  const permMode = permissionModeDisplay(effectiveMode).chip;
   const otherParticipants = [...session.sessionAllowedUsers].filter((u) => u !== session.startedBy).map((u) => formatter.formatUserMention(u)).join(", ");
   const statusItems = [];
   const versionStr = formatVersionString();
@@ -65982,7 +66083,7 @@ async function updateSessionHeader(session, ctx) {
   ].filter((item) => item !== null && item !== undefined).join(`
 `);
   const postId = session.sessionStartPostId;
-  await updatePost2(session, postId, msg);
+  await updatePost(session, postId, msg);
 }
 async function showUpdateStatus(session, updateManager, ctx) {
   const formatter = session.platform.getFormatter();
@@ -66122,7 +66223,7 @@ init_logger();
 import { exec as exec3 } from "child_process";
 import { promisify as promisify3 } from "util";
 var execAsync2 = promisify3(exec3);
-var log22 = createLogger("branch");
+var log21 = createLogger("branch");
 var SUGGESTION_TIMEOUT3 = 15000;
 var MAX_SUGGESTIONS = 3;
 async function getCurrentBranch3(workingDir) {
@@ -66171,7 +66272,7 @@ function parseBranchSuggestions(response) {
   return lines.slice(0, MAX_SUGGESTIONS);
 }
 async function suggestBranchNames(workingDir, userMessage) {
-  log22.debug(`Suggesting branch names for: "${userMessage.substring(0, 50)}..."`);
+  log21.debug(`Suggesting branch names for: "${userMessage.substring(0, 50)}..."`);
   try {
     const [currentBranch, recentCommits] = await Promise.all([
       getCurrentBranch3(workingDir),
@@ -66185,14 +66286,14 @@ async function suggestBranchNames(workingDir, userMessage) {
       workingDir
     });
     if (!result.success || !result.response) {
-      log22.debug(`Branch suggestion failed: ${result.error || "no response"}`);
+      log21.debug(`Branch suggestion failed: ${result.error || "no response"}`);
       return [];
     }
     const suggestions = parseBranchSuggestions(result.response);
-    log22.debug(`Got ${suggestions.length} branch suggestions: ${suggestions.join(", ")}`);
+    log21.debug(`Got ${suggestions.length} branch suggestions: ${suggestions.join(", ")}`);
     return suggestions;
   } catch (err) {
-    log22.debug(`Branch suggestion error: ${err}`);
+    log21.debug(`Branch suggestion error: ${err}`);
     return [];
   }
 }
@@ -66201,8 +66302,8 @@ async function suggestBranchNames(workingDir, userMessage) {
 init_worktree();
 import { randomUUID as randomUUID3 } from "crypto";
 init_logger();
-var log23 = createLogger("worktree");
-var sessionLog3 = createSessionLog(log23);
+var log22 = createLogger("worktree");
+var sessionLog3 = createSessionLog(log22);
 function parseWorktreeError(error) {
   const message = error instanceof Error ? error.message : String(error);
   const lowerMessage = message.toLowerCase();
@@ -66441,7 +66542,11 @@ async function createAndSwitchToWorktree(session, branch, username, options2) {
         const cliOptions = {
           workingDir: existing.path,
           threadId: session.threadId,
-          skipPermissions: options2.skipPermissions || !session.forceInteractivePermissions,
+          permissionMode: effectivePermissionMode({
+            override: session.permissionModeOverride,
+            sessionHasInteractiveOverride: session.forceInteractivePermissions,
+            botWideMode: options2.permissionMode
+          }),
           sessionId: newSessionId,
           resume: false,
           chrome: options2.chromeEnabled,
@@ -66530,7 +66635,11 @@ ${fmt.formatItalic("Claude Code restarted in the worktree")}`);
       const cliOptions = {
         workingDir: worktreePath,
         threadId: session.threadId,
-        skipPermissions: options2.skipPermissions || !session.forceInteractivePermissions,
+        permissionMode: effectivePermissionMode({
+          override: session.permissionModeOverride,
+          sessionHasInteractiveOverride: session.forceInteractivePermissions,
+          botWideMode: options2.permissionMode
+        }),
         sessionId: newSessionId,
         resume: false,
         chrome: options2.chromeEnabled,
@@ -66576,7 +66685,7 @@ ${fmt.formatItalic("Claude Code restarted in the new worktree")}`);
     const { summary, suggestion } = parseWorktreeError(err);
     const worktreePromptId = session.worktreePromptPostId;
     if (worktreePromptId) {
-      await updatePost2(session, worktreePromptId, `❌ ${fmt.formatBold(summary)}: ${fmt.formatCode(branch)}`);
+      await updatePost(session, worktreePromptId, `❌ ${fmt.formatBold(summary)}: ${fmt.formatCode(branch)}`);
       await removeReaction(session, worktreePromptId, "x");
     }
     if (options2.worktreeMode === "require") {
@@ -66753,8 +66862,8 @@ async function cleanupWorktreeCommand(session, username, hasOtherSessionsUsingWo
 }
 // src/operations/events/handler.ts
 init_logger();
-var log24 = createLogger("events");
-var sessionLog4 = createSessionLog(log24);
+var log23 = createLogger("events");
+var sessionLog4 = createSessionLog(log23);
 function detectAndExecuteClaudeCommands(text, session, ctx) {
   const parsed = parseClaudeCommand(text);
   if (parsed && isClaudeAllowedCommand(parsed.command)) {
@@ -66887,7 +66996,7 @@ async function handleCompactionComplete(session, compactMetadata, _ctx) {
   const formatter = session.platform.getFormatter();
   const completionMessage = `✅ ${formatter.formatBold("Context compacted")} ${formatter.formatItalic(`(${info})`)}`;
   if (session.compactionPostId) {
-    await updatePost2(session, session.compactionPostId, completionMessage);
+    await updatePost(session, session.compactionPostId, completionMessage);
     session.compactionPostId = undefined;
   } else {
     await withErrorHandling(() => post(session, "info", completionMessage), { action: "Post compaction complete", session });
@@ -67002,8 +67111,8 @@ function createSessionContext(config, state, ops) {
 // src/operations/context-prompt/handler.ts
 init_emoji();
 init_logger();
-var log25 = createLogger("context");
-var sessionLog5 = createSessionLog(log25);
+var log24 = createLogger("context");
+var sessionLog5 = createSessionLog(log24);
 var CONTEXT_PROMPT_TIMEOUT_MS = 30000;
 var CONTEXT_OPTIONS = [3, 5, 10];
 var contextPromptTimeouts = new Map;
@@ -67253,8 +67362,8 @@ function formatRelativeTime(date) {
 }
 // src/session/lifecycle.ts
 init_worktree();
-var log26 = createLogger("lifecycle");
-var sessionLog6 = createSessionLog(log26);
+var log25 = createLogger("lifecycle");
+var sessionLog6 = createSessionLog(log25);
 function mutableSessions(ctx) {
   return ctx.state.sessions;
 }
@@ -67366,7 +67475,8 @@ function createMessageManager(session, ctx) {
     },
     emitSessionUpdate: (updates) => {
       ctx.ops.emitSessionUpdate(session.sessionId, updates);
-    }
+    },
+    flushDelayMs: ctx.config.flushDelayMs
   });
   messageManager.events.on("question:complete", ({ toolUseId: _toolUseId, answers }) => {
     const answerJson = JSON.stringify(answers);
@@ -67618,8 +67728,9 @@ async function startSession(options2, username, displayName, replyToPostId, plat
   platform.sendTyping(actualThreadId);
   const claudeSessionId = randomUUID4();
   let workingDir = ctx.config.workingDir;
-  let skipPermissions = ctx.config.skipPermissions;
+  let permissionMode = ctx.config.permissionMode;
   let forceInteractivePermissions = false;
+  let sessionPermissionModeOverride;
   const formatter = platform.getFormatter();
   if (initialOptions?.workingDir) {
     const { resolve: resolve6 } = await import("path");
@@ -67637,12 +67748,17 @@ async function startSession(options2, username, displayName, replyToPostId, plat
       return;
     }
     workingDir = resolvedDir;
-    log26.info(`Starting session in directory: ${workingDir} (from !cd command)`);
-  }
-  if (initialOptions?.forceInteractivePermissions) {
+    log25.info(`Starting session in directory: ${workingDir} (from !cd command)`);
+  }
+  if (initialOptions?.permissionMode) {
+    permissionMode = initialOptions.permissionMode;
+    forceInteractivePermissions = permissionMode === "default";
+    sessionPermissionModeOverride = permissionMode;
+    log25.info(`Starting session with permission mode "${permissionMode}" (from !permissions command)`);
+  } else if (initialOptions?.forceInteractivePermissions) {
     forceInteractivePermissions = true;
-    skipPermissions = false;
-    log26.info(`Starting session with interactive permissions (from !permissions command)`);
+    permissionMode = "default";
+    log25.info(`Starting session with interactive permissions (from !permissions command)`);
   }
   const sessionContext = buildSessionContext(platform, workingDir);
   const systemPrompt = `${sessionContext}
@@ -67651,12 +67767,12 @@ ${CHAT_PLATFORM_PROMPT}`;
   const platformMcpConfig = platform.getMcpConfig();
   const claudeAccount = ctx.ops.acquireClaudeAccount();
   if (claudeAccount) {
-    log26.info(`Session ${sessionId.substring(0, 20)} reserved Claude account "${claudeAccount.id}"`);
+    log25.info(`Session ${sessionId.substring(0, 20)} reserved Claude account "${claudeAccount.id}"`);
   }
   const cliOptions = {
     workingDir,
     threadId: actualThreadId,
-    skipPermissions,
+    permissionMode,
     sessionId: claudeSessionId,
     resume: false,
     chrome: ctx.config.chromeEnabled,
@@ -67684,6 +67800,7 @@ ${CHAT_PLATFORM_PROMPT}`;
     planApproved: false,
     sessionAllowedUsers: new Set([username]),
     forceInteractivePermissions,
+    permissionModeOverride: sessionPermissionModeOverride,
     sessionStartPostId: startPost.id,
     timers: createSessionTimers(),
     lifecycle: createSessionLifecycle(),
@@ -67755,28 +67872,28 @@ async function resumeSession(state, ctx) {
       !state.claudeSessionId && "claudeSessionId",
       !state.workingDir && "workingDir"
     ].filter(Boolean).join(", ");
-    log26.warn(`Skipping session with missing required fields: ${missing}`);
+    log25.warn(`Skipping session with missing required fields: ${missing}`);
     return;
   }
   const shortId = state.threadId.substring(0, 8);
   const platforms = ctx.state.platforms;
   const platform = platforms.get(state.platformId);
   if (!platform) {
-    log26.warn(`Platform ${state.platformId} not registered, skipping resume for ${shortId}...`);
+    log25.warn(`Platform ${state.platformId} not registered, skipping resume for ${shortId}...`);
     return;
   }
   const threadPost = await platform.getPost(state.threadId);
   if (!threadPost) {
-    log26.warn(`Thread ${shortId}... deleted, skipping resume`);
+    log25.warn(`Thread ${shortId}... deleted, skipping resume`);
     ctx.state.sessionStore.remove(`${state.platformId}:${state.threadId}`);
     return;
   }
   if (ctx.state.sessions.size >= ctx.config.maxSessions) {
-    log26.warn(`Max sessions reached, skipping resume for ${shortId}...`);
+    log25.warn(`Max sessions reached, skipping resume for ${shortId}...`);
     return;
   }
   if (!existsSync11(state.workingDir)) {
-    log26.warn(`Working directory ${state.workingDir} no longer exists, skipping resume for ${shortId}...`);
+    log25.warn(`Working directory ${state.workingDir} no longer exists, skipping resume for ${shortId}...`);
     ctx.state.sessionStore.remove(`${state.platformId}:${state.threadId}`);
     const resumeFormatter = platform.getFormatter();
     const tempSession = {
@@ -67792,7 +67909,7 @@ Please start a new session.`), { action: "Post resume failure notification" });
   }
   const platformId = state.platformId;
   const sessionId = ctx.ops.getSessionId(platformId, state.threadId);
-  const skipPerms = ctx.config.skipPermissions && !state.forceInteractivePermissions;
+  const resumePermissionMode = state.forceInteractivePermissions ? "default" : ctx.config.permissionMode;
   const platformMcpConfig = platform.getMcpConfig();
   const sessionContext = buildSessionContext(platform, state.workingDir);
   const appendSystemPrompt = `${sessionContext}
@@ -67800,12 +67917,12 @@ Please start a new session.`), { action: "Post resume failure notification" });
 ${CHAT_PLATFORM_PROMPT}`;
   const claudeAccount = ctx.ops.acquireClaudeAccount(state.claudeAccountId);
   if (state.claudeAccountId && !claudeAccount) {
-    log26.warn(`Persisted session referenced Claude account "${state.claudeAccountId}" ` + `which is no longer configured — resuming under default env`);
+    log25.warn(`Persisted session referenced Claude account "${state.claudeAccountId}" ` + `which is no longer configured — resuming under default env`);
   }
   const cliOptions = {
     workingDir: state.workingDir,
     threadId: state.threadId,
-    skipPermissions: skipPerms,
+    permissionMode: resumePermissionMode,
     sessionId: state.claudeSessionId,
     resume: true,
     chrome: ctx.config.chromeEnabled,
@@ -67865,7 +67982,7 @@ ${CHAT_PLATFORM_PROMPT}`;
         worktreePath: detected.worktreePath,
         branch: detected.branch
       };
-      log26.info(`Auto-detected worktree info for resumed session: branch=${detected.branch}`);
+      log25.info(`Auto-detected worktree info for resumed session: branch=${detected.branch}`);
     }
   }
   session.messageManager = createMessageManager(session, ctx);
@@ -67921,7 +68038,7 @@ ${sessionFormatter.formatItalic("Reconnected to Claude session. You can continue
     await ctx.ops.updateStickyMessage();
     ctx.ops.persistSession(session);
   } catch (err) {
-    log26.error(`Failed to resume session ${shortId}`, err instanceof Error ? err : undefined);
+    log25.error(`Failed to resume session ${shortId}`, err instanceof Error ? err : undefined);
     ctx.ops.emitSessionRemove(sessionId);
     mutableSessions(ctx).delete(sessionId);
     ctx.state.sessionStore.remove(sessionId);
@@ -67961,18 +68078,18 @@ async function resumePausedSession(threadId, message, files, ctx) {
   const persisted = ctx.state.sessionStore.load();
   const state = findPersistedByThreadId(persisted, threadId);
   if (!state) {
-    log26.debug(`No persisted session found for ${threadId.substring(0, 8)}...`);
+    log25.debug(`No persisted session found for ${threadId.substring(0, 8)}...`);
     return;
   }
   const shortId = threadId.substring(0, 8);
-  log26.info(`\uD83D\uDD04 Resuming paused session ${shortId}... for new message`);
+  log25.info(`\uD83D\uDD04 Resuming paused session ${shortId}... for new message`);
   await resumeSession(state, ctx);
   const session = ctx.ops.findSessionByThreadId(threadId);
   if (session && session.claude.isRunning() && session.messageManager) {
     session.messageCount++;
     await session.messageManager.handleUserMessage(message, files, state.startedBy);
   } else {
-    log26.warn(`Failed to resume session ${shortId}..., could not send message`);
+    log25.warn(`Failed to resume session ${shortId}..., could not send message`);
   }
 }
 async function handleExit(sessionId, code, ctx) {
@@ -67980,7 +68097,7 @@ async function handleExit(sessionId, code, ctx) {
   const shortId = sessionId.substring(0, 8);
   sessionLog6(session).debug(`handleExit called code=${code} isShuttingDown=${ctx.state.isShuttingDown}`);
   if (!session) {
-    log26.debug(`Session ${shortId}... not found (already cleaned up)`);
+    log25.debug(`Session ${shortId}... not found (already cleaned up)`);
     return;
   }
   if (isSessionRestarting(session)) {
@@ -68173,7 +68290,7 @@ async function cleanupIdleSessions(timeoutMs, warningMs, ctx) {
 }
 
 // src/operations/monitor/handler.ts
-var log27 = createLogger("monitor");
+var log26 = createLogger("monitor");
 var DEFAULT_INTERVAL_MS = 60 * 1000;
 
 class SessionMonitor {
@@ -68195,14 +68312,14 @@ class SessionMonitor {
   }
   start() {
     if (this.isRunning) {
-      log27.debug("Session monitor already running");
+      log26.debug("Session monitor already running");
       return;
     }
     this.isRunning = true;
-    log27.debug(`Session monitor started (interval: ${this.intervalMs / 1000}s)`);
+    log26.debug(`Session monitor started (interval: ${this.intervalMs / 1000}s)`);
     this.timer = setInterval(() => {
       this.runCheck().catch((err) => {
-        log27.error(`Error during session monitoring: ${err}`);
+        log26.error(`Error during session monitoring: ${err}`);
       });
     }, this.intervalMs);
   }
@@ -68212,7 +68329,7 @@ class SessionMonitor {
       this.timer = null;
     }
     this.isRunning = false;
-    log27.debug("Session monitor stopped");
+    log26.debug("Session monitor stopped");
   }
   async runCheck() {
     await cleanupIdleSessions(this.sessionTimeoutMs, this.sessionWarningMs, this.getContext());
@@ -68224,8 +68341,8 @@ class SessionMonitor {
 // src/operations/plugin/handler.ts
 init_spawn();
 init_logger();
-var log28 = createLogger("plugin");
-var sessionLog7 = createSessionLog(log28);
+var log27 = createLogger("plugin");
+var sessionLog7 = createSessionLog(log27);
 async function runPluginCommand(args, cwd, timeout2 = 60000) {
   return new Promise((resolve6) => {
     const claudePath = process.env.CLAUDE_PATH || "claude";
@@ -68246,7 +68363,7 @@ async function runPluginCommand(args, cwd, timeout2 = 60000) {
     });
     proc.on("error", (err) => {
       resolve6({ stdout, stderr, exitCode: 1 });
-      log28.error(`Plugin command error: ${err.message}`);
+      log27.error(`Plugin command error: ${err.message}`);
     });
   });
 }
@@ -68282,9 +68399,13 @@ ${formatter.formatCodeBlock(errorMsg, "text")}`);
   const cliOptions = {
     workingDir: session.workingDir,
     threadId: session.threadId,
-    skipPermissions: ctx.config.skipPermissions || !session.forceInteractivePermissions,
+    permissionMode: effectivePermissionMode({
+      override: session.permissionModeOverride,
+      sessionHasInteractiveOverride: session.forceInteractivePermissions,
+      botWideMode: ctx.config.permissionMode
+    }),
     sessionId: session.claudeSessionId,
-    resume: true,
+    resume: session.lifecycle.hasClaudeResponded,
     chrome: ctx.config.chromeEnabled,
     platformConfig: session.platform.getMcpConfig(),
     logSessionId: session.sessionId,
@@ -68315,9 +68436,13 @@ ${formatter.formatCodeBlock(errorMsg, "text")}`);
   const cliOptions = {
     workingDir: session.workingDir,
     threadId: session.threadId,
-    skipPermissions: ctx.config.skipPermissions || !session.forceInteractivePermissions,
+    permissionMode: effectivePermissionMode({
+      override: session.permissionModeOverride,
+      sessionHasInteractiveOverride: session.forceInteractivePermissions,
+      botWideMode: ctx.config.permissionMode
+    }),
     sessionId: session.claudeSessionId,
-    resume: true,
+    resume: session.lifecycle.hasClaudeResponded,
     chrome: ctx.config.chromeEnabled,
     platformConfig: session.platform.getMcpConfig(),
     logSessionId: session.sessionId,
@@ -68439,12 +68564,12 @@ class SessionRegistry {
 
 // src/session/manager.ts
 init_logger();
-var log29 = createLogger("manager");
+var log28 = createLogger("manager");
 
 class SessionManager extends EventEmitter4 {
   platforms = new Map;
   workingDir;
-  skipPermissions;
+  permissionMode;
   chromeEnabled;
   worktreeMode;
   threadLogsEnabled;
@@ -68463,10 +68588,10 @@ class SessionManager extends EventEmitter4 {
   customFooter;
   autoUpdateManager = null;
   accountPool;
-  constructor(workingDir, skipPermissions = false, chromeEnabled = false, worktreeMode = "prompt", sessionsPath, threadLogsEnabled = true, threadLogsRetentionDays = 30, limits, claudeAccounts) {
+  constructor(workingDir, permissionModeOrSkipFlag = "default", chromeEnabled = false, worktreeMode = "prompt", sessionsPath, threadLogsEnabled = true, threadLogsRetentionDays = 30, limits, claudeAccounts) {
     super();
     this.workingDir = workingDir;
-    this.skipPermissions = skipPermissions;
+    this.permissionMode = typeof permissionModeOrSkipFlag === "boolean" ? permissionModeOrSkipFlag ? "bypass" : "default" : permissionModeOrSkipFlag;
     this.chromeEnabled = chromeEnabled;
     this.worktreeMode = worktreeMode;
     this.threadLogsEnabled = threadLogsEnabled;
@@ -68508,7 +68633,7 @@ class SessionManager extends EventEmitter4 {
       markNeedsBump(platformId);
       this.updateStickyMessage();
     });
-    log29.info(`\uD83D\uDCE1 Platform "${platformId}" registered`);
+    log28.info(`\uD83D\uDCE1 Platform "${platformId}" registered`);
   }
   removePlatform(platformId) {
     this.platforms.delete(platformId);
@@ -68524,7 +68649,7 @@ class SessionManager extends EventEmitter4 {
     if (users) {
       users.add(sessionId);
     }
-    log29.debug(`Registered session ${sessionId.substring(0, 20)} as worktree user for ${worktreePath}`);
+    log28.debug(`Registered session ${sessionId.substring(0, 20)} as worktree user for ${worktreePath}`);
   }
   unregisterWorktreeUser(worktreePath, sessionId) {
     const users = this.worktreeUsers.get(worktreePath);
@@ -68544,13 +68669,14 @@ class SessionManager extends EventEmitter4 {
   getContext() {
     const config = {
       workingDir: this.workingDir,
-      skipPermissions: this.skipPermissions,
+      permissionMode: this.permissionMode,
       chromeEnabled: this.chromeEnabled,
       debug: this.debug,
       maxSessions: this.limits.maxSessions,
       threadLogsEnabled: this.threadLogsEnabled,
       threadLogsRetentionDays: this.threadLogsRetentionDays,
-      permissionTimeoutMs: this.limits.permissionTimeoutSeconds * 1000
+      permissionTimeoutMs: this.limits.permissionTimeoutSeconds * 1000,
+      flushDelayMs: this.limits.flushDelayMs
     };
     const state = {
       sessions: this.registry.getSessions(),
@@ -68649,6 +68775,15 @@ class SessionManager extends EventEmitter4 {
     if (session.platformId !== platformId)
       return;
     if (!session.sessionAllowedUsers.has(username) && !session.platform.isUserAllowed(username)) {
+      log28.info(`\uD83D\uDEAB rejected reaction from unauthorized user`, {
+        event: "reaction.rejected",
+        platformId,
+        sessionId: session.sessionId,
+        postId,
+        emoji: normalizedEmoji,
+        action,
+        user: username
+      });
       return;
     }
     await this.handleSessionReaction(session, postId, normalizedEmoji, username, action);
@@ -68676,7 +68811,7 @@ class SessionManager extends EventEmitter4 {
       return false;
     }
     const shortId = persistedSession.threadId.substring(0, 8);
-    log29.info(`\uD83D\uDD04 Resuming session ${shortId}... via emoji reaction by @${username}`);
+    log28.info(`\uD83D\uDD04 Resuming session ${shortId}... via emoji reaction by @${username}`);
     await resumeSession(persistedSession, this.getContext());
     return true;
   }
@@ -68706,7 +68841,7 @@ class SessionManager extends EventEmitter4 {
       }
       if (session.lastError?.postId === postId && isBugReportEmoji(emojiName)) {
         if (session.startedBy === username || session.platform.isUserAllowed(username) || session.sessionAllowedUsers.has(username)) {
-          log29.info(`\uD83D\uDC1B @${username} triggered bug report from error reaction`);
+          log28.info(`\uD83D\uDC1B @${username} triggered bug report from error reaction`);
           await reportBug(session, undefined, username, this.getContext(), session.lastError);
           return;
         }
@@ -68843,7 +68978,7 @@ class SessionManager extends EventEmitter4 {
     await updateAllStickyMessages(this.platforms, this.registry.getSessions(), {
       maxSessions: this.limits.maxSessions,
       chromeEnabled: this.chromeEnabled,
-      skipPermissions: this.skipPermissions,
+      permissionMode: this.permissionMode,
       worktreeMode: this.worktreeMode,
       workingDir: this.workingDir,
       debug: this.debug,
@@ -68859,8 +68994,14 @@ class SessionManager extends EventEmitter4 {
     this.customDescription = description;
     this.customFooter = footer;
   }
+  setPermissionMode(mode) {
+    this.permissionMode = mode;
+  }
   setSkipPermissions(value) {
-    this.skipPermissions = value;
+    this.permissionMode = value ? "bypass" : "default";
+  }
+  getPermissionMode() {
+    return this.permissionMode;
   }
   setChromeEnabled(value) {
     this.chromeEnabled = value;
@@ -68874,11 +69015,11 @@ class SessionManager extends EventEmitter4 {
       }
     }
     if (sessionsToKill.length === 0) {
-      log29.info(`No active sessions to pause for platform ${platformId}`);
+      log28.info(`No active sessions to pause for platform ${platformId}`);
       await this.updateStickyMessage();
       return;
     }
-    log29.info(`⏸️ Pausing ${sessionsToKill.length} session(s) for platform ${platformId}`);
+    log28.info(`⏸️ Pausing ${sessionsToKill.length} session(s) for platform ${platformId}`);
     for (const session of sessionsToKill) {
       try {
         const fmt = session.platform.getFormatter();
@@ -68894,9 +69035,9 @@ class SessionManager extends EventEmitter4 {
         session.claude.kill();
         this.registry.unregister(session.sessionId);
         this.emitSessionRemove(session.sessionId);
-        log29.info(`⏸️ Paused session ${session.threadId.substring(0, 8)}`);
+        log28.info(`⏸️ Paused session ${session.threadId.substring(0, 8)}`);
       } catch (err) {
-        log29.warn(`Failed to pause session ${session.threadId}: ${err}`);
+        log28.warn(`Failed to pause session ${session.threadId}: ${err}`);
       }
     }
     for (const session of sessionsToKill) {
@@ -68917,17 +69058,17 @@ class SessionManager extends EventEmitter4 {
       sessionsToResume.push(state);
     }
     if (sessionsToResume.length === 0) {
-      log29.info(`No paused sessions to resume for platform ${platformId}`);
+      log28.info(`No paused sessions to resume for platform ${platformId}`);
       await this.updateStickyMessage();
       return;
     }
-    log29.info(`▶️ Resuming ${sessionsToResume.length} paused session(s) for platform ${platformId}`);
+    log28.info(`▶️ Resuming ${sessionsToResume.length} paused session(s) for platform ${platformId}`);
     for (const state of sessionsToResume) {
       try {
         await resumeSession(state, this.getContext());
-        log29.info(`▶️ Resumed session ${state.threadId.substring(0, 8)}`);
+        log28.info(`▶️ Resumed session ${state.threadId.substring(0, 8)}`);
       } catch (err) {
-        log29.warn(`Failed to resume session ${state.threadId}: ${err}`);
+        log28.warn(`Failed to resume session ${state.threadId}: ${err}`);
       }
     }
     await this.updateStickyMessage();
@@ -68939,14 +69080,14 @@ class SessionManager extends EventEmitter4 {
     const sessionTimeoutMs = this.limits.sessionTimeoutMinutes * 60 * 1000;
     const staleIds = this.sessionStore.cleanStale(sessionTimeoutMs * 2);
     if (staleIds.length > 0) {
-      log29.info(`\uD83E\uDDF9 Soft-deleted ${staleIds.length} stale session(s) (kept for history)`);
+      log28.info(`\uD83E\uDDF9 Soft-deleted ${staleIds.length} stale session(s) (kept for history)`);
     }
     const removedCount = this.sessionStore.cleanHistory();
     if (removedCount > 0) {
-      log29.info(`\uD83D\uDDD1️ Permanently removed ${removedCount} old session(s) from history`);
+      log28.info(`\uD83D\uDDD1️ Permanently removed ${removedCount} old session(s) from history`);
     }
     const persisted = this.sessionStore.load();
-    log29.info(`\uD83D\uDCC2 Loaded ${persisted.size} session(s) from persistence`);
+    log28.info(`\uD83D\uDCC2 Loaded ${persisted.size} session(s) from persistence`);
     const excludePostIdsByPlatform = new Map;
     for (const session of persisted.values()) {
       const platformId = session.platformId;
@@ -68966,10 +69107,10 @@ class SessionManager extends EventEmitter4 {
       const excludePostIds = excludePostIdsByPlatform.get(platform.platformId);
       platform.getBotUser().then((botUser) => {
         cleanupOldStickyMessages(platform, botUser.id, true, excludePostIds).catch((err) => {
-          log29.warn(`Failed to cleanup old sticky messages for ${platform.platformId}: ${err}`);
+          log28.warn(`Failed to cleanup old sticky messages for ${platform.platformId}: ${err}`);
         });
       }).catch((err) => {
-        log29.warn(`Failed to get bot user for cleanup on ${platform.platformId}: ${err}`);
+        log28.warn(`Failed to get bot user for cleanup on ${platform.platformId}: ${err}`);
       });
     }
     if (persisted.size > 0) {
@@ -68983,10 +69124,10 @@ class SessionManager extends EventEmitter4 {
         }
       }
       if (pausedToSkip.length > 0) {
-        log29.info(`⏸️ ${pausedToSkip.length} session(s) remain paused (waiting for user message)`);
+        log28.info(`⏸️ ${pausedToSkip.length} session(s) remain paused (waiting for user message)`);
       }
       if (activeToResume.length > 0) {
-        log29.info(`\uD83D\uDD04 Attempting to resume ${activeToResume.length} active session(s)...`);
+        log28.info(`\uD83D\uDD04 Attempting to resume ${activeToResume.length} active session(s)...`);
         for (const state of activeToResume) {
           await resumeSession(state, this.getContext());
         }
@@ -69081,11 +69222,14 @@ class SessionManager extends EventEmitter4 {
       return;
     await kickUser(session, kickedUser, kickedBy, this.getContext());
   }
-  async enableInteractivePermissions(threadId, username) {
+  async setSessionPermissionMode(threadId, username, mode) {
     const session = this.findSessionByThreadId(threadId);
     if (!session)
       return;
-    await enableInteractivePermissions(session, username, this.getContext());
+    await setSessionPermissionMode(session, username, mode, this.getContext());
+  }
+  async enableInteractivePermissions(threadId, username) {
+    await this.setSessionPermissionMode(threadId, username, "default");
   }
   async reportBug(threadId, description, username, files) {
     const session = this.findSessionByThreadId(threadId);
@@ -69168,10 +69312,13 @@ class SessionManager extends EventEmitter4 {
   isSessionInteractive(threadId) {
     const session = this.findSessionByThreadId(threadId);
     if (!session)
-      return !this.skipPermissions;
-    if (!this.skipPermissions)
-      return true;
-    return session.forceInteractivePermissions;
+      return this.permissionMode !== "bypass";
+    const effective = effectivePermissionMode({
+      override: session.permissionModeOverride,
+      sessionHasInteractiveOverride: session.forceInteractivePermissions,
+      botWideMode: this.permissionMode
+    });
+    return effective !== "bypass";
   }
   async requestMessageApproval(threadId, username, message) {
     const session = this.findSessionByThreadId(threadId);
@@ -69196,7 +69343,7 @@ class SessionManager extends EventEmitter4 {
     if (!session)
       return;
     await createAndSwitchToWorktree(session, branch, username, {
-      skipPermissions: this.skipPermissions,
+      permissionMode: this.permissionMode,
       chromeEnabled: this.chromeEnabled,
       worktreeMode: this.worktreeMode,
       permissionTimeoutMs: this.limits.permissionTimeoutSeconds * 1000,
@@ -69405,7 +69552,7 @@ Mention me to start a session in this worktree.`, threadId);
         const message = messageBuilder(formatter);
         await post(session, "info", message);
       } catch (err) {
-        log29.warn(`Failed to broadcast to session ${session.threadId}: ${err}`);
+        log28.warn(`Failed to broadcast to session ${session.threadId}: ${err}`);
       }
     }
   }
@@ -69424,7 +69571,7 @@ Mention me to start a session in this worktree.`, threadId);
         session.messageManager?.setPendingUpdatePrompt({ postId: post2.id });
         this.registerPost(post2.id, session.threadId);
       } catch (err) {
-        log29.warn(`Failed to post ask message to ${threadId}: ${err}`);
+        log28.warn(`Failed to post ask message to ${threadId}: ${err}`);
       }
     }
   }
@@ -77020,29 +77167,29 @@ function SessionLog({ logs, maxLines = 20 }) {
   return /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
     flexDirection: "column",
     flexShrink: 0,
-    children: displayLogs.map((log30) => /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
+    children: displayLogs.map((log29) => /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
       flexShrink: 0,
       children: [
         /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-          color: getColorForLevel(log30.level),
+          color: getColorForLevel(log29.level),
           dimColor: true,
           wrap: "truncate",
           children: [
             "[",
-            padComponent(log30.component),
+            padComponent(log29.component),
             "]"
           ]
         }, undefined, true, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-          color: getColorForLevel(log30.level),
+          color: getColorForLevel(log29.level),
           wrap: "truncate",
           children: [
             " ",
-            log30.message
+            log29.message
           ]
         }, undefined, true, undefined, this)
       ]
-    }, log30.id, true, undefined, this))
+    }, log29.id, true, undefined, this))
   }, undefined, false, undefined, this);
 }
 // src/ui/components/Footer.tsx
@@ -77072,6 +77219,34 @@ function ToggleKey({ keyChar, label, enabled, color }) {
     ]
   }, undefined, true, undefined, this);
 }
+function PermissionModeKey({ mode }) {
+  const color = mode === "default" ? "green" : mode === "auto" ? "yellow" : "red";
+  return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+    gap: 0,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        dimColor: true,
+        children: "["
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        color,
+        bold: true,
+        children: "p"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        dimColor: true,
+        children: "]"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        color,
+        children: [
+          "erms:",
+          permissionModeDisplay(mode).label.toLowerCase()
+        ]
+      }, undefined, true, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
 function PlatformToggle({ index, platform: platform2 }) {
   let color;
   if (!platform2.enabled) {
@@ -77172,10 +77347,8 @@ function Footer({
                 label: "ebug",
                 enabled: toggles.debugMode
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(ToggleKey, {
-                keyChar: "p",
-                label: "erms",
-                enabled: !toggles.skipPermissions
+              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(PermissionModeKey, {
+                mode: toggles.permissionMode
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(ToggleKey, {
                 keyChar: "c",
@@ -77540,7 +77713,7 @@ function LogPanel({ logs, maxLines = 10, focused = false }) {
   const scrollRef = import_react59.default.useRef(null);
   const { stdout } = use_stdout_default();
   const isDebug = process.env.DEBUG === "1";
-  const displayLogs = logs.filter((log30) => isDebug || log30.level !== "debug");
+  const displayLogs = logs.filter((log29) => isDebug || log29.level !== "debug");
   const visibleLogs = displayLogs.slice(-Math.max(maxLines * 3, 100));
   import_react59.default.useEffect(() => {
     const handleResize = () => scrollRef.current?.remeasure();
@@ -77580,25 +77753,25 @@ function LogPanel({ logs, maxLines = 10, focused = false }) {
     overflow: "hidden",
     children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(ScrollView, {
       ref: scrollRef,
-      children: visibleLogs.map((log30) => /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+      children: visibleLogs.map((log29) => /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
         children: [
           /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
             dimColor: true,
             children: [
               "[",
-              padComponent2(log30.component),
+              padComponent2(log29.component),
               "]"
             ]
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-            color: getLevelColor(log30.level),
+            color: getLevelColor(log29.level),
             children: [
               " ",
-              log30.message
+              log29.message
             ]
           }, undefined, true, undefined, this)
         ]
-      }, log30.id, true, undefined, this))
+      }, log29.id, true, undefined, this))
     }, undefined, false, undefined, this)
   }, undefined, false, undefined, this);
 }
@@ -78115,10 +78288,10 @@ function useAppState(initialConfig) {
     });
   }, []);
   const getLogsForSession = import_react60.useCallback((sessionId) => {
-    return state.logs.filter((log30) => log30.sessionId === sessionId);
+    return state.logs.filter((log29) => log29.sessionId === sessionId);
   }, [state.logs]);
   const getGlobalLogs = import_react60.useCallback(() => {
-    return state.logs.filter((log30) => !log30.sessionId);
+    return state.logs.filter((log29) => !log29.sessionId);
   }, [state.logs]);
   const togglePlatformEnabled = import_react60.useCallback((platformId) => {
     let newEnabled = false;
@@ -78239,6 +78412,19 @@ function useKeyboard({
   });
 }
 
+// src/config/permission-mode-cycle.ts
+var PERMISSION_MODE_CYCLE = [
+  "default",
+  "auto",
+  "bypass"
+];
+function nextPermissionMode(current) {
+  const idx = PERMISSION_MODE_CYCLE.indexOf(current);
+  if (idx === -1)
+    return PERMISSION_MODE_CYCLE[0];
+  return PERMISSION_MODE_CYCLE[(idx + 1) % PERMISSION_MODE_CYCLE.length];
+}
+
 // src/ui/App.tsx
 var jsx_dev_runtime13 = __toESM(require_jsx_dev_runtime(), 1);
 function App2({ config, onStateReady, onResizeReady, onQuit, toggleCallbacks }) {
@@ -78261,7 +78447,7 @@ function App2({ config, onStateReady, onResizeReady, onQuit, toggleCallbacks })
   const [resizeCount, setResizeCount] = import_react61.default.useState(0);
   const [toggles, setToggles] = import_react61.default.useState({
     debugMode: process.env.DEBUG === "1",
-    skipPermissions: config.skipPermissions,
+    permissionMode: config.permissionMode,
     chromeEnabled: config.chromeEnabled,
     keepAliveEnabled: config.keepAliveEnabled,
     updateModalVisible: false,
@@ -78282,9 +78468,9 @@ function App2({ config, onStateReady, onResizeReady, onQuit, toggleCallbacks })
   }, [toggleCallbacks]);
   const handlePermissionsToggle = import_react61.default.useCallback(() => {
     setToggles((prev) => {
-      const newValue = !prev.skipPermissions;
-      toggleCallbacks?.onPermissionsToggle?.(newValue);
-      return { ...prev, skipPermissions: newValue };
+      const newMode = nextPermissionMode(prev.permissionMode);
+      toggleCallbacks?.onPermissionsToggle?.(newMode);
+      return { ...prev, permissionMode: newMode };
     });
   }, [toggleCallbacks]);
   const handleChromeToggle = import_react61.default.useCallback(() => {
@@ -78749,7 +78935,7 @@ class HeadlessProvider {
     this.options = options2;
     this.toggles = {
       debugMode: process.env.DEBUG === "1",
-      skipPermissions: options2.config.skipPermissions,
+      permissionMode: options2.config.permissionMode,
       chromeEnabled: options2.config.chromeEnabled,
       keepAliveEnabled: options2.config.keepAliveEnabled,
       updateModalVisible: false,
@@ -79112,7 +79298,7 @@ import { EventEmitter as EventEmitter9 } from "events";
 // src/auto-update/checker.ts
 init_logger();
 import { EventEmitter as EventEmitter7 } from "events";
-var log30 = createLogger("checker");
+var log29 = createLogger("checker");
 var PACKAGE_NAME = "claude-threads";
 function compareVersions(a, b) {
   const partsA = a.replace(/^v/, "").split(".").map(Number);
@@ -79135,13 +79321,13 @@ async function fetchLatestVersion() {
       }
     });
     if (!response.ok) {
-      log30.warn(`Failed to fetch latest version: HTTP ${response.status}`);
+      log29.warn(`Failed to fetch latest version: HTTP ${response.status}`);
       return null;
     }
     const data = await response.json();
     return data.version ?? null;
   } catch (err) {
-    log30.warn(`Failed to fetch latest version: ${err}`);
+    log29.warn(`Failed to fetch latest version: ${err}`);
     return null;
   }
 }
@@ -79158,38 +79344,38 @@ class UpdateChecker extends EventEmitter7 {
   }
   start() {
     if (!this.config.enabled) {
-      log30.debug("Auto-update disabled, not starting checker");
+      log29.debug("Auto-update disabled, not starting checker");
       return;
     }
     setTimeout(() => {
       this.check().catch((err) => {
-        log30.warn(`Initial update check failed: ${err}`);
+        log29.warn(`Initial update check failed: ${err}`);
       });
     }, 5000);
     const intervalMs = this.config.checkIntervalMinutes * 60 * 1000;
     this.checkInterval = setInterval(() => {
       this.check().catch((err) => {
-        log30.warn(`Periodic update check failed: ${err}`);
+        log29.warn(`Periodic update check failed: ${err}`);
       });
     }, intervalMs);
-    log30.info(`\uD83D\uDD04 Update checker started (every ${this.config.checkIntervalMinutes} minutes)`);
+    log29.info(`\uD83D\uDD04 Update checker started (every ${this.config.checkIntervalMinutes} minutes)`);
   }
   stop() {
     if (this.checkInterval) {
       clearInterval(this.checkInterval);
       this.checkInterval = null;
     }
-    log30.debug("Update checker stopped");
+    log29.debug("Update checker stopped");
   }
   async check() {
     if (this.isChecking) {
-      log30.debug("Check already in progress, skipping");
+      log29.debug("Check already in progress, skipping");
       return this.lastUpdateInfo;
     }
     this.isChecking = true;
     this.emit("check:start");
     try {
-      log30.debug("Checking for updates...");
+      log29.debug("Checking for updates...");
       const latestVersion2 = await fetchLatestVersion();
       if (!latestVersion2) {
         this.emit("check:complete", false);
@@ -79206,18 +79392,18 @@ class UpdateChecker extends EventEmitter7 {
           detectedAt: new Date
         };
         if (!this.lastUpdateInfo || this.lastUpdateInfo.latestVersion !== latestVersion2) {
-          log30.info(`\uD83C\uDD95 Update available: v${currentVersion} → v${latestVersion2}`);
+          log29.info(`\uD83C\uDD95 Update available: v${currentVersion} → v${latestVersion2}`);
           this.lastUpdateInfo = updateInfo;
           this.emit("update", updateInfo);
         }
         this.emit("check:complete", true);
         return updateInfo;
       }
-      log30.debug(`Up to date (v${currentVersion})`);
+      log29.debug(`Up to date (v${currentVersion})`);
       this.emit("check:complete", false);
       return null;
     } catch (err) {
-      log30.warn(`Update check failed: ${err}`);
+      log29.warn(`Update check failed: ${err}`);
       this.emit("check:error", err);
       return null;
     } finally {
@@ -79288,7 +79474,7 @@ function isInScheduledWindow(window2) {
 }
 
 // src/auto-update/scheduler.ts
-var log31 = createLogger("scheduler");
+var log30 = createLogger("scheduler");
 
 class UpdateScheduler extends EventEmitter8 {
   config;
@@ -79312,7 +79498,7 @@ class UpdateScheduler extends EventEmitter8 {
   scheduleUpdate(updateInfo) {
     this.pendingUpdate = updateInfo;
     if (this.config.autoRestartMode === "immediate") {
-      log31.info("Immediate mode: triggering update now");
+      log30.info("Immediate mode: triggering update now");
       this.emit("ready", updateInfo);
       return;
     }
@@ -79325,19 +79511,19 @@ class UpdateScheduler extends EventEmitter8 {
     this.scheduledRestartAt = null;
     this.askApprovals.clear();
     this.askStartTime = null;
-    log31.debug("Update schedule cancelled");
+    log30.debug("Update schedule cancelled");
   }
   deferUpdate(minutes) {
     const deferUntil = new Date(Date.now() + minutes * 60 * 1000);
     this.scheduledRestartAt = null;
     this.idleStartTime = null;
     this.emit("deferred", deferUntil);
-    log31.info(`Update deferred until ${deferUntil.toLocaleTimeString()}`);
+    log30.info(`Update deferred until ${deferUntil.toLocaleTimeString()}`);
     return deferUntil;
   }
   recordAskResponse(threadId, approved) {
     this.askApprovals.set(threadId, approved);
-    log31.debug(`Thread ${threadId.substring(0, 8)} ${approved ? "approved" : "denied"} update`);
+    log30.debug(`Thread ${threadId.substring(0, 8)} ${approved ? "approved" : "denied"} update`);
     this.checkAskCondition();
   }
   getScheduledRestartAt() {
@@ -79358,7 +79544,7 @@ class UpdateScheduler extends EventEmitter8 {
       return;
     this.checkCondition();
     this.checkTimer = setInterval(() => this.checkCondition(), 1e4);
-    log31.debug(`Started checking for ${this.config.autoRestartMode} condition`);
+    log30.debug(`Started checking for ${this.config.autoRestartMode} condition`);
   }
   stopChecking() {
     if (this.checkTimer) {
@@ -79389,17 +79575,17 @@ class UpdateScheduler extends EventEmitter8 {
     if (activity.activeSessionCount === 0) {
       if (!this.idleStartTime) {
         this.idleStartTime = new Date;
-        log31.debug("No active sessions, starting idle timer");
+        log30.debug("No active sessions, starting idle timer");
       }
       const idleMs = Date.now() - this.idleStartTime.getTime();
       const requiredMs = this.config.idleTimeoutMinutes * 60 * 1000;
       if (idleMs >= requiredMs) {
-        log31.info(`Idle for ${this.config.idleTimeoutMinutes} minutes, triggering update`);
+        log30.info(`Idle for ${this.config.idleTimeoutMinutes} minutes, triggering update`);
         this.triggerCountdown();
       }
     } else {
       if (this.idleStartTime) {
-        log31.debug("Sessions became active, resetting idle timer");
+        log30.debug("Sessions became active, resetting idle timer");
         this.idleStartTime = null;
       }
     }
@@ -79410,7 +79596,7 @@ class UpdateScheduler extends EventEmitter8 {
       const quietMs = Date.now() - activity.lastActivityAt.getTime();
       const requiredMs = this.config.quietTimeoutMinutes * 60 * 1000;
       if (quietMs >= requiredMs && !activity.anySessionBusy) {
-        log31.info(`Sessions quiet for ${this.config.quietTimeoutMinutes} minutes, triggering update`);
+        log30.info(`Sessions quiet for ${this.config.quietTimeoutMinutes} minutes, triggering update`);
         this.triggerCountdown();
       }
     } else if (activity.activeSessionCount === 0) {
@@ -79420,7 +79606,7 @@ class UpdateScheduler extends EventEmitter8 {
       const idleMs = Date.now() - this.idleStartTime.getTime();
       const requiredMs = this.config.quietTimeoutMinutes * 60 * 1000;
       if (idleMs >= requiredMs) {
-        log31.info("No sessions and quiet timeout reached, triggering update");
+        log30.info("No sessions and quiet timeout reached, triggering update");
         this.triggerCountdown();
       }
     }
@@ -79431,13 +79617,13 @@ class UpdateScheduler extends EventEmitter8 {
     }
     const activity = this.getSessionActivity();
     if (activity.activeSessionCount === 0) {
-      log31.info("Within scheduled window and no active sessions, triggering update");
+      log30.info("Within scheduled window and no active sessions, triggering update");
       this.triggerCountdown();
     } else if (activity.lastActivityAt) {
       const quietMs = Date.now() - activity.lastActivityAt.getTime();
       const requiredMs = this.config.idleTimeoutMinutes * 60 * 1000;
       if (quietMs >= requiredMs && !activity.anySessionBusy) {
-        log31.info("Within scheduled window and sessions quiet, triggering update");
+        log30.info("Within scheduled window and sessions quiet, triggering update");
         this.triggerCountdown();
       }
     }
@@ -79445,14 +79631,14 @@ class UpdateScheduler extends EventEmitter8 {
   checkAskCondition() {
     const threadIds = this.getActiveThreadIds();
     if (threadIds.length === 0) {
-      log31.info("No active threads, proceeding with update");
+      log30.info("No active threads, proceeding with update");
       this.triggerCountdown();
       return;
     }
     if (!this.askStartTime && this.pendingUpdate) {
       this.askStartTime = new Date;
       this.postAskMessage(threadIds, this.pendingUpdate.latestVersion).catch((err) => {
-        log31.warn(`Failed to post ask message: ${err}`);
+        log30.warn(`Failed to post ask message: ${err}`);
       });
       return;
     }
@@ -79465,12 +79651,12 @@ class UpdateScheduler extends EventEmitter8 {
         denials++;
     }
     if (approvals > threadIds.length / 2) {
-      log31.info(`Majority approved (${approvals}/${threadIds.length}), triggering update`);
+      log30.info(`Majority approved (${approvals}/${threadIds.length}), triggering update`);
       this.triggerCountdown();
       return;
     }
     if (denials > threadIds.length / 2) {
-      log31.info(`Majority denied (${denials}/${threadIds.length}), deferring update`);
+      log30.info(`Majority denied (${denials}/${threadIds.length}), deferring update`);
       this.deferUpdate(60);
       return;
     }
@@ -79478,7 +79664,7 @@ class UpdateScheduler extends EventEmitter8 {
       const elapsedMs = Date.now() - this.askStartTime.getTime();
       const timeoutMs = this.config.askTimeoutMinutes * 60 * 1000;
       if (elapsedMs >= timeoutMs) {
-        log31.info(`Ask timeout reached (${this.config.askTimeoutMinutes} min), triggering update`);
+        log30.info(`Ask timeout reached (${this.config.askTimeoutMinutes} min), triggering update`);
         this.triggerCountdown();
       }
     }
@@ -79498,7 +79684,7 @@ class UpdateScheduler extends EventEmitter8 {
         this.emit("ready", this.pendingUpdate);
       }
     }, 1000);
-    log31.info("Update countdown started (60 seconds)");
+    log30.info("Update countdown started (60 seconds)");
   }
   stopCountdown() {
     if (this.countdownTimer) {
@@ -79511,27 +79697,27 @@ class UpdateScheduler extends EventEmitter8 {
 // src/auto-update/installer.ts
 init_logger();
 import { spawn as spawn4, spawnSync } from "child_process";
-import { existsSync as existsSync13, readFileSync as readFileSync9, writeFileSync as writeFileSync5, mkdirSync as mkdirSync4 } from "fs";
+import { existsSync as existsSync13, readFileSync as readFileSync9, writeFileSync as writeFileSync6, mkdirSync as mkdirSync4 } from "fs";
 import { dirname as dirname8, resolve as resolve6 } from "path";
 import { homedir as homedir5 } from "os";
-var log32 = createLogger("installer");
+var log31 = createLogger("installer");
 function detectPackageManager() {
   const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
   const originalInstaller = detectOriginalInstaller();
   if (originalInstaller) {
-    log32.debug(`Detected original installer: ${originalInstaller}`);
+    log31.debug(`Detected original installer: ${originalInstaller}`);
     if (originalInstaller === "bun") {
       const bunCheck2 = spawnSync("bun", ["--version"], { stdio: "ignore" });
       if (bunCheck2.status === 0) {
         return { cmd: "bun", isBun: true };
       }
-      log32.warn("Originally installed with bun, but bun not found. Falling back to npm.");
+      log31.warn("Originally installed with bun, but bun not found. Falling back to npm.");
     } else {
       const npmCheck2 = spawnSync(npmCmd, ["--version"], { stdio: "ignore" });
       if (npmCheck2.status === 0) {
         return { cmd: npmCmd, isBun: false };
       }
-      log32.warn("Originally installed with npm, but npm not found. Falling back to bun.");
+      log31.warn("Originally installed with npm, but npm not found. Falling back to bun.");
     }
   }
   const bunCheck = spawnSync("bun", ["--version"], { stdio: "ignore" });
@@ -79582,7 +79768,7 @@ function loadUpdateState() {
       return JSON.parse(content);
     }
   } catch (err) {
-    log32.warn(`Failed to load update state: ${err}`);
+    log31.warn(`Failed to load update state: ${err}`);
   }
   return {};
 }
@@ -79592,19 +79778,19 @@ function saveUpdateState(state) {
     if (!existsSync13(dir)) {
       mkdirSync4(dir, { recursive: true });
     }
-    writeFileSync5(STATE_PATH, JSON.stringify(state, null, 2), "utf-8");
-    log32.debug("Update state saved");
+    writeFileSync6(STATE_PATH, JSON.stringify(state, null, 2), "utf-8");
+    log31.debug("Update state saved");
   } catch (err) {
-    log32.warn(`Failed to save update state: ${err}`);
+    log31.warn(`Failed to save update state: ${err}`);
   }
 }
 function clearUpdateState() {
   try {
     if (existsSync13(STATE_PATH)) {
-      writeFileSync5(STATE_PATH, "{}", "utf-8");
+      writeFileSync6(STATE_PATH, "{}", "utf-8");
     }
   } catch (err) {
-    log32.warn(`Failed to clear update state: ${err}`);
+    log31.warn(`Failed to clear update state: ${err}`);
   }
 }
 function checkJustUpdated() {
@@ -79636,11 +79822,11 @@ function clearRuntimeSettings() {
   }
 }
 async function installVersion(version) {
-  log32.info(`\uD83D\uDCE6 Installing ${PACKAGE_NAME2}@${version}...`);
+  log31.info(`\uD83D\uDCE6 Installing ${PACKAGE_NAME2}@${version}...`);
   const pm = detectPackageManager();
   if (!pm) {
     const error = "Neither bun nor npm found in PATH. Cannot install update.";
-    log32.error(`❌ ${error}`);
+    log31.error(`❌ ${error}`);
     return { success: false, error };
   }
   saveUpdateState({
@@ -79652,7 +79838,7 @@ async function installVersion(version) {
   return new Promise((resolve7) => {
     const { cmd, isBun: isBun3 } = pm;
     const args = ["install", "-g", `${PACKAGE_NAME2}@${version}`];
-    log32.debug(`Using ${isBun3 ? "bun" : "npm"} for installation`);
+    log31.debug(`Using ${isBun3 ? "bun" : "npm"} for installation`);
     const child = spawn4(cmd, args, {
       stdio: ["ignore", "pipe", "pipe"],
       env: {
@@ -79670,7 +79856,7 @@ async function installVersion(version) {
     });
     child.on("close", (code) => {
       if (code === 0) {
-        log32.info(`✅ Successfully installed ${PACKAGE_NAME2}@${version}`);
+        log31.info(`✅ Successfully installed ${PACKAGE_NAME2}@${version}`);
         saveUpdateState({
           previousVersion: VERSION,
           targetVersion: version,
@@ -79680,20 +79866,20 @@ async function installVersion(version) {
         resolve7({ success: true });
       } else {
         const errorMsg = stderr || stdout || `Exit code: ${code}`;
-        log32.error(`❌ Installation failed: ${errorMsg}`);
+        log31.error(`❌ Installation failed: ${errorMsg}`);
         clearUpdateState();
         resolve7({ success: false, error: errorMsg });
       }
     });
     child.on("error", (err) => {
-      log32.error(`❌ Failed to spawn npm: ${err}`);
+      log31.error(`❌ Failed to spawn npm: ${err}`);
       clearUpdateState();
       resolve7({ success: false, error: err.message });
     });
     setTimeout(() => {
       if (child.exitCode === null) {
         child.kill();
-        log32.error("❌ Installation timed out");
+        log31.error("❌ Installation timed out");
         clearUpdateState();
         resolve7({ success: false, error: "Installation timed out" });
       }
@@ -79735,7 +79921,7 @@ class UpdateInstaller {
 }
 
 // src/auto-update/manager.ts
-var log33 = createLogger("updater");
+var log32 = createLogger("updater");
 
 class AutoUpdateManager extends EventEmitter9 {
   config;
@@ -79758,23 +79944,23 @@ class AutoUpdateManager extends EventEmitter9 {
   }
   start() {
     if (!this.config.enabled) {
-      log33.info("Auto-update is disabled");
+      log32.info("Auto-update is disabled");
       return;
     }
     const updateResult = this.installer.checkJustUpdated();
     if (updateResult) {
-      log33.info(`\uD83C\uDF89 Updated from v${updateResult.previousVersion} to v${updateResult.currentVersion}`);
+      log32.info(`\uD83C\uDF89 Updated from v${updateResult.previousVersion} to v${updateResult.currentVersion}`);
       this.callbacks.broadcastUpdate((fmt) => `\uD83C\uDF89 ${fmt.formatBold("Bot updated")} from v${updateResult.previousVersion} to v${updateResult.currentVersion}`).catch((err) => {
-        log33.warn(`Failed to broadcast update notification: ${err}`);
+        log32.warn(`Failed to broadcast update notification: ${err}`);
       });
     }
     this.checker.start();
-    log33.info(`\uD83D\uDD04 Auto-update manager started (mode: ${this.config.autoRestartMode})`);
+    log32.info(`\uD83D\uDD04 Auto-update manager started (mode: ${this.config.autoRestartMode})`);
   }
   stop() {
     this.checker.stop();
     this.scheduler.stop();
-    log33.debug("Auto-update manager stopped");
+    log32.debug("Auto-update manager stopped");
   }
   getState() {
     return { ...this.state };
@@ -79788,10 +79974,10 @@ class AutoUpdateManager extends EventEmitter9 {
   async forceUpdate() {
     const updateInfo = this.state.updateInfo || await this.checker.check();
     if (!updateInfo) {
-      log33.info("No update available");
+      log32.info("No update available");
       return;
     }
-    log33.info("Forcing immediate update");
+    log32.info("Forcing immediate update");
     await this.performUpdate(updateInfo);
   }
   deferUpdate(minutes = 60) {
@@ -79846,7 +80032,7 @@ class AutoUpdateManager extends EventEmitter9 {
       await this.callbacks.broadcastUpdate((fmt) => `✅ ${fmt.formatBold("Update installed")} - restarting now. ${fmt.formatItalic("Sessions will resume automatically.")}`).catch(() => {});
       await new Promise((resolve7) => setTimeout(resolve7, 1000));
       await this.callbacks.prepareForRestart();
-      log33.info(`\uD83D\uDD04 Restarting for update to v${updateInfo.latestVersion}`);
+      log32.info(`\uD83D\uDD04 Restarting for update to v${updateInfo.latestVersion}`);
       process.stdout.write("\x1B[2J\x1B[H");
       process.stdout.write("\x1B[?25h");
       process.exit(RESTART_EXIT_CODE);
@@ -79906,7 +80092,7 @@ function wirePlatformEvents(platformId, client, session, ui) {
     ui.addLog({ level: "error", component: platformId, message: String(e) });
   });
 }
-program.name("claude-threads").version(VERSION).description("Share Claude Code sessions in Mattermost").option("--url <url>", "Mattermost server URL").option("--token <token>", "Mattermost bot token").option("--channel <id>", "Mattermost channel ID").option("--bot-name <name>", "Bot mention name (default: claude-code)").option("--allowed-users <users>", "Comma-separated allowed usernames").option("--skip-permissions", "Skip interactive permission prompts").option("--no-skip-permissions", "Enable interactive permission prompts (override env)").option("--chrome", "Enable Claude in Chrome integration").option("--no-chrome", "Disable Claude in Chrome integration").option("--worktree-mode <mode>", "Git worktree mode: off, prompt, require (default: prompt)").option("--keep-alive", "Enable system sleep prevention (default: enabled)").option("--no-keep-alive", "Disable system sleep prevention").option("--setup", "Run interactive setup wizard (reconfigure existing settings)").option("--debug", "Enable debug logging").option("--skip-version-check", "Skip Claude CLI version compatibility check").option("--auto-restart", "Enable auto-restart on updates (default when autoUpdate enabled)").option("--no-auto-restart", "Disable auto-restart on updates").option("--headless", "Run without interactive UI (logs to stdout)").parse();
+program.name("claude-threads").version(VERSION).description("Share Claude Code sessions in Mattermost").option("--url <url>", "Mattermost server URL").option("--token <token>", "Mattermost bot token").option("--channel <id>", "Mattermost channel ID").option("--bot-name <name>", "Bot mention name (default: claude-code)").option("--allowed-users <users>", "Comma-separated allowed usernames").option("--permission-mode <mode>", "Permission mode: default | auto | bypass (default: from config)").option("--skip-permissions", "[deprecated] Alias for --permission-mode bypass").option("--no-skip-permissions", "[deprecated] Alias for --permission-mode default").option("--chrome", "Enable Claude in Chrome integration").option("--no-chrome", "Disable Claude in Chrome integration").option("--worktree-mode <mode>", "Git worktree mode: off, prompt, require (default: prompt)").option("--keep-alive", "Enable system sleep prevention (default: enabled)").option("--no-keep-alive", "Disable system sleep prevention").option("--setup", "Run interactive setup wizard (reconfigure existing settings)").option("--debug", "Enable debug logging").option("--skip-version-check", "Skip Claude CLI version compatibility check").option("--auto-restart", "Enable auto-restart on updates (default when autoUpdate enabled)").option("--no-auto-restart", "Disable auto-restart on updates").option("--headless", "Run without interactive UI (logs to stdout)").parse();
 var opts = program.opts();
 var forcedInteractive = !!process.env.CLAUDE_THREADS_INTERACTIVE;
 var isHeadless = opts.headless || !forcedInteractive && (!process.stdout.isTTY || !process.stdin.isTTY);
@@ -79990,6 +80176,10 @@ async function startWithoutDaemon() {
   if (opts.debug) {
     process.env.DEBUG = "1";
   }
+  if (opts.permissionMode !== undefined && !["default", "auto", "bypass"].includes(opts.permissionMode)) {
+    console.error(red(`  ❌ Invalid --permission-mode: "${opts.permissionMode}". Must be one of: default, auto, bypass.`));
+    process.exit(1);
+  }
   const cliArgs = {
     url: opts.url,
     token: opts.token,
@@ -79997,6 +80187,7 @@ async function startWithoutDaemon() {
     botName: opts.botName,
     allowedUsers: opts.allowedUsers,
     skipPermissions: opts.skipPermissions,
+    permissionMode: opts.permissionMode,
     chrome: opts.chrome,
     worktreeMode: opts.worktreeMode,
     keepAlive: opts.keepAlive
@@ -80026,7 +80217,10 @@ async function startWithoutDaemon() {
   }
   const config = newConfig;
   const firstPlatformConfig = config.platforms[0];
-  const initialSkipPermissions = firstPlatformConfig.skipPermissions ?? false;
+  const initialPermissionMode = resolvePermissionMode({
+    permissionMode: cliArgs.permissionMode ?? firstPlatformConfig.permissionMode,
+    skipPermissions: cliArgs.skipPermissions ?? firstPlatformConfig.skipPermissions
+  });
   const claudeValidation = validateClaudeCli();
   if (!claudeValidation.compatible && !opts.skipVersionCheck) {
     console.error(red(`  ❌ ${claudeValidation.message}`));
@@ -80053,8 +80247,10 @@ async function startWithoutDaemon() {
       process.env.DEBUG = "1";
     }
   }
+  const restoredPermissionMode = restoredSettings?.permissionMode ?? (restoredSettings?.skipPermissions === true ? "bypass" : restoredSettings?.skipPermissions === false ? "default" : initialPermissionMode);
   const runtimeConfig = {
-    skipPermissions: restoredSettings?.skipPermissions ?? initialSkipPermissions,
+    permissionMode: restoredPermissionMode,
+    skipPermissions: restoredPermissionMode === "bypass",
     chromeEnabled: restoredSettings?.chromeEnabled ?? (config.chrome ?? false),
     keepAliveEnabled: restoredSettings?.keepAliveEnabled ?? keepAliveEnabled
   };
@@ -80067,7 +80263,7 @@ async function startWithoutDaemon() {
       workingDir,
       claudeVersion: claudeValidation.version || "unknown",
       claudeCompatible: claudeValidation.compatible,
-      skipPermissions: runtimeConfig.skipPermissions,
+      permissionMode: runtimeConfig.permissionMode,
       chromeEnabled: runtimeConfig.chromeEnabled,
       keepAliveEnabled: runtimeConfig.keepAliveEnabled
     },
@@ -80082,14 +80278,20 @@ async function startWithoutDaemon() {
         ui.addLog({ level: "info", component: "toggle", message: `Debug mode ${enabled ? "enabled" : "disabled"}` });
         sessionManager?.updateAllStickyMessages();
       },
-      onPermissionsToggle: (skipPermissions) => {
-        runtimeConfig.skipPermissions = skipPermissions;
-        saveRuntimeSettings({ ...getRuntimeSettings(), skipPermissions });
+      onPermissionsToggle: (mode) => {
+        runtimeConfig.permissionMode = mode;
+        saveRuntimeSettings({
+          ...getRuntimeSettings(),
+          permissionMode: mode,
+          skipPermissions: mode === "bypass"
+        });
         for (const platformConfig of config.platforms) {
-          platformConfig.skipPermissions = skipPermissions;
+          const pc = platformConfig;
+          pc.permissionMode = mode;
+          pc.skipPermissions = mode === "bypass";
         }
-        sessionManager?.setSkipPermissions(skipPermissions);
-        ui.addLog({ level: "info", component: "toggle", message: `Permissions ${skipPermissions ? "auto (skip prompts)" : "interactive"}` });
+        sessionManager?.setPermissionMode(mode);
+        ui.addLog({ level: "info", component: "toggle", message: `Permission mode: ${mode}` });
         sessionManager?.updateAllStickyMessages();
       },
       onChromeToggle: (enabled) => {
@@ -80152,7 +80354,7 @@ async function startWithoutDaemon() {
   keepAlive.setEnabled(keepAliveEnabled);
   const threadLogsEnabled = config.threadLogs?.enabled ?? true;
   const threadLogsRetentionDays = config.threadLogs?.retentionDays ?? 30;
-  const session = new SessionManager(workingDir, initialSkipPermissions, config.chrome, config.worktreeMode, undefined, threadLogsEnabled, threadLogsRetentionDays, config.limits, config.claudeAccounts);
+  const session = new SessionManager(workingDir, initialPermissionMode, config.chrome, config.worktreeMode, undefined, threadLogsEnabled, threadLogsRetentionDays, config.limits, config.claudeAccounts);
   if (config.stickyMessage) {
     session.setStickyMessageCustomization(config.stickyMessage.description, config.stickyMessage.footer);
   }