@schoolai/shipyard 3.29.0 → 3.30.0-rc.20260912.0

package/dist/{serve-VBMV5LEN.js → serve-RFNU5ZMH.js}

@@ -12,7 +12,7 @@ import {
   guardedSubscribe,
   makeInitialAttemptState,
   shutdownFileWatcherGuard
-} from "./chunk-J5MLXWO5.js";
+} from "./chunk-WO5EM3BP.js";
 import {
   TRAILER_SCHEMA_VERSION,
   appendTrailerToMessage,
@@ -40,13 +40,13 @@ import {
   startPlanBackfillForDaemon,
   sync,
   validatePeerId
-} from "./chunk-CDOIPKD6.js";
+} from "./chunk-D7AICUJM.js";
 import {
   loadAuthToken
 } from "./chunk-XPYW5WQS.js";
 import {
   getDaemonVersion
-} from "./chunk-SR3T3EYE.js";
+} from "./chunk-RGVTFZDF.js";
 import {
   collectPriorCrashDetail,
   getRecentWasmPanicMessages
@@ -100,6 +100,7 @@ import {
   detectCodexAuth,
   detectDevinAuth,
   detectMarketplacePlugins,
+  devinAcpModeId,
   devinProfile,
   emitStartupComplete,
   ensureLabel,
@@ -187,12 +188,12 @@ import {
   unresolveReviewThread,
   withLabelAsync,
   writeCursorApiKeyToVault
-} from "./chunk-3NS2YSRP.js";
+} from "./chunk-JVE24NQT.js";
 import {
   classifySkill,
   detectSkills,
   resolveDevinConfigHome
-} from "./chunk-CB35TLO4.js";
+} from "./chunk-ZDJEJI62.js";
 import {
   buildNodeSpawnEnv,
   nodeSpawnEnvOverlay,
@@ -253,7 +254,7 @@ import {
   createAssetResolver,
   toSdkContent,
   toSdkPermissionMode
-} from "./chunk-IJGA4YA3.js";
+} from "./chunk-J2QE7DS3.js";
 import {
   AGENT_IDS,
   AGENT_SYSTEM_CLAUDE_CODE,
@@ -462,7 +463,7 @@ import {
   unsafeAssertSourceId,
   vizFileExtension,
   withPreferredRuntimeAuthMethod
-} from "./chunk-ASK7AIJM.js";
+} from "./chunk-QV5KC6S4.js";
 import {
   AuthGitHubCallbackRequestSchema,
   AuthGitHubCallbackResponseSchema,
@@ -510,7 +511,7 @@ import {
   VaultKeyPutResponseSchema,
   classifyClaudeCodeCompatibility,
   classifyCodexCompatibility
-} from "./chunk-HIGCNT53.js";
+} from "./chunk-FARMJBC7.js";
 import {
   external_exports as external_exports2
 } from "./chunk-EHQITHQX.js";
@@ -3969,6 +3970,7 @@ function buildBroadcastSnapshot(caps) {
      * the slot so both paths agree.
      */
     cursorAuth: caps.cursorAuth ?? null,
+    devinAuth: caps.devinAuth ?? null,
     browserMetricsIntervalMs: null,
     installedRuntimes: caps.installedRuntimes,
     detectionComplete: caps.detectionComplete,
@@ -4011,6 +4013,22 @@ function mergeEnvironmentPatch(current, patch) {
   for (const env of patch) byPath.set(env.path, env);
   return [...byPath.values()];
 }
+function preserveFullSnapshotState(fresh, current, reconciledSkills, devinAuthAtStart) {
+  const effectiveDevinAuth = current?.devinAuth !== devinAuthAtStart ? current?.devinAuth : fresh.devinAuth ?? current?.devinAuth ?? null;
+  const snapshot = {
+    ...fresh,
+    ...reconciledSkills !== void 0 ? { skills: reconciledSkills } : {},
+    cursorAuth: fresh.cursorAuth ?? current?.cursorAuth ?? null,
+    /** A timed-out native status probe is inconclusive; keep the last authoritative Devin result. */
+    devinAuth: effectiveDevinAuth,
+    depsStatus: fresh.depsStatus ?? current?.depsStatus,
+    unscopedWorkspace: fresh.unscopedWorkspace ?? current?.unscopedWorkspace
+  };
+  return {
+    ...snapshot,
+    runtimeAuth: buildRuntimeAuthMapFromSnapshot(snapshotProfileAuth(snapshot))
+  };
+}
 function createCapabilitySnapshotBroadcaster(deps) {
   let lastBroadcastSerialized = null;
   let lastSkillsBroadcastSerialized = null;
@@ -4092,28 +4110,19 @@ function createCapabilitySnapshotBroadcaster(deps) {
     broadcastCapabilitiesSnapshot();
     if (effectivePatch.skills !== void 0) broadcastSkillsSnapshot();
   };
-  const applyFullSnapshot = async (fresh) => {
+  const applyFullSnapshot = async (fresh, guard) => {
     if (deps.isDisposed()) return;
+    const devinAuthAtStart = guard ? guard.devinAuthBaseline : deps.getCapabilities()?.devinAuth;
     const reconciledSkills = await reconcileSkillsIfNeeded(fresh.skills);
     if (deps.isDisposed()) return;
     const disabled = await loadDisabledMcpServers();
     if (deps.isDisposed()) return;
-    const current = deps.getCapabilities();
-    const preserved = {
-      ...fresh,
-      ...reconciledSkills !== void 0 ? { skills: reconciledSkills } : {},
-      cursorAuth: fresh.cursorAuth ?? current?.cursorAuth ?? null,
-      runtimeAuth: current?.runtimeAuth?.cursor !== void 0 ? { ...fresh.runtimeAuth, cursor: current.runtimeAuth.cursor } : fresh.runtimeAuth,
-      /**
-       * Same preservation reason as cursorAuth: the full-detect worker does
-       * not produce depsStatus/unscopedWorkspace (they are seeded at boot and
-       * recomputed only in the cwd-scoped patch), so a full refresh would
-       * otherwise wipe them and silently drop the editor's deps/no-project
-       * banner ~30s after boot. Preserve last-known when fresh lacks them.
-       */
-      depsStatus: fresh.depsStatus ?? current?.depsStatus,
-      unscopedWorkspace: fresh.unscopedWorkspace ?? current?.unscopedWorkspace
-    };
+    const preserved = preserveFullSnapshotState(
+      fresh,
+      deps.getCapabilities(),
+      reconciledSkills,
+      devinAuthAtStart
+    );
     const next = normalizeCapabilities(preserved);
     const nextMcpServers = resolveFilteredMcpServers(next.mcpServers, disabled);
     deps.setCapabilities({
@@ -6049,7 +6058,7 @@ function nanoid(size = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.29.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.30.0" : "unknown";
 function createDaemonSignaling(config) {
   const agentId = config.agentId ?? nanoid();
   function send(msg) {
@@ -14978,6 +14987,7 @@ function filterOutboundForCollab(msg, collabTaskId, getTaskSync) {
     /** Suppressed: host-only settings and schedules */
     case "user_settings_snapshot":
     case "user_settings_updated":
+    case "user_setting_update_ack":
     /**
      * Project structure is currently host-only. When collab wiring lands,
      * shared projects become the share boundary and these will flip to
@@ -16373,7 +16383,7 @@ function routeMessage(msg, callbacks, sendControl, log) {
       callbacks.onRequestInboxSnapshot();
       break;
     case "update_user_setting":
-      callbacks.onUpdateUserSetting(msg.key, msg.value);
+      callbacks.onUpdateUserSetting(msg.key, msg.value, msg.requestId);
       break;
     case "request_user_settings":
       callbacks.onRequestUserSettings();
@@ -17913,7 +17923,7 @@ async function refreshPluginCapabilities(daemon, tokenStore) {
         readPreferredClaudeAuthMethod(userSettings)
       )
     ),
-    import("./skills-FSYFQ6FY.js").then(
+    import("./skills-BX2NZKPN.js").then(
       (m2) => m2.detectSkills(daemon.capabilities.environments)
     )
   ]);
@@ -26724,13 +26734,28 @@ function buildTaskCallbacks(deps) {
 function buildUserSettingsCallbacks(deps) {
   const { daemon, getControlHandler, logAdapter } = deps;
   return {
-    onUpdateUserSetting: (key, value) => {
-      daemon.userSettingsStore.updateSetting(key, value).catch((err3) => {
+    onUpdateUserSetting: (key, value, requestId) => {
+      daemon.userSettingsStore.updateSetting(key, value).then(() => {
+        if (requestId) {
+          getControlHandler().sendControl({
+            type: "user_setting_update_ack",
+            requestId,
+            ok: true
+          });
+        }
+      }).catch((err3) => {
         logAdapter({
           event: "user_setting_update_failed",
           key,
           error: err3 instanceof Error ? err3.message : String(err3)
         });
+        if (requestId) {
+          getControlHandler().sendControl({
+            type: "user_setting_update_ack",
+            requestId,
+            ok: false
+          });
+        }
         getControlHandler().sendControl({
           type: "error",
           error: `Failed to update setting "${key}": ${err3 instanceof Error ? err3.message : String(err3)}`
@@ -35246,6 +35271,9 @@ function applyPersistedComposerSettings(orchestrator, settings) {
     patch.compactionPrefs = normalizedSettings.compactionPrefs;
   if (normalizedSettings.mutedResources != null)
     patch.mutedResources = normalizedSettings.mutedResources;
+  if (normalizedSettings.permissionMode != null) {
+    orchestrator.seedConfirmedPermissionMode(normalizedSettings.permissionMode);
+  }
   if (Object.keys(patch).length > 0) orchestrator.applySettings(patch);
 }
 function persistMessageBorneComposerSettings(deps, settings) {
@@ -63877,6 +63905,8 @@ var AutomationService = class {
       case "init_received":
       case "available_commands_updated":
       case "mcp_mid_thread_reload_needed":
+      case "permission_mode_applied":
+      case "permission_mode_rejected":
       case "auth_not_logged_in":
       case "rate_limit":
       case "billing_error":
@@ -72967,6 +72997,9 @@ function createDeferredSubprocess(initialize, onEvent, options = {}) {
     });
   }
   return {
+    reconcilePermissionModeBeforePrompt: options.reconcilePermissionModeBeforePrompt,
+    preservePendingPermissionRequestsInBypass: options.preservePendingPermissionRequestsInBypass,
+    permissionModeRequiresNativeAck: options.permissionModeRequiresNativeAck,
     get isClosed() {
       return controller.signal.aborted || inner?.isClosed === true;
     },
@@ -73327,8 +73360,7 @@ async function prepareDevinRuntimeConfig(options) {
     const configPath = path5.join(devinDir, "config.json");
     const config = {
       auto_update: false,
-      read_config_from: READ_CONFIG_FROM_NONE,
-      permissions: { ask: ["Write(/**)", "exec", "fetch", "mcp__*"] }
+      read_config_from: READ_CONFIG_FROM_NONE
     };
     const mcpConfig = { mcpServers: buildDevinMcpServers(options.servers) };
     const ruleChunks = instructions ? splitUtf8(instructions, DEVIN_LOADED_RULE_MAX_BYTES) : [];
@@ -77557,6 +77589,9 @@ var ClientSideConnection = class {
 };
 
 // src/services/session/devin-acp-session.ts
+var DevinPermissionModeRejectedError = class extends Error {
+  name = "DevinPermissionModeRejectedError";
+};
 var DevinAcpSession = class {
   #connection;
   #options;
@@ -77670,10 +77705,18 @@ var DevinAcpSession = class {
   async setMode(modeId) {
     if (!this.#sessionId) throw new Error("Devin session has not started");
     if (!this.#modes?.availableModes.some((mode) => mode.id === modeId)) {
-      throw new Error(`Devin CLI does not advertise permission mode ${modeId}`);
+      throw new DevinPermissionModeRejectedError(
+        `Devin CLI does not advertise permission mode ${modeId}`
+      );
     }
     if (this.#modes.currentModeId !== modeId) {
-      await this.#connection.setSessionMode({ sessionId: this.#sessionId, modeId });
+      try {
+        await this.#connection.setSessionMode({ sessionId: this.#sessionId, modeId });
+      } catch (error) {
+        throw new DevinPermissionModeRejectedError(
+          error instanceof Error ? error.message : String(error)
+        );
+      }
       this.#modes = { ...this.#modes, currentModeId: modeId };
     }
   }
@@ -78114,19 +78157,6 @@ function patchCognitionToolMetadata(existing, meta) {
   const planFilePath = typeof pathPatch === "string" || pathPatch === null ? typeof pathPatch === "string" ? pathPatch : void 0 : existing?.planFilePath;
   return { isExitPlan, planFilePath };
 }
-function acpMode(mode) {
-  switch (mode) {
-    case "plan":
-      return "plan";
-    case "bypass":
-      return "bypass";
-    case "auto":
-      return "smart";
-    case "default":
-    case "accept-edits":
-      return "accept-edits";
-  }
-}
 function mergeToolPatch(existing, toolCallId, patch) {
   const title = patchNullableString(existing?.title, patch.title);
   const explicitToolName = patchExplicitToolName(existing?.explicitToolName, patch);
@@ -78187,6 +78217,7 @@ var DevinAgentSubprocess = class {
   #options;
   #child;
   #session;
+  #startup;
   #translator = new DevinEventTranslator();
   #initialServerConfigs;
   #closed = false;
@@ -78200,6 +78231,8 @@ var DevinAgentSubprocess = class {
   #sessionId = null;
   #tools = /* @__PURE__ */ new Map();
   reconcilePermissionModeBeforePrompt = true;
+  preservePendingPermissionRequestsInBypass = true;
+  permissionModeRequiresNativeAck = true;
   #executingTools = /* @__PURE__ */ new Set();
   #compaction = null;
   #context = null;
@@ -78230,7 +78263,7 @@ var DevinAgentSubprocess = class {
       mcpServers: options.mcpServers ?? [],
       resumeSessionId: options.resumeSessionId,
       forkMessageId: options.forkMessageId,
-      modeId: acpMode(options.permissionMode),
+      modeId: devinAcpModeId(options.permissionMode),
       modelId: this.#nativeModel,
       onQuestion: options.onQuestion,
       onExtensionNotification: (method, params) => this.#handleExtensionNotification(method, params),
@@ -78316,7 +78349,7 @@ var DevinAgentSubprocess = class {
     if (options.initialContent.length > 0) {
       this.#pushMessage(options.initialContent, options.initialMessageKind === "synthetic");
     }
-    void this.#start();
+    this.#startup = this.#start();
   }
   get isClosed() {
     return this.#exited;
@@ -78385,7 +78418,8 @@ var DevinAgentSubprocess = class {
       } finally {
         if (timer) clearTimeout(timer);
       }
-      if (this.#closed) return;
+      if (this.#closed) return false;
+      this.#emit({ type: "permission_mode_applied", mode: this.#options.permissionMode });
       this.#emit({
         type: "init_received",
         sessionId: this.#sessionId,
@@ -78398,7 +78432,15 @@ var DevinAgentSubprocess = class {
           agentSystem: "devin"
         }
       });
+      return true;
     } catch (error) {
+      if (error instanceof DevinPermissionModeRejectedError) {
+        this.#emit({
+          type: "permission_mode_rejected",
+          mode: this.#options.permissionMode,
+          error: error.message
+        });
+      }
       if (!this.#errorReported) {
         this.#emit({
           type: "sdk_error",
@@ -78406,6 +78448,7 @@ var DevinAgentSubprocess = class {
         });
       }
       this.close();
+      return false;
     }
   }
   #emit(event) {
@@ -78583,7 +78626,8 @@ var DevinAgentSubprocess = class {
     return operation;
   }
   async setPermissionMode(mode) {
-    await this.#session.setMode(acpMode(mode));
+    if (!await this.#startup) throw new Error("Devin session did not start");
+    await this.#session.setMode(devinAcpModeId(mode));
   }
   async setMcpServers(servers) {
     const next = new Map(
@@ -78910,7 +78954,12 @@ function buildDevinTaskSubprocess(options) {
     (event) => {
       if (isLiveSubprocessEpoch(options.taskId, epoch)) options.onEvent(event);
     },
-    { atomicModelSelection: true }
+    {
+      atomicModelSelection: true,
+      reconcilePermissionModeBeforePrompt: true,
+      preservePendingPermissionRequestsInBypass: true,
+      permissionModeRequiresNativeAck: true
+    }
   );
 }
 
@@ -87246,6 +87295,7 @@ function buildUserSettingsStore(filePath) {
   }
   return {
     async getSettings() {
+      await writeQueue;
       return readStore();
     },
     async updateSetting(key, value) {
@@ -91798,24 +91848,29 @@ var PermissionHandler = class {
       { once: true }
     );
   }
-  applyPermissionMode(mode) {
+  applyPermissionMode(mode, callbacks) {
     this.#deps.enqueueAsync(async () => {
       try {
-        await this.#deps.getSubprocess()?.setPermissionMode(mode);
-        if (mode === "bypass") {
+        const subprocess = this.#deps.getSubprocess();
+        await subprocess?.setPermissionMode(mode);
+        if (mode === "bypass" && subprocess?.preservePendingPermissionRequestsInBypass !== true) {
           this.#approveAllPendingForBypass();
         }
-        this.#deps.getSendControlMessage()?.({
-          type: "task_settings_changed",
-          taskId: this.#deps.taskId,
-          settings: { permissionMode: mode }
-        });
+        if (callbacks?.suppressBroadcast !== true) {
+          this.#deps.getSendControlMessage()?.({
+            type: "task_settings_changed",
+            taskId: this.#deps.taskId,
+            settings: { permissionMode: mode }
+          });
+        }
+        callbacks?.onApplied?.();
       } catch (err3) {
         this.#deps.log({
           event: "apply_permission_mode_error",
           taskId: this.#deps.taskId,
           error: err3 instanceof Error ? err3.message : String(err3)
         });
+        callbacks?.onRejected?.(err3);
       }
     });
   }
@@ -92204,8 +92259,8 @@ var ThreadControlController = class {
   get sendControlMessage() {
     return this.#sendControlMessage;
   }
-  applyPermissionMode(mode) {
-    this.#permissionHandler.applyPermissionMode(mode);
+  applyPermissionMode(mode, callbacks) {
+    this.#permissionHandler.applyPermissionMode(mode, callbacks);
   }
   get pendingPermissionCount() {
     return this.#permissionHandler.pendingCount;
@@ -92565,6 +92620,12 @@ var ThreadEventProcessor = class {
   async #handle(event) {
     const manager = this.#deps.getManager();
     switch (event.type) {
+      case "permission_mode_applied":
+        this.#deps.config.onPermissionModeApplied?.(event.mode);
+        break;
+      case "permission_mode_rejected":
+        this.#deps.config.onPermissionModeRejected?.(event.mode);
+        break;
       case "init_received":
         await this.#handleInitReceived(event);
         break;
@@ -92749,12 +92810,14 @@ var ThreadEventProcessor = class {
 
 // src/services/conversation/thread-settings-flush.ts
 var PermissionModeFlushError = class extends Error {
+  mode;
   constructor(mode, cause) {
     super(`Could not apply permission mode ${mode}`, { cause });
     this.name = "PermissionModeFlushError";
+    this.mode = mode;
   }
 };
-async function reconcilePermissionMode(subprocess, settings, applied, onError) {
+async function reconcilePermissionMode(subprocess, settings, applied, onError, onApplied) {
   const mode = settings.permissionMode;
   if (mode === void 0) return;
   if (mode === applied.permissionMode && subprocess.reconcilePermissionModeBeforePrompt !== true) {
@@ -92763,12 +92826,13 @@ async function reconcilePermissionMode(subprocess, settings, applied, onError) {
   try {
     await subprocess.setPermissionMode(mode);
     applied.permissionMode = mode;
+    onApplied?.(mode);
   } catch (error) {
     onError("permission_mode", error);
     throw new PermissionModeFlushError(mode, error);
   }
 }
-async function flushSubprocessSettings(subprocess, settings, applied, onError) {
+async function flushSubprocessSettings(subprocess, settings, applied, onError, onPermissionModeApplied) {
   const attempt = async (kind, operation) => {
     try {
       await operation();
@@ -92776,7 +92840,7 @@ async function flushSubprocessSettings(subprocess, settings, applied, onError) {
       onError(kind, error);
     }
   };
-  await reconcilePermissionMode(subprocess, settings, applied, onError);
+  await reconcilePermissionMode(subprocess, settings, applied, onError, onPermissionModeApplied);
   const selection = {
     model: settings.model,
     reasoningEffort: settings.reasoningEffort,
@@ -92831,9 +92895,15 @@ var ThreadSettingsController = class {
   merge(settings) {
     this.#latest = { ...this.#latest, ...settings };
   }
-  applyPermissionMode(mode) {
+  applyPermissionMode(mode, callbacks) {
     this.#latest = { ...this.#latest, permissionMode: mode };
-    this.#deps.applyPermissionMode(mode);
+    this.#deps.applyPermissionMode(mode, {
+      onApplied: () => {
+        callbacks?.onApplied?.();
+      },
+      onRejected: callbacks?.onRejected,
+      suppressBroadcast: callbacks?.suppressBroadcast
+    });
   }
   setModel(model) {
     this.#latest = { ...this.#latest, model };
@@ -92943,9 +93013,13 @@ var ThreadSettingsController = class {
         event: `thread_flush_${kind}_error`,
         threadId: this.#deps.config.threadId,
         error: error instanceof Error ? error.message : String(error)
-      })
+      }),
+      this.#deps.config.onPermissionModeApplied
     );
   }
+  stagePermissionMode(mode) {
+    this.#latest = { ...this.#latest, permissionMode: mode };
+  }
   resetApplied() {
     this.#applied = {};
   }
@@ -92999,7 +93073,7 @@ var Thread = class {
       config,
       getSubprocess: () => this.#subprocess,
       getAgentSystem: () => this.#agentSystem,
-      applyPermissionMode: (mode) => this.#control.applyPermissionMode(mode),
+      applyPermissionMode: (mode, callbacks2) => this.#control.applyPermissionMode(mode, callbacks2),
       respawnForProfileSwitch: () => {
         this.#subprocess?.close();
         this.resetSessionId();
@@ -93325,8 +93399,11 @@ var Thread = class {
     const heldCount = this.#rewindInput.cancelHumans();
     return this.#manager.cancelQueued() + heldCount;
   }
-  applyPermissionMode(mode) {
-    this.#settings.applyPermissionMode(mode);
+  applyPermissionMode(mode, callbacks) {
+    this.#settings.applyPermissionMode(mode, callbacks);
+  }
+  stagePermissionMode(mode) {
+    this.#settings.stagePermissionMode(mode);
   }
   get pendingPermissionCount() {
     return this.#control.pendingPermissionCount;
@@ -93573,6 +93650,7 @@ var Thread = class {
           error: err3 instanceof Error ? err3.message : String(err3)
         });
         if (err3 instanceof PermissionModeFlushError) {
+          this.#config.onPermissionModeRejected?.(err3.mode);
           this.#events.surfaceSdkError(`Message was not sent: ${err3.message}`);
         }
       }
@@ -93626,6 +93704,7 @@ var Thread = class {
           error: err3 instanceof Error ? err3.message : String(err3)
         });
         if (err3 instanceof PermissionModeFlushError) {
+          this.#config.onPermissionModeRejected?.(err3.mode);
           this.#events.surfaceSdkError(`Message was not sent: ${err3.message}`);
         }
       }
@@ -98599,6 +98678,8 @@ var SideThreadRegistry = class {
         metricsCollector: this.#deps.metricsCollector,
         /** Cross-profile model switch detection — same wiring as the main thread. */
         resolveProfileForModel: (modelId) => profileRegistry.findByModelId(modelId)?.id ?? null,
+        onPermissionModeApplied: this.#deps.onPermissionModeApplied,
+        onPermissionModeRejected: this.#deps.onPermissionModeRejected,
         lookupToolDisplayName: this.#deps.lookupToolDisplayName
       },
       {
@@ -99609,6 +99690,8 @@ function isCompactionActivityEvent(event) {
     case "compaction_failed":
     case "compaction_started":
     case "init_received":
+    case "permission_mode_applied":
+    case "permission_mode_rejected":
     case "rate_limit":
     case "rate_limit_error":
     case "sdk_error":
@@ -99790,6 +99873,8 @@ function handleMainThreadEvent(ctx, event) {
       break;
     case "stream_activity":
     case "available_commands_updated":
+    case "permission_mode_applied":
+    case "permission_mode_rejected":
       break;
     case "tool_execution_started":
     case "tool_execution_settled":
@@ -104076,6 +104161,7 @@ var Task = class {
   #originalCwd;
   #cwdEscapeWarningActive = false;
   #latestSettings = {};
+  #confirmedPermissionMode = "default";
   #pendingMessageMeta = [];
   #pendingWorktreeToolUseIds = /* @__PURE__ */ new Set();
   #lastAgentSeqNo = null;
@@ -104672,6 +104758,8 @@ var Task = class {
          * subprocess. Returns null for unknown models.
          */
         resolveProfileForModel: (modelId) => profileRegistry.findByModelId(modelId)?.id ?? null,
+        onPermissionModeApplied: (mode) => this.#handlePermissionModeApplied(mode),
+        onPermissionModeRejected: (mode) => this.#handlePermissionModeRejected(mode),
         /*
          * Thread applies `?? null` internally (thread.ts), so pass through raw
          * to avoid an extra `??` in this already-at-budget constructor.
@@ -104718,6 +104806,8 @@ var Task = class {
       getThreadMeta: (threadId) => this.#shiftThreadMeta(threadId),
       prepareMessages: (threadId, channelId, messages) => this.#prepareSideMessages(threadId, channelId, messages),
       onThreadTurnComplete: (threadId) => this.notifyThreadTurnComplete(threadId),
+      onPermissionModeApplied: (mode) => this.#handlePermissionModeApplied(mode),
+      onPermissionModeRejected: (mode) => this.#handlePermissionModeRejected(mode),
       lookupToolDisplayName: deps.lookupToolDisplayName
     });
     this.#commentNotificationWatcher = this.#buildCommentNotificationWatcher();
@@ -104917,8 +105007,12 @@ var Task = class {
    * compaction occurred on those.
    */
   applyCrossRuntimeSwitch(newRuntimeId, pendingHandoff, mode) {
+    const previousRuntimeId = this.#runtimeId;
     this.#deps.onCrossRuntimeSwitch?.(this.#deps.taskId, this.#runtimeId, newRuntimeId);
     applyCrossRuntimeSwitch(this.#crossRuntimeCtx(), newRuntimeId, pendingHandoff, mode);
+    if (previousRuntimeId !== this.#runtimeId) {
+      this.#confirmedPermissionMode = this.#runtimeId === "devin" ? "default" : this.#latestSettings.permissionMode ?? "default";
+    }
   }
   /**
    * The wire `handoff_status.mode` the daemon ran for the most recent
@@ -105233,8 +105327,75 @@ var Task = class {
       currentReasoningEffort: this.#latestSettings.reasoningEffort,
       log: this.#deps.log
     });
+    const primary = this.#getPrimary();
+    if (normalized.permissionMode !== void 0 && this.#runtimeId === "devin" && primary.currentSubprocess?.permissionModeRequiresNativeAck === true) {
+      const mode = normalized.permissionMode;
+      const immediate = { ...normalized };
+      delete immediate.permissionMode;
+      if (Object.values(immediate).some((value) => value !== void 0)) {
+        this.#latestSettings = { ...this.#latestSettings, ...immediate };
+        primary.applySettings(immediate);
+        this.#propagateToSideThreads(
+          (thread) => thread.applySettings(immediate),
+          "side_thread_apply_settings_failed"
+        );
+        this.#deps.onSettingsApplied(immediate);
+      }
+      primary.applyPermissionMode(mode, {
+        suppressBroadcast: true,
+        onApplied: () => {
+          this.#confirmedPermissionMode = mode;
+          this.#latestSettings = { ...this.#latestSettings, permissionMode: mode };
+          this.#propagateToSideThreads(
+            (thread) => thread.applyPermissionMode(mode, { suppressBroadcast: true }),
+            "side_thread_apply_permission_mode_failed"
+          );
+          this.#deps.onSettingsApplied({ permissionMode: mode });
+        },
+        onRejected: () => {
+          const rollback = this.#confirmedPermissionMode === mode ? "default" : this.#confirmedPermissionMode;
+          this.#confirmedPermissionMode = rollback;
+          this.#latestSettings = {
+            ...this.#latestSettings,
+            permissionMode: rollback
+          };
+          primary.stagePermissionMode(rollback);
+          this.#propagateToSideThreads(
+            (thread) => thread.stagePermissionMode(rollback),
+            "side_thread_stage_permission_mode_rollback_failed"
+          );
+          this.#deps.onSettingsApplied({
+            permissionMode: rollback
+          });
+        }
+      });
+      return;
+    }
+    if (normalized.permissionMode !== void 0 && this.#runtimeId === "devin") {
+      const mode = normalized.permissionMode;
+      const immediate = { ...normalized };
+      delete immediate.permissionMode;
+      this.#latestSettings = { ...this.#latestSettings, ...immediate, permissionMode: mode };
+      primary.stagePermissionMode(mode);
+      this.#propagateToSideThreads(
+        (thread) => thread.stagePermissionMode(mode),
+        "side_thread_stage_permission_mode_failed"
+      );
+      if (Object.values(immediate).some((value) => value !== void 0)) {
+        primary.applySettings(immediate);
+        this.#propagateToSideThreads(
+          (thread) => thread.applySettings(immediate),
+          "side_thread_apply_settings_failed"
+        );
+        this.#deps.onSettingsApplied(immediate);
+      }
+      return;
+    }
     this.#latestSettings = { ...this.#latestSettings, ...normalized };
-    this.#getPrimary().applySettings(normalized);
+    if (normalized.permissionMode !== void 0 && this.#runtimeId !== "devin") {
+      this.#confirmedPermissionMode = normalized.permissionMode;
+    }
+    primary.applySettings(normalized);
     this.#propagateToSideThreads(
       (t) => t.applySettings(normalized),
       "side_thread_apply_settings_failed"
@@ -105244,6 +105405,10 @@ var Task = class {
     }
     this.#deps.onSettingsApplied(normalized);
   }
+  /** A persisted Devin mode was acknowledged in the prior native session. */
+  seedConfirmedPermissionMode(mode) {
+    this.#confirmedPermissionMode = mode;
+  }
   /**
    * Stage settings for the next spawn without live-applying them to the current
    * subprocess. Used by cross-runtime model switches: the destination model must
@@ -105333,6 +105498,24 @@ var Task = class {
       }
     }
   }
+  #handlePermissionModeApplied(mode) {
+    if (this.#confirmedPermissionMode === mode) return;
+    this.#confirmedPermissionMode = mode;
+    this.#latestSettings = { ...this.#latestSettings, permissionMode: mode };
+    this.#deps.onSettingsApplied({ permissionMode: mode });
+  }
+  #handlePermissionModeRejected(mode) {
+    if (this.#latestSettings.permissionMode !== mode) return;
+    const rollback = this.#confirmedPermissionMode === mode ? "default" : this.#confirmedPermissionMode;
+    this.#confirmedPermissionMode = rollback;
+    this.#latestSettings = { ...this.#latestSettings, permissionMode: rollback };
+    this.#getPrimary().stagePermissionMode(rollback);
+    this.#propagateToSideThreads(
+      (thread) => thread.stagePermissionMode(rollback),
+      "side_thread_stage_permission_mode_rollback_failed"
+    );
+    this.#deps.onSettingsApplied({ permissionMode: rollback });
+  }
   async setMcpServers(servers) {
     const mainResult = await this.#getPrimary().setMcpServers(servers);
     for (const thread of this.#sideThreads.liveThreads()) {
@@ -115607,8 +115790,11 @@ async function runServeBody(options, captureRefs) {
       });
     }
   })();
+  let fullDetectionDevinAuthBaseline = daemon.capabilities?.devinAuth;
   const applyFreshCapabilities = async (fresh) => {
-    await applyFullSnapshot(fresh);
+    await applyFullSnapshot(fresh, {
+      devinAuthBaseline: fullDetectionDevinAuthBaseline
+    });
     if (disposed) return;
     await retryProxyAndCoordinatorWiring();
     await broadcastProfileSnapshot();
@@ -115616,6 +115802,7 @@ async function runServeBody(options, captureRefs) {
   const capabilityRefresh = createCapabilityRefreshCoordinator({
     isDisposed: () => disposed,
     detectFull: async () => {
+      fullDetectionDevinAuthBaseline = daemon.capabilities?.devinAuth;
       const userSettings = await daemon.userSettingsStore.getSettings();
       return withLabelAsync("awaitCapabilityWorker", async () => {
         await new Promise((r) => {
@@ -116045,4 +116232,4 @@ export {
   decideWorkspaceScope,
   serve
 };
-//# sourceMappingURL=serve-VBMV5LEN.js.map
+//# sourceMappingURL=serve-RFNU5ZMH.js.map