agor-live 0.17.2 → 0.17.3

package/dist/core/db/index.cjs

@@ -547,6 +547,8 @@ var init_task = __esm({
     "use strict";
     init_cjs_shims();
     TaskStatus = {
+      QUEUED: "queued",
+      // Task created but not yet running (waiting for executor to drain queue)
       CREATED: "created",
       RUNNING: "running",
       STOPPING: "stopping",
@@ -577,6 +579,21 @@ function normalizeRole(role) {
   if (role === "owner") return ROLES.SUPERADMIN;
   return role || ROLES.MEMBER;
 }
+function toAgenticToolsStatus(stored) {
+  if (!stored) return void 0;
+  const out = {};
+  for (const [tool, fields] of Object.entries(stored)) {
+    if (!fields) continue;
+    const flags = {};
+    for (const [field, value] of Object.entries(fields)) {
+      if (value) flags[field] = true;
+    }
+    if (Object.keys(flags).length > 0) {
+      out[tool] = flags;
+    }
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 var ROLES, ROLE_RANK;
 var init_user = __esm({
   "src/types/user.ts"() {
@@ -770,6 +787,7 @@ var init_schema_postgres = __esm({
         completed_at: t.timestamp("completed_at"),
         status: (0, import_pg_core.text)("status", {
           enum: [
+            "queued",
             "created",
             "running",
             "stopping",
@@ -781,6 +799,8 @@ var init_schema_postgres = __esm({
             "stopped"
           ]
         }).notNull(),
+        // Queue position (lower drains first); only populated for status='queued'
+        queue_position: (0, import_pg_core.integer)("queue_position"),
         // User attribution
         created_by: (0, import_pg_core.varchar)("created_by", { length: 36 }).notNull().default("anonymous"),
         // MD5 of SDK session file at task completion (only populated when stateless_fs_mode is enabled)
@@ -790,7 +810,12 @@ var init_schema_postgres = __esm({
       (table) => ({
         sessionIdx: (0, import_pg_core.index)("tasks_session_idx").on(table.session_id),
         statusIdx: (0, import_pg_core.index)("tasks_status_idx").on(table.status),
-        createdIdx: (0, import_pg_core.index)("tasks_created_idx").on(table.created_at)
+        createdIdx: (0, import_pg_core.index)("tasks_created_idx").on(table.created_at),
+        queueIdx: (0, import_pg_core.index)("tasks_queue_idx").on(table.session_id, table.status, table.queue_position),
+        // Partial unique index — defense-in-depth for `tasks.createPending` race
+        // serialization. Only QUEUED rows are constrained; CREATED/RUNNING/done
+        // rows have NULL queue_position and are unaffected.
+        queuedPositionUnique: (0, import_pg_core.uniqueIndex)("tasks_queued_position_unique").on(table.session_id, table.queue_position).where(import_drizzle_orm.sql`${table.status} = 'queued'`)
       })
     );
     serializedSessions = (0, import_pg_core.pgTable)(
@@ -850,11 +875,9 @@ var init_schema_postgres = __esm({
         // First 200 chars for list views
         // Parent tool use ID (for nested tool calls - e.g., Task tool spawning Read/Grep)
         parent_tool_use_id: (0, import_pg_core.text)("parent_tool_use_id"),
-        // Message queueing fields
-        status: (0, import_pg_core.text)("status", { enum: ["queued"] }),
-        // 'queued' or null (normal message)
-        queue_position: (0, import_pg_core.integer)("queue_position"),
-        // Position in queue (1, 2, 3, ...)
+        // NOTE: queueing moved off `messages` and onto `tasks.status='queued'` as
+        // of migration sqlite/0040 (postgres/0030). The legacy `status` and
+        // `queue_position` columns are gone — see `tasks.queue_position` instead.
         // Full data (JSON blob)
         data: t.json("data").$type().notNull()
       },
@@ -862,8 +885,7 @@ var init_schema_postgres = __esm({
         // Indexes for efficient lookups
         sessionIdx: (0, import_pg_core.index)("messages_session_id_idx").on(table.session_id),
         taskIdx: (0, import_pg_core.index)("messages_task_id_idx").on(table.task_id),
-        sessionIndexIdx: (0, import_pg_core.index)("messages_session_index_idx").on(table.session_id, table.index),
-        queueIdx: (0, import_pg_core.index)("messages_queue_idx").on(table.session_id, table.status, table.queue_position)
+        sessionIndexIdx: (0, import_pg_core.index)("messages_session_index_idx").on(table.session_id, table.index)
       })
     );
     boards = (0, import_pg_core.pgTable)(
@@ -1500,6 +1522,7 @@ var init_schema_sqlite = __esm({
         completed_at: t2.timestamp("completed_at"),
         status: (0, import_sqlite_core.text)("status", {
           enum: [
+            "queued",
             "created",
             "running",
             "stopping",
@@ -1511,6 +1534,8 @@ var init_schema_sqlite = __esm({
             "stopped"
           ]
         }).notNull(),
+        // Queue position (lower drains first); only populated for status='queued'
+        queue_position: (0, import_sqlite_core.integer)("queue_position"),
         // User attribution
         created_by: (0, import_sqlite_core.text)("created_by", { length: 36 }).notNull().default("anonymous"),
         // MD5 of SDK session file at task completion (only populated when stateless_fs_mode is enabled)
@@ -1520,7 +1545,12 @@ var init_schema_sqlite = __esm({
       (table) => ({
         sessionIdx: (0, import_sqlite_core.index)("tasks_session_idx").on(table.session_id),
         statusIdx: (0, import_sqlite_core.index)("tasks_status_idx").on(table.status),
-        createdIdx: (0, import_sqlite_core.index)("tasks_created_idx").on(table.created_at)
+        createdIdx: (0, import_sqlite_core.index)("tasks_created_idx").on(table.created_at),
+        queueIdx: (0, import_sqlite_core.index)("tasks_queue_idx").on(table.session_id, table.status, table.queue_position),
+        // Partial unique index — defense-in-depth for `tasks.createPending` race
+        // serialization. Only QUEUED rows are constrained; CREATED/RUNNING/done
+        // rows have NULL queue_position and are unaffected.
+        queuedPositionUnique: (0, import_sqlite_core.uniqueIndex)("tasks_queued_position_unique").on(table.session_id, table.queue_position).where(import_drizzle_orm2.sql`${table.status} = 'queued'`)
       })
     );
     serializedSessions2 = (0, import_sqlite_core.sqliteTable)(
@@ -1580,11 +1610,9 @@ var init_schema_sqlite = __esm({
         // First 200 chars for list views
         // Parent tool use ID (for nested tool calls - e.g., Task tool spawning Read/Grep)
         parent_tool_use_id: (0, import_sqlite_core.text)("parent_tool_use_id"),
-        // Message queueing fields
-        status: (0, import_sqlite_core.text)("status", { enum: ["queued"] }),
-        // 'queued' or null (normal message)
-        queue_position: (0, import_sqlite_core.integer)("queue_position"),
-        // Position in queue (1, 2, 3, ...)
+        // NOTE: queueing moved off `messages` and onto `tasks.status='queued'` as
+        // of migration sqlite/0040 (postgres/0030). The legacy `status` and
+        // `queue_position` columns are gone — see `tasks.queue_position` instead.
         // Full data (JSON blob)
         data: t2.json("data").$type().notNull()
       },
@@ -1592,8 +1620,7 @@ var init_schema_sqlite = __esm({
         // Indexes for efficient lookups
         sessionIdx: (0, import_sqlite_core.index)("messages_session_id_idx").on(table.session_id),
         taskIdx: (0, import_sqlite_core.index)("messages_task_id_idx").on(table.task_id),
-        sessionIndexIdx: (0, import_sqlite_core.index)("messages_session_index_idx").on(table.session_id, table.index),
-        queueIdx: (0, import_sqlite_core.index)("messages_queue_idx").on(table.session_id, table.status, table.queue_position)
+        sessionIndexIdx: (0, import_sqlite_core.index)("messages_session_index_idx").on(table.session_id, table.index)
       })
     );
     boards2 = (0, import_sqlite_core.sqliteTable)(
@@ -5573,8 +5600,6 @@ var MessagesRepository = class {
       content: row.data.content,
       tool_uses: row.data.tool_uses,
       parent_tool_use_id: row.parent_tool_use_id || void 0,
-      status: row.status,
-      queue_position: row.queue_position ?? void 0,
       metadata: row.data.metadata
     };
   }
@@ -5593,8 +5618,6 @@ var MessagesRepository = class {
       timestamp: new Date(message.timestamp),
       content_preview: message.content_preview,
       parent_tool_use_id: message.parent_tool_use_id || null,
-      status: message.status || null,
-      queue_position: message.queue_position ?? null,
       data: {
         content: message.content,
         tool_uses: message.tool_uses,
@@ -5693,68 +5716,6 @@ var MessagesRepository = class {
   async delete(messageId) {
     await deleteFrom(this.db, messages3).where((0, import_drizzle_orm13.eq)(messages3.message_id, messageId)).run();
   }
-  /**
-   * Create a queued message
-   * NOTE: Queued messages always store prompt as string content
-   * This ensures compatibility with prompt execution endpoint
-   *
-   * @param sessionId - Session to queue message for
-   * @param prompt - Message content (string)
-   * @param metadata - Optional metadata (e.g., is_agor_callback, source, child_session_id)
-   */
-  async createQueued(sessionId, prompt, metadata) {
-    if (!prompt || typeof prompt !== "string") {
-      throw new Error("Prompt must be a non-empty string");
-    }
-    const { generateId: generateId2 } = await Promise.resolve().then(() => (init_ids(), ids_exports));
-    const result = await select(this.db).from(messages3).where((0, import_drizzle_orm13.and)((0, import_drizzle_orm13.eq)(messages3.session_id, sessionId), (0, import_drizzle_orm13.eq)(messages3.status, "queued"))).all();
-    const maxPosition = result.reduce(
-      (max, row) => Math.max(max, row.queue_position || 0),
-      0
-    );
-    const nextPosition = maxPosition + 1;
-    const messageType = metadata?.is_agor_callback ? "system" : "user";
-    const message = {
-      message_id: generateId2(),
-      session_id: sessionId,
-      type: messageType,
-      role: "user",
-      // Always 'user' for right-side positioning
-      index: -1,
-      // Not in conversation yet
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      content_preview: prompt.substring(0, 200),
-      content: prompt,
-      // Always string for queued messages
-      status: "queued",
-      queue_position: nextPosition,
-      task_id: void 0,
-      metadata
-      // Include metadata (is_agor_callback, source, child_session_id, etc.)
-    };
-    return this.create(message);
-  }
-  /**
-   * Find queued messages for a session
-   */
-  async findQueued(sessionId) {
-    const { asc: asc2 } = await import("drizzle-orm");
-    const rows = await select(this.db).from(messages3).where((0, import_drizzle_orm13.and)((0, import_drizzle_orm13.eq)(messages3.session_id, sessionId), (0, import_drizzle_orm13.eq)(messages3.status, "queued"))).orderBy(asc2(messages3.queue_position)).all();
-    return rows.map((r) => this.rowToMessage(r));
-  }
-  /**
-   * Get next queued message
-   */
-  async getNextQueued(sessionId) {
-    const queued = await this.findQueued(sessionId);
-    return queued[0] || null;
-  }
-  /**
-   * Delete queued message (when processing or user cancels)
-   */
-  async deleteQueued(messageId) {
-    await this.delete(messageId);
-  }
 };
 
 // src/db/repositories/repos.ts
@@ -6917,14 +6878,7 @@ var SessionRepository = class {
       for (const sessionId of sessionIds) {
         const query = select(this.db, {
           data: messagesTable.data
-        }).from(messagesTable).where(
-          (0, import_drizzle_orm17.and)(
-            (0, import_drizzle_orm17.eq)(messagesTable.session_id, sessionId),
-            (0, import_drizzle_orm17.eq)(messagesTable.role, "assistant"),
-            (0, import_drizzle_orm17.isNull)(messagesTable.status)
-            // Exclude queued messages
-          )
-        );
+        }).from(messagesTable).where((0, import_drizzle_orm17.and)((0, import_drizzle_orm17.eq)(messagesTable.session_id, sessionId), (0, import_drizzle_orm17.eq)(messagesTable.role, "assistant")));
         const lastMessage = await query.orderBy((0, import_drizzle_orm17.desc)(messagesTable.index)).limit(1).one();
         if (lastMessage) {
           const messageData = lastMessage.data;
@@ -7212,6 +7166,7 @@ var TaskRepository = class {
       task_id: row.task_id,
       session_id: row.session_id,
       status: row.status,
+      queue_position: row.queue_position ?? void 0,
       created_at: new Date(row.created_at).toISOString(),
       completed_at: row.completed_at ? new Date(row.completed_at).toISOString() : void 0,
       created_by: row.created_by,
@@ -7239,11 +7194,11 @@ var TaskRepository = class {
       // Always use server timestamp, ignore client-provided value
       completed_at: task.completed_at ? new Date(task.completed_at) : void 0,
       status: task.status ?? TaskStatus.CREATED,
+      queue_position: task.queue_position ?? null,
       created_by: task.created_by ?? "anonymous",
       session_md5: task.session_md5 ?? null,
       data: {
-        description: task.description ?? "",
-        full_prompt: task.full_prompt ?? task.description ?? "",
+        full_prompt: task.full_prompt ?? "",
         message_range: task.message_range ?? {
           start_index: 0,
           end_index: 0,
@@ -7265,8 +7220,10 @@ var TaskRepository = class {
         computed_context_window: task.computed_context_window,
         // Cumulative context window (computed by tool.computeContextWindow())
         report: task.report,
-        permission_request: task.permission_request
+        permission_request: task.permission_request,
         // Permission state for UI approval flow
+        metadata: task.metadata
+        // Generic metadata bag (e.g., is_agor_callback, source)
       }
     };
   }
@@ -7393,7 +7350,12 @@ var TaskRepository = class {
   }
   /**
    * Find orphaned tasks (running, stopping, awaiting permission, or awaiting input)
-   * These are tasks that were interrupted when daemon stopped
+   * These are tasks that were interrupted when daemon stopped.
+   *
+   * NOTE: QUEUED tasks are intentionally NOT considered orphans — they were
+   * never spawned, so they have no executor to recover. The startup queue
+   * drainer (see register-routes.ts processNextQueuedTask) picks them up
+   * once any session goes idle. See never-lose-prompt §C.
    */
   async findOrphaned() {
     try {
@@ -7445,6 +7407,7 @@ var TaskRepository = class {
         const insertData = this.taskToInsert(merged);
         await update(txAsDb(tx), tasks3).set({
           status: insertData.status,
+          queue_position: insertData.queue_position,
           completed_at: insertData.completed_at,
           session_md5: insertData.session_md5,
           data: insertData.data
@@ -7479,6 +7442,92 @@ var TaskRepository = class {
       );
     }
   }
+  /**
+   * Create a pending task — either CREATED (will spawn immediately) or
+   * QUEUED (will drain later) — owning the sentinel defaults that the
+   * caller would otherwise have to assemble by hand.
+   *
+   * For QUEUED tasks, `queue_position = max(queue_position) + 1` is computed
+   * inside a transaction so concurrent writers don't both observe the same
+   * max and collide. (The schema also carries a partial unique index on
+   * `(session_id, queue_position) WHERE status='queued'` as a belt-and-
+   * suspenders against transaction-isolation surprises.)
+   *
+   * Sentinel contract: while a task carries `message_range.start_index = -1`
+   * and `git_state.sha_at_start = ''`, it has not yet been pinned to real
+   * conversation/git state. spawnTaskExecutor is the sole place that
+   * overwrites these on the way to RUNNING.
+   */
+  async createPending(input) {
+    const taskBase = {
+      session_id: input.session_id,
+      full_prompt: input.full_prompt,
+      created_by: input.created_by,
+      status: input.status,
+      metadata: input.metadata,
+      // Sentinels — overwritten by spawnTaskExecutor at the status → RUNNING
+      // transition. While `start_index === -1` / `sha_at_start === ''`, the
+      // task is intentionally unpinned.
+      message_range: {
+        start_index: -1,
+        end_index: -1,
+        start_timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      },
+      git_state: {
+        ref_at_start: "",
+        sha_at_start: ""
+      },
+      tool_use_count: 0
+    };
+    if (input.status === TaskStatus.CREATED) {
+      return this.create(taskBase);
+    }
+    return this.db.transaction(async (tx) => {
+      const positionRow = await select(txAsDb(tx), {
+        maxPos: import_drizzle_orm19.sql`max(${tasks3.queue_position})`
+      }).from(tasks3).where(import_drizzle_orm19.sql`${tasks3.session_id} = ${input.session_id} AND ${tasks3.status} = 'queued'`).one();
+      const nextPosition = (positionRow?.maxPos ?? 0) + 1;
+      const insertData = this.taskToInsert({
+        ...taskBase,
+        queue_position: nextPosition
+      });
+      await insert(txAsDb(tx), tasks3).values(insertData).run();
+      const row = await select(txAsDb(tx)).from(tasks3).where((0, import_drizzle_orm19.eq)(tasks3.task_id, insertData.task_id)).one();
+      if (!row) {
+        throw new RepositoryError("Failed to retrieve created queued task");
+      }
+      return this.rowToTask(row);
+    });
+  }
+  /**
+   * Find all QUEUED tasks for a session, ordered by queue_position ascending.
+   */
+  async findQueued(sessionId) {
+    try {
+      const rows = await select(this.db).from(tasks3).where(import_drizzle_orm19.sql`${tasks3.session_id} = ${sessionId} AND ${tasks3.status} = 'queued'`).orderBy(tasks3.queue_position).all();
+      return rows.map((row) => this.rowToTask(row));
+    } catch (error) {
+      throw new RepositoryError(
+        `Failed to find queued tasks: ${error instanceof Error ? error.message : String(error)}`,
+        error
+      );
+    }
+  }
+  /**
+   * Return the next QUEUED task to drain (lowest queue_position) for a session,
+   * or null if none.
+   */
+  async getNextQueued(sessionId) {
+    try {
+      const row = await select(this.db).from(tasks3).where(import_drizzle_orm19.sql`${tasks3.session_id} = ${sessionId} AND ${tasks3.status} = 'queued'`).orderBy(tasks3.queue_position).limit(1).one();
+      return row ? this.rowToTask(row) : null;
+    } catch (error) {
+      throw new RepositoryError(
+        `Failed to get next queued task: ${error instanceof Error ? error.message : String(error)}`,
+        error
+      );
+    }
+  }
   /**
    * Count tasks for a session
    */
@@ -8047,6 +8096,7 @@ var UserMCPOAuthTokenRepository = class {
 
 // src/db/repositories/users.ts
 init_cjs_shims();
+init_types();
 var import_drizzle_orm23 = require("drizzle-orm");
 
 // src/config/env-vars.ts
@@ -8086,8 +8136,9 @@ var UsersRepository = class {
     this.db = db;
   }
   /**
-   * Convert database row to User type
-   * Note: Converts encrypted API keys (strings) to boolean flags for API exposure
+   * Convert database row to User type.
+   * Converts the encrypted `agentic_tools` blob to a boolean presence DTO so
+   * decrypted credentials never leave this repository.
    */
   rowToUser(row) {
     return {
@@ -8103,13 +8154,8 @@ var UsersRepository = class {
       must_change_password: row.must_change_password,
       avatar: row.data.avatar,
       preferences: row.data.preferences,
-      // Convert encrypted keys to boolean flags (true = key exists, false/undefined = no key)
-      api_keys: row.data.api_keys ? {
-        ANTHROPIC_API_KEY: !!row.data.api_keys.ANTHROPIC_API_KEY,
-        OPENAI_API_KEY: !!row.data.api_keys.OPENAI_API_KEY,
-        GEMINI_API_KEY: !!row.data.api_keys.GEMINI_API_KEY,
-        COPILOT_GITHUB_TOKEN: !!row.data.api_keys.COPILOT_GITHUB_TOKEN
-      } : void 0,
+      // Convert encrypted per-tool credential blobs into boolean presence flags.
+      agentic_tools: toAgenticToolsStatus(row.data.agentic_tools),
       // Convert stored env vars to presence + scope metadata (never exposes secrets).
       // Handles both legacy string form and v0.5 object form via normalizeStoredEnvMap.
       // The schema stores `scope` as a generic string (no SQL CHECK constraint); the
@@ -8153,10 +8199,17 @@ var UsersRepository = class {
       data: {
         avatar: user.avatar,
         preferences: user.preferences,
-        // Use raw API keys if provided (for internal operations like setApiKey)
-        api_keys: user.api_keys_raw,
-        env_vars: void 0,
-        // Not implemented yet
+        // Encrypted per-tool credentials. Only forwarded when caller passes the
+        // raw shape (internal credential mutators); regular updates leave it undefined,
+        // letting the merge in `update()` reuse the existing on-disk blob.
+        // Cast: schema declares `opencode: Record<string, never>` (no fields by
+        // contract); StoredAgenticTools widens that to string values for shape
+        // uniformity. Runtime never writes opencode, so the cast is safe.
+        agentic_tools: user.agentic_tools_raw,
+        // Same pass-through as agentic_tools: env_vars are encrypted blobs
+        // not represented on the public DTO. `update()` threads the raw value
+        // from the existing row so a generic field update doesn't wipe them.
+        env_vars: user.env_vars_raw,
         default_agentic_config: user.default_agentic_config
       }
     };
@@ -8268,7 +8321,14 @@ var UsersRepository = class {
         );
       }
     }
+    const rawRow = await this.getRawRow(fullId);
     const merged = { ...current, ...updates };
+    if (rawRow?.data.agentic_tools) {
+      merged.agentic_tools_raw = rawRow.data.agentic_tools;
+    }
+    if (rawRow?.data.env_vars) {
+      merged.env_vars_raw = rawRow.data.env_vars;
+    }
     const insertData = this.userToInsert(merged);
     await update(this.db, users3).set({
       ...insertData,
@@ -8303,96 +8363,103 @@ var UsersRepository = class {
     }
   }
   /**
-   * Get decrypted API key for a user and service
+   * Get the full decrypted credential bag for a single agentic tool.
    *
-   * @param userId - User ID
-   * @param service - Service name ('anthropic', 'openai', 'gemini')
-   * @returns Decrypted API key or null if not found
+   * Returns `null` when the user has no stored config for that tool.
+   * Fields that fail to decrypt are dropped from the returned object and
+   * logged — callers see "missing field" rather than a thrown error so a
+   * single corrupt value doesn't poison an entire SDK spawn.
    */
-  async getApiKey(userId, service) {
+  async getToolConfig(userId, tool) {
     const row = await this.getRawRow(userId);
-    if (!row || !row.data.api_keys) {
-      return null;
-    }
-    const keyMap = {
-      anthropic: "ANTHROPIC_API_KEY",
-      openai: "OPENAI_API_KEY",
-      gemini: "GEMINI_API_KEY",
-      copilot: "COPILOT_GITHUB_TOKEN"
-    };
-    const encryptedKey = row.data.api_keys[keyMap[service]];
-    if (!encryptedKey) {
-      return null;
+    if (!row) return null;
+    const stored = row.data.agentic_tools;
+    const fields = stored?.[tool];
+    if (!fields || Object.keys(fields).length === 0) return null;
+    const out = {};
+    for (const [field, encrypted] of Object.entries(fields)) {
+      if (!encrypted) continue;
+      try {
+        out[field] = decryptApiKey(encrypted);
+      } catch (error) {
+        console.error(
+          `[users] Failed to decrypt ${tool}.${field} for user ${userId.substring(0, 8)}: ${error.message}`
+        );
+      }
     }
+    return Object.keys(out).length > 0 ? out : null;
+  }
+  /**
+   * Get a single decrypted credential field for a tool.
+   *
+   * Returns `null` when the field is unset OR when decryption fails (logged).
+   * Throws only on storage-layer errors, not on missing/corrupt values.
+   */
+  async getToolConfigField(userId, tool, field) {
+    const row = await this.getRawRow(userId);
+    if (!row) return null;
+    const stored = row.data.agentic_tools;
+    const encrypted = stored?.[tool]?.[field];
+    if (!encrypted) return null;
     try {
-      return decryptApiKey(encryptedKey);
+      return decryptApiKey(encrypted);
     } catch (error) {
-      throw new RepositoryError(`Failed to decrypt API key for service ${service}`, error);
+      console.error(
+        `[users] Failed to decrypt ${tool}.${field} for user ${userId.substring(0, 8)}: ${error.message}`
+      );
+      return null;
     }
   }
   /**
-   * Set encrypted API key for a user and service
+   * Set (encrypt + persist) a single credential field for a tool.
    *
-   * @param userId - User ID
-   * @param service - Service name ('anthropic', 'openai', 'gemini')
-   * @param apiKey - Plaintext API key to encrypt and store
+   * Field names are env-var-shaped (e.g. ANTHROPIC_API_KEY, ANTHROPIC_BASE_URL)
+   * and are stored encrypted regardless of whether the value is a secret —
+   * keeping the on-disk shape uniform avoids decrypt-vs-plain branching at
+   * read time. UI controls own the text-vs-password rendering distinction.
    */
-  async setApiKey(userId, service, apiKey) {
+  async setToolConfigField(userId, tool, field, value) {
     const fullId = await this.resolveId(userId);
     const row = await this.getRawRow(fullId);
     if (!row) {
       throw new EntityNotFoundError("User", userId);
     }
-    const keyMap = {
-      anthropic: "ANTHROPIC_API_KEY",
-      openai: "OPENAI_API_KEY",
-      gemini: "GEMINI_API_KEY",
-      copilot: "COPILOT_GITHUB_TOKEN"
-    };
-    const encryptedKey = encryptApiKey(apiKey);
-    const updatedApiKeys = {
-      ...row.data.api_keys || {},
-      [keyMap[service]]: encryptedKey
-    };
-    const user = this.rowToUser(row);
-    const updateData = {
-      ...user,
-      api_keys_raw: updatedApiKeys
+    const stored = row.data.agentic_tools ?? {};
+    const next = {
+      ...stored,
+      [tool]: {
+        ...stored[tool] ?? {},
+        [field]: encryptApiKey(value)
+      }
     };
-    const insertData = this.userToInsert(updateData);
     await update(this.db, users3).set({
-      ...insertData,
+      data: { ...row.data, agentic_tools: next },
       updated_at: /* @__PURE__ */ new Date()
     }).where((0, import_drizzle_orm23.eq)(users3.user_id, fullId)).run();
   }
   /**
-   * Delete API key for a user and service
+   * Delete a single credential field for a tool.
    *
-   * @param userId - User ID
-   * @param service - Service name ('anthropic', 'openai', 'gemini')
+   * If the tool's bucket becomes empty after the delete, the bucket itself is
+   * removed so `data.agentic_tools` doesn't accumulate empty objects.
    */
-  async deleteApiKey(userId, service) {
+  async deleteToolConfigField(userId, tool, field) {
     const fullId = await this.resolveId(userId);
     const row = await this.getRawRow(fullId);
     if (!row) {
       throw new EntityNotFoundError("User", userId);
     }
-    const keyMap = {
-      anthropic: "ANTHROPIC_API_KEY",
-      openai: "OPENAI_API_KEY",
-      gemini: "GEMINI_API_KEY",
-      copilot: "COPILOT_GITHUB_TOKEN"
-    };
-    const updatedApiKeys = { ...row.data.api_keys || {} };
-    delete updatedApiKeys[keyMap[service]];
-    const user = this.rowToUser(row);
-    const updateData = {
-      ...user,
-      api_keys_raw: updatedApiKeys
-    };
-    const insertData = this.userToInsert(updateData);
+    const stored = row.data.agentic_tools ?? {};
+    const toolFields = { ...stored[tool] ?? {} };
+    delete toolFields[field];
+    const next = { ...stored };
+    if (Object.keys(toolFields).length > 0) {
+      next[tool] = toolFields;
+    } else {
+      delete next[tool];
+    }
     await update(this.db, users3).set({
-      ...insertData,
+      data: { ...row.data, agentic_tools: next },
       updated_at: /* @__PURE__ */ new Date()
     }).where((0, import_drizzle_orm23.eq)(users3.user_id, fullId)).run();
   }
@@ -8932,14 +8999,7 @@ var WorktreeRepository = class {
       for (const sessionId of sessionIds) {
         const query = select(this.db, {
           data: messagesTable.data
-        }).from(messagesTable).where(
-          (0, import_drizzle_orm24.and)(
-            (0, import_drizzle_orm24.eq)(messagesTable.session_id, sessionId),
-            (0, import_drizzle_orm24.eq)(messagesTable.role, "assistant"),
-            (0, import_drizzle_orm24.isNull)(messagesTable.status)
-            // Exclude queued messages
-          )
-        );
+        }).from(messagesTable).where((0, import_drizzle_orm24.and)((0, import_drizzle_orm24.eq)(messagesTable.session_id, sessionId), (0, import_drizzle_orm24.eq)(messagesTable.role, "assistant")));
         const lastMessage = await query.orderBy((0, import_drizzle_orm24.desc)(messagesTable.index)).limit(1).one();
         if (lastMessage) {
           const messageData = lastMessage.data;