@coseung2/opencodex 2.8.0-cs.16 → 2.8.0-cs.17

package/src/adapters/kiro-thinking.ts

@@ -75,6 +75,14 @@ export class KiroThinkingParser {
     return [];
   }
 
+  /** Release any partial tag/content carry when the owning stream stops early. */
+  dispose(): void {
+    this.replaceCarry("preBuffer", "");
+    this.replaceCarry("thinkingBuffer", "");
+    this.closeTag = "";
+    this.state = "streaming";
+  }
+
   private drainThinking(): AdapterEvent[] {
     const close = this.closeTag;
     const idx = this.thinkingBuffer.indexOf(close);
@@ -89,8 +97,16 @@ export class KiroThinkingParser {
       return events;
     }
     if (this.thinkingBuffer.length <= MAX_CLOSE_TAG) return [];
-    const send = this.thinkingBuffer.slice(0, -MAX_CLOSE_TAG);
-    this.replaceCarry("thinkingBuffer", this.thinkingBuffer.slice(-MAX_CLOSE_TAG));
+    // Never split a surrogate pair at the send boundary: a lone high
+    // surrogate at the end of one delta encodes as U+FFFD. Move the cut one
+    // unit earlier so the whole pair stays in the carry.
+    let cut = this.thinkingBuffer.length - MAX_CLOSE_TAG;
+    if (cut > 0 && cut < this.thinkingBuffer.length) {
+      const atCut = this.thinkingBuffer.charCodeAt(cut - 1);
+      if (atCut >= 0xd800 && atCut <= 0xdbff) cut -= 1;
+    }
+    const send = this.thinkingBuffer.slice(0, cut);
+    this.replaceCarry("thinkingBuffer", this.thinkingBuffer.slice(cut));
     return send ? [{ type: "reasoning_raw_delta", text: send }] : [];
   }
 }

package/src/adapters/kiro-tools.ts

@@ -103,7 +103,7 @@ function ensureRootObjectType(schema: unknown): Record<string, unknown> {
   // Seed with the root's own properties/required so a schema like
   // { type:"object", properties:{path}, required:["path"], oneOf:[...] } keeps them.
   if (obj.properties && typeof obj.properties === "object") {
-    Object.assign(props, sanitizeKiroSchema(obj.properties) as Record<string, unknown>);
+    Object.assign(props, sanitizeSchemaMap(obj.properties) as Record<string, unknown>);
   }
   if (Array.isArray(obj.required)) {
     for (const r of obj.required) if (typeof r === "string") required.add(r);
@@ -118,7 +118,7 @@ function ensureRootObjectType(schema: unknown): Record<string, unknown> {
       if (!variant || typeof variant !== "object" || Array.isArray(variant)) continue;
       const v = variant as Record<string, unknown>;
       if (v.properties && typeof v.properties === "object") {
-        Object.assign(props, sanitizeKiroSchema(v.properties) as Record<string, unknown>);
+        Object.assign(props, sanitizeSchemaMap(v.properties) as Record<string, unknown>);
       }
       if (mergeRequired && Array.isArray(v.required)) {
         for (const r of v.required) if (typeof r === "string") required.add(r);
@@ -149,7 +149,16 @@ function toolDescriptionLimit(modelId: string): number {
 function truncateDescription(description: string, limit: number): string {
   if (description.length <= limit) return description;
   if (limit <= 1) return description.slice(0, limit);
-  return `${description.slice(0, limit - 1)}…`;
+  let end = limit - 1;
+  // Never end the kept text on a lone high surrogate; one step back keeps
+  // the whole pair out instead of a U+FFFD-producing half.
+  if (description.charCodeAt(end - 1) >= 0xd800 && description.charCodeAt(end - 1) <= 0xdbff) end -= 1;
+  return `${description.slice(0, end)}…`;
+}
+
+/** Test-only: exercise the surrogate-safe description truncation directly. */
+export function truncateDescriptionForTests(description: string, limit: number): string {
+  return truncateDescription(description, limit);
 }
 
 function serializedToolCatalogBytes(tools: readonly unknown[]): number {