switchroom 0.16.23 → 0.16.27

package/telegram-plugin/tests/permission-title.test.ts

@@ -128,7 +128,7 @@ describe('formatPermissionCardBody', () => {
       agentName: 'gymbro',
     })
     expect(body).toBe(
-      ['🔐 <b>Gymbro</b> wants to edit: supplement-log.md', 'why: <i>logging today\'s lifts</i>'].join('\n'),
+      ['🔐 **Gymbro** wants to edit: supplement-log.md', 'why: _logging today\'s lifts_'].join('\n'),
     )
   })
 
@@ -141,7 +141,7 @@ describe('formatPermissionCardBody', () => {
       description: 'Restart an agent via the host-control daemon. cross-agent (`name` ≠ $SWITCHROOM_AGENT_NAME) …',
       agentName: 'carrie',
     })
-    expect(body).toContain('why: <i>gateway is wedged, bouncing it</i>')
+    expect(body).toContain('why: _gateway is wedged, bouncing it_')
     expect(body).not.toContain('$SWITCHROOM_AGENT_NAME')
     expect(body).not.toContain('host-control daemon')
   })
@@ -153,7 +153,7 @@ describe('formatPermissionCardBody', () => {
       description: 'Run a shell command.',
       agentName: 'gymbro',
     })
-    expect(body).toContain('why: <i>listing temp files</i>')
+    expect(body).toContain('why: _listing temp files_')
   })
 
   test('shows "not provided" when no caller reason is present (never the description)', () => {
@@ -163,7 +163,7 @@ describe('formatPermissionCardBody', () => {
       description: 'Run a shell command on the host.',
       agentName: 'gymbro',
     })
-    expect(body).toContain('why: <i>not provided</i>')
+    expect(body).toContain('why: _not provided_')
     expect(body).not.toContain('Run a shell command')
   })
 
@@ -174,7 +174,7 @@ describe('formatPermissionCardBody', () => {
       description: 'Run a shell command.',
       agentName: 'gymbro',
     })
-    expect(body).toContain('why: <i>not provided</i>')
+    expect(body).toContain('why: _not provided_')
   })
 
   test('drops the agent prefix when agentName is null (early-boot edge)', () => {
@@ -184,21 +184,23 @@ describe('formatPermissionCardBody', () => {
       description: 'Use a skill.',
       agentName: null,
     })
-    expect(body).toBe(['🔐 Use the mail skill', 'why: <i>do the thing</i>'].join('\n'))
+    expect(body).toBe(['🔐 Use the mail skill', 'why: _do the thing_'].join('\n'))
   })
 
-  test('HTML-escapes <, >, & in agentName / action / reason', () => {
+  test('markdown-escapes emphasis specials in agentName / action / reason; passes < > & through (#2669)', () => {
     const body = formatPermissionCardBody({
       toolName: 'Bash',
-      inputPreview: JSON.stringify({ command: 'echo "a < b && c > d"', reason: 'compare a < b & c > d' }),
+      inputPreview: JSON.stringify({ command: 'echo "a_b *c*"', reason: 'compare a_b and c < d' }),
       description: 'Run a shell command.',
-      agentName: 'agent<test>',
+      agentName: 'agent_test',
     })
-    expect(body).toContain('&lt;test&gt;')
-    expect(body).toContain('&amp;')
-    expect(body).not.toContain('<test>')
-    expect(body).toContain('<b>')
-    expect(body).toContain('<i>')
+    // < > & are literal in rich markdown; the underscore in the agent name is
+    // backslash-escaped so it can't open an italic run.
+    expect(body).toContain('Agent\\_test')
+    expect(body).toContain('c < d')
+    // The card's own wrappers (** for the name, _ for the why line) are present.
+    expect(body).toContain('**')
+    expect(body).toContain('why: _')
   })
 
   test('truncates a very long caller reason with an ellipsis', () => {
@@ -208,8 +210,8 @@ describe('formatPermissionCardBody', () => {
       description: 'Use a skill.',
       agentName: 'clerk',
     })
-    expect(body).toContain('xxxx…</i>')
-    expect(body.split('\n')[0]).toBe('🔐 <b>Clerk</b> wants to use the mail skill')
+    expect(body).toContain('xxxx…_')
+    expect(body.split('\n')[0]).toBe('🔐 **Clerk** wants to use the mail skill')
   })
 
   test('collapses internal whitespace in the caller reason', () => {
@@ -219,7 +221,7 @@ describe('formatPermissionCardBody', () => {
       description: 'Use a skill.',
       agentName: 'clerk',
     })
-    expect(body).toContain('why: <i>first second paragraph</i>')
+    expect(body).toContain('why: _first second paragraph_')
   })
 
   // config-edit-hardening: upstream Claude Code truncates `inputPreview`
@@ -247,7 +249,7 @@ describe('formatPermissionCardBody', () => {
       description: 'Propose a unified-diff patch against switchroom.yaml.',
       agentName: 'klanker',
     })
-    expect(body).toContain(`why: <i>${reason}</i>`)
+    expect(body).toContain(`why: _${reason}_`)
     expect(body).not.toContain('not provided')
   })
 
@@ -263,7 +265,7 @@ describe('formatPermissionCardBody', () => {
       description: 'desc',
       agentName: 'klanker',
     })
-    expect(body).toContain(`why: <i>${reason}</i>`)
+    expect(body).toContain(`why: _${reason}_`)
   })
 
   // #2469: hostd agent_* cards must name WHICH agent is targeted, pulled
@@ -275,7 +277,7 @@ describe('formatPermissionCardBody', () => {
       description: 'Restart an agent via the host-control daemon. $SWITCHROOM_AGENT_NAME …',
       agentName: 'klanker',
     })
-    expect(body.split('\n')[0]).toBe('🔐 <b>Klanker</b> wants to restart agent `carrie` in the fleet')
+    expect(body.split('\n')[0]).toBe('🔐 **Klanker** wants to restart agent `carrie` in the fleet')
   })
 
   test('hostd start/stop/logs/exec each name the target agent (#2469)', () => {
@@ -286,10 +288,10 @@ describe('formatPermissionCardBody', () => {
         description: 'static schema doc',
         agentName: 'klanker',
       }).split('\n')[0]
-    expect(mk('mcp__hostd__agent_start')).toBe('🔐 <b>Klanker</b> wants to start agent `pixel` in the fleet')
-    expect(mk('mcp__hostd__agent_stop')).toBe('🔐 <b>Klanker</b> wants to stop agent `pixel` in the fleet')
-    expect(mk('mcp__hostd__agent_logs')).toBe("🔐 <b>Klanker</b> wants to read agent `pixel`'s container logs")
-    expect(mk('mcp__hostd__agent_exec')).toBe('🔐 <b>Klanker</b> wants to run a read-only inspection inside agent `pixel`')
+    expect(mk('mcp__hostd__agent_start')).toBe('🔐 **Klanker** wants to start agent `pixel` in the fleet')
+    expect(mk('mcp__hostd__agent_stop')).toBe('🔐 **Klanker** wants to stop agent `pixel` in the fleet')
+    expect(mk('mcp__hostd__agent_logs')).toBe("🔐 **Klanker** wants to read agent `pixel`'s container logs")
+    expect(mk('mcp__hostd__agent_exec')).toBe('🔐 **Klanker** wants to run a read-only inspection inside agent `pixel`')
   })
 
   test('hostd agent verb without a name arg falls back to the generic phrase (no crash) (#2469)', () => {
@@ -299,8 +301,8 @@ describe('formatPermissionCardBody', () => {
       description: 'static schema doc',
       agentName: 'klanker',
     })
-    expect(body.split('\n')[0]).toBe('🔐 <b>Klanker</b> wants to restart an agent in the fleet')
-    expect(body).toContain('why: <i>bouncing the fleet</i>')
+    expect(body.split('\n')[0]).toBe('🔐 **Klanker** wants to restart an agent in the fleet')
+    expect(body).toContain('why: _bouncing the fleet_')
   })
 
   test('non-name-arg gated verb (update_apply) stays generic and does not break (#2469)', () => {
@@ -310,8 +312,8 @@ describe('formatPermissionCardBody', () => {
       description: 'static schema doc',
       agentName: 'klanker',
     })
-    expect(body.split('\n')[0]).toBe('🔐 <b>Klanker</b> wants to apply a fleet-wide update (pull + recreate)')
-    expect(body).toContain('why: <i>rolling out v0.16</i>')
+    expect(body.split('\n')[0]).toBe('🔐 **Klanker** wants to apply a fleet-wide update (pull + recreate)')
+    expect(body).toContain('why: _rolling out v0.16_')
   })
 
   // Clarity fix: the card gains a third "↳" line summarizing the REST
@@ -330,8 +332,8 @@ describe('formatPermissionCardBody', () => {
       agentName: 'marko',
     })
     const lines = body.split('\n')
-    expect(lines[0]).toBe('🔐 <b>Marko</b> wants to POST /smtp/email (Brevo)')
-    expect(lines[1]).toBe('why: <i>sending the priority-access invite</i>')
+    expect(lines[0]).toBe('🔐 **Marko** wants to POST /smtp/email (Brevo)')
+    expect(lines[1]).toBe('why: _sending the priority-access invite_')
     // Third line: scalar keys show value; the nested `to` array shows key-only.
     expect(lines[2]).toContain('↳')
     expect(lines[2]).toContain('subject: Priority access')
@@ -366,6 +368,49 @@ describe('formatPermissionCardBody', () => {
   })
 })
 
+// Bug 1: the hostd rollout verb gained an optional `reason` (which the agent
+// can now actually supply) and a curated MCP_TOOL_DESCRIPTIONS title, so the
+// card stops rendering the generic "rollout (Hostd)" with "why: not provided".
+describe('formatPermissionCardBody — hostd rollout (Bug 1)', () => {
+  test('renders the caller-supplied reason on the why: line', () => {
+    const body = formatPermissionCardBody({
+      toolName: 'mcp__hostd__rollout',
+      inputPreview: JSON.stringify({
+        reason: 'promote canary-green v0.16.24 to the fleet',
+        pin: 'v0.16.24',
+      }),
+      description: 'SAFELY roll the fleet to a pinned SEMVER version …',
+      agentName: 'overlord',
+    })
+    expect(body).toContain('why: _promote canary-green v0.16.24 to the fleet_')
+    // #2469: never the schema description.
+    expect(body).not.toContain('SAFELY roll the fleet')
+  })
+
+  test('renders the clean MCP_TOOL_DESCRIPTIONS title, not the raw tool id', () => {
+    const body = formatPermissionCardBody({
+      toolName: 'mcp__hostd__rollout',
+      inputPreview: JSON.stringify({
+        reason: 'rollback to last-good tag',
+        pin: 'v0.16.20',
+      }),
+      description: 'desc',
+      agentName: 'overlord',
+    })
+    const firstLine = body.split('\n')[0]
+    // Curated phrase from MCP_TOOL_DESCRIPTIONS["mcp__hostd__rollout"].
+    expect(firstLine).toBe('🔐 **Overlord** wants to roll the fleet to a pinned version')
+    expect(firstLine).not.toContain('mcp__hostd__rollout')
+    expect(firstLine).not.toMatch(/rollout \(Hostd\)/i)
+  })
+
+  test('naturalAction surfaces the curated title for the rollout verb', () => {
+    expect(naturalAction('mcp__hostd__rollout', undefined)).toBe(
+      'roll the fleet to a pinned version',
+    )
+  })
+})
+
 describe('describeGrant — phrased from the chosen scope', () => {
   test('MCP server wildcard → "use any <Server> tool"', () => {
     expect(describeGrant('mcp__perplexity__search', undefined, opt('mcp__perplexity__*'))).toBe(
@@ -411,7 +456,7 @@ describe('formatPermissionResumeMessage — agent-voiced verdict ack', () => {
         behavior: 'allow',
         action: 'edit: supplement-log.md',
       }),
-    ).toBe('▶️ <b>Gymbro</b> — got it, continuing: <i>edit: supplement-log.md</i>')
+    ).toBe('▶️ **Gymbro** — got it, continuing: _edit: supplement-log.md_')
   })
 
   test('deny names what it will skip, lower-cased inline', () => {
@@ -421,7 +466,7 @@ describe('formatPermissionResumeMessage — agent-voiced verdict ack', () => {
         behavior: 'deny',
         action: 'Search the web',
       }),
-    ).toBe("🚫 <b>Ziggy</b> — noted, I won't search the web. Continuing without it.")
+    ).toBe("🚫 **Ziggy** — noted, I won't search the web. Continuing without it.")
   })
 
   test('TTL auto-deny variant reads as a timeout, not a tap', () => {
@@ -432,17 +477,19 @@ describe('formatPermissionResumeMessage — agent-voiced verdict ack', () => {
         action: 'run: deploy.sh',
         timeoutMinutes: 5,
       }),
-    ).toBe('🚫 <b>Finn</b> — no answer in 5m, continuing without it (<i>run: deploy.sh</i>).')
+    ).toBe('🚫 **Finn** — no answer in 5m, continuing without it (_run: deploy.sh_).')
   })
 
-  test('HTML-escapes a hostile action phrase (no raw </>& injection)', () => {
+  test('markdown-escapes a hostile action phrase (no raw ** emphasis injection) (#2669)', () => {
     const out = formatPermissionResumeMessage({
       agentName: 'clerk',
       behavior: 'allow',
-      action: 'run: echo <b>&"pwned"</b>',
+      action: 'run: echo **pwned**',
     })
-    expect(out).toContain('&lt;b&gt;&amp;')
-    expect(out).not.toContain('<b>&"pwned"')
+    // The injected ** markers are backslash-escaped so they render literally
+    // and cannot hijack the card's own emphasis.
+    expect(out).toContain('\\*\\*pwned\\*\\*')
+    expect(out).not.toContain('echo **pwned**')
   })
 
   test('cap-first on the agent name', () => {
@@ -451,22 +498,22 @@ describe('formatPermissionResumeMessage — agent-voiced verdict ack', () => {
       behavior: 'allow',
       action: 'read: contract.pdf',
     })
-    expect(out).toContain('<b>Lawgpt</b>')
+    expect(out).toContain('**Lawgpt**')
   })
 
   test('empty action falls back to a generic continue (no dangling phrase)', () => {
     expect(
       formatPermissionResumeMessage({ agentName: 'carrie', behavior: 'allow', action: '' }),
-    ).toBe('▶️ <b>Carrie</b> — got it, back to work.')
+    ).toBe('▶️ **Carrie** — got it, back to work.')
     expect(
       formatPermissionResumeMessage({ agentName: 'carrie', behavior: 'deny', action: '   ' }),
-    ).toBe('🚫 <b>Carrie</b> — noted, continuing without it.')
+    ).toBe('🚫 **Carrie** — noted, continuing without it.')
   })
 
   test('null agent name degrades to a neutral "Agent" label', () => {
     expect(
       formatPermissionResumeMessage({ agentName: null, behavior: 'allow', action: 'edit: x.md' }),
-    ).toBe('▶️ <b>Agent</b> — got it, continuing: <i>edit: x.md</i>')
+    ).toBe('▶️ **Agent** — got it, continuing: _edit: x.md_')
   })
 })
 

package/telegram-plugin/tests/pty-partial-handler.test.ts

@@ -33,7 +33,6 @@ function makeDeps(
 ): PtyHandlerDeps {
   return {
     bot,
-    renderText: (t) => t, // identity for tests — easier to assert
     ...overrides,
   }
 }
@@ -93,17 +92,18 @@ describe('handlePtyPartialPure', () => {
     expect(onFirstPartial).toHaveBeenCalledWith('1', 5)
   })
 
-  it('applies renderText before pushing into the stream', async () => {
+  it('sends the raw PTY text LITERALLY (literalText path, no markdown render) (#2669)', () => {
+    // PTY-tail previews are raw terminal/TUI output — they go through the
+    // literal plain `sendMessage` path, NOT the rich-markdown parser, so
+    // control glyphs / box-drawing chars aren't misinterpreted as markdown.
     const state = makeState({ currentSessionChatId: '1' })
-    const deps = makeDeps(bot, {
-      renderText: (t) => `<b>${t}</b>`,
-    })
+    const deps = makeDeps(bot)
 
-    handlePtyPartialPure('bold', state, deps)
-    await microtaskFlush()
+    handlePtyPartialPure('│ tool: ls -la │ *not bold*', state, deps)
 
     expect(bot.api.sendMessage).toHaveBeenCalledTimes(1)
-    expect(bot.api.sendMessage.mock.calls[0][1]).toBe('<b>bold</b>')
+    expect(bot.api.sendRichMessage).not.toHaveBeenCalled()
+    expect(bot.api.sendMessage.mock.calls[0][1]).toBe('│ tool: ls -la │ *not bold*')
   })
 
   it('reuses an existing stream on second update', async () => {

package/telegram-plugin/tests/quota-check.test.ts

@@ -91,9 +91,9 @@ describe('formatQuotaBlock', () => {
       },
       now,
     )
-    expect(block).toContain('<b>Claude plan quota</b>')
-    expect(block).toContain('<b>5h window</b>  29% · resets in 2h 30m')
-    expect(block).toContain('<b>7d window</b>  33% · resets in 3d')
+    expect(block).toContain('**Claude plan quota**')
+    expect(block).toContain('**5h window**  29% · resets in 2h 30m')
+    expect(block).toContain('**7d window**  33% · resets in 3d')
     expect(block).toContain('Binding window: five hour')
     // overage=allowed should not be surfaced
     expect(block).not.toContain('Overage:')

package/telegram-plugin/tests/quota-watch.test.ts

@@ -249,17 +249,21 @@ describe("evaluateQuotaWatchAccount — message content", () => {
     expect(d.message).toContain("30%");
   });
 
-  it("throttling message HTML-escapes account label", () => {
+  it("throttling message markdown-escapes the account label (#2669)", () => {
+    // The label is interpolated inside a code span — the renderer escapes
+    // inline-markdown specials (\ ` * _ ~ = [ ] |), not HTML entities. A label
+    // with an emphasis special (e.g. an underscore) is backslash-escaped; the
+    // literal `<` / `>` pass through (they are not markdown specials).
     const d = evaluateQuotaWatchAccount({
       agentName: "lawgpt",
-      snap: makeSnap("<evil>@example.com", makeQuota(85, 40)),
+      snap: makeSnap("ev_il@example.com", makeQuota(85, 40)),
       prev: PREV_NEVER_NOTIFIED,
       now: NOW,
     });
     expect(d.kind).toBe("notify");
     if (d.kind !== "notify") return;
-    expect(d.message).toContain("&lt;evil&gt;");
-    expect(d.message).not.toContain("<evil>");
+    // The underscore is escaped so it can't open an italic run inside the span.
+    expect(d.message).toContain("ev\\_il@example.com");
   });
 
   it("throttling message for active account mentions /auth use", () => {

package/telegram-plugin/tests/secret-detect-delete-must-surface-failures.test.ts

@@ -126,8 +126,9 @@ describe("secret-detect — deleteSensitiveMessage helper retains its 'surface f
   it("helper posts an in-chat warning naming the leaked message id", () => {
     // The warning is the only signal a mobile-only operator gets —
     // stderr is invisible to them. Pinning the in-chat surface as
-    // the load-bearing piece.
-    expect(helperBody).toMatch(/sendMessage/);
-    expect(helperBody).toMatch(/delete message.*manually|delete it manually|manually|delete message <code>/i);
+    // the load-bearing piece. Post-#2669 the warning ships via the
+    // rich-message path (sendRichMessage).
+    expect(helperBody).toMatch(/sendRichMessage|sendMessage/);
+    expect(helperBody).toMatch(/delete message.*manually|delete it manually|manually/i);
   });
 });

package/telegram-plugin/tests/silence-poke.test.ts

@@ -251,80 +251,52 @@ describe('silence-poke — #1292 tool-aware framework fallback', () => {
     expect(ctx.inFlightTools[0]!.durationMs).toBe(305_000 - 30_000)
   })
 
-  it('formatFrameworkFallbackText names the longest-running tool with duration', () => {
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'Grep', label: '"foo"', durationMs: 275_000 },
-    ])
-    expect(text).toBe(
-      'running Grep "foo" for 5m (no update from agent in 5 min)',
-    )
-  })
-
-  it('multiple in-flight tools render as "+ N more"', () => {
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'Grep', label: '"foo"', durationMs: 275_000 },
-      { name: 'Read', label: 'config.ts', durationMs: 120_000 },
-      { name: 'Bash', label: null, durationMs: 60_000 },
-    ])
-    expect(text).toBe(
-      'running Grep "foo" + 2 more for 5m (no update from agent in 5 min)',
-    )
-  })
-
-  it('tool with no label renders the bare name', () => {
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'Bash', label: null, durationMs: 305_000 },
-    ])
-    expect(text).toBe(
-      'running Bash for 5m (no update from agent in 5 min)',
-    )
-  })
-
-  it('raw mcp__ tool name with a human label drops the technical name and leads with the label', () => {
-    // mcp__hindsight__reflect is the internal MCP identifier — looks
-    // like a leak when surfaced to a user. The label table emits
-    // "Searching memory" for it (see hooks/tool-label-pretool.mjs);
-    // the fallback message should lead with the label, not concatenate
-    // both.
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'mcp__hindsight__reflect', label: 'Searching memory', durationMs: 305_000 },
-    ])
-    expect(text).toBe(
-      'Searching memory for 5m (no update from agent in 5 min)',
-    )
-  })
-
-  it('raw mcp__ tool name with NO label falls back to the bare name (no leak-but-no-better-option)', () => {
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'mcp__some-third-party__do_thing', label: null, durationMs: 305_000 },
-    ])
-    expect(text).toBe(
-      'running mcp__some-third-party__do_thing for 5m (no update from agent in 5 min)',
-    )
+  // The "no update from agent in N min" stall notice is a retired stop-gap
+  // (operator: obsolete now that the live draft + the model's own pacing beats
+  // carry progress). `formatFrameworkFallbackText` now returns null for every
+  // stall variant — the generic "still working / still thinking" notice AND the
+  // #1292 tool-aware enrichment — so the gateway sends nothing for a plain
+  // stall (it still runs the unwedge teardown). Only `blockedOnApproval`
+  // still produces a user-visible string. The tests below pin that contract.
+
+  it('stall notice (in-flight tool) returns null — no user-visible send', () => {
+    expect(
+      formatFrameworkFallbackText('working', 305_000, [
+        { name: 'Grep', label: '"foo"', durationMs: 275_000 },
+      ]),
+    ).toBeNull()
   })
 
-  it('built-in tool (Grep) with a label keeps the prior "running Name label" shape — name is already human-readable', () => {
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'Grep', label: 'foo', durationMs: 305_000 },
-    ])
-    expect(text).toBe(
-      'running Grep foo for 5m (no update from agent in 5 min)',
-    )
+  it('stall notice (multiple in-flight tools) returns null', () => {
+    expect(
+      formatFrameworkFallbackText('working', 305_000, [
+        { name: 'Grep', label: '"foo"', durationMs: 275_000 },
+        { name: 'Read', label: 'config.ts', durationMs: 120_000 },
+        { name: 'Bash', label: null, durationMs: 60_000 },
+      ]),
+    ).toBeNull()
   })
 
-  it('empty inFlightTools falls back to the base "still working" wording', () => {
+  it('stall notice (raw mcp__ tool, with or without label) returns null', () => {
     expect(
-      formatFrameworkFallbackText('working', 305_000, []),
-    ).toBe('still working… (no update from agent in 5 min)')
-    expect(
-      formatFrameworkFallbackText('thinking', 305_000, []),
-    ).toBe('still thinking… (no update from agent in 5 min)')
+      formatFrameworkFallbackText('working', 305_000, [
+        { name: 'mcp__hindsight__reflect', label: 'Searching memory', durationMs: 305_000 },
+      ]),
+    ).toBeNull()
     expect(
-      formatFrameworkFallbackText('working', 305_000),
-    ).toBe('still working… (no update from agent in 5 min)')
+      formatFrameworkFallbackText('working', 305_000, [
+        { name: 'mcp__some-third-party__do_thing', label: null, durationMs: 305_000 },
+      ]),
+    ).toBeNull()
   })
 
-  it('blockedOnApproval names the real blocker instead of the dishonest "still working…"', () => {
+  it('generic stall notice (empty inFlightTools, working AND thinking) returns null', () => {
+    expect(formatFrameworkFallbackText('working', 305_000, [])).toBeNull()
+    expect(formatFrameworkFallbackText('thinking', 305_000, [])).toBeNull()
+    expect(formatFrameworkFallbackText('working', 305_000)).toBeNull()
+  })
+
+  it('blockedOnApproval still names the real blocker (the one surviving user-visible send)', () => {
     expect(
       formatFrameworkFallbackText('working', 305_000, [], true),
     ).toBe('waiting for your approval — tap Approve or Deny on the card above (5 min)')
@@ -338,18 +310,10 @@ describe('silence-poke — #1292 tool-aware framework fallback', () => {
     ).toBe('waiting for your approval — tap Approve or Deny on the card above (5 min)')
   })
 
-  it('blockedOnApproval=false keeps the existing wording (default, back-compat)', () => {
+  it('blockedOnApproval=false is a stall → returns null (stop-gap retired)', () => {
     expect(
       formatFrameworkFallbackText('working', 305_000, [], false),
-    ).toBe('still working… (no update from agent in 5 min)')
-  })
-
-  it('tool-aware wording wins over "thinking" — the actual observable beats the inferred kind', () => {
-    const text = formatFrameworkFallbackText('thinking', 305_000, [
-      { name: 'Grep', label: '"foo"', durationMs: 305_000 },
-    ])
-    expect(text.startsWith('running Grep')).toBe(true)
-    expect(text).not.toContain('still thinking')
+    ).toBeNull()
   })
 
   it('tool completed before the fallback → empty snapshot → base wording', () => {
@@ -450,22 +414,21 @@ describe('silence-poke — #1292 tool-aware framework fallback', () => {
     expect(__getStateForTests('k')!.inFlightTools.size).toBe(0)
   })
 
-  it('formatFrameworkFallbackText sub-minute durations render as "Ns"', () => {
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'Grep', label: 'foo', durationMs: 12_000 },
-    ])
-    expect(text).toBe(
-      'running Grep foo for 12s (no update from agent in 5 min)',
-    )
-  })
-
-  it('formatFrameworkFallbackText truncates very long labels', () => {
+  it('in-flight tool stall (any duration/label) returns null — stop-gap retired', () => {
+    // Previously rendered "running Grep foo for 12s (…)" / truncated long
+    // labels. The whole tool-aware stall enrichment is gone now, so the
+    // duration + label formatting paths no longer surface — they return null.
+    expect(
+      formatFrameworkFallbackText('working', 305_000, [
+        { name: 'Grep', label: 'foo', durationMs: 12_000 },
+      ]),
+    ).toBeNull()
     const longLabel = '"' + 'x'.repeat(120) + '"'
-    const text = formatFrameworkFallbackText('working', 305_000, [
-      { name: 'Grep', label: longLabel, durationMs: 305_000 },
-    ])
-    expect(text.length).toBeLessThan(120)
-    expect(text).toContain('…')
+    expect(
+      formatFrameworkFallbackText('working', 305_000, [
+        { name: 'Grep', label: longLabel, durationMs: 305_000 },
+      ]),
+    ).toBeNull()
   })
 })
 
@@ -528,38 +491,38 @@ describe('silence-poke — fallback handler errors do not break timer', () => {
 })
 
 // CC-4 from `docs/status-ask-cause-classes.md`: wording is load-bearing
-// (`reference/rfcs/conversational-pacing.md` § Safety net). Snapshot the exact
-// strings here so a refactor that drops a key phrase fails loud at test
-// time. If you genuinely need to change the wording, update the snapshot
-// AND the design doc together.
+// (`reference/rfcs/conversational-pacing.md` § Safety net). The stall notice is
+// a retired stop-gap — its wording is gone (returns null). The ONE surviving
+// user-visible string is the approval-blocked re-ping; snapshot it here so a
+// refactor that drops the phrase fails loud. The `N min` parenthetical is still
+// derived from silenceMs (honest), so pin that too.
 describe('silence-poke — wording snapshots (CC-4)', () => {
-  it('framework fallback — working at 300s', () => {
-    expect(formatFrameworkFallbackText('working', 300_000)).toMatchInlineSnapshot(
-      `"still working… (no update from agent in 5 min)"`,
-    )
+  it('framework fallback — generic stall (working/thinking) emits no message', () => {
+    expect(formatFrameworkFallbackText('working', 300_000)).toBeNull()
+    expect(formatFrameworkFallbackText('thinking', 300_000)).toBeNull()
   })
 
-  it('framework fallback — thinking at 300s', () => {
-    expect(formatFrameworkFallbackText('thinking', 300_000)).toMatchInlineSnapshot(
-      `"still thinking… (no update from agent in 5 min)"`,
+  it('approval-blocked re-ping — exact wording', () => {
+    expect(formatFrameworkFallbackText('working', 300_000, [], true)).toMatchInlineSnapshot(
+      `"waiting for your approval — tap Approve or Deny on the card above (5 min)"`,
     )
   })
 
-  it('framework fallback — minutes derived from silenceMs, not hard-coded', () => {
-    expect(formatFrameworkFallbackText('working', 360_000)).toBe(
-      'still working… (no update from agent in 6 min)',
+  it('approval-blocked — minutes derived from silenceMs, not hard-coded', () => {
+    expect(formatFrameworkFallbackText('working', 360_000, [], true)).toBe(
+      'waiting for your approval — tap Approve or Deny on the card above (6 min)',
     )
-    expect(formatFrameworkFallbackText('working', 600_000)).toBe(
-      'still working… (no update from agent in 10 min)',
+    expect(formatFrameworkFallbackText('working', 600_000, [], true)).toBe(
+      'waiting for your approval — tap Approve or Deny on the card above (10 min)',
     )
   })
 
-  it('framework fallback — minutes floor at 1 even when silenceMs is small', () => {
-    expect(formatFrameworkFallbackText('working', 30_000)).toBe(
-      'still working… (no update from agent in 1 min)',
+  it('approval-blocked — minutes floor at 1 even when silenceMs is small', () => {
+    expect(formatFrameworkFallbackText('working', 30_000, [], true)).toBe(
+      'waiting for your approval — tap Approve or Deny on the card above (1 min)',
     )
-    expect(formatFrameworkFallbackText('working', 0)).toBe(
-      'still working… (no update from agent in 1 min)',
+    expect(formatFrameworkFallbackText('working', 0, [], true)).toBe(
+      'waiting for your approval — tap Approve or Deny on the card above (1 min)',
     )
   })
 })