agor-live 0.17.2 → 0.17.3

package/dist/core/resolve-config-DTCxuSBx.d.cts

@@ -0,0 +1,74 @@
+import { E as EffortLevel, a as Session } from './session-MNU4BQv4.cjs';
+
+/**
+ * Model configuration normalization
+ *
+ * Single source of truth for turning a partial model-config input (from an
+ * MCP tool arg, a user default, a worktree setting, etc.) into the canonical
+ * shape persisted on `Session['model_config']`.
+ *
+ * Callers compose these helpers into a precedence chain instead of hand-rolling
+ * the normalization at every session-creation site (MCP create, spawn service,
+ * worktree auto-create, gateway session creation, ...). Centralizing here:
+ *
+ * - Guarantees every site writes the same shape (mode default, updated_at
+ *   stamp, conditional effort/provider inclusion), avoiding drift.
+ * - Makes it safe to add a new optional field (e.g. a future `notes` or
+ *   `temperature`) in exactly one place.
+ * - Returns `undefined` when there is no usable model, so callers can chain
+ *   with `??` or feed a list into `resolveModelConfigPrecedence`.
+ */
+
+/**
+ * Loose input shape accepted by the resolver.
+ *
+ * Mirrors `Session['model_config']` but every field is optional so we can
+ * accept partials from MCP Zod schemas, user/tool defaults, worktree
+ * overrides, and legacy callers — then either normalize or reject them
+ * based on whether `model` is set.
+ */
+type ModelConfigInput = {
+    mode?: 'alias' | 'exact';
+    model?: string;
+    effort?: EffortLevel;
+    provider?: string;
+};
+/**
+ * Canonical persisted shape — a non-null `Session.model_config`.
+ */
+type ResolvedModelConfig = NonNullable<Session['model_config']>;
+/**
+ * Normalize a partial model-config into the shape persisted on
+ * `session.model_config`. Returns `undefined` if no usable `model` was
+ * provided, so callers can fall through to the next source in a precedence
+ * chain.
+ *
+ * Behavior:
+ * - `mode` defaults to `'alias'` (matches every legacy call site).
+ * - `updated_at` is stamped from `opts.now ?? new Date()` (injectable for
+ *   determinism in tests).
+ * - `effort` and `provider` are only included when explicitly defined, so
+ *   we never write `undefined` values onto the persisted object.
+ */
+declare function resolveModelConfig(input: ModelConfigInput | undefined | null, opts?: {
+    now?: Date;
+}): ResolvedModelConfig | undefined;
+/**
+ * Walk a precedence list (highest priority first) and return the first
+ * source that yields a resolvable model config. Mirrors the "explicit arg >
+ * worktree override > user default" pattern used at session-create time.
+ *
+ * Example:
+ * ```ts
+ * const modelConfig = resolveModelConfigPrecedence([
+ *   args.modelConfig,              // explicit MCP arg
+ *   worktree.modelConfig,          // worktree override
+ *   userToolDefaults?.modelConfig, // user default
+ * ]);
+ * ```
+ */
+declare function resolveModelConfigPrecedence(sources: Array<ModelConfigInput | undefined | null>, opts?: {
+    now?: Date;
+}): ResolvedModelConfig | undefined;
+
+export { type ModelConfigInput as M, type ResolvedModelConfig as R, resolveModelConfigPrecedence as a, resolveModelConfig as r };

package/dist/core/seed/index.cjs

@@ -87,6 +87,7 @@ __export(config_manager_exports, {
   getWorktreesDir: () => getWorktreesDir,
   getWorktreesDirAsync: () => getWorktreesDirAsync,
   initConfig: () => initConfig,
+  isConfigCredentialKey: () => isConfigCredentialKey,
   isUnixImpersonationEnabled: () => isUnixImpersonationEnabled,
   isWorktreeRbacEnabled: () => isWorktreeRbacEnabled,
   loadConfig: () => loadConfig,
@@ -353,6 +354,9 @@ function loadConfigSync() {
     );
   }
 }
+function isConfigCredentialKey(key) {
+  return CONFIG_CREDENTIAL_KEYS.has(key);
+}
 function getCredential(key) {
   try {
     const config = loadConfigSync();
@@ -448,7 +452,7 @@ async function getReposDirAsync() {
 async function getWorktreesDirAsync() {
   return import_node_path.default.join(await getDataHomeAsync(), "worktrees");
 }
-var import_node_fs, import_promises, import_node_os, import_node_path, import_js_yaml, PublicBaseUrlNotConfiguredError;
+var import_node_fs, import_promises, import_node_os, import_node_path, import_js_yaml, PublicBaseUrlNotConfiguredError, CONFIG_CREDENTIAL_KEYS;
 var init_config_manager = __esm({
   "src/config/config-manager.ts"() {
     "use strict";
@@ -466,6 +470,13 @@ var init_config_manager = __esm({
         this.name = "PublicBaseUrlNotConfiguredError";
       }
     };
+    CONFIG_CREDENTIAL_KEYS = /* @__PURE__ */ new Set([
+      "ANTHROPIC_API_KEY",
+      "ANTHROPIC_AUTH_TOKEN",
+      "ANTHROPIC_BASE_URL",
+      "OPENAI_API_KEY",
+      "GEMINI_API_KEY"
+    ]);
   }
 });
 
@@ -887,6 +898,21 @@ var init_ui = __esm({
 });
 
 // src/types/user.ts
+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"() {
@@ -1080,6 +1106,7 @@ var init_schema_postgres = __esm({
         completed_at: t.timestamp("completed_at"),
         status: (0, import_pg_core.text)("status", {
           enum: [
+            "queued",
             "created",
             "running",
             "stopping",
@@ -1091,6 +1118,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)
@@ -1100,7 +1129,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_orm2.sql`${table.status} = 'queued'`)
       })
     );
     serializedSessions = (0, import_pg_core.pgTable)(
@@ -1160,11 +1194,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()
       },
@@ -1172,8 +1204,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)(
@@ -1810,6 +1841,7 @@ var init_schema_sqlite = __esm({
         completed_at: t2.timestamp("completed_at"),
         status: (0, import_sqlite_core.text)("status", {
           enum: [
+            "queued",
             "created",
             "running",
             "stopping",
@@ -1821,6 +1853,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)
@@ -1830,7 +1864,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_orm3.sql`${table.status} = 'queued'`)
       })
     );
     serializedSessions2 = (0, import_sqlite_core.sqliteTable)(
@@ -1890,11 +1929,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()
       },
@@ -1902,8 +1939,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)(
@@ -4234,6 +4270,7 @@ init_schema();
 
 // src/db/repositories/users.ts
 init_cjs_shims();
+init_types();
 var import_drizzle_orm22 = require("drizzle-orm");
 
 // src/config/env-vars.ts
@@ -4273,8 +4310,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 {
@@ -4290,13 +4328,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
@@ -4340,10 +4373,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
       }
     };
@@ -4455,7 +4495,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,
@@ -4490,96 +4537,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_orm22.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_orm22.eq)(users3.user_id, fullId)).run();
   }
@@ -5119,14 +5173,7 @@ var WorktreeRepository = class {
       for (const sessionId of sessionIds) {
         const query = select(this.db, {
           data: messagesTable.data
-        }).from(messagesTable).where(
-          (0, import_drizzle_orm23.and)(
-            (0, import_drizzle_orm23.eq)(messagesTable.session_id, sessionId),
-            (0, import_drizzle_orm23.eq)(messagesTable.role, "assistant"),
-            (0, import_drizzle_orm23.isNull)(messagesTable.status)
-            // Exclude queued messages
-          )
-        );
+        }).from(messagesTable).where((0, import_drizzle_orm23.and)((0, import_drizzle_orm23.eq)(messagesTable.session_id, sessionId), (0, import_drizzle_orm23.eq)(messagesTable.role, "assistant")));
         const lastMessage = await query.orderBy((0, import_drizzle_orm23.desc)(messagesTable.index)).limit(1).one();
         if (lastMessage) {
           const messageData = lastMessage.data;