@agentstep/agent-sdk 0.4.39 → 0.5.0

package/dist/{chunk-S7W3KJYH.js → chunk-GIMDS46L.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-XBHDQK4Z.js";
 import {
   getConfig
-} from "./chunk-V7MTIMPB.js";
+} from "./chunk-X6QIWZ33.js";
 
 // src/backends/claude/args.ts
 function buildClaudeArgs(input) {
@@ -37,7 +37,7 @@ Your custom tools are: ${toolList}. Call them by these exact names \u2014 do not
   }
   argv.push("--system-prompt", systemPrompt);
   if (input.agent.model) {
-    argv.push("--model", input.agent.model);
+    argv.push("--model", input.agent.model.id);
   }
   const mcpToolNames = Array.from(tools.customToolNames).map(
     (name) => `mcp__tool-bridge__${name}`
@@ -52,10 +52,15 @@ Your custom tools are: ${toolList}. Call them by these exact names \u2014 do not
   if (input.agent.model_config?.speed === "fast") {
     argv.push("--fast");
   }
-  if (input.agent.mcp_servers && Object.keys(input.agent.mcp_servers).length > 0) {
+  if (input.agent.mcp_servers && input.agent.mcp_servers.length > 0) {
+    const mcpRecord = {};
+    for (const s of input.agent.mcp_servers) {
+      const { name, ...rest } = s;
+      mcpRecord[name] = rest;
+    }
     argv.push(
       "--mcp-config",
-      JSON.stringify({ mcpServers: input.agent.mcp_servers })
+      JSON.stringify({ mcpServers: mcpRecord })
     );
   }
   return argv;

package/dist/{chunk-FP4E3QUS.js → chunk-GLKWJESP.js}

@@ -8,14 +8,14 @@ import {
 import {
   jsonOk,
   routeWrap
-} from "./chunk-RH4GKU52.js";
+} from "./chunk-QTXAWC5J.js";
 import {
   snapshotApiMetrics
 } from "./chunk-D2XITRN6.js";
 import {
   getDb,
   init_client
-} from "./chunk-6POQAFEC.js";
+} from "./chunk-W3JMIUHV.js";
 import {
   badRequest
 } from "./chunk-EZYKRG4W.js";

package/dist/{chunk-FDBR634Z.js → chunk-GV6GUSCP.js}

@@ -1,21 +1,21 @@
 import {
   piBackend
-} from "./chunk-5EQJOUWM.js";
+} from "./chunk-NHAYKVXG.js";
 import {
   opencodeBackend
-} from "./chunk-MQQ44IGX.js";
+} from "./chunk-KKAJC3Z2.js";
 import {
   factoryBackend
-} from "./chunk-2GIX4HAT.js";
+} from "./chunk-L26TVIB6.js";
 import {
   geminiBackend
-} from "./chunk-JZL4L54R.js";
+} from "./chunk-DKLHYSPW.js";
 import {
   codexBackend
-} from "./chunk-2I35VGHX.js";
+} from "./chunk-R3QHLKJG.js";
 import {
   claudeBackend
-} from "./chunk-ZMNQ2YJ6.js";
+} from "./chunk-PNZF7HIU.js";
 
 // src/backends/registry.ts
 var BACKENDS = {

package/dist/{chunk-X6IQ57SC.js → chunk-H6OT5GUL.js}

@@ -1,6 +1,6 @@
 import {
   DEFAULT_TENANT_ID
-} from "./chunk-AR2TM7CR.js";
+} from "./chunk-I26QP3A3.js";
 import {
   init_ids,
   newId
@@ -13,10 +13,10 @@ import {
 import {
   getDrizzle,
   init_drizzle
-} from "./chunk-R5T4LJSK.js";
+} from "./chunk-PZNAQBHQ.js";
 import {
   schema_exports
-} from "./chunk-ZMJ4EP4C.js";
+} from "./chunk-ILHIHMO3.js";
 
 // src/db/environments.ts
 init_drizzle();
@@ -25,6 +25,7 @@ init_clock();
 import { eq, and, isNull, lt, gt, sql } from "drizzle-orm";
 function hydrate(row) {
   return {
+    type: "environment",
     id: row.id,
     name: row.name,
     description: row.description ?? null,
@@ -33,6 +34,7 @@ function hydrate(row) {
     state: row.state,
     state_message: row.state_message,
     created_at: toIso(row.created_at),
+    updated_at: toIso(row.updated_at),
     archived_at: row.archived_at ? toIso(row.archived_at) : null
   };
 }
@@ -48,7 +50,8 @@ function createEnvironment(input) {
     metadata_json: JSON.stringify(input.metadata ?? {}),
     tenant_id: input.tenant_id ?? DEFAULT_TENANT_ID,
     state: "preparing",
-    created_at: now
+    created_at: now,
+    updated_at: now
   }).run();
   return getEnvironment(id);
 }
@@ -64,7 +67,8 @@ function updateEnvironment(id, updates) {
     name: newName,
     description: newDescription ?? null,
     config_json: newConfigJson,
-    metadata_json: newMetadataJson
+    metadata_json: newMetadataJson,
+    updated_at: nowMs()
   }).where(eq(schema_exports.environments.id, id)).run();
   return getEnvironment(id);
 }

package/dist/{chunk-TPPLYCJF.js → chunk-HMOSAXVZ.js}

@@ -1,9 +1,9 @@
 import {
   listCredentialsWithTokens
-} from "./chunk-L5RW66H5.js";
+} from "./chunk-HVLYE4S5.js";
 import {
   listEntries
-} from "./chunk-ZVXIZ2JD.js";
+} from "./chunk-VP527YC5.js";
 
 // src/sessions/secrets.ts
 function loadSessionSecrets(vaultIds) {

package/dist/{chunk-L5RW66H5.js → chunk-HVLYE4S5.js}

@@ -14,7 +14,7 @@ import {
 import {
   getDb,
   init_client
-} from "./chunk-6POQAFEC.js";
+} from "./chunk-W3JMIUHV.js";
 
 // src/db/credentials.ts
 init_client();

package/dist/{chunk-RVR6C22M.js → chunk-HWR2HYQJ.js}

@@ -1,6 +1,6 @@
 import {
   getConfig
-} from "./chunk-V7MTIMPB.js";
+} from "./chunk-X6QIWZ33.js";
 
 // src/backends/pi/auth.ts
 function buildPiAuthEnv() {

package/dist/{chunk-HH4OXSOV.js → chunk-HY3T4YJV.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-23UKWXJH.js";
 import {
   recordAudit
-} from "./chunk-KLN6HPYM.js";
+} from "./chunk-L3IACZ72.js";
 import {
   COMMUNITY_LIMITS,
   hasFeature,
@@ -15,7 +15,7 @@ import {
 import {
   jsonOk,
   routeWrap
-} from "./chunk-RH4GKU52.js";
+} from "./chunk-QTXAWC5J.js";
 import {
   createApiKey,
   getApiKeyById,
@@ -23,14 +23,14 @@ import {
   listApiKeys,
   revokeApiKey,
   updateApiKeyPermissions
-} from "./chunk-USYY3L7G.js";
+} from "./chunk-T3FQPTOA.js";
 import {
   listSessionsByApiKey
-} from "./chunk-3NK6YTA5.js";
+} from "./chunk-KUWJJD6O.js";
 import {
   getDb,
   init_client
-} from "./chunk-6POQAFEC.js";
+} from "./chunk-W3JMIUHV.js";
 import {
   badRequest,
   forbidden,

package/dist/{chunk-AR2TM7CR.js → chunk-I26QP3A3.js}

@@ -10,7 +10,7 @@ import {
 import {
   getDb,
   init_client
-} from "./chunk-6POQAFEC.js";
+} from "./chunk-W3JMIUHV.js";
 
 // src/db/tenants.ts
 init_client();

package/dist/{chunk-D2TRWKVQ.js → chunk-I2WVMCYN.js}

@@ -70,6 +70,7 @@ import {
   UpdateEnvironmentRequestSchema,
   UpdateMemoryRequestSchema,
   UpdateSessionRequestSchema,
+  UpdateVaultRequestSchema,
   UpstreamKeyDeletedResponseSchema,
   UpstreamKeyListResponseSchema,
   UpstreamKeySchema,
@@ -83,7 +84,7 @@ import {
   VaultListResponseSchema,
   VaultSchema,
   WhoamiResponseSchema
-} from "./chunk-OXWELRJL.js";
+} from "./chunk-CBPO2P4I.js";
 import {
   registry
 } from "./chunk-7346CKTF.js";
@@ -212,6 +213,44 @@ registry.registerPath({
     ...ErrorResponses
   }
 });
+registry.registerPath({
+  method: "post",
+  path: "/v1/agents/{id}/archive",
+  tags: ["Agents"],
+  summary: "Archive an agent (returns the archived agent)",
+  description: "Archives the agent and returns the full agent object with `archived_at` set.",
+  security: [{ ApiKey: [] }],
+  request: { params: z.object({ id: z.string() }) },
+  responses: {
+    200: {
+      description: "Agent archived",
+      content: { "application/json": { schema: AgentSchema } }
+    },
+    ...ErrorResponses
+  }
+});
+registry.registerPath({
+  method: "get",
+  path: "/v1/agents/{id}/versions",
+  tags: ["Agents"],
+  summary: "List agent versions",
+  description: "Returns a paginated list of all versions of this agent, ordered by version number descending.",
+  security: [{ ApiKey: [] }],
+  request: {
+    params: z.object({ id: z.string() }),
+    query: z.object({
+      limit: z.coerce.number().int().min(1).max(100).optional(),
+      page: z.string().optional().describe("Cursor for pagination (base64url-encoded version number)")
+    })
+  },
+  responses: {
+    200: {
+      description: "A page of agent versions",
+      content: { "application/json": { schema: AgentListResponseSchema } }
+    },
+    ...ErrorResponses
+  }
+});
 registry.registerPath({
   method: "post",
   path: "/v1/environments",
@@ -359,7 +398,8 @@ registry.registerPath({
       agent_id: z.string().optional(),
       agent_version: z.coerce.number().int().optional(),
       environment_id: z.string().optional(),
-      status: SessionStatusSchema.optional(),
+      status: SessionStatusSchema.optional().describe("Filter by single status (deprecated, use statuses)"),
+      statuses: z.string().optional().describe("Comma-separated or repeated status filter, e.g. statuses=idle,running"),
       "created_at[gt]": z.string().optional(),
       "created_at[gte]": z.string().optional(),
       "created_at[lt]": z.string().optional(),
@@ -754,6 +794,28 @@ registry.registerPath({
     ...ErrorResponses
   }
 });
+registry.registerPath({
+  method: "post",
+  path: "/v1/vaults/{id}",
+  tags: ["Vaults"],
+  summary: "Update a vault",
+  description: "Updates vault display_name and/or metadata.",
+  security: [{ ApiKey: [] }],
+  request: {
+    params: z.object({ id: z.string() }),
+    body: {
+      required: true,
+      content: { "application/json": { schema: UpdateVaultRequestSchema } }
+    }
+  },
+  responses: {
+    200: {
+      description: "Vault updated",
+      content: { "application/json": { schema: VaultSchema } }
+    },
+    ...ErrorResponses
+  }
+});
 registry.registerPath({
   method: "delete",
   path: "/v1/vaults/{id}",
@@ -769,6 +831,22 @@ registry.registerPath({
     ...ErrorResponses
   }
 });
+registry.registerPath({
+  method: "post",
+  path: "/v1/vaults/{id}/archive",
+  tags: ["Vaults"],
+  summary: "Archive a vault",
+  description: "Archives the vault and returns the full vault object with `archived_at` set.",
+  security: [{ ApiKey: [] }],
+  request: { params: z.object({ id: z.string() }) },
+  responses: {
+    200: {
+      description: "Vault archived",
+      content: { "application/json": { schema: VaultSchema } }
+    },
+    ...ErrorResponses
+  }
+});
 registry.registerPath({
   method: "post",
   path: "/v1/vaults/{id}/credentials",

package/dist/{chunk-JHGJG2Z2.js → chunk-IBYOMAZ3.js}

@@ -11,7 +11,7 @@ function buildGeminiArgs(input) {
     args.push("--resume", input.backendSessionId);
   }
   if (input.agent.model) {
-    args.push("--model", input.agent.model);
+    args.push("--model", input.agent.model.id);
   }
   return args;
 }

package/dist/{chunk-SUGSHXND.js → chunk-IEZFRNLC.js}

@@ -10,10 +10,10 @@ import {
 import {
   getDrizzle,
   init_drizzle
-} from "./chunk-R5T4LJSK.js";
+} from "./chunk-PZNAQBHQ.js";
 import {
   schema_exports
-} from "./chunk-ZMJ4EP4C.js";
+} from "./chunk-ILHIHMO3.js";
 
 // src/db/memory.ts
 init_drizzle();

package/dist/{chunk-ZMJ4EP4C.js → chunk-ILHIHMO3.js}

@@ -57,6 +57,8 @@ var init_schema = __esm({
       id: text("id").primaryKey(),
       current_version: integer("current_version").notNull(),
       name: text("name").notNull(),
+      description: text("description"),
+      metadata_json: text("metadata_json").notNull().default("{}"),
       // v0.4 ALTER TABLE addition:
       fallback_json: text("fallback_json"),
       // v0.5 ALTER TABLE addition:
@@ -99,6 +101,7 @@ var init_schema = __esm({
       // v0.5 ALTER TABLE addition:
       tenant_id: text("tenant_id"),
       created_at: integer("created_at").notNull(),
+      updated_at: integer("updated_at").notNull(),
       archived_at: integer("archived_at")
     });
     sessions = sqliteTable("sessions", {
@@ -157,12 +160,14 @@ var init_schema = __esm({
     });
     vaults = sqliteTable("vaults", {
       id: text("id").primaryKey(),
-      agent_id: text("agent_id").notNull(),
+      agent_id: text("agent_id"),
       name: text("name").notNull(),
+      metadata_json: text("metadata_json").notNull().default("{}"),
       // v0.5 ALTER TABLE addition:
       tenant_id: text("tenant_id"),
       created_at: integer("created_at").notNull(),
-      updated_at: integer("updated_at").notNull()
+      updated_at: integer("updated_at").notNull(),
+      archived_at: integer("archived_at")
     });
     vaultEntries = sqliteTable("vault_entries", {
       vault_id: text("vault_id").notNull(),

package/dist/{chunk-XWWLMJXT.js → chunk-IRW7AYTP.js}

@@ -12,15 +12,16 @@ import {
   listMemories,
   listMemoryStores,
   updateMemory
-} from "./chunk-SUGSHXND.js";
+} from "./chunk-IEZFRNLC.js";
 import {
   jsonOk,
+  paginatedOk,
   routeWrap
-} from "./chunk-RH4GKU52.js";
+} from "./chunk-QTXAWC5J.js";
 import {
   getDb,
   init_client
-} from "./chunk-6POQAFEC.js";
+} from "./chunk-W3JMIUHV.js";
 import {
   badRequest,
   conflict,
@@ -75,12 +76,7 @@ function handleListMemoryStores(request) {
       agent_id: agentId,
       tenantFilter: tenantFilter(auth)
     });
-    return jsonOk({
-      data,
-      has_more: data.length === requestedLimit,
-      first_id: data.length > 0 ? data[0].id : null,
-      last_id: data.length > 0 ? data[data.length - 1].id : null
-    });
+    return paginatedOk(data, requestedLimit);
   });
 }
 function handleGetMemoryStore(request, id) {
@@ -121,12 +117,7 @@ function handleListMemories(request, storeId) {
     const url = new URL(req.url);
     const requestedLimit = Number(url.searchParams.get("limit") || "100");
     const data = listMemories(storeId);
-    return jsonOk({
-      data,
-      has_more: data.length === requestedLimit,
-      first_id: data.length > 0 ? data[0].id : null,
-      last_id: data.length > 0 ? data[data.length - 1].id : null
-    });
+    return paginatedOk(data, requestedLimit);
   });
 }
 function handleGetMemory(request, storeId, memId) {

package/dist/{chunk-N76ZVITA.js → chunk-JFOHGHW5.js}

@@ -3,19 +3,19 @@ import {
 } from "./chunk-4XXQAVKE.js";
 import {
   resolveVaultSecrets
-} from "./chunk-5IGBMS2U.js";
+} from "./chunk-T3HMVHDG.js";
 import {
   appendEvent
-} from "./chunk-MHBLVGRF.js";
+} from "./chunk-5MERXOLJ.js";
 import {
   getSession,
   getSessionRow,
   setSessionSandbox
-} from "./chunk-3NK6YTA5.js";
+} from "./chunk-KUWJJD6O.js";
 import {
   deleteSprite,
   listSprites
-} from "./chunk-FXLUSECC.js";
+} from "./chunk-NKQVOAWN.js";
 import {
   allSessionSandboxes,
   countInEnv,
@@ -24,12 +24,12 @@ import {
 } from "./chunk-EFOIR7R3.js";
 import {
   resolveContainerProvider
-} from "./chunk-WPK4ZPMG.js";
+} from "./chunk-UE6DNLSV.js";
 import {
   getEnvironment,
   getEnvironmentRow,
   listEnvironments
-} from "./chunk-X6IQ57SC.js";
+} from "./chunk-H6OT5GUL.js";
 import {
   addWarm,
   claimWarm,
@@ -40,13 +40,13 @@ import {
 } from "./chunk-G7KUVNDY.js";
 import {
   getAgent
-} from "./chunk-ZTH5JRZG.js";
+} from "./chunk-BCIFFAGW.js";
 import {
   resolveBackend
-} from "./chunk-FDBR634Z.js";
+} from "./chunk-GV6GUSCP.js";
 import {
   getConfig
-} from "./chunk-V7MTIMPB.js";
+} from "./chunk-X6QIWZ33.js";
 import {
   init_clock,
   nowMs

package/dist/{chunk-DAVYI5H4.js → chunk-JLUCJMAQ.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-H6TQGV4L.js";
 import {
   injectMcpAuthHeaders
-} from "./chunk-SV2B3P6B.js";
+} from "./chunk-DBFPJSOY.js";
 import {
   incrementRetry,
   resetRetry,
@@ -21,24 +21,24 @@ import {
 } from "./chunk-72BKGVBE.js";
 import {
   loadSessionSecrets
-} from "./chunk-TPPLYCJF.js";
+} from "./chunk-HMOSAXVZ.js";
 import {
   isProxied
-} from "./chunk-E7DD7F7J.js";
+} from "./chunk-5U5LRAFJ.js";
 import {
   acquireForFirstTurn,
   installSkills,
   provisionResources,
   wrapProviderWithSecrets
-} from "./chunk-N76ZVITA.js";
+} from "./chunk-JFOHGHW5.js";
 import {
   BLOCKED_ENV_KEYS,
   resolveVaultSecrets
-} from "./chunk-5IGBMS2U.js";
+} from "./chunk-T3HMVHDG.js";
 import {
   appendEvent,
   appendEventsBatch
-} from "./chunk-MHBLVGRF.js";
+} from "./chunk-5MERXOLJ.js";
 import {
   bumpSessionStats,
   getOutcomeCriteria,
@@ -49,26 +49,26 @@ import {
   setOutcomeCriteria,
   updateSessionMutable,
   updateSessionStatus
-} from "./chunk-3NK6YTA5.js";
+} from "./chunk-KUWJJD6O.js";
 import {
   listEvents,
   markUserEventProcessed
-} from "./chunk-TH7WJLZC.js";
+} from "./chunk-KGBKIJPF.js";
 import {
   getBySession
 } from "./chunk-EFOIR7R3.js";
 import {
   resolveContainerProvider
-} from "./chunk-WPK4ZPMG.js";
+} from "./chunk-UE6DNLSV.js";
 import {
   getEnvironment
-} from "./chunk-X6IQ57SC.js";
+} from "./chunk-H6OT5GUL.js";
 import {
   getAgent
-} from "./chunk-ZTH5JRZG.js";
+} from "./chunk-BCIFFAGW.js";
 import {
   resolveBackend
-} from "./chunk-FDBR634Z.js";
+} from "./chunk-GV6GUSCP.js";
 import {
   PERMISSION_BRIDGE_PENDING_PATH,
   PERMISSION_BRIDGE_REQUEST_PATH,
@@ -84,7 +84,7 @@ import {
 } from "./chunk-XBHDQK4Z.js";
 import {
   getConfig
-} from "./chunk-V7MTIMPB.js";
+} from "./chunk-X6QIWZ33.js";
 import {
   init_clock,
   nowMs
@@ -259,7 +259,7 @@ async function runTurn(sessionId, inputs, _depth = 0, parentTrace) {
   updateSessionStatus(sessionId, "running");
   const turnStartMs = nowMs();
   emit("session.status_running", {}, { at: turnStartMs });
-  emit("span.model_request_start", { model: agent.model }, { at: turnStartMs });
+  emit("span.model_request_start", { model: agent.model.id }, { at: turnStartMs });
   const promptText = inputs.filter((i) => i.kind === "text").map((i) => i.text).join("\n\n");
   const toolResults = inputs.filter((i) => i.kind === "tool_result").map((i) => ({
     custom_tool_use_id: i.custom_tool_use_id,
@@ -277,7 +277,7 @@ async function runTurn(sessionId, inputs, _depth = 0, parentTrace) {
   } catch (err) {
     const msg = err instanceof ApiError ? err.message : err instanceof Error ? err.message : String(err);
     const type = err instanceof ApiError ? err.type : "server_error";
-    emit("span.model_request_end", { model: agent.model, model_usage: null, status: "error" });
+    emit("span.model_request_end", { model: agent.model.id, model_usage: null, status: "error" });
     emit("session.error", { error: { type, message: msg } });
     emit("session.status_idle", { stop_reason: formatStopReason("error") });
     updateSessionStatus(sessionId, "idle", "error");
@@ -298,7 +298,7 @@ async function runTurn(sessionId, inputs, _depth = 0, parentTrace) {
       }
     }
   }
-  console.log(`[driver] ${sessionId} executing turn (engine: ${agent.engine}, model: ${agent.model})`);
+  console.log(`[driver] ${sessionId} executing turn (engine: ${agent.engine}, model: ${agent.model.id})`);
   const argv = [backend.wrapperPath, ...turnBuild.argv];
   const freshSession = getSession(sessionId);
   if (freshSession?.resources && freshSession.resources.length > 0) {
@@ -324,7 +324,7 @@ async function runTurn(sessionId, inputs, _depth = 0, parentTrace) {
     delete turnBuild.env.ANTHROPIC_API_KEY;
   }
   const ollamaCloudPrefixes = ["claude-", "gpt-", "o1-", "o3-", "o4-", "codex-", "chatgpt-", "gemini-"];
-  const isOllamaModel = !agent.model.includes("/") && !ollamaCloudPrefixes.some((p) => agent.model.startsWith(p));
+  const isOllamaModel = !agent.model.id.includes("/") && !ollamaCloudPrefixes.some((p) => agent.model.id.startsWith(p));
   if (isOllamaModel) {
     let ollamaHostPort;
     if (!turnBuild.env.OLLAMA_HOST) {
@@ -424,7 +424,7 @@ ${turnBuild.stdin}`;
   } catch (err) {
     runtime.inFlightRuns.delete(sessionId);
     const msg = err instanceof Error ? err.message : String(err);
-    emit("span.model_request_end", { model: agent.model, model_usage: null, status: "error" });
+    emit("span.model_request_end", { model: agent.model.id, model_usage: null, status: "error" });
     emit("session.error", { error: { type: "server_error", message: `exec failed: ${msg}` } });
     emit("session.status_idle", { stop_reason: formatStopReason("error") });
     updateSessionStatus(sessionId, "idle", "error");
@@ -539,7 +539,7 @@ ${turnBuild.stdin}`;
         await retryDelay(retry.delayMs);
         return runTurn(sessionId, inputs, _depth + 1, parentTrace);
       }
-      emit("span.model_request_end", { model: agent.model, model_usage: null, status: "error" });
+      emit("span.model_request_end", { model: agent.model.id, model_usage: null, status: "error" });
       const retryStatus = classified.retryable ? "exhausted" : "terminal";
       emit("session.error", { error: buildErrorPayload(classified, retryStatus) });
       emit("session.status_idle", { stop_reason: formatStopReason("error") });
@@ -556,7 +556,7 @@ ${turnBuild.stdin}`;
   if (aborted) {
     const partial = translator.getTurnResult();
     emit("span.model_request_end", {
-      model: agent.model,
+      model: agent.model.id,
       model_usage: partial?.usage ?? null,
       status: "interrupted"
     });
@@ -622,7 +622,7 @@ ${turnBuild.stdin}`;
     if (serverToolResult) {
       emit(
         "span.model_request_end",
-        { model: agent.model, model_usage: result?.usage ?? null, status: "ok" },
+        { model: agent.model.id, model_usage: result?.usage ?? null, status: "ok" },
         { at: now }
       );
       emit("session.status_idle", { stop_reason: formatStopReason("custom_tool_call", customToolEventIds) }, { at: now });
@@ -659,7 +659,7 @@ ${turnBuild.stdin}`;
   }
   emit(
     "span.model_request_end",
-    { model: agent.model, model_usage: result?.usage ?? null, status: "ok" },
+    { model: agent.model.id, model_usage: result?.usage ?? null, status: "ok" },
     { at: now }
   );
   const finalEventIds = stopReason === "custom_tool_call" ? listEvents(sessionId, { limit: 20, order: "desc" }).filter((e) => e.type === "agent.custom_tool_use").map((e) => e.id) : void 0;
@@ -691,7 +691,7 @@ ${turnBuild.stdin}`;
         const evaluation = await runGraderEvaluation(
           criteria.rubric,
           lastAgentText,
-          agent.model
+          agent.model.id
         );
         if (evaluation.usage.input_tokens || evaluation.usage.output_tokens) {
           bumpSessionStats(sessionId, {}, {