Merge pull request #875 from qwen-code-dev-bot/issue/874-task-plan-truncation

fix(cli): surrogate-safe truncation for task-plan objective + verify commands (Issue #874)

Author: qwen-code-dev-bot

src/repo-context.ts

@@ -17,6 +17,7 @@ import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { redactSecrets } from "./permission-impact.js";
+import { safeCutEnd } from "./text-cut.js";
 
 export const REPO_CONTEXT_SCHEMA = "oh-my-cli.repo-context";
 export const REPO_CONTEXT_VERSION = 1;
@@ -120,7 +121,10 @@ function redactName(text: string): string {
 }
 
 function redactCommand(text: string): string {
-  return redactSecrets(text).text.slice(0, MAX_COMMAND_LEN);
+  const t = redactSecrets(text).text;
+  // Issue #874: safeCutEnd drops an astral char straddling the bound whole
+  // rather than orphaning a surrogate.
+  return t.slice(0, safeCutEnd(t, MAX_COMMAND_LEN));
 }
 
 // A locale-independent comparator (UTF-16 code-unit order) so ordering is

src/task-plan.ts

@@ -15,6 +15,7 @@
 import { collectRepoContext } from "./repo-context.js";
 import type { RepoContextSnapshot, CanonicalCommand } from "./repo-context.js";
 import { redactSecrets } from "./permission-impact.js";
+import { safeCutEnd } from "./text-cut.js";
 
 export const PLAN_SCHEMA = "oh-my-cli.plan";
 export const PLAN_VERSION = 1;
@@ -60,7 +61,10 @@ export interface TaskPlanOptions {
 }
 
 function redactObjective(task: string): string {
-  return redactSecrets(task ?? "").text.trim().slice(0, MAX_OBJECTIVE);
+  const trimmed = redactSecrets(task ?? "").text.trim();
+  // Issue #874: safeCutEnd drops an astral char straddling the bound whole
+  // rather than orphaning a surrogate.
+  return trimmed.slice(0, safeCutEnd(trimmed, MAX_OBJECTIVE));
 }
 
 // Derive the ordered verify commands from a repository-context snapshot, in
@@ -70,7 +74,12 @@ export function deriveVerifyCommands(snapshot: RepoContextSnapshot): string[] {
   const commands: string[] = [];
   for (const key of CANONICAL_ORDER) {
     const ref = snapshot.commands[key];
-    if (ref) commands.push(redactSecrets(ref.command).text.slice(0, MAX_COMMAND_LEN));
+    if (ref) {
+      const text = redactSecrets(ref.command).text;
+      // Issue #874: safeCutEnd drops an astral char straddling the bound whole
+      // rather than orphaning a surrogate.
+      commands.push(text.slice(0, safeCutEnd(text, MAX_COMMAND_LEN)));
+    }
     if (commands.length >= MAX_COMMANDS) break;
   }
   return commands;

tests/unit/task-plan.test.ts

@@ -141,6 +141,21 @@ describe("redaction and bounding", () => {
     expect(plan.objective.length).toBe(500);
   });
 
+  it("does not orphan a surrogate when bounding the objective (Issue #874)", () => {
+    const dir = tmp();
+    const plan = planTask({ task: "a".repeat(499) + "🚀 tail", workspace: dir });
+    const LONE = /[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/;
+    expect(plan.objective).not.toMatch(LONE);
+  });
+
+  it("does not orphan a surrogate when bounding a derived verify command (Issue #874)", () => {
+    const dir = tmp();
+    write(dir, "package.json", JSON.stringify({ scripts: { test: "a".repeat(119) + "🚀 tail" } }));
+    const plan = planTask({ task: "fix", workspace: dir });
+    const LONE = /[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/;
+    expect(plan.verifyCommands[0]).not.toMatch(LONE);
+  });
+
   it("never leaks the workspace path", () => {
     const dir = tmp();
     write(dir, "src/index.ts", "");