@agent-native/core 0.83.0 → 0.84.0

package/corpus/core/src/agent/harness/acp-adapter.ts

@@ -171,6 +171,7 @@ class AcpHarnessSession implements AgentHarnessSession {
   private queue: AsyncEventQueue<AgentHarnessEvent> | null = null;
   private readonly pendingPermissions = new Map<string, PendingPermission>();
   private readonly toolTitles = new Map<string, string>();
+  private readonly toolInputs = new Map<string, Record<string, unknown>>();
   private approvalCounter = 0;
   private stderrTail = "";
   private childExited = false;
@@ -358,12 +359,20 @@ class AcpHarnessSession implements AgentHarnessSession {
     if (update?.sessionUpdate === "tool_call" && update.title) {
       this.toolTitles.set(update.toolCallId, update.title);
     }
+    if (
+      (update?.sessionUpdate === "tool_call" ||
+        update?.sessionUpdate === "tool_call_update") &&
+      update.rawInput
+    ) {
+      this.toolInputs.set(update.toolCallId, update.rawInput);
+    }
     // Updates that arrive without an active turn are history replay from
     // loadSession; the transcript already contains them, so drop them.
     if (!this.queue) return;
-    for (const event of acpUpdateToHarnessEvents(update, (id) =>
-      this.toolTitles.get(id),
-    )) {
+    for (const event of acpUpdateToHarnessEvents(update, {
+      titleFor: (id) => this.toolTitles.get(id),
+      inputFor: (id) => this.toolInputs.get(id),
+    })) {
       this.queue.push(event);
     }
   }
@@ -488,8 +497,17 @@ function messageToText(content: string | unknown[]): string {
  */
 export function acpUpdateToHarnessEvents(
   update: AcpSessionUpdate,
-  titleFor?: (toolCallId: string) => string | undefined,
+  resolvers?:
+    | ((toolCallId: string) => string | undefined)
+    | {
+        titleFor?: (toolCallId: string) => string | undefined;
+        inputFor?: (toolCallId: string) => Record<string, unknown> | undefined;
+      },
 ): AgentHarnessEvent[] {
+  const titleFor =
+    typeof resolvers === "function" ? resolvers : resolvers?.titleFor;
+  const inputFor =
+    typeof resolvers === "function" ? undefined : resolvers?.inputFor;
   switch (update.sessionUpdate) {
     case "agent_message_chunk": {
       const text = acpContentBlockToText(update.content);
@@ -517,6 +535,9 @@ export function acpUpdateToHarnessEvents(
           type: "tool-done",
           id: update.toolCallId,
           name: update.title || titleFor?.(update.toolCallId) || "tool",
+          ...((update.rawInput ?? inputFor?.(update.toolCallId))
+            ? { input: update.rawInput ?? inputFor?.(update.toolCallId) }
+            : {}),
           result: update.rawOutput ?? acpToolContentText(update.content),
         });
       }
@@ -531,6 +552,9 @@ export function acpUpdateToHarnessEvents(
           type: "tool-done",
           id: update.toolCallId,
           name: update.title || titleFor?.(update.toolCallId) || "tool",
+          ...((update.rawInput ?? inputFor?.(update.toolCallId))
+            ? { input: update.rawInput ?? inputFor?.(update.toolCallId) }
+            : {}),
           result: update.rawOutput ?? acpToolContentText(content),
         });
       }

package/corpus/core/src/agent/harness/ai-sdk-adapter.ts

@@ -448,6 +448,9 @@ export function aiSdkHarnessPartToEvents(part: any): AgentHarnessEvent[] {
         type: "tool-done",
         id: part.toolCallId ?? part.id,
         name: part.toolName ?? part.name ?? "tool",
+        ...(part.input !== undefined || part.args !== undefined
+          ? { input: part.input ?? part.args }
+          : {}),
         result: part.output ?? part.result,
       });
       break;

package/corpus/core/src/agent/harness/translate.ts

@@ -32,6 +32,9 @@ export function agentHarnessEventToAgentChatEvents(
         {
           type: "tool_done",
           tool: event.name,
+          ...(event.input !== undefined
+            ? { input: normalizeToolInput(event.input) }
+            : {}),
           result: stringifyResult(event.result),
           ...(event.mcpApp ? { mcpApp: event.mcpApp } : {}),
         },

package/corpus/core/src/agent/harness/types.ts

@@ -100,6 +100,7 @@ export type AgentHarnessEvent =
       type: "tool-done";
       id?: string;
       name: string;
+      input?: unknown;
       result?: unknown;
       mcpApp?: AgentMcpAppPayload;
     }

package/corpus/core/src/agent/model-config.ts

@@ -1,10 +1,9 @@
 /**
  * Central model catalog for built-in agent engines.
  *
- * To bump the framework's managed default, update
- * FRAMEWORK_DEFAULT_OPENAI_MODEL. Builder gateway and OpenRouter IDs are
- * derived from that provider-native OpenAI ID so the usual default bump stays
- * in this one file.
+ * To bump the framework's managed default, update the Anthropic/OpenAI
+ * constants below. Builder gateway and OpenRouter IDs are derived here so the
+ * usual default bump stays in one file.
  */
 
 // ---------------------------------------------------------------------------
@@ -15,6 +14,7 @@
 //  OpenAI     https://developers.openai.com/api/docs/models/gpt-5.5
 //             https://developers.openai.com/api/docs/models/gpt-5.4
 //  Google     https://ai.google.dev/gemini-api/docs/models
+//  OpenRouter https://openrouter.ai/api/v1/models
 //
 // Family defaults (used when a model id isn't listed explicitly):
 //  claude-*        → 200_000  (Haiku 4.5 and earlier models)
@@ -22,7 +22,7 @@
 //  gemini-2* / gemini-3* → 1_048_576
 //  everything else → 128_000  (safe conservative floor)
 //
-// Note: Fable 5, Sonnet 4.6, and Opus 4.6/4.7/4.8 support 1M via the API
+// Note: Fable 5, Sonnet 5, Sonnet 4.6, and Opus 4.6/4.7/4.8 support 1M via the API
 // at standard prices.
 // ---------------------------------------------------------------------------
 
@@ -31,6 +31,7 @@ const MODEL_CONTEXT_WINDOWS: Record<string, number> = {
   "claude-fable-5": 1_000_000,
   "claude-opus-4-8": 1_000_000,
   "claude-opus-4-7": 1_000_000,
+  "claude-sonnet-5": 1_000_000,
   "claude-sonnet-4-6": 1_000_000,
   "claude-haiku-4-5": 200_000,
   "claude-haiku-4-5-20251001": 200_000,
@@ -49,10 +50,12 @@ const MODEL_CONTEXT_WINDOWS: Record<string, number> = {
   "anthropic/claude-fable-5": 1_000_000,
   "anthropic/claude-opus-4.8": 1_000_000,
   "anthropic/claude-opus-4.7": 1_000_000,
+  "anthropic/claude-sonnet-5": 1_000_000,
   "anthropic/claude-sonnet-4.6": 1_000_000,
   "openai/gpt-5.5": 1_050_000,
   "openai/gpt-5.4": 1_050_000,
   "google/gemini-2.5-flash": 1_048_576,
+  "z-ai/glm-5.2": 1_048_576,
 
   // ── AI-SDK native OpenAI IDs ──────────────────────────────────────────────
   "gpt-5.5": 1_050_000,
@@ -85,12 +88,13 @@ export function getContextWindowForModel(modelId: string): number {
   // Family heuristics for unlisted model IDs
   const id = modelId.toLowerCase();
 
-  // Anthropic Fable 5, Opus 4.x, and Sonnet 4.6 = 1M
+  // Anthropic Fable 5, Opus 4.x, Sonnet 5, and Sonnet 4.6 = 1M
   if (
     id === "claude-fable-5" ||
     id.includes("claude-fable-5") ||
     id.startsWith("claude-opus-4") ||
-    id === "claude-sonnet-4-6" ||
+    id.includes("claude-sonnet-5") ||
+    id.includes("claude-sonnet-4-6") ||
     id.includes("claude-sonnet-4.6")
   )
     return 1_000_000;
@@ -110,10 +114,26 @@ export function getContextWindowForModel(modelId: string): number {
   )
     return 1_048_576;
 
+  // Z.ai GLM 5.x on OpenRouter — 1M context.
+  if (id.startsWith("glm-5") || id.includes("/glm-5")) return 1_048_576;
+
   return DEFAULT_CONTEXT_WINDOW;
 }
 
-const ANTHROPIC_DEFAULT_MODEL_ID = "claude-sonnet-4-6";
+const ENABLE_CLAUDE_SONNET_5 = false;
+
+export const CLAUDE_SONNET_MODEL_ID = ENABLE_CLAUDE_SONNET_5
+  ? "claude-sonnet-5"
+  : "claude-sonnet-4-6";
+export const CLAUDE_SONNET_MODEL_LABEL = ENABLE_CLAUDE_SONNET_5
+  ? "Claude Sonnet 5"
+  : "Claude Sonnet 4.6";
+
+const OPENROUTER_CLAUDE_SONNET_MODEL_ID = ENABLE_CLAUDE_SONNET_5
+  ? "anthropic/claude-sonnet-5"
+  : "anthropic/claude-sonnet-4.6";
+
+const ANTHROPIC_DEFAULT_MODEL_ID = CLAUDE_SONNET_MODEL_ID;
 
 function builderGatewayModelId(model: string): string {
   return model.replace(/\./g, "-");
@@ -138,8 +158,8 @@ export const AGENT_MODEL_CONFIG = {
     defaultModel: FRAMEWORK_DEFAULT_BUILDER_MODEL,
     supportedModels: [
       "auto",
-      "claude-opus-4-7",
-      FRAMEWORK_DEFAULT_BUILDER_MODEL,
+      "claude-opus-4-8",
+      CLAUDE_SONNET_MODEL_ID,
       "claude-haiku-4-5",
       FRAMEWORK_DEFAULT_BUILDER_OPENAI_MODEL,
       "gpt-5-4",
@@ -156,7 +176,7 @@ export const AGENT_MODEL_CONFIG = {
     supportedModels: [
       "claude-fable-5",
       "claude-opus-4-8",
-      ANTHROPIC_DEFAULT_MODEL_ID,
+      CLAUDE_SONNET_MODEL_ID,
       "claude-haiku-4-5-20251001",
     ],
   },
@@ -166,7 +186,7 @@ export const AGENT_MODEL_CONFIG = {
       supportedModels: [
         "claude-fable-5",
         "claude-opus-4-8",
-        ANTHROPIC_DEFAULT_MODEL_ID,
+        CLAUDE_SONNET_MODEL_ID,
         "claude-haiku-4-5-20251001",
       ],
     },
@@ -183,11 +203,12 @@ export const AGENT_MODEL_CONFIG = {
       supportedModels: [
         "anthropic/claude-fable-5",
         "anthropic/claude-opus-4.8",
-        "anthropic/claude-sonnet-4.6",
+        OPENROUTER_CLAUDE_SONNET_MODEL_ID,
         FRAMEWORK_DEFAULT_OPENROUTER_MODEL,
         "openai/gpt-5.4",
         // Current stable Gemini on OpenRouter (2.5 Flash is GA)
         "google/gemini-2.5-flash",
+        "z-ai/glm-5.2",
       ],
     },
     google: {

package/corpus/core/src/agent/production-agent.ts

@@ -3134,7 +3134,13 @@ export async function runAgentLoop(opts: {
           tool: toolCall.name,
           input: toolCall.input as Record<string, string>,
         });
-        send({ type: "tool_done", tool: toolCall.name, result });
+        send({
+          type: "tool_done",
+          tool: toolCall.name,
+          input: toolCall.input as Record<string, unknown>,
+          result,
+          completedSideEffect: false,
+        });
         recordToolResult(result, false);
         return {
           type: "tool-result" as const,
@@ -3152,7 +3158,13 @@ export async function runAgentLoop(opts: {
           tool: toolCall.name,
           input: toolCall.input as Record<string, string>,
         });
-        send({ type: "tool_done", tool: toolCall.name, result });
+        send({
+          type: "tool_done",
+          tool: toolCall.name,
+          input: toolCall.input as Record<string, unknown>,
+          result,
+          completedSideEffect: false,
+        });
         recordToolResult(result, false);
         return {
           type: "tool-result" as const,
@@ -3172,7 +3184,14 @@ export async function runAgentLoop(opts: {
           tool: toolCall.name,
           input: toolCall.input as Record<string, string>,
         });
-        send({ type: "tool_done", tool: toolCall.name, result });
+        send({
+          type: "tool_done",
+          tool: toolCall.name,
+          input: toolCall.input as Record<string, unknown>,
+          result,
+          isError: true,
+          completedSideEffect: false,
+        });
         recordToolResult(result, true);
         return {
           type: "tool-result" as const,
@@ -3247,7 +3266,13 @@ export async function runAgentLoop(opts: {
             `Awaiting human approval to run "${toolCall.name}". This action did ` +
             `NOT execute — a human must approve this specific call before it ` +
             `can run. The turn is paused; do not retry.`;
-          send({ type: "tool_done", tool: toolCall.name, result });
+          send({
+            type: "tool_done",
+            tool: toolCall.name,
+            input: toolCall.input as Record<string, unknown>,
+            result,
+            completedSideEffect: false,
+          });
           recordToolResult(result, false);
           requestedActionStop ??= {
             message: `Waiting for your approval to run ${toolCall.name}.`,
@@ -3280,7 +3305,13 @@ export async function runAgentLoop(opts: {
           tool: toolCall.name,
           input: toolCall.input as Record<string, string>,
         });
-        send({ type: "tool_done", tool: toolCall.name, result });
+        send({
+          type: "tool_done",
+          tool: toolCall.name,
+          input: toolCall.input as Record<string, unknown>,
+          result,
+          completedSideEffect: false,
+        });
         recordToolResult(result, false);
         if (repeats >= 3) {
           requestedActionStop ??= {
@@ -3338,7 +3369,13 @@ export async function runAgentLoop(opts: {
             tool: toolCall.name,
             input: toolCall.input as Record<string, string>,
           });
-          send({ type: "tool_done", tool: toolCall.name, result });
+          send({
+            type: "tool_done",
+            tool: toolCall.name,
+            input: toolCall.input as Record<string, unknown>,
+            result,
+            completedSideEffect: false,
+          });
           recordToolResult(result, false);
           return {
             type: "tool-result" as const,
@@ -3389,6 +3426,7 @@ export async function runAgentLoop(opts: {
             send({
               type: "tool_done",
               tool: toolCall.name,
+              input: toolCall.input as Record<string, unknown>,
               result,
               ...(actionEntry.chatUI ? { chatUI: actionEntry.chatUI } : {}),
             });
@@ -3413,7 +3451,14 @@ export async function runAgentLoop(opts: {
             tool: toolCall.name,
             input: toolCall.input as Record<string, string>,
           });
-          send({ type: "tool_done", tool: toolCall.name, result });
+          send({
+            type: "tool_done",
+            tool: toolCall.name,
+            input: toolCall.input as Record<string, unknown>,
+            result,
+            isError: true,
+            completedSideEffect: false,
+          });
           recordToolResult(result, true);
           requestedActionStop ??= {
             message:
@@ -3467,7 +3512,14 @@ export async function runAgentLoop(opts: {
             toolCallSchemaError.error,
           ),
         );
-        send({ type: "tool_done", tool: toolCall.name, result });
+        send({
+          type: "tool_done",
+          tool: toolCall.name,
+          input: toolCall.input as Record<string, unknown>,
+          result,
+          isError: true,
+          completedSideEffect: false,
+        });
         recordToolResult(result, true);
         return {
           type: "tool-result" as const,
@@ -3491,7 +3543,14 @@ export async function runAgentLoop(opts: {
             rawToolInputError,
           ),
         );
-        send({ type: "tool_done", tool: toolCall.name, result });
+        send({
+          type: "tool_done",
+          tool: toolCall.name,
+          input: toolCall.input as Record<string, unknown>,
+          result,
+          isError: true,
+          completedSideEffect: false,
+        });
         recordToolResult(result, true);
         return {
           type: "tool-result" as const,
@@ -3508,7 +3567,14 @@ export async function runAgentLoop(opts: {
         !isPlanModeToolCallAllowed(toolCall.name, toolCall.input, actionEntry)
       ) {
         const result = planModeBlockedMessage(toolCall.name);
-        send({ type: "tool_done", tool: toolCall.name, result });
+        send({
+          type: "tool_done",
+          tool: toolCall.name,
+          input: toolCall.input as Record<string, unknown>,
+          result,
+          isError: true,
+          completedSideEffect: false,
+        });
         recordToolResult(result, true);
         return {
           type: "tool-result" as const,
@@ -3586,6 +3652,14 @@ export async function runAgentLoop(opts: {
           actionPromise
             .then((zombieRaw: unknown) => {
               const zombieMcp = isMcpActionResult(zombieRaw) ? zombieRaw : null;
+              if (
+                zombieMcp &&
+                zombieMcp.raw &&
+                typeof zombieMcp.raw === "object" &&
+                (zombieMcp.raw as Record<string, unknown>).isError === true
+              ) {
+                return;
+              }
               const zombieText = zombieMcp ? zombieMcp.text : zombieRaw;
               const zombieStr =
                 typeof zombieText === "string"
@@ -3721,7 +3795,10 @@ export async function runAgentLoop(opts: {
       send({
         type: "tool_done",
         tool: toolCall.name,
+        input: toolCall.input as Record<string, unknown>,
         result,
+        ...(isError ? { isError: true } : {}),
+        ...(isError ? { completedSideEffect: false } : {}),
         ...(mcpApp ? { mcpApp } : {}),
         ...(actionEntry.chatUI ? { chatUI: actionEntry.chatUI } : {}),
       });

package/corpus/core/src/agent/thread-data-builder.ts

@@ -278,8 +278,17 @@ function getMessageRunId(message: any): string | undefined {
 }
 
 function messageContentIsEmpty(content: unknown): boolean {
-  if (Array.isArray(content)) return content.length === 0;
-  return content == null || content === "";
+  if (typeof content === "string") return content.trim().length === 0;
+  if (Array.isArray(content)) {
+    return !content.some((part: any) => {
+      if (!part || typeof part !== "object") return false;
+      if (part.type === "text") {
+        return typeof part.text === "string" && part.text.trim().length > 0;
+      }
+      return true;
+    });
+  }
+  return content == null;
 }
 
 function messageText(content: unknown): string {
@@ -790,7 +799,15 @@ export function mergeThreadDataForClientSave(
   const idRewrites = new Map<string, string>();
 
   for (const existingEntry of existingMessages) {
-    const existingKeys = messageIdentityKeys(getStoredMessage(existingEntry));
+    const existingMessage = getStoredMessage(existingEntry);
+    if (
+      existingMessage?.role === "assistant" &&
+      messageContentIsEmpty(existingMessage.content)
+    ) {
+      continue;
+    }
+
+    const existingKeys = messageIdentityKeys(existingMessage);
     const incomingIndex = incomingKeySets.findIndex(
       (keys: Set<string>, index: number) =>
         !usedIncoming.has(index) && existingKeys.some((key) => keys.has(key)),
@@ -813,7 +830,15 @@ export function mergeThreadDataForClientSave(
   }
 
   for (let index = 0; index < incomingMessages.length; index++) {
-    if (!usedIncoming.has(index)) nextMessages.push(incomingMessages[index]);
+    if (usedIncoming.has(index)) continue;
+    const incomingMessage = getStoredMessage(incomingMessages[index]);
+    if (
+      incomingMessage?.role === "assistant" &&
+      messageContentIsEmpty(incomingMessage.content)
+    ) {
+      continue;
+    }
+    nextMessages.push(incomingMessages[index]);
   }
 
   merged.messages = nextMessages.map((entry) =>