fix: cover C1 in sanitizeHookConsoleValue and fix config.test.ts lint

lsr911 · claude · lsr911 · commit 2f1fe32d8e8e · 2026-07-12T13:57:22.000+08:00
- Add C1 (0x80-0x9f) coverage to sanitizeHookConsoleValue to align with
  the sink-wide C1 pass
- Add regression test: C1 characters in model/summary/status are
  replaced with space in hook warning console messages
- Fix no-base-to-string lint error in config.test.ts by narrowing
  mock.calls type parameter from unknown to string

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;
diff --git a/src/gateway/server-methods/config.test.ts b/src/gateway/server-methods/config.test.ts
@@ -155,10 +155,9 @@ describe("config.openFile", () => {
 
       const { logGateway } = await invokeConfigOpenFile();
 
-      const logged = String(
-        (logGateway.warn as unknown as { mock: { calls: unknown[][] } }).mock.calls.at(-1)?.[0] ??
-          "",
-      );
+      const logged =
+        (logGateway.warn as unknown as { mock: { calls: string[][] } }).mock.calls.at(-1)?.[0] ??
+        "";
       expect(logged.startsWith("config.openFile failed path=")).toBe(true);
       // The raw C1 byte is replaced with "?" before it reaches the warning log.
       expect(logged).toContain("cfg?.json");
diff --git a/src/gateway/server/hooks.agent-trust.test.ts b/src/gateway/server/hooks.agent-trust.test.ts
@@ -362,6 +362,54 @@ describe("dispatchAgentHook trust handling", () => {
     expect(requestHeartbeatMock).not.toHaveBeenCalled();
   });
 
+  it("strips C1 control characters from hook warning console messages", async () => {
+    // U+009B is the C1 CSI introducer, equivalent to ESC [. A model or
+    // status string containing it must not reach the hook console message.
+    const CSI = String.fromCharCode(0x9b);
+    runCronIsolatedAgentTurnMock.mockResolvedValueOnce({
+      status: "error",
+      summary: "tool failure",
+      diagnostics: {
+        summary: `model ${CSI}contaminated rejected`,
+        entries: [
+          {
+            ts: 1,
+            source: "cron-preflight",
+            severity: "error",
+            message: `model ${CSI}contaminated rejected`,
+          },
+        ],
+      },
+      delivered: false,
+    });
+
+    dispatchAgentHook({
+      ...buildAgentPayload("Model hook"),
+      model: `gpt${CSI}4o`,
+    });
+
+    await vi.waitFor(() =>
+      expect(enqueueSystemEventMock).toHaveBeenCalledWith(
+        `Hook Model hook (error): model ${CSI}contaminated rejected`,
+        {
+          sessionKey: "agent:main:main",
+        },
+      ),
+    );
+    const meta = logWarnMetaFor(
+      "hook agent run returned non-ok status",
+      (candidate) => candidate.name === "Model hook",
+    );
+    // The raw C1 byte must never appear in the console message.
+    expect(meta.consoleMessage).not.toContain(CSI);
+    // The C1 byte in the model field is replaced with space before the log.
+    expect(meta.consoleMessage).toContain("gpt 4o");
+    // The diagnostics summary carries C1 through the system event
+    // (resolveHookRunSummary), but the console message strips it.
+    expect(meta.consoleMessage).toContain("model");
+    expect(meta.consoleMessage).toContain("contaminated rejected");
+  });
+
   it("marks error events as untrusted and sanitizes hook names", async () => {
     runCronIsolatedAgentTurnMock.mockRejectedValueOnce(new Error("agent exploded"));
 
diff --git a/src/gateway/server/hooks.ts b/src/gateway/server/hooks.ts
@@ -68,7 +68,7 @@ function sanitizeHookConsoleValue(value: string | undefined): string | undefined
   }
   const withoutControlChars = Array.from(normalized, (char) => {
     const code = char.charCodeAt(0);
-    return code < 32 || code === 127 ? " " : char;
+    return code < 32 || code === 127 || (code >= 0x80 && code <= 0x9f) ? " " : char;
   }).join("");
   return truncateUtf16Safe(withoutControlChars.replace(/\s+/gu, " ").trim(), 500);
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function sanitizeHookConsoleValue(value: string \| undefined): string \| undefined`
`68`	`68`	`}`
`69`	`69`	`const withoutControlChars = Array.from(normalized, (char) => {`
`70`	`70`	`const code = char.charCodeAt(0);`
`71`		`- return code < 32 \|\| code === 127 ? " " : char;`
	`71`	`+ return code < 32 \|\| code === 127 \|\| (code >= 0x80 && code <= 0x9f) ? " " : char;`
`72`	`72`	`}).join("");`
`73`	`73`	`return truncateUtf16Safe(withoutControlChars.replace(/\s+/gu, " ").trim(), 500);`
`74`	`74`	`}`