agor-live 0.17.2 → 0.17.3

package/dist/daemon/setup/socketio.d.ts

@@ -102,6 +102,15 @@ declare function getSocketAuthState(socket: Socket): SocketAuthState;
  * Exported for unit tests.
  */
 declare function createTokenBucket(capacity: number, refillPerSec: number, now?: () => number): () => boolean;
+/**
+ * Per-user socket.io room name. Sockets owned by `userId` auto-join this room
+ * on connect / login (see the connection handler and the `app.on('login', …)`
+ * hook in this file). Use this everywhere we want to emit to "every tab the
+ * user owns" — e.g. user-scoped notifications like `oauth:completed`.
+ *
+ * Centralized so the prefix can change in one place without drift.
+ */
+declare function userRoomName(userId: string): string;
 /**
  * Validate a terminal channel name and extract its target user_id.
  *
@@ -150,4 +159,4 @@ declare function createSocketIOConfig(app: Application, options: SocketIOOptions
  */
 declare function configureChannels(app: Application): void;
 
-export { type SocketAuthState, type SocketIOOptions, type SocketIOResult, configureChannels, createSocketIOConfig, createTokenBucket, getSocketAuthState, parseTerminalChannel };
+export { type SocketAuthState, type SocketIOOptions, type SocketIOResult, configureChannels, createSocketIOConfig, createTokenBucket, getSocketAuthState, parseTerminalChannel, userRoomName };

package/dist/daemon/setup/socketio.js

@@ -32,6 +32,9 @@ function createTokenBucket(capacity, refillPerSec, now = Date.now) {
     return false;
   };
 }
+function userRoomName(userId) {
+  return `user:${userId}`;
+}
 function parseTerminalChannel(channel) {
   if (typeof channel !== "string") return null;
   if (!channel.startsWith("user/") || !channel.endsWith("/terminal")) return null;
@@ -125,7 +128,7 @@ function createSocketIOConfig(app, options) {
         });
       }
       if (user?.user_id) {
-        socket.join(`user:${user.user_id}`);
+        socket.join(userRoomName(user.user_id));
         console.log(
           `\u{1F3E0} Socket ${socket.id} joined user room at connection: user:${user.user_id.substring(0, 8)}`
         );
@@ -320,7 +323,7 @@ function createSocketIOConfig(app, options) {
       if (!userId) return;
       for (const [, socket] of io.sockets.sockets) {
         if (socket.feathers === context.connection) {
-          socket.join(`user:${userId}`);
+          socket.join(userRoomName(userId));
           console.log(
             `\u{1F3E0} Socket ${socket.id} joined user room after login: user:${userId.substring(0, 8)}`
           );
@@ -364,5 +367,6 @@ export {
   createSocketIOConfig,
   createTokenBucket,
   getSocketAuthState,
-  parseTerminalChannel
+  parseTerminalChannel,
+  userRoomName
 };

package/dist/daemon/startup.js

@@ -735,7 +735,19 @@ async function cleanupOrphans(ctx) {
       }
     }
   }
-  if (orphanedTasks.length === 0 && orphanedSessions.length === 0) {
+  const queuedResult = await tasksService.find({
+    query: { status: TaskStatus.QUEUED, $limit: 1e3 }
+  });
+  const queuedTasks = queuedResult.data;
+  if (queuedTasks.length > 0) {
+    console.log(`   Found ${queuedTasks.length} queued task(s) \u2014 wiping queue on restart`);
+    for (const task of queuedTasks) {
+      await tasksService.patch(task.task_id, {
+        status: TaskStatus.STOPPED
+      });
+    }
+  }
+  if (orphanedTasks.length === 0 && orphanedSessions.length === 0 && queuedTasks.length === 0) {
     console.log("   No orphaned tasks or sessions found");
   }
 }

package/dist/daemon/utils/apply-session-config-defaults.d.ts

@@ -0,0 +1,54 @@
+import { HookContext } from '@agor/core/types';
+
+/**
+ * Before-create hook that auto-fills `permission_config` and `model_config`
+ * from the creator's `default_agentic_config[tool]` when the caller omits them.
+ *
+ * Why this hook exists
+ * --------------------
+ * Multiple session-creation paths (MCP `agor_sessions_create`, MCP
+ * `agor_worktrees_set_zone`, gateway, the UI drag-into-zone handler, raw
+ * REST) used to each carry their own copy of the "fetch user → read tool
+ * defaults → resolve permission mode → build permission_config" dance. The UI
+ * drag handler shipped without it (issue #1064), so dragged sessions were
+ * created with `permission_config: null` — which Claude Code interprets as
+ * the most restrictive mode and which made every dragged session hang
+ * waiting for manual approval.
+ *
+ * Centralizing the resolution as a `before:create` hook means:
+ *  - Every caller benefits, including future ones.
+ *  - Callers that DO want to set explicit config (MCP tools with `modelConfig`
+ *    args, gateway with channel-level config, spawn/fork with parent
+ *    inheritance) just pre-populate the field — the hook leaves populated
+ *    fields untouched.
+ *
+ * The shared resolution logic lives in `@agor/core/sessions`
+ * ({@link resolveSessionDefaults}); this hook is just the FeathersJS adapter
+ * around it.
+ *
+ * Caveats
+ * -------
+ *  - The hook ONLY fills `permission_config` and `model_config`. MCP server
+ *    attachment is intentionally left to caller-side code because the
+ *    "explicit-failures-must-surface" semantics differ between
+ *    explicitly-requested servers (caller wants to know about failures) and
+ *    inherited servers (best-effort, log-and-skip). See the open follow-up
+ *    in `apps/agor-ui/src/components/SessionCanvas/SessionCanvas.tsx`.
+ *  - Internal calls (no `params.provider`) only resolve via `data.created_by`,
+ *    so service-to-service callers must stamp it (or the helper falls back to
+ *    the system default — same behavior as the bug today, just no longer
+ *    reachable via REST/MCP/UI).
+ */
+
+/**
+ * @param opts.warnOnExternalDefaultFill — when `true` (recommended in dev),
+ *   logs a warning whenever an external (REST/socketio/MCP) caller omits
+ *   `permission_config`. This surfaces lazy callers without breaking them.
+ *   The hook still applies defaults; the warning is purely diagnostic.
+ */
+interface ApplySessionConfigDefaultsOpts {
+    warnOnExternalDefaultFill?: boolean;
+}
+declare function applySessionConfigDefaults(opts?: ApplySessionConfigDefaultsOpts): (context: HookContext) => Promise<HookContext>;
+
+export { type ApplySessionConfigDefaultsOpts, applySessionConfigDefaults };

package/dist/daemon/utils/apply-session-config-defaults.js

@@ -0,0 +1,46 @@
+// src/utils/apply-session-config-defaults.ts
+import { resolveSessionDefaults } from "@agor/core/sessions";
+function applySessionConfigDefaults(opts = {}) {
+  const { warnOnExternalDefaultFill = true } = opts;
+  return async (context) => {
+    if (Array.isArray(context.data)) {
+      return context;
+    }
+    const data = context.data;
+    if (!data) return context;
+    const hasPermission = data.permission_config != null;
+    const hasModel = data.model_config != null;
+    if (hasPermission && hasModel) return context;
+    const agenticTool = data.agentic_tool;
+    if (!agenticTool) return context;
+    const userId = data.created_by;
+    if (!userId) return context;
+    let user;
+    try {
+      const usersService = context.app.service("users");
+      user = await usersService.get(userId, { provider: void 0 });
+    } catch (err) {
+      console.warn(
+        `[apply-session-config-defaults] Failed to load user ${userId} for defaults:`,
+        err instanceof Error ? err.message : String(err)
+      );
+      user = null;
+    }
+    const resolved = resolveSessionDefaults({ agenticTool, user });
+    if (!hasPermission) {
+      data.permission_config = resolved.permission_config;
+      if (warnOnExternalDefaultFill && context.params.provider) {
+        console.warn(
+          `[apply-session-config-defaults] Filled missing permission_config for ${agenticTool} session (user=${userId}, provider=${context.params.provider}, mode=${resolved.permission_config.mode}). Caller should send permission_config explicitly.`
+        );
+      }
+    }
+    if (!hasModel && resolved.model_config) {
+      data.model_config = resolved.model_config;
+    }
+    return context;
+  };
+}
+export {
+  applySessionConfigDefaults
+};

package/dist/daemon/utils/spawn-executor.js

@@ -100,7 +100,9 @@ function spawnExecutorLocal(payload, options) {
       ANTHROPIC_API_KEY: env.ANTHROPIC_API_KEY,
       ANTHROPIC_AUTH_TOKEN: env.ANTHROPIC_AUTH_TOKEN,
       ANTHROPIC_BASE_URL: env.ANTHROPIC_BASE_URL,
+      CLAUDE_CODE_OAUTH_TOKEN: env.CLAUDE_CODE_OAUTH_TOKEN,
       OPENAI_API_KEY: env.OPENAI_API_KEY,
+      OPENAI_BASE_URL: env.OPENAI_BASE_URL,
       GEMINI_API_KEY: env.GEMINI_API_KEY,
       GOOGLE_API_KEY: env.GOOGLE_API_KEY
     }).filter(([_, v]) => v !== void 0)

package/dist/daemon/utils/worktree-authorization.d.ts

@@ -9,8 +9,7 @@ import { WorktreePermissionLevel, Session, HookContext, Worktree, UUID } from '@
  * Uses RBACParams to provide type-safe access to cached RBAC entities (worktree, session, ownership).
  * This avoids redundant database queries within hook chains.
  *
- * @see context/explorations/rbac.md
- * @see context/explorations/unix-user-modes.md
+ * @see context/guides/rbac-and-unix-isolation.md
  */
 
 /**
@@ -183,8 +182,7 @@ declare function loadWorktreeFromSession(worktreeRepo: WorktreeRepository): (con
  * This is CRITICAL for Unix isolation - session execution context is determined
  * by session.created_by (which maps to Unix user) and session.unix_username.
  *
- * @see context/explorations/rbac.md - Session Ownership (CRITICAL)
- * @see context/explorations/unix-user-modes.md - Session Execution Model
+ * @see context/guides/rbac-and-unix-isolation.md — Session Ownership / Execution Model
  */
 declare function ensureSessionImmutability(): (context: HookContext) => HookContext<unknown>;
 /**

package/dist/executor/commands/zellij.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zellij.d.ts","sourceRoot":"","sources":["../../src/commands/zellij.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGjG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAsBjD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAgQzB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAgDzB;AAuID;;GAEG;AACH,wBAAgB,aAAa,IAAI,IAAI,CAWpC"}
+{"version":3,"file":"zellij.d.ts","sourceRoot":"","sources":["../../src/commands/zellij.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGjG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAYjD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAoPzB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAgDzB;AAuID;;GAEG;AACH,wBAAgB,aAAa,IAAI,IAAI,CAWpC"}

package/dist/executor/commands/zellij.js

@@ -85,8 +85,8 @@ export async function handleZellijAttach(payload, options) {
             process.exit(0);
         });
         // Import node-pty dynamically (native module)
-        // Using @homebridge/node-pty-prebuilt-multiarch for consistency with daemon
-        const nodePty = (await import('@homebridge/node-pty-prebuilt-multiarch'));
+        // Using upstream microsoft/node-pty (no engines cap, supports Node 24/25)
+        const nodePty = await import('node-pty');
         // Build zellij command - config path added after fs/actualHome are defined below
         const zellijArgs = ['attach', sessionName, '--create'];
         // Build clean environment for Zellij

package/dist/executor/handlers/sdk/base-executor.d.ts

@@ -4,7 +4,8 @@
  * This module provides shared helpers to reduce duplication across
  * Claude, Codex, Gemini, and OpenCode executors.
  */
-import type { MessageID, MessageSource, PermissionMode, SessionID, TaskID } from '@agor/core/types';
+import { type ApiKeyName } from '@agor/core/config';
+import type { AgenticToolName, MessageID, MessageSource, PermissionMode, SessionID, TaskID } from '@agor/core/types';
 import { createFeathersBackedRepositories } from '../../db/feathers-repositories.js';
 import type { StreamingCallbacks } from '../../sdk-handlers/base/types.js';
 import type { AgorClient } from '../../services/feathers-client.js';
@@ -87,8 +88,8 @@ export declare function executeToolTask(params: {
     prompt: string;
     permissionMode?: PermissionMode;
     abortController: AbortController;
-    apiKeyEnvVar: string;
-    toolName: string;
+    apiKeyEnvVar: ApiKeyName;
+    toolName: AgenticToolName;
     messageSource?: 'gateway' | 'agor';
     createTool: (repos: ReturnType<typeof createFeathersBackedRepositories>, apiKey: string, useNativeAuth: boolean) => BaseTool;
 }): Promise<void>;

package/dist/executor/handlers/sdk/base-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-executor.d.ts","sourceRoot":"","sources":["../../../src/handlers/sdk/base-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-executor.d.ts","sourceRoot":"","sources":["../../../src/handlers/sdk/base-executor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAiB,MAAM,mBAAmB,CAAC;AAGnE,OAAO,KAAK,EACV,eAAe,EACf,SAAS,EACT,aAAa,EACb,cAAc,EACd,SAAS,EAGT,MAAM,EACP,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,0BAA0B,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,kBAAkB,EAC9B,eAAe,CAAC,EAAE,eAAe,EACjC,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC;QACT,aAAa,EAAE,SAAS,CAAC;QACzB,mBAAmB,EAAE,SAAS,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE;YACX,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,aAAa,CAAC,EAAE,MAAM,CAAC;YACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;YAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;SAChC,CAAC;QACF,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,8EAA8E;QAC9E,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,mDAAmD;QACnD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,oEAAoE;QACpE,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,2FAA2F;QAC3F,eAAe,CAAC,EAAE;YAChB,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;YAClB,UAAU,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC,CAAC;IAGH,QAAQ,CAAC,CACP,SAAS,EAAE,SAAS,EACpB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,aAAa,CAAC,EAAE,OAAO,CAAC;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAA;SAAE,CAAC,CAAC;QAC1F,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IAEH;;;;;;;;;;;OAWG;IACH,oBAAoB,CAAC,CACnB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,EACtB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC,OAAO,gCAAgC,CAAC,CAAC;IAC3D,SAAS,EAAE,kBAAkB,CAAC;CAC/B;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAoFpB;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,GACnB,gBAAgB,CAMlB;AAuFD;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,UAAU,CAAC;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,aAAa,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC,UAAU,EAAE,CACV,KAAK,EAAE,UAAU,CAAC,OAAO,gCAAgC,CAAC,EAC1D,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,OAAO,KACnB,QAAQ,CAAC;CACf,GAAG,OAAO,CAAC,IAAI,CAAC,CAiQhB"}

package/dist/executor/handlers/sdk/base-executor.js

@@ -158,13 +158,16 @@ async function captureGitStateAtTaskEnd(client, sessionId) {
  *
  * Returns resolution result with key, source, and useNativeAuth flag
  */
-async function resolveApiKeyForTask(keyName, client, taskId) {
+async function resolveApiKeyForTask(keyName, client, taskId, tool) {
     // Call daemon service to resolve API key (no direct database access from executor!)
-    // This allows executors to run as different Unix users without needing database access
+    // This allows executors to run as different Unix users without needing database access.
+    // `tool` scopes the per-user lookup to the calling SDK's bucket so a Codex spawn
+    // never resolves a key stored under `agentic_tools['claude-code']`, and vice versa.
     try {
         const result = (await client.service('config/resolve-api-key').create({
             taskId,
             keyName,
+            tool,
         }));
         console.log(`[API Key Resolution] Resolved ${keyName} via daemon (source: ${result.source})`);
         return result;
@@ -181,13 +184,16 @@ async function resolveApiKeyForTask(keyName, client, taskId) {
 export async function executeToolTask(params) {
     const { client, sessionId, taskId, prompt, permissionMode, apiKeyEnvVar, toolName, createTool } = params;
     console.log(`[${toolName}] Executing task ${taskId.substring(0, 8)}...`);
-    // Resolve API key with proper precedence (user → config → env → native auth)
-    const resolution = await resolveApiKeyForTask(apiKeyEnvVar, client, taskId);
+    // Resolve API key with proper precedence (user → config → env → native auth).
+    // Pass `toolName` so the daemon scopes the per-user lookup to this tool's
+    // credential bucket — prevents cross-SDK leak (e.g. Codex picking up an
+    // ANTHROPIC_API_KEY stored under claude-code).
+    const resolution = await resolveApiKeyForTask(apiKeyEnvVar, client, taskId, toolName);
     // Fail fast if stored key can't be decrypted (e.g. master secret changed)
     if (resolution.decryptionFailed) {
         throw new Error(`API key "${apiKeyEnvVar}" could not be decrypted. ` +
             `The stored key may have been encrypted with a different master secret. ` +
-            `Please re-enter your API key in Settings > API Keys.`);
+            `Please re-enter your API key in Settings > ${toolName} > Authentication.`);
     }
     // Log resolution result
     if (resolution.apiKey) {

package/dist/executor/payload-types.d.ts

@@ -12,11 +12,11 @@ import { z } from 'zod';
  * Tool types supported by the prompt command
  */
 export declare const ToolTypeSchema: z.ZodEnum<{
-    opencode: "opencode";
     "claude-code": "claude-code";
-    copilot: "copilot";
     gemini: "gemini";
     codex: "codex";
+    opencode: "opencode";
+    copilot: "copilot";
 }>;
 export type ToolType = z.infer<typeof ToolTypeSchema>;
 /**
@@ -31,12 +31,12 @@ export type ToolType = z.infer<typeof ToolTypeSchema>;
  */
 export declare const PermissionModeSchema: z.ZodEnum<{
     default: "default";
-    autoEdit: "autoEdit";
-    yolo: "yolo";
     acceptEdits: "acceptEdits";
     bypassPermissions: "bypassPermissions";
     plan: "plan";
     dontAsk: "dontAsk";
+    autoEdit: "autoEdit";
+    yolo: "yolo";
     ask: "ask";
     auto: "auto";
     "on-failure": "on-failure";
@@ -69,20 +69,20 @@ export declare const PromptPayloadSchema: z.ZodObject<{
         taskId: z.ZodString;
         prompt: z.ZodString;
         tool: z.ZodEnum<{
-            opencode: "opencode";
             "claude-code": "claude-code";
-            copilot: "copilot";
             gemini: "gemini";
             codex: "codex";
+            opencode: "opencode";
+            copilot: "copilot";
         }>;
         permissionMode: z.ZodOptional<z.ZodEnum<{
             default: "default";
-            autoEdit: "autoEdit";
-            yolo: "yolo";
             acceptEdits: "acceptEdits";
             bypassPermissions: "bypassPermissions";
             plan: "plan";
             dontAsk: "dontAsk";
+            autoEdit: "autoEdit";
+            yolo: "yolo";
             ask: "ask";
             auto: "auto";
             "on-failure": "on-failure";
@@ -90,8 +90,8 @@ export declare const PromptPayloadSchema: z.ZodObject<{
         }>>;
         cwd: z.ZodString;
         messageSource: z.ZodOptional<z.ZodEnum<{
-            agor: "agor";
             gateway: "gateway";
+            agor: "agor";
         }>>;
     }, z.core.$strip>;
 }, z.core.$strip>;
@@ -344,20 +344,20 @@ export declare const ExecutorPayloadSchema: z.ZodDiscriminatedUnion<[z.ZodObject
         taskId: z.ZodString;
         prompt: z.ZodString;
         tool: z.ZodEnum<{
-            opencode: "opencode";
             "claude-code": "claude-code";
-            copilot: "copilot";
             gemini: "gemini";
             codex: "codex";
+            opencode: "opencode";
+            copilot: "copilot";
         }>;
         permissionMode: z.ZodOptional<z.ZodEnum<{
             default: "default";
-            autoEdit: "autoEdit";
-            yolo: "yolo";
             acceptEdits: "acceptEdits";
             bypassPermissions: "bypassPermissions";
             plan: "plan";
             dontAsk: "dontAsk";
+            autoEdit: "autoEdit";
+            yolo: "yolo";
             ask: "ask";
             auto: "auto";
             "on-failure": "on-failure";
@@ -365,8 +365,8 @@ export declare const ExecutorPayloadSchema: z.ZodDiscriminatedUnion<[z.ZodObject
         }>>;
         cwd: z.ZodString;
         messageSource: z.ZodOptional<z.ZodEnum<{
-            agor: "agor";
             gateway: "gateway";
+            agor: "agor";
         }>>;
     }, z.core.$strip>;
 }, z.core.$strip>, z.ZodObject<{

package/dist/executor/sdk-handlers/claude/claude-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/claude-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/claude-tool.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/claude/claude-tool.js

@@ -163,8 +163,11 @@ export class ClaudeTool {
         // Get next message index
         const existingMessages = await this.messagesRepo.findBySessionId(sessionId);
         let nextIndex = existingMessages.length;
-        // Create user message
-        const userMessage = await createUserMessage(sessionId, prompt, taskId, nextIndex++, this.messagesService, messageSource);
+        // Create user message (or reuse the daemon's pre-write — see Alt D in
+        // docs/never-lose-prompt-design.md). When the row is reused, advance
+        // nextIndex from the returned message's actual index.
+        const userMessage = await createUserMessage(sessionId, prompt, taskId, nextIndex, this.messagesService, { messageSource, existingMessages });
+        nextIndex = userMessage.index + 1;
         // Execute prompt via Agent SDK with streaming
         const assistantMessageIds = [];
         let capturedAgentSessionId;
@@ -655,8 +658,10 @@ export class ClaudeTool {
         // Get next message index
         const existingMessages = await this.messagesRepo.findBySessionId(sessionId);
         let nextIndex = existingMessages.length;
-        // Create user message
-        const userMessage = await createUserMessage(sessionId, prompt, taskId, nextIndex++, this.messagesService, messageSource);
+        // Create user message (or reuse the daemon's pre-write — see Alt D in
+        // docs/never-lose-prompt-design.md).
+        const userMessage = await createUserMessage(sessionId, prompt, taskId, nextIndex, this.messagesService, { messageSource, existingMessages });
+        nextIndex = userMessage.index + 1;
         // Execute prompt via Agent SDK
         const assistantMessageIds = [];
         let capturedAgentSessionId;

package/dist/executor/sdk-handlers/claude/import/task-extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-extractor.d.ts","sourceRoot":"","sources":["../../../../src/sdk-handlers/claude/import/task-extractor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,UAAU,CAAC,SAAS,CAAC;IACpC,aAAa,EAAE;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,SAAS,EAAE;QACT,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,IAAI,CAAC,EAAE,CA6EjB"}
+{"version":3,"file":"task-extractor.d.ts","sourceRoot":"","sources":["../../../../src/sdk-handlers/claude/import/task-extractor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,UAAU,CAAC,SAAS,CAAC;IACpC,aAAa,EAAE;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,SAAS,EAAE;QACT,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,IAAI,CAAC,EAAE,CAsEjB"}

package/dist/executor/sdk-handlers/claude/import/task-extractor.js

@@ -44,10 +44,6 @@ export function extractTasksFromMessages(messages, sessionId) {
         else {
             fullPrompt = JSON.stringify(userMessage.content);
         }
-        // Clean up newlines and excessive whitespace for description
-        const cleanPrompt = fullPrompt.replace(/\n/g, ' ').replace(/\s+/g, ' ').trim();
-        // Generate short description (first 120 chars)
-        const description = cleanPrompt.substring(0, 120) + (cleanPrompt.length > 120 ? '...' : '');
         // Get timestamps
         const startTimestamp = userMessage.timestamp;
         const endMessage = messages[endIndex];
@@ -57,7 +53,6 @@ export function extractTasksFromMessages(messages, sessionId) {
             task_id: generateId(),
             session_id: sessionId,
             full_prompt: fullPrompt,
-            description,
             status: TaskStatus.COMPLETED, // Imported sessions are historical
             message_range: {
                 start_index: startIndex,

package/dist/executor/sdk-handlers/claude/message-builder.d.ts

@@ -17,9 +17,30 @@ import type { MessagesService, TasksService } from './claude-tool.js';
  */
 export declare function extractTokenUsage(raw: unknown): TokenUsage | undefined;
 /**
- * Create user message in database (from text prompt)
+ * Create user message in database (from text prompt).
+ *
+ * Idempotency (Alt D — "never lose a prompt"): when `options.existingMessages` is
+ * provided AND a user message already exists for this `taskId`, this returns the
+ * pre-existing row WITHOUT inserting. This lets the executor remain a safe
+ * fallback writer even after the daemon adopts the user-message write up-front
+ * inside `POST /sessions/:id/prompt`.
+ *
+ * Callers should always pass `existingMessages` (the result of
+ * `messagesRepo.findBySessionId(sessionId)` they already fetched to compute
+ * `nextIndex`) so the guard can fire. The `nextIndex` argument is still used
+ * for the freshly-created row's `index`; if the guard fires, callers should
+ * recompute their next index from the returned message:
+ *
+ *   nextIndex = userMessage.index + 1;
  */
-export declare function createUserMessage(sessionId: SessionID, prompt: string, taskId: TaskID | undefined, nextIndex: number, messagesService: MessagesService, messageSource?: MessageSource): Promise<Message>;
+export declare function createUserMessage(sessionId: SessionID, prompt: string, taskId: TaskID | undefined, nextIndex: number, messagesService: MessagesService, options?: {
+    messageSource?: MessageSource;
+    /**
+     * Pre-fetched messages for this session. When provided, used to detect a
+     * pre-existing user-message row for `taskId` and skip the insert.
+     */
+    existingMessages?: ReadonlyArray<Message>;
+}): Promise<Message>;
 /**
  * Create user message from SDK content (tool results, etc.)
  */

package/dist/executor/sdk-handlers/claude/message-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-builder.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/message-builder.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGtE;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAetE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC,EACF,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,GAC9B,OAAO,CAAC,OAAO,CAAC,CA8BlB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC,EACF,QAAQ,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GAAG,SAAS,EACzF,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,eAAe,EAAE,eAAe,EAChC,YAAY,CAAC,EAAE,YAAY,EAC3B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,EAC/B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,OAAO,CAAC,CAmClB;AA0BD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC,EACF,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,OAAO,CAAC,CAmBlB"}
+{"version":3,"file":"message-builder.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/message-builder.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/claude/message-builder.js

@@ -30,9 +30,40 @@ export function extractTokenUsage(raw) {
     };
 }
 /**
- * Create user message in database (from text prompt)
+ * Create user message in database (from text prompt).
+ *
+ * Idempotency (Alt D — "never lose a prompt"): when `options.existingMessages` is
+ * provided AND a user message already exists for this `taskId`, this returns the
+ * pre-existing row WITHOUT inserting. This lets the executor remain a safe
+ * fallback writer even after the daemon adopts the user-message write up-front
+ * inside `POST /sessions/:id/prompt`.
+ *
+ * Callers should always pass `existingMessages` (the result of
+ * `messagesRepo.findBySessionId(sessionId)` they already fetched to compute
+ * `nextIndex`) so the guard can fire. The `nextIndex` argument is still used
+ * for the freshly-created row's `index`; if the guard fires, callers should
+ * recompute their next index from the returned message:
+ *
+ *   nextIndex = userMessage.index + 1;
  */
-export async function createUserMessage(sessionId, prompt, taskId, nextIndex, messagesService, messageSource) {
+export async function createUserMessage(sessionId, prompt, taskId, nextIndex, messagesService, options) {
+    const { messageSource, existingMessages } = options ?? {};
+    // Skip-if-exists guard (Alt D): if the daemon already wrote the initial
+    // prompt row for this task, return it instead of inserting a duplicate.
+    //
+    // Match on `role === USER` regardless of `type`, because the daemon writes
+    // callback prompts as `type:'system', role:'user'` (so the UI can apply the
+    // Agor-callback styling) while normal prompts are `type:'user', role:'user'`.
+    // A `type`-strict predicate misses callback rows and double-inserts the
+    // prompt. Tool-result rows (also role:USER) cannot exist yet at executor
+    // startup — this guard runs before any agent turn has produced output —
+    // so role-only matching is safe here.
+    if (taskId && existingMessages) {
+        const existing = existingMessages.find((m) => m.task_id === taskId && m.role === MessageRole.USER);
+        if (existing) {
+            return existing;
+        }
+    }
     const userMessage = {
         message_id: generateId(),
         session_id: sessionId,

package/dist/executor/sdk-handlers/claude/permissions/permission-hooks.d.ts

@@ -5,7 +5,7 @@
  * Fires AFTER SDK checks settings.json, respects user's existing permissions.
  * Uses SDK's built-in permission persistence via updatedPermissions.
  */
-import type { SessionID, TaskID } from '@agor/core/types';
+import type { PermissionMode, SessionID, TaskID } from '@agor/core/types';
 import type { MCPServerRepository, MessagesRepository, SessionMCPServerRepository, SessionRepository } from '../../../db/feathers-repositories.js';
 import type { InputRequestService } from '../../../input-requests/input-request-service.js';
 import type { PermissionService } from '../../../permissions/permission-service.js';
@@ -28,6 +28,14 @@ export declare function createCanUseToolCallback(sessionId: SessionID, taskId: T
     permissionLocks: Map<SessionID, Promise<void>>;
     mcpServerRepo: MCPServerRepository;
     sessionMCPRepo: SessionMCPServerRepository;
+    /**
+     * Effective permission mode for this query. Used to fast-path non-
+     * AskUserQuestion tools to `allow` when running in `bypassPermissions`,
+     * since the callback is now registered in bypass mode too (see
+     * query-builder.ts for why — AskUserQuestion's `requiresUserInteraction`
+     * forces the SDK to invoke `canUseTool` regardless of mode).
+     */
+    permissionMode?: PermissionMode;
 }): (toolName: string, toolInput: Record<string, unknown>, options: {
     signal: AbortSignal;
     suggestions?: Array<Record<string, unknown>>;

package/dist/executor/sdk-handlers/claude/permissions/permission-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permission-hooks.d.ts","sourceRoot":"","sources":["../../../../src/sdk-handlers/claude/permissions/permission-hooks.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAS9E,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAExF;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IACJ,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,iBAAiB,CAAC;IAChC,YAAY,EAAE,kBAAkB,CAAC;IACjC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,aAAa,EAAE,mBAAmB,CAAC;IACnC,cAAc,EAAE,0BAA0B,CAAC;CAC5C,IAGC,UAAU,MAAM,EAChB,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,SAAS;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAAE,KAC7E,OAAO,CAAC;IACT,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,kBAAkB,CAAC,EAAE,KAAK,CAAC;QACzB,IAAI,EAAE,UAAU,CAAC;QACjB,KAAK,EAAE,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QACnC,QAAQ,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,SAAS,GAAG,iBAAiB,GAAG,cAAc,GAAG,eAAe,CAAC;KAC/E,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAweH"}
+{"version":3,"file":"permission-hooks.d.ts","sourceRoot":"","sources":["../../../../src/sdk-handlers/claude/permissions/permission-hooks.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAsB,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAS9F,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAExF;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IACJ,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,iBAAiB,CAAC;IAChC,YAAY,EAAE,kBAAkB,CAAC;IACjC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,aAAa,EAAE,mBAAmB,CAAC;IACnC,cAAc,EAAE,0BAA0B,CAAC;IAC3C;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,IAGC,UAAU,MAAM,EAChB,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,SAAS;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAAE,KAC7E,OAAO,CAAC;IACT,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,kBAAkB,CAAC,EAAE,KAAK,CAAC;QACzB,IAAI,EAAE,UAAU,CAAC;QACjB,KAAK,EAAE,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QACnC,QAAQ,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,SAAS,GAAG,iBAAiB,GAAG,cAAc,GAAG,eAAe,CAAC;KAC/E,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAqfH"}

package/dist/executor/sdk-handlers/claude/permissions/permission-hooks.js

@@ -138,6 +138,18 @@ export function createCanUseToolCallback(sessionId, taskId, deps) {
                 };
             }
         }
+        // Bypass-mode fast-path: when permissionMode is `bypassPermissions`, the SDK
+        // would normally skip canUseTool entirely. We register the callback anyway
+        // so AskUserQuestion (handled above) still routes through Agor's UI — but
+        // every other tool should be auto-allowed without prompting, matching the
+        // mode's semantics. Without this, registering canUseTool in bypass mode
+        // would force every tool through the WebSocket permission flow.
+        if (deps.permissionMode === 'bypassPermissions') {
+            return {
+                behavior: 'allow',
+                updatedInput: toolInput,
+            };
+        }
         // Auto-approve MCP tools only if they belong to an attached MCP server
         // MCP tool names follow pattern: mcp__<server_name>__<tool_name>
         if (toolName.startsWith('mcp__')) {