fix(ui): match reset soft whitespace boundary

vincentkoc · vincentkoc · commit 5dee6f488fd3 · 2026-06-13T23:47:10.000+08:00
diff --git a/ui/src/ui/app-chat.test.ts b/ui/src/ui/app-chat.test.ts
@@ -1380,7 +1380,24 @@ describe("handleSendChat", () => {
     expect(host.chatMessage).toBe("");
   });
 
-  it("preserves /reset soft args and skips confirmation dialog", async () => {
+  it.each([
+    {
+      input: "/reset soft please reload system prompt",
+      expected: "/reset soft please reload system prompt",
+    },
+    {
+      input: "/reset\tsoft please reload system prompt",
+      expected: "/reset soft please reload system prompt",
+    },
+    {
+      input: "/reset\nsoft please reload system prompt",
+      expected: "/reset soft please reload system prompt",
+    },
+    {
+      input: "/reset: soft please reload system prompt",
+      expected: "/reset soft please reload system prompt",
+    },
+  ])("preserves $input args and skips confirmation dialog", async ({ input, expected }) => {
     const confirm = vi.fn(() => false);
     vi.stubGlobal("confirm", confirm);
     const request = vi.fn(async (method: string) => {
@@ -1391,7 +1408,7 @@ describe("handleSendChat", () => {
     });
     const host = makeHost({
       client: { request } as unknown as ChatHost["client"],
-      chatMessage: "/reset soft please reload system prompt",
+      chatMessage: input,
       sessionKey: "agent:main",
     });
 
@@ -1404,10 +1421,37 @@ describe("handleSendChat", () => {
       "chat send payload",
     );
     expect(payload.sessionKey).toBe("agent:main");
-    expect(payload.message).toBe("/reset soft please reload system prompt");
+    expect(payload.message).toBe(expected);
     expect(host.chatMessage).toBe("");
   });
 
+  it.each([
+    "/reset softish please archive",
+    "/reset\tsoftish please archive",
+    "/reset\nsoftish please archive",
+    "/reset: softish please archive",
+  ])("keeps %s on the hard-reset confirmation path", async (message) => {
+    const confirm = vi.fn(() => false);
+    vi.stubGlobal("confirm", confirm);
+    const request = vi.fn(async (method: string) => {
+      throw new Error(`Unexpected request: ${method}`);
+    });
+    const host = makeHost({
+      client: { request } as unknown as ChatHost["client"],
+      chatMessage: "keep this draft",
+      sessionKey: "agent:main",
+    });
+
+    await handleSendChat(host, message, {
+      confirmReset: true,
+      restoreDraft: true,
+    });
+
+    expect(confirm).toHaveBeenCalledTimes(1);
+    expect(request).not.toHaveBeenCalled();
+    expect(host.chatMessage).toBe("keep this draft");
+  });
+
   it("records visible send timing phases for a normal chat send", async () => {
     const request = vi.fn(async (method: string) => {
       if (method === "chat.send") {
diff --git a/ui/src/ui/app-chat.ts b/ui/src/ui/app-chat.ts
@@ -245,18 +245,17 @@ export function isChatStopCommand(text: string) {
 }
 
 function isChatResetCommand(text: string) {
-  const trimmed = text.trim();
-  if (!trimmed) {
+  const parsed = parseSlashCommand(text);
+  if (!parsed || (parsed.command.key !== "new" && parsed.command.key !== "reset")) {
     return false;
   }
-  const normalized = normalizeLowercaseStringOrEmpty(trimmed);
-  if (normalized === "/new" || normalized === "/reset") {
+  if (parsed.command.key === "new") {
     return true;
   }
-  if (normalized.match(/^\/reset soft(?:\s|$)/)) {
+  if (/^soft(?:\s|$)/.test(normalizeLowercaseStringOrEmpty(parsed.args))) {
     return false;
   }
-  return normalized.startsWith("/new ") || normalized.startsWith("/reset ");
+  return true;
 }
 
 function confirmChatResetCommand(text: string) {

Original file line number	Diff line number	Diff line change
`@@ -245,18 +245,17 @@ export function isChatStopCommand(text: string) {`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`function isChatResetCommand(text: string) {`
`248`		`- const trimmed = text.trim();`
`249`		`- if (!trimmed) {`
	`248`	`+ const parsed = parseSlashCommand(text);`
	`249`	`+ if (!parsed \|\| (parsed.command.key !== "new" && parsed.command.key !== "reset")) {`
`250`	`250`	`return false;`
`251`	`251`	`}`
`252`		`- const normalized = normalizeLowercaseStringOrEmpty(trimmed);`
`253`		`- if (normalized === "/new" \|\| normalized === "/reset") {`
	`252`	`+ if (parsed.command.key === "new") {`
`254`	`253`	`return true;`
`255`	`254`	`}`
`256`		`- if (normalized.match(/^\/reset soft(?:\s\|$)/)) {`
	`255`	`+ if (/^soft(?:\s\|$)/.test(normalizeLowercaseStringOrEmpty(parsed.args))) {`
`257`	`256`	`return false;`
`258`	`257`	`}`
`259`		`- return normalized.startsWith("/new ") \|\| normalized.startsWith("/reset ");`
	`258`	`+ return true;`
`260`	`259`	`}`
`261`	`260`
`262`	`261`	`function confirmChatResetCommand(text: string) {`