fix: complete CommandCode 1.3.1 contract alignment

Author: yelixir-dev

src/commandcode.ts

@@ -433,7 +433,7 @@ export class CommandCodeClient implements CommandCodeUpstream {
         "x-project-slug": slugFromWorkingDir(body.config.workingDir),
         "x-taste-learning": "false",
         "x-co-flag": "false",
-        "x-session-id": body.threadId,
+        ...(body.threadId ? { "x-session-id": body.threadId } : {}),
       },
       body: JSON.stringify(body),
       signal,

src/converter.ts

@@ -183,6 +183,10 @@ function formatDate(date: Date): string {
   return date.toISOString().slice(0, 10);
 }
 
+function isUuid(value: string): boolean {
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
+}
+
 export function buildCommandCodeGenerateBody(
   options: BuildCommandCodeBodyOptions,
 ): CommandCodeGenerateBody {
@@ -203,6 +207,7 @@ export function buildCommandCodeGenerateBody(
   if (options.request.top_p !== undefined) params.top_p = options.request.top_p;
   if (options.request.stop !== undefined) params.stop = options.request.stop;
 
+  const threadId = options.threadId ?? randomUUID();
   return {
     config: {
       workingDir,
@@ -215,11 +220,11 @@ export function buildCommandCodeGenerateBody(
       gitStatus: "",
       recentCommits: [],
     },
-    memory: "",
-    taste: "",
-    skills: "",
+    memory: null,
+    taste: null,
+    skills: null,
     permissionMode: "standard",
     params,
-    threadId: options.threadId ?? randomUUID(),
+    ...(isUuid(threadId) ? { threadId } : {}),
   };
 }

src/model-catalog.ts

@@ -407,6 +407,78 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     enabledByDefault: false,
     notes: "$3/M in · $10.25/M out",
   },
+  {
+    id: "xiaomi/mimo-v2.5-pro",
+    label: "MiMo V2.5 Pro",
+    provider: "Xiaomi",
+    family: "mimo",
+    aliases: ["mimo-v2.5-pro", "MiMo-V2.5-Pro"],
+    enabledByDefault: false,
+    notes: "$0.435/M in · $0.87/M out",
+  },
+  {
+    id: "xiaomi/mimo-v2.5",
+    label: "MiMo V2.5",
+    provider: "Xiaomi",
+    family: "mimo",
+    aliases: ["mimo-v2.5", "MiMo-V2.5"],
+    enabledByDefault: false,
+    notes: "$0.14/M in · $0.28/M out",
+  },
+  {
+    id: "nvidia/nemotron-3-ultra-550b-a55b",
+    label: "Nemotron 3 Ultra",
+    provider: "NVIDIA",
+    family: "nemotron",
+    aliases: ["nemotron-3-ultra-550b-a55b", "Nemotron-3-Ultra"],
+    enabledByDefault: false,
+    notes: "$0.60/M in · $2.40/M out",
+  },
+  {
+    id: "thinkingmachines/inkling",
+    label: "Inkling",
+    provider: "Thinking Machines",
+    family: "inkling",
+    aliases: ["inkling"],
+    enabledByDefault: false,
+    notes: "$1/M in · $4.05/M out",
+  },
+  {
+    id: "poolside/laguna-s-2.1-free",
+    label: "Laguna S 2.1",
+    provider: "Poolside",
+    family: "laguna",
+    aliases: ["laguna-s-2.1-free", "Laguna-S-2.1-Free"],
+    enabledByDefault: false,
+    notes: "$0/M in · $0/M out",
+  },
+  {
+    id: "sakana/fugu-ultra",
+    label: "Fugu Ultra",
+    provider: "Sakana",
+    family: "fugu",
+    aliases: ["fugu-ultra", "Fugu-Ultra"],
+    enabledByDefault: false,
+    notes: "$5/M in · $30/M out",
+  },
+  {
+    id: "meta/muse-spark-1.1",
+    label: "Muse Spark 1.1",
+    provider: "Meta",
+    family: "muse",
+    aliases: ["muse-spark-1.1", "Muse-Spark-1.1"],
+    enabledByDefault: false,
+    notes: "$1.25/M in · $4.25/M out",
+  },
+  {
+    id: "xai/grok-4.5",
+    label: "Grok 4.5",
+    provider: "xAI",
+    family: "grok",
+    aliases: ["grok-4.5", "Grok-4.5"],
+    enabledByDefault: false,
+    notes: "$2/M in · $6/M out",
+  },
 ];
 
 export function modelAliasMap(): Record<string, string> {

src/types.ts

@@ -87,8 +87,8 @@ export interface CommandCodeMessage {
 
 export interface CommandCodeGenerateBody {
   config: CommandCodeConfigContext;
-  memory: string;
-  taste: string;
+  memory: string | null;
+  taste: string | null;
   skills: string | null;
   permissionMode: "standard";
   params: {
@@ -102,7 +102,7 @@ export interface CommandCodeGenerateBody {
     stop?: string | string[];
     stream: true;
   };
-  threadId: string;
+  threadId?: string;
 }
 
 export interface CommandCodeUsage {

tests/commandcode.test.ts

@@ -69,8 +69,8 @@ const generateBody: CommandCodeGenerateBody = {
     gitStatus: "",
     recentCommits: [],
   },
-  memory: "",
-  taste: "",
+  memory: null,
+  taste: null,
   skills: null,
   permissionMode: "standard",
   params: {
@@ -182,6 +182,11 @@ describe("CommandCode stream parsing", () => {
     expect(parseCommandCodeEventLine('{"type":"reasoning-end"}')).toEqual({
       type: "reasoning-end",
     });
+    expect(
+      parseCommandCodeEventLine(
+        'data: {"type":"tool-call","toolCallId":"call_0","toolName":"read_file","input":{"path":"input.txt"}}',
+      ),
+    ).toMatchObject({ type: "tool-call", toolCallId: "call_0", input: { path: "input.txt" } });
     expect(
       parseCommandCodeEventLine(
         'data: {"type":"tool-call","toolCallId":"call_1","toolName":"read_file","args":{"path":"a.txt"}}',
@@ -203,6 +208,17 @@ describe("CommandCode stream parsing", () => {
       result: "ok",
       isError: false,
     });
+    expect(
+      parseCommandCodeEventLine(
+        'data: {"type":"tool-result","toolCallId":"call_2","toolName":"read_file","output":"failed","isError":true,"providerExecuted":true}',
+      ),
+    ).toMatchObject({
+      type: "tool-result",
+      toolCallId: "call_2",
+      output: "failed",
+      isError: true,
+      providerExecuted: true,
+    });
     expect(parseCommandCodeEventLine('data: {"type":"error","error":"upstream failed"}')).toEqual({
       type: "error",
       error: "upstream failed",

tests/config.test.ts

@@ -70,12 +70,49 @@ describe("configuration and model aliases", () => {
       "gpt-5.6-terra",
       "tencent/hy3-paid",
       "zai-org/GLM-5.2-Fast",
+      "xiaomi/mimo-v2.5-pro",
+      "xiaomi/mimo-v2.5",
+      "nvidia/nemotron-3-ultra-550b-a55b",
+      "thinkingmachines/inkling",
+      "poolside/laguna-s-2.1-free",
+      "sakana/fugu-ultra",
+      "meta/muse-spark-1.1",
+      "xai/grok-4.5",
     ]) {
       expect(catalog.has(id)).toBe(true);
       expect(catalog.get(id)?.enabled).toBe(false);
     }
   });
 
+  it("records exact CommandCode 1.3.1 prices for disabled candidates", () => {
+    const catalog = new Map(
+      loadBridgeConfig({ env: {} }).modelCatalog?.map((model) => [model.id, model]),
+    );
+    const prices = {
+      "claude-sonnet-5": "$2/M in · $10/M out",
+      "google/gemini-3.5-flash-lite": "$0.30/M in · $2.50/M out",
+      "google/gemini-3.6-flash": "$1.50/M in · $7.50/M out",
+      "inclusionai/ling-3.0-flash-free": "$0/M in · $0/M out",
+      "moonshotai/Kimi-K3": "$3/M in · $15/M out",
+      "gpt-5.6-luna": "$1/M in · $6/M out",
+      "gpt-5.6-sol": "$5/M in · $30/M out",
+      "gpt-5.6-terra": "$2.50/M in · $15/M out",
+      "tencent/hy3-paid": "$0.14/M in · $0.58/M out",
+      "zai-org/GLM-5.2-Fast": "$3/M in · $10.25/M out",
+      "xiaomi/mimo-v2.5-pro": "$0.435/M in · $0.87/M out",
+      "xiaomi/mimo-v2.5": "$0.14/M in · $0.28/M out",
+      "nvidia/nemotron-3-ultra-550b-a55b": "$0.60/M in · $2.40/M out",
+      "thinkingmachines/inkling": "$1/M in · $4.05/M out",
+      "poolside/laguna-s-2.1-free": "$0/M in · $0/M out",
+      "sakana/fugu-ultra": "$5/M in · $30/M out",
+      "meta/muse-spark-1.1": "$1.25/M in · $4.25/M out",
+      "xai/grok-4.5": "$2/M in · $6/M out",
+    };
+    for (const [id, notes] of Object.entries(prices)) {
+      expect(catalog.get(id)).toMatchObject({ enabled: false, notes });
+    }
+  });
+
   it("keeps balance alerts off by default while failing closed on empty length responses", () => {
     const config = loadBridgeConfig({ env: {} });
     expect(config.balanceAlerts.enabled).toBe(false);

tests/converter.test.ts

@@ -76,6 +76,19 @@ describe("OpenAI to CommandCode conversion", () => {
       { role: "user", content: [{ type: "text", text: "Say hi" }] },
     ]);
     expect(body.config.workingDir).toBe("/tmp/project");
+    expect(body.memory).toBeNull();
+    expect(body.taste).toBeNull();
+    expect(body.skills).toBeNull();
+    expect(body.threadId).toBe("00000000-0000-4000-8000-000000000000");
+  });
+
+  it("omits invalid thread IDs instead of forwarding them upstream", () => {
+    const body = buildCommandCodeGenerateBody({
+      request: { model: "deepseek/deepseek-v4-pro", messages: [{ role: "user", content: "hi" }] },
+      upstreamModel: "deepseek/deepseek-v4-pro",
+      threadId: "not-a-uuid",
+    });
+    expect(body.threadId).toBeUndefined();
   });
 
   it("treats OpenAI developer messages as system instructions for Hermes compatibility", () => {