agor-live 0.17.2 → 0.17.3

package/dist/daemon/mcp/tools/boards.js

@@ -13823,20 +13823,34 @@ import { extractSlugFromUrl, isValidGitUrl, isValidSlug } from "@agor/core/confi
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13845,7 +13859,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled as isWorktreeRbacEnabled2 } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";

package/dist/daemon/mcp/tools/card-types.js

@@ -13823,20 +13823,34 @@ import { extractSlugFromUrl, isValidGitUrl, isValidSlug } from "@agor/core/confi
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13845,7 +13859,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled as isWorktreeRbacEnabled2 } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";

package/dist/daemon/mcp/tools/cards.js

@@ -13833,20 +13833,34 @@ import { extractSlugFromUrl, isValidGitUrl, isValidSlug } from "@agor/core/confi
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13855,7 +13869,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled as isWorktreeRbacEnabled2 } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";

package/dist/daemon/mcp/tools/environment.js

@@ -13823,20 +13823,34 @@ import { extractSlugFromUrl, isValidGitUrl, isValidSlug } from "@agor/core/confi
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13845,7 +13859,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled as isWorktreeRbacEnabled2 } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";

package/dist/daemon/mcp/tools/mcp-servers.d.ts

@@ -1,12 +1,39 @@
+import { MCPServer } from '@agor/core/types';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { McpContext } from '../server.js';
 import '@agor/core/db';
 import '@agor/core/feathers';
-import '@agor/core/types';
 import '../../declarations.js';
 import '../../services/sessions.js';
 import '../../adapters/drizzle.js';
 
+/**
+ * Standard MCP-server payload returned by the MCP tools. Shared by the catalog
+ * lister (`agor_mcp_servers_list`) and the per-session attachment view that
+ * `agor_sessions_get_current` / `agor_sessions_get` embeds as
+ * `attached_mcp_servers` — keeping one shape so agents can treat them
+ * identically.
+ */
+interface McpServerSummary {
+    mcp_server_id: string;
+    name: string;
+    display_name?: string;
+    transport: string;
+    auth_type: string;
+    oauth_mode?: string;
+    oauth_authenticated: boolean;
+    enabled: boolean;
+}
+/** Build the standard MCP-server summary, resolving OAuth status inline. */
+declare function summarizeMcpServer(ctx: McpContext, mcpServer: MCPServer): Promise<McpServerSummary>;
+/**
+ * List MCP servers attached to a session (via the `session-mcp-servers`
+ * junction), enriched with OAuth status. Used by `agor_sessions_get_current`
+ * and `agor_sessions_get` to expose `attached_mcp_servers` in their payload.
+ */
+declare function listAttachedMcpServers(ctx: McpContext, sessionId: string, opts?: {
+    includeDisabled?: boolean;
+}): Promise<McpServerSummary[]>;
 declare function registerMcpServerTools(server: McpServer, ctx: McpContext): void;
 
-export { registerMcpServerTools };
+export { type McpServerSummary, listAttachedMcpServers, registerMcpServerTools, summarizeMcpServer };

package/dist/daemon/mcp/tools/mcp-servers.js

@@ -13823,20 +13823,34 @@ import { extractSlugFromUrl, isValidGitUrl, isValidSlug } from "@agor/core/confi
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13845,7 +13859,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled as isWorktreeRbacEnabled2 } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";
@@ -13878,11 +13892,47 @@ async function getOAuthStatus(ctx, mcpServer) {
   }
   return { authenticated: false };
 }
+async function summarizeMcpServer(ctx, mcpServer) {
+  const authType = mcpServer.auth?.type || "none";
+  const oauthMode = mcpServer.auth?.oauth_mode || "per_user";
+  const { authenticated } = await getOAuthStatus(ctx, mcpServer);
+  return {
+    mcp_server_id: mcpServer.mcp_server_id,
+    name: mcpServer.name,
+    display_name: mcpServer.display_name,
+    transport: mcpServer.transport,
+    auth_type: authType,
+    oauth_mode: oauthMode,
+    oauth_authenticated: authenticated,
+    enabled: mcpServer.enabled
+  };
+}
+async function listAttachedMcpServers(ctx, sessionId, opts = {}) {
+  const sessionMCPServers = await ctx.app.service("session-mcp-servers").find({
+    ...ctx.baseServiceParams,
+    query: {
+      session_id: sessionId,
+      ...opts.includeDisabled ? {} : { enabled: true },
+      $limit: 100
+    }
+  });
+  const data = Array.isArray(sessionMCPServers) ? sessionMCPServers : sessionMCPServers.data;
+  const summaries = [];
+  for (const sms of data) {
+    try {
+      const mcpServer = await ctx.app.service("mcp-servers").get(sms.mcp_server_id, ctx.baseServiceParams);
+      summaries.push(await summarizeMcpServer(ctx, mcpServer));
+    } catch (error48) {
+      console.warn(`Failed to fetch MCP server ${sms.mcp_server_id}:`, error48);
+    }
+  }
+  return summaries;
+}
 function registerMcpServerTools(server, ctx) {
   server.registerTool(
     "agor_mcp_servers_list",
     {
-      description: "List MCP servers available to the current session. Shows each server's name, transport type, authentication type, and OAuth connection status. Use this to see which external tools/services are configured and whether they need authentication.",
+      description: "List the MCP-server catalog the current user can access (i.e. servers eligible to attach to a session). Each entry includes name, transport, auth type, and OAuth status. Use this to discover IDs to pass to `agor_sessions_create({ mcpServerIds })`. To see which servers are currently ATTACHED to a session, read `attached_mcp_servers` from `agor_sessions_get_current` or `agor_sessions_get`.",
       annotations: { readOnlyHint: true },
       inputSchema: external_exports.object({
         includeDisabled: external_exports.boolean().optional().describe("Include disabled MCP servers (default: false)")
@@ -13890,62 +13940,20 @@ function registerMcpServerTools(server, ctx) {
     },
     async (args) => {
       const includeDisabled = args.includeDisabled === true;
-      const sessionMCPServers = await ctx.app.service("session-mcp-servers").find({
+      const result = await ctx.app.service("mcp-servers").find({
         ...ctx.baseServiceParams,
         query: {
-          session_id: ctx.sessionId,
+          scope: "global",
           ...includeDisabled ? {} : { enabled: true },
           $limit: 100
         }
       });
+      const data = Array.isArray(result) ? result : result.data;
       const servers = [];
-      const sessionMCPData = Array.isArray(sessionMCPServers) ? sessionMCPServers : sessionMCPServers.data;
-      const mcpServerIds = sessionMCPData.map(
-        (sms) => sms.mcp_server_id
-      );
-      for (const serverId of mcpServerIds) {
-        try {
-          const mcpServer = await ctx.app.service("mcp-servers").get(serverId, ctx.baseServiceParams);
-          const authType = mcpServer.auth?.type || "none";
-          const oauthMode = mcpServer.auth?.oauth_mode || "per_user";
-          const { authenticated } = await getOAuthStatus(ctx, mcpServer);
-          servers.push({
-            mcp_server_id: mcpServer.mcp_server_id,
-            name: mcpServer.name,
-            display_name: mcpServer.display_name,
-            transport: mcpServer.transport,
-            auth_type: authType,
-            oauth_mode: oauthMode,
-            oauth_authenticated: authenticated,
-            enabled: mcpServer.enabled
-          });
-        } catch (error48) {
-          console.warn(`Failed to fetch MCP server ${serverId}:`, error48);
-        }
-      }
-      const globalServers = await ctx.app.service("mcp-servers").find({
-        ...ctx.baseServiceParams,
-        query: { scope: "global", ...includeDisabled ? {} : { enabled: true }, $limit: 100 }
-      });
-      for (const mcpServer of Array.isArray(globalServers) ? globalServers : globalServers.data) {
-        if (!mcpServerIds.includes(mcpServer.mcp_server_id)) {
-          const authType = mcpServer.auth?.type || "none";
-          const oauthMode = mcpServer.auth?.oauth_mode || "per_user";
-          const { authenticated } = await getOAuthStatus(ctx, mcpServer);
-          servers.push({
-            mcp_server_id: mcpServer.mcp_server_id,
-            name: mcpServer.name,
-            display_name: mcpServer.display_name,
-            transport: mcpServer.transport,
-            auth_type: authType,
-            oauth_mode: oauthMode,
-            oauth_authenticated: authenticated,
-            enabled: mcpServer.enabled
-          });
-        }
+      for (const mcpServer of data) {
+        servers.push(await summarizeMcpServer(ctx, mcpServer));
       }
       return textResult({
-        session_id: ctx.sessionId,
         mcp_servers: servers,
         summary: {
           total: servers.length,
@@ -13984,5 +13992,7 @@ function registerMcpServerTools(server, ctx) {
   );
 }
 export {
-  registerMcpServerTools
+  listAttachedMcpServers,
+  registerMcpServerTools,
+  summarizeMcpServer
 };

package/dist/daemon/mcp/tools/messages.js

@@ -13837,20 +13837,34 @@ import { extractSlugFromUrl, isValidGitUrl, isValidSlug } from "@agor/core/confi
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13859,7 +13873,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";

package/dist/daemon/mcp/tools/repos.js

@@ -13823,20 +13823,34 @@ import {
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13845,7 +13859,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled as isWorktreeRbacEnabled2 } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";

package/dist/daemon/mcp/tools/search.js

@@ -13918,20 +13918,34 @@ import { extractSlugFromUrl, isValidGitUrl, isValidSlug } from "@agor/core/confi
 
 // src/mcp/tools/sessions.ts
 import { WorktreeRepository as WorktreeRepository2 } from "@agor/core/db";
-import { resolveModelConfigPrecedence } from "@agor/core/models";
+import {
+  AVAILABLE_CLAUDE_MODEL_ALIASES,
+  CODEX_MODEL_METADATA,
+  DEFAULT_CLAUDE_MODEL,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  GEMINI_MODELS
+} from "@agor/core/models";
+import { resolveSessionDefaults } from "@agor/core/sessions";
 import {
   AGENTIC_TOOL_CAPABILITIES,
   getSessionType
 } from "@agor/core/types";
-var modelConfigInputSchema = external_exports.object({
+var modelConfigObjectSchema = external_exports.object({
   mode: external_exports.enum(["alias", "exact"]).optional().describe("Model selection mode (default: 'alias')"),
   // .min(1): reject empty-string model explicitly so callers don't silently
   // fall through to user defaults when they meant to pin a specific model.
   model: external_exports.string().min(1).describe("Model identifier (e.g. 'claude-opus-4-6', 'claude-sonnet-4-6')"),
   effort: external_exports.enum(["low", "medium", "high", "max"]).optional().describe("Reasoning effort level (default: high)"),
   provider: external_exports.string().optional().describe("Provider ID (OpenCode only, e.g. 'anthropic')")
-}).optional().describe(
-  "Model override for this session. When set, overrides the user default model_config. Threaded through to the spawned agent process so it actually runs on the requested model."
+});
+var modelConfigInputSchema = external_exports.union([
+  external_exports.string().min(1).describe(
+    "Shorthand: just the model ID string (e.g. 'claude-opus-4-6'). Equivalent to { model: <id> }."
+  ),
+  modelConfigObjectSchema
+]).optional().describe(
+  "Model override for this session. Pass either a model ID string (e.g. 'claude-opus-4-6') or a full { mode, model, effort, provider } object. Overrides the user default model_config and is threaded through to the spawned agent process. Call agor_models_list to discover valid model IDs per agenticTool."
 );
 
 // src/mcp/tools/users.ts
@@ -13940,7 +13954,7 @@ import { ROLES as ROLES2 } from "@agor/core/types";
 // src/mcp/tools/worktrees.ts
 import { isWorktreeRbacEnabled as isWorktreeRbacEnabled2 } from "@agor/core/config";
 import { WorktreeRepository as WorktreeRepository3 } from "@agor/core/db";
-import { resolveModelConfig } from "@agor/core/models";
+import { resolveSessionDefaults as resolveSessionDefaults2 } from "@agor/core/sessions";
 import { getAssistantConfig, isAssistant, WORKTREE_PERMISSION_LEVELS as WORKTREE_PERMISSION_LEVELS2 } from "@agor/core/types";
 import { computeZoneRelativePosition } from "@agor/core/utils/board-placement";
 import { normalizeOptionalHttpUrl } from "@agor/core/utils/url";