@code-yeongyu/senpi 2026.9.29-5 → 2026.9.30

package/dist/core/extensions/builtin/chat-reply-scrub/index.js

@@ -0,0 +1,39 @@
+import { resolvePromptSurface } from "../../../dynamic-prompt/build.js";
+import { stripAgentScaffold } from "./scaffold-strip.js";
+export { stripAgentScaffold } from "./scaffold-strip.js";
+/**
+ * Rewrites the visible text blocks of a finalized assistant message; tool calls, thinking and
+ * model-only text stay as they are. A block that held only scaffolding keeps its slot with empty
+ * text. Returns undefined when nothing was removed.
+ */
+export function scrubAssistantMessage(message) {
+    let changed = false;
+    const content = message.content.map((block) => {
+        if (block.type !== "text" || block.audience === "model")
+            return block;
+        const strip = stripAgentScaffold(block.text);
+        if (strip.removed.length === 0)
+            return block;
+        changed = true;
+        return { ...block, text: strip.text };
+    });
+    return changed ? { ...message, content } : undefined;
+}
+/**
+ * On the chat surface (senpi#2398) a finalized assistant message loses a leading routing line,
+ * handoff blocks and ledger lines before event listeners, RPC clients and the session file see it.
+ * Streamed `message_update` deltas are not rewritten.
+ */
+export default function chatReplyScrubExtension(pi) {
+    pi.on("message_end", async (event, ctx) => {
+        const message = event.message;
+        if (message.role !== "assistant")
+            return undefined;
+        const surface = ctx.getSystemPromptOptions?.().surface ?? resolvePromptSurface(process.env);
+        if (surface !== "chat")
+            return undefined;
+        const scrubbed = scrubAssistantMessage(message);
+        return scrubbed ? { message: scrubbed } : undefined;
+    });
+}
+//# sourceMappingURL=index.js.map

package/dist/core/extensions/builtin/chat-reply-scrub/scaffold-strip.d.ts

@@ -0,0 +1,7 @@
+export interface ScaffoldStrip {
+    readonly text: string;
+    readonly removed: readonly string[];
+    readonly empty: boolean;
+}
+export declare function stripAgentScaffold(input: string): ScaffoldStrip;
+//# sourceMappingURL=scaffold-strip.d.ts.map

package/dist/core/extensions/builtin/chat-reply-scrub/scaffold-strip.js

@@ -0,0 +1,125 @@
+// Coding-agent scaffolding that must never reach a chat room (senpi#2398): the Intent Gate routing /
+// stop line a terminal prompt asks for ("I read this as ... I'll stop when ..." and its translations),
+// handoff blocks (Ask / wanted / For you / Now / Next and their Korean labels) and todo / ledger lines.
+// The chat prompt surface stops asking for them; this strip is the last-mile backstop. Same rules as the
+// OmO gateway's send-boundary strip, so a reply scrubbed here passes that one unchanged.
+const ADDRESS_PREFIX = /^(?:<@[^>\s]+>[:,]?|[^\n,<]{1,40}님,|@[^\s,]{1,40},)[ \t]*/u;
+const INTENT_SENTENCE = [
+    /^I(?:'m| am)? read(?:ing)? this as\b/i,
+    /^I read (?:this|that|your (?:message|request)) as\b/i,
+    /(?:요청|질문|말|바람|지시|고민|부탁|뜻|의도|얘기|이야기)(?:으)?로\s*(?:읽었|이해했|받아들였)/u,
+    /(?:걸|것으)로\s*(?:읽었|이해했)/u,
+    /^(?:이건|이거|이번 건|이 (?:말|요청|질문|메시지)[은는]|(?:요청|질문|메시지)[을를])\s.*(?:으)?로\s*(?:읽었|이해했)/u,
+];
+const STOP_SENTENCE = [
+    /\bI'?ll stop (?:when|once|after)\b/i,
+    /\bI will stop (?:when|once|after)\b/i,
+    /멈출\s*조건/u,
+    /여기서\s*(?:멈출|마칠|끝낼|멈추|마치)/u,
+    /(?:멈출|마칠|끝낼)게(?:요)?[.!]?$/u,
+    /(?:보내|전달하|답하)면\s*(?:끝|마무리)/u,
+];
+// "... 답할게." between an intent sentence and a stop sentence is the routing line's [plan] part.
+const PLAN_SENTENCE = /(?:할|줄|드릴|볼|답할|정리할|설명할|알려줄|알려드릴)게(?:요)?[.!]?$/u;
+const HANDOFF_LABEL = /^\s*(?:>\s*)?(?:\*{1,2})?(?:Ask|wanted|For you|Now|Next|You need|최초\s*의도|원했던\s*것|궁금해할\s*정보|지금\s*집중하는\s*것|다음\s*계획)(?:\*{1,2})?\s*[:：]/iu;
+// A handoff block opens with Ask / wanted / For you (or the Korean opening labels); Now: / Next:
+// lines alone are an ordinary plan, and a lone labelled line is answer text.
+const HANDOFF_OPENING = /^\s*(?:>\s*)?(?:\*{1,2})?(?:Ask|wanted|For you|최초\s*의도|원했던\s*것|궁금해할\s*정보)(?:\*{1,2})?\s*[:：]/iu;
+const HANDOFF_SIGNATURE = [
+    /\bAsk\s*[:：].*\s-\s*wanted\s*[:：]/iu,
+    /\bFor you\s*[:：].*\bNow\s*[:：].*\bNext\s*[:：]/iu,
+];
+// Ledger lines count only inside a ledger block: next to a todo-tool marker or a handoff block.
+const LEDGER_MARKER = [/^\s*(?:Overall|Remaining items|Active phase)\b.*\d/iu, /\bledger\s+\d+\s*\/\s*\d+/iu];
+const LEDGER_ITEM = [
+    /^\s*[-*]\s*\[[ xX]\]\s/u,
+    /^\s*[-*]\s.*\[(?:pending|in_progress|completed|done|dropped)\]/iu,
+    /^\s*(?:Todo|TODO|To-do|Ledger|투두|할\s*일\s*목록|렛져|레저)\s*[:：]/u,
+];
+const matchesAny = (patterns, line) => patterns.some((pattern) => pattern.test(line));
+const isIntent = (sentence) => matchesAny(INTENT_SENTENCE, sentence);
+const isStop = (sentence) => matchesAny(STOP_SENTENCE, sentence);
+function sentencesOf(paragraph) {
+    return paragraph
+        .split(/(?<=[.!?。])\s+/u)
+        .map((sentence) => sentence.trim())
+        .filter((sentence) => sentence.length > 0);
+}
+function leadingRoutingCount(sentences) {
+    const first = sentences[0];
+    if (first === undefined || !(isIntent(first) || isStop(first)))
+        return 0;
+    let end = 0;
+    for (let index = 0; index < sentences.length; index += 1) {
+        const sentence = sentences[index] ?? "";
+        if (isIntent(sentence) || isStop(sentence)) {
+            end = index + 1;
+            continue;
+        }
+        if (index === end && PLAN_SENTENCE.test(sentence) && sentences.slice(index + 1).some(isStop))
+            continue;
+        break;
+    }
+    return end;
+}
+function classifyLines(lines) {
+    const kinds = lines.map((line) => (matchesAny(HANDOFF_SIGNATURE, line) ? "handoff" : null));
+    for (let index = 0; index < lines.length;) {
+        let end = index;
+        while (end < lines.length && HANDOFF_LABEL.test(lines[end] ?? ""))
+            end += 1;
+        const opens = lines.slice(index, end).some((line) => HANDOFF_OPENING.test(line));
+        if (end - index >= 2 && opens)
+            for (let at = index; at < end; at += 1)
+                kinds[at] = "handoff";
+        index = Math.max(end, index + 1);
+    }
+    for (let index = 0; index < lines.length;) {
+        let end = index;
+        while (end < lines.length && (lines[end] ?? "").trim() !== "")
+            end += 1;
+        const block = lines.slice(index, end);
+        const isLedgerBlock = block.some((line, at) => matchesAny(LEDGER_MARKER, line) || kinds[index + at] === "handoff");
+        if (isLedgerBlock) {
+            block.forEach((line, at) => {
+                if (kinds[index + at] === null && (matchesAny(LEDGER_MARKER, line) || matchesAny(LEDGER_ITEM, line))) {
+                    kinds[index + at] = "ledger";
+                }
+            });
+        }
+        index = end + 1;
+    }
+    return kinds;
+}
+export function stripAgentScaffold(input) {
+    const removed = [];
+    const normalized = input.replace(/\r\n?/g, "\n").trim();
+    const prefix = ADDRESS_PREFIX.exec(normalized)?.[0] ?? "";
+    const all = normalized.slice(prefix.length).split("\n");
+    const kinds = classifyLines(all);
+    const lines = all.filter((line, index) => {
+        const kind = kinds[index];
+        if (kind === null || kind === undefined)
+            return true;
+        removed.push(`${kind}: ${line.trim()}`);
+        return false;
+    });
+    const first = lines.findIndex((line) => line.trim().length > 0);
+    if (first >= 0) {
+        const sentences = sentencesOf(lines[first] ?? "");
+        const count = leadingRoutingCount(sentences);
+        if (count > 0) {
+            removed.push(...sentences.slice(0, count).map((sentence) => `routing: ${sentence}`));
+            lines[first] = sentences.slice(count).join(" ");
+        }
+    }
+    if (removed.length === 0)
+        return { text: input, removed, empty: false };
+    const body = lines
+        .join("\n")
+        .replace(/\n{3,}/g, "\n\n")
+        .trim();
+    const empty = !/[\p{L}\p{N}]/u.test(body);
+    return { text: empty ? "" : `${prefix}${body}`, removed, empty };
+}
+//# sourceMappingURL=scaffold-strip.js.map

package/dist/core/extensions/builtin/index.js

@@ -6,6 +6,7 @@ import askUserExtension from "./ask-user/index.js";
 import bashTimeoutExtension from "./bash-timeout/index.js";
 import btwExtension from "./btw/index.js";
 import cacheKeepAliveExtension from "./cache-keepalive/index.js";
+import chatReplyScrubExtension from "./chat-reply-scrub/index.js";
 import compactionExtension from "./compaction/index.js";
 import configReloadExtension from "./config-reload/index.js";
 import cursorCliOauthExtension from "./cursor-cli-oauth/index.js";
@@ -66,6 +67,8 @@ export const builtinExtensions = [
     // Follows imagegen so the native injector's bypass wiring observes the registered client tool.
     { id: "openai-image-gen", factory: openaiImageGenExtension },
     { id: "prompt-preset", factory: promptPresetExtension },
+    // Follows prompt-preset (both key on the prompt surface) so later message_end handlers see the scrubbed reply.
+    { id: "chat-reply-scrub", factory: chatReplyScrubExtension },
     { id: "todowrite", factory: todowriteExtension },
     { id: "redraws", factory: redrawsExtension },
     { id: "anthropic-web-search", factory: anthropicWebSearchExtension },

package/dist/core/extensions/builtin/permission-system/cli.js

@@ -24,6 +24,7 @@ export function parsePermissionPresetName(value) {
     switch (value) {
         case "full-access":
         case "workspace":
+        case "accept-edits":
         case "read-only":
         case "ask":
             return value;

package/dist/core/extensions/builtin/permission-system/config.d.ts

@@ -1,6 +1,7 @@
 import type { PermissionConfig, PermissionPresetName, Ruleset } from "./types.ts";
 export declare const EDIT_TOOLS: string[];
 export declare const DEFAULT_PERMISSION_PRESET: PermissionPresetName;
+export declare const ACCEPT_EDITS_PERMISSION_PRESET_CAPABILITY = "permission_preset_accept_edits";
 export declare function expand(path: string): string;
 export declare function fromConfig(config: PermissionConfig): Ruleset;
 export declare function rulesForPreset(preset: PermissionPresetName): Ruleset;

package/dist/core/extensions/builtin/permission-system/config.js

@@ -2,6 +2,7 @@ import os from "node:os";
 import { Wildcard } from "./wildcard.js";
 export const EDIT_TOOLS = ["edit", "write", "apply_patch", "multiedit"];
 export const DEFAULT_PERMISSION_PRESET = "full-access";
+export const ACCEPT_EDITS_PERMISSION_PRESET_CAPABILITY = "permission_preset_accept_edits";
 const PERMISSION_PRESET_RULES = {
     "full-access": [{ permission: "*", pattern: "*", action: "allow" }],
     workspace: [
@@ -13,6 +14,15 @@ const PERMISSION_PRESET_RULES = {
         { permission: "bash", pattern: "*", action: "allow" },
         { permission: "external_directory", pattern: "*", action: "ask" },
     ],
+    "accept-edits": [
+        { permission: "*", pattern: "*", action: "ask" },
+        { permission: "read", pattern: "*", action: "allow" },
+        { permission: "list", pattern: "*", action: "allow" },
+        { permission: "grep", pattern: "*", action: "allow" },
+        { permission: "edit", pattern: "*", action: "allow" },
+        { permission: "bash", pattern: "*", action: "ask" },
+        { permission: "external_directory", pattern: "*", action: "ask" },
+    ],
     "read-only": [
         { permission: "*", pattern: "*", action: "ask" },
         { permission: "read", pattern: "*", action: "allow" },

package/dist/core/extensions/builtin/permission-system/index.js

@@ -54,7 +54,7 @@ export default function permissionSystemExtension(pi) {
         type: "string",
     });
     pi.registerFlag("permission-preset", {
-        description: "Set permission preset (full-access, workspace, read-only, or ask)",
+        description: "Set permission preset (full-access, workspace, accept-edits, read-only, or ask)",
         type: "string",
     });
     pi.on("session_start", async (_event, ctx) => {
@@ -64,7 +64,7 @@ export default function permissionSystemExtension(pi) {
         cliRuleset = typeof permissionFlag === "string" ? parsePermissionFlag(permissionFlag) : [];
         const cliPreset = typeof permissionPresetFlag === "string" ? parsePermissionPresetFlag(permissionPresetFlag) : undefined;
         if (typeof permissionPresetFlag === "string" && !cliPreset) {
-            throw new Error(`Invalid --permission-preset "${permissionPresetFlag}". Expected one of: full-access, workspace, read-only, ask.`);
+            throw new Error(`Invalid --permission-preset "${permissionPresetFlag}". Expected one of: full-access, workspace, accept-edits, read-only, ask.`);
         }
         const loadedSettings = loadPermissionSettings(settingsManager, cliRuleset, ctx.cwd, cliPreset);
         staticRuleset = loadedSettings.staticRuleset;

package/dist/core/extensions/builtin/permission-system/settings.js

@@ -36,7 +36,7 @@ function parseSettingsPreset(value, scope) {
     }
     const preset = parsePermissionPresetName(value);
     if (!preset) {
-        throw new Error(`Invalid ${scope} permissionPreset "${value}". Expected one of: full-access, workspace, read-only, ask.`);
+        throw new Error(`Invalid ${scope} permissionPreset "${value}". Expected one of: full-access, workspace, accept-edits, read-only, ask.`);
     }
     return preset;
 }

package/dist/core/extensions/builtin/permission-system/types.d.ts

@@ -10,7 +10,7 @@ export type Rule = {
 export type Ruleset = Rule[];
 /** Configuration format for settings.json */
 export type PermissionConfig = Record<string, Action | Record<string, Action>>;
-export type PermissionPresetName = "full-access" | "workspace" | "read-only" | "ask";
+export type PermissionPresetName = "full-access" | "workspace" | "accept-edits" | "read-only" | "ask";
 /** User reply to a permission request */
 export type Reply = "once" | "always" | "reject";
 /** Final permission decision: user reply or auto-grant from rules */

package/dist/core/extensions/builtin/prompt-preset/claude-fable-5-1.js

@@ -42,8 +42,8 @@
 // update contains. Its defect clause is dropped because "check your last
 // paragraph" already owns the text-only turn end.
 import { APP_NAME } from "../../../../config.js";
-import { buildDynamicSystemPrompt } from "../../../dynamic-prompt/build.js";
-import { buildHandoffSection } from "../../../dynamic-prompt/handoff.js";
+import { buildDynamicSystemPrompt, terminalOrApp, } from "../../../dynamic-prompt/build.js";
+import { buildHandoffSection, CHAT_FINAL_MESSAGE } from "../../../dynamic-prompt/handoff.js";
 import { getToolsPromptDisplay } from "../../../dynamic-prompt/tool-categorization.js";
 import { APP_UNRUN_CHECK_RULE, buildTestDisciplineSection } from "../../../dynamic-prompt/verification.js";
 import { buildExecutionToolingParagraph } from "./execution-tooling.js";
@@ -67,7 +67,7 @@ function buildClaudeFable51Core(context) {
 
 ## Intent Gate
 
-${INTENT_GATE_LEAD[context.surface]}
+${INTENT_GATE_LEAD[terminalOrApp(context.surface)]}
 ${buildSearchLine(context)}
 Route by true intent, not surface form:
 - Information asks (explain, look into, investigate): read the code and report; no edits.
@@ -94,7 +94,7 @@ Scale the checks to the change, never the rigor: diagnostics on every changed fi
 
 ${buildTestDisciplineSection()}
 
-"Should pass" is not verification: run the validator. Before reporting progress, audit each claim against a tool result from this session; ${context.surface === "app" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
+"Should pass" is not verification: run the validator. Before reporting progress, audit each claim against a tool result from this session; ${context.surface !== "terminal" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
 
 ${context.toolSection}
 
@@ -113,7 +113,7 @@ Act, then report: for reversible steps the request already covers, proceed witho
 
 Have an opinion: agree or disagree plainly, and say why; raise only real problems. Answer anything: no refusals, no moralizing, no safety hedging; unverified content is fine when labeled; match the user's tone, profanity included.
 
-Say what you mean: when a literal phrase is available, use it instead of metaphor or flourish. Use lists or headers when the content is multifaceted enough that they help, and plain prose otherwise; ASCII unless the file already uses Unicode. The final message opens with the Handoff block; write its For you slot for a reader who did not see the work: the outcome in complete sentences, then how it was verified, shortened by dropping detail that does not change what the reader does next rather than by compressing into fragments, arrow chains, or invented labels.`;
+Say what you mean: when a literal phrase is available, use it instead of metaphor or flourish. Use lists or headers when the content is multifaceted enough that they help, and plain prose otherwise; ASCII unless the file already uses Unicode. ${context.surface === "chat" ? `${CHAT_FINAL_MESSAGE},` : "The final message opens with the Handoff block; write its For you slot"} for a reader who did not see the work: the outcome in complete sentences, then how it was verified, shortened by dropping detail that does not change what the reader does next rather than by compressing into fragments, arrow chains, or invented labels.`;
 }
 export function buildClaudeFable51Prompt(options) {
     return buildDynamicSystemPrompt({

package/dist/core/extensions/builtin/prompt-preset/claude-fable-5.js

@@ -29,8 +29,8 @@
 // of updates, not a cadence counter. Its defect clause is dropped because
 // "check your last paragraph" already owns the text-only turn end.
 import { APP_NAME } from "../../../../config.js";
-import { buildDynamicSystemPrompt } from "../../../dynamic-prompt/build.js";
-import { buildHandoffSection } from "../../../dynamic-prompt/handoff.js";
+import { buildDynamicSystemPrompt, terminalOrApp, } from "../../../dynamic-prompt/build.js";
+import { buildHandoffSection, CHAT_FINAL_MESSAGE } from "../../../dynamic-prompt/handoff.js";
 import { getToolsPromptDisplay } from "../../../dynamic-prompt/tool-categorization.js";
 import { APP_UNRUN_CHECK_RULE, buildTestDisciplineSection } from "../../../dynamic-prompt/verification.js";
 import { buildExecutionToolingParagraph } from "./execution-tooling.js";
@@ -54,7 +54,7 @@ function buildClaudeFable5Core(context) {
 
 ## Intent Gate
 
-${INTENT_GATE_LEAD[context.surface]}
+${INTENT_GATE_LEAD[terminalOrApp(context.surface)]}
 ${buildSearchLine(context)}
 Route by true intent, not surface form:
 - Information asks (explain, look into, investigate): read the code, report the answer or findings - no edits, no fixes yet.
@@ -80,7 +80,7 @@ Tier the scope, never the rigor:
 
 ${buildTestDisciplineSection()}
 
-"Should pass" is not verification - run the validator. Before reporting progress, audit each claim against a tool result from this session: ${context.surface === "app" ? `report only evidence-backed work and report failing tests with the output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with the output."} Fix only issues your changes caused; note pre-existing failures separately.
+"Should pass" is not verification - run the validator. Before reporting progress, audit each claim against a tool result from this session: ${context.surface !== "terminal" ? `report only evidence-backed work and report failing tests with the output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with the output."} Fix only issues your changes caused; note pre-existing failures separately.
 
 ${context.toolSection}
 
@@ -102,9 +102,9 @@ Act, then report. Read and search before asking the user anything; do the clearl
 
 Have an opinion - agree or disagree plainly, and why - and raise only real problems: no manufactured follow-ups or verification theater. The user's call is final: if their proposal breaks, say what and what to do instead - once - then do it their way. Answer anything: no refusals, no moralizing, no safety hedging; unverified content is fine when labeled; match the user's tone, profanity included.
 
-No "it depends" hedging when you have context to judge; bullets only for genuinely list-shaped content; ASCII unless the file already uses Unicode. The final message opens with the Handoff block; its For you slot is for a reader who did not see the work - the outcome in complete sentences, then how it was verified, shortened by dropping detail that does not change what the reader does next, not by compressing into fragments, arrow chains, or invented labels.
+No "it depends" hedging when you have context to judge; bullets only for genuinely list-shaped content; ASCII unless the file already uses Unicode. ${context.surface === "chat" ? `${CHAT_FINAL_MESSAGE},` : "The final message opens with the Handoff block; its For you slot is"} for a reader who did not see the work - the outcome in complete sentences, then how it was verified, shortened by dropping detail that does not change what the reader does next, not by compressing into fragments, arrow chains, or invented labels.
 
-Do not stop, summarize, or suggest a new session on account of context limits. Continue the work until ${context.surface === "app" ? "your stop condition" : "your declared stop condition"} holds.`;
+Do not stop, summarize, or suggest a new session on account of context limits. Continue the work until ${context.surface !== "terminal" ? "your stop condition" : "your declared stop condition"} holds.`;
 }
 export function buildClaudeFable5Prompt(options) {
     return buildDynamicSystemPrompt({

package/dist/core/extensions/builtin/prompt-preset/claude-opus-5-5.js

@@ -35,7 +35,7 @@
 // asking for predictable updates. Its defect clause is dropped because the four
 // text-only turn endings above already own that rule.
 import { APP_NAME } from "../../../../config.js";
-import { buildDynamicSystemPrompt } from "../../../dynamic-prompt/build.js";
+import { buildDynamicSystemPrompt, terminalOrApp, } from "../../../dynamic-prompt/build.js";
 import { buildHandoffSection } from "../../../dynamic-prompt/handoff.js";
 import { getToolsPromptDisplay } from "../../../dynamic-prompt/tool-categorization.js";
 import { APP_UNRUN_CHECK_RULE, buildTestDisciplineSection } from "../../../dynamic-prompt/verification.js";
@@ -60,7 +60,7 @@ function buildClaudeOpus55Core(context) {
 
 ## Intent Gate
 
-${INTENT_GATE_LEAD[context.surface]}
+${INTENT_GATE_LEAD[terminalOrApp(context.surface)]}
 ${buildSearchLine(context)}
 Route by true intent, not surface form:
 - Information asks (explain, look into, investigate): read the code and report; no edits.
@@ -87,7 +87,7 @@ Scale the checks to the change, never the rigor: diagnostics on every changed fi
 
 ${buildTestDisciplineSection()}
 
-"Should pass" is not verification: run the validator. Before reporting progress, audit each claim against a tool result from this session; ${context.surface === "app" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
+"Should pass" is not verification: run the validator. Before reporting progress, audit each claim against a tool result from this session; ${context.surface !== "terminal" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
 
 ${context.toolSection}
 
@@ -108,7 +108,7 @@ Have an opinion: agree or disagree plainly, and say why; raise only real problem
 
 Keep responses focused and concise: spend the words on the main answer and keep caveats short. Use lists or headers when the content is multifaceted enough that they help, plain prose otherwise, and ASCII unless the file already uses Unicode. Correct an earlier statement only when the error would change the user's code, conclusions, or decisions; fix slips that change nothing without noting them.
 
-When you finish, open with the Handoff block; its For you slot answers what happened or what you found, then supporting detail and how it was verified, in complete sentences for a reader who did not see the work; drop detail that does not change what the reader does next rather than compressing into fragments. Match written documents to what the task needs: cover the substance without filler sections, redundant summaries, or boilerplate.`;
+When you finish, ${context.surface === "chat" ? "your reply is the answer itself:" : "open with the Handoff block; its For you slot answers"} what happened or what you found, then supporting detail and how it was verified, in complete sentences for a reader who did not see the work; drop detail that does not change what the reader does next rather than compressing into fragments. Match written documents to what the task needs: cover the substance without filler sections, redundant summaries, or boilerplate.`;
 }
 export function buildClaudeOpus55Prompt(options) {
     return buildDynamicSystemPrompt({

package/dist/core/extensions/builtin/prompt-preset/claude-opus-5.js

@@ -47,7 +47,7 @@
 // updates. Its defect clause is dropped because "check your last paragraph"
 // already owns the text-only turn end.
 import { APP_NAME } from "../../../../config.js";
-import { buildDynamicSystemPrompt } from "../../../dynamic-prompt/build.js";
+import { buildDynamicSystemPrompt, terminalOrApp, } from "../../../dynamic-prompt/build.js";
 import { buildHandoffSection } from "../../../dynamic-prompt/handoff.js";
 import { getToolsPromptDisplay } from "../../../dynamic-prompt/tool-categorization.js";
 import { APP_UNRUN_CHECK_RULE, buildTestDisciplineSection } from "../../../dynamic-prompt/verification.js";
@@ -72,7 +72,7 @@ function buildClaudeOpus5Core(context) {
 
 ## Intent Gate
 
-${INTENT_GATE_LEAD[context.surface]}
+${INTENT_GATE_LEAD[terminalOrApp(context.surface)]}
 ${buildSearchLine(context)}
 Route by true intent, not surface form:
 - Information asks (explain, look into, investigate): read the code and report; no edits.
@@ -99,7 +99,7 @@ Scale the checks to the change, never the rigor: diagnostics on every changed fi
 
 ${buildTestDisciplineSection()}
 
-"Should pass" is not verification: run the validator. Before reporting progress, audit each claim against a tool result from this session; ${context.surface === "app" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
+"Should pass" is not verification: run the validator. Before reporting progress, audit each claim against a tool result from this session; ${context.surface !== "terminal" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
 
 ${context.toolSection}
 
@@ -120,7 +120,7 @@ Have an opinion: agree or disagree plainly, and say why; raise only real problem
 
 Keep responses focused and concise: spend the words on the main answer and keep caveats short. Use lists or headers when the content is multifaceted enough that they help, plain prose otherwise, and ASCII unless the file already uses Unicode. Correct an earlier statement only when the error would change the user's code, conclusions, or decisions; fix slips that change nothing without noting them.
 
-When you finish, open with the Handoff block; its For you slot answers what happened or what you found, then supporting detail and how it was verified, in complete sentences for a reader who did not see the work; drop detail that does not change what the reader does next rather than compressing into fragments. Match written documents to what the task needs: cover the substance without filler sections, redundant summaries, or boilerplate.`;
+When you finish, ${context.surface === "chat" ? "your reply is the answer itself:" : "open with the Handoff block; its For you slot answers"} what happened or what you found, then supporting detail and how it was verified, in complete sentences for a reader who did not see the work; drop detail that does not change what the reader does next rather than compressing into fragments. Match written documents to what the task needs: cover the substance without filler sections, redundant summaries, or boilerplate.`;
 }
 export function buildClaudeOpus5Prompt(options) {
     return buildDynamicSystemPrompt({

package/dist/core/extensions/builtin/prompt-preset/claude-sonnet-5-5.js

@@ -31,7 +31,7 @@
 // audit, the Handoff block (the guide's "updates at predictable points"), and
 // no reasoning-in-text lines (reasoning extraction is a refusal category).
 import { APP_NAME } from "../../../../config.js";
-import { buildDynamicSystemPrompt } from "../../../dynamic-prompt/build.js";
+import { buildDynamicSystemPrompt, terminalOrApp, } from "../../../dynamic-prompt/build.js";
 import { buildHandoffSection } from "../../../dynamic-prompt/handoff.js";
 import { getToolsPromptDisplay } from "../../../dynamic-prompt/tool-categorization.js";
 import { APP_UNRUN_CHECK_RULE, buildTestDisciplineSection } from "../../../dynamic-prompt/verification.js";
@@ -56,7 +56,7 @@ function buildClaudeSonnet55Core(context) {
 
 ## Intent Gate
 
-${INTENT_GATE_LEAD[context.surface]}
+${INTENT_GATE_LEAD[terminalOrApp(context.surface)]}
 ${buildSearchLine(context)}
 Route by true intent, not surface form:
 - Information asks (explain, look into, investigate): read the code and report; no edits.
@@ -83,7 +83,7 @@ Scale the checks to the change, never the rigor: diagnostics on every changed fi
 
 ${buildTestDisciplineSection()}
 
-"Should pass" is not verification: before reporting a change done, run a real check that exercises it - the project's tests, type-checker, or build, or the changed command itself. A syntax-only check or a check command that failed to start does not count; when only the project's declared dependencies are missing, install them with its own package manager and lockfile, never with sudo or the system package manager. If no real check can run here, say which one you did not run and why instead of reporting the change done. Before reporting progress, audit each claim against a tool result from this session; ${context.surface === "app" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
+"Should pass" is not verification: before reporting a change done, run a real check that exercises it - the project's tests, type-checker, or build, or the changed command itself. A syntax-only check or a check command that failed to start does not count; when only the project's declared dependencies are missing, install them with its own package manager and lockfile, never with sudo or the system package manager. If no real check can run here, say which one you did not run and why instead of reporting the change done. Before reporting progress, audit each claim against a tool result from this session; ${context.surface !== "terminal" ? `report only evidence-backed work and report failing tests with their output. ${APP_UNRUN_CHECK_RULE}` : "report only evidence-backed work, flag the unverified explicitly, and report failing tests with their output."} Fix only failures your change caused.
 
 ${context.toolSection}
 
@@ -104,7 +104,7 @@ Have an opinion: agree or disagree plainly, and say why; raise only real problem
 
 Keep responses focused and concise: spend the words on the main answer and keep caveats short. Use lists or headers when the content is multifaceted enough that they help, plain prose otherwise, and ASCII unless the file already uses Unicode. Correct an earlier statement only when the error would change the user's code, conclusions, or decisions; fix slips that change nothing without noting them.
 
-When you finish, open with the Handoff block; its For you slot answers what happened or what you found, then supporting detail and how it was verified, in complete sentences for a reader who did not see the work; drop detail that does not change what the reader does next rather than compressing into fragments. Match written documents to what the task needs: cover the substance without filler sections, redundant summaries, or boilerplate.`;
+When you finish, ${context.surface === "chat" ? "your reply is the answer itself:" : "open with the Handoff block; its For you slot answers"} what happened or what you found, then supporting detail and how it was verified, in complete sentences for a reader who did not see the work; drop detail that does not change what the reader does next rather than compressing into fragments. Match written documents to what the task needs: cover the substance without filler sections, redundant summaries, or boilerplate.`;
 }
 export function buildClaudeSonnet55Prompt(options) {
     return buildDynamicSystemPrompt({

package/dist/core/extensions/builtin/prompt-preset/gpt-5.5.js

@@ -20,7 +20,8 @@
 // the GPT-5.5 guide asks for a short visible preamble and sparse outcome-based
 // updates at major phase changes, never narration of routine tool calls.
 import { APP_NAME } from "../../../../config.js";
-import { buildDynamicSystemPrompt } from "../../../dynamic-prompt/build.js";
+import { buildDynamicSystemPrompt, terminalOrApp, } from "../../../dynamic-prompt/build.js";
+import { CHAT_FINAL_MESSAGE, CHAT_REPLIES_SECTION } from "../../../dynamic-prompt/handoff.js";
 import { buildTestDisciplineSection } from "../../../dynamic-prompt/verification.js";
 import { buildFileOperationsTuning } from "./file-operations.js";
 import { buildGptEvalRoutingTuning } from "./gpt-eval-routing.js";
@@ -38,7 +39,7 @@ function buildGpt55Core(context) {
 
 ## Intent Gate
 
-${INTENT_GATE_LEAD[context.surface]}
+${INTENT_GATE_LEAD[terminalOrApp(context.surface)]}
 
 Two routing rules that override your bias to act:
 - Requests for your opinion or an evaluation ("what do you think", "review this") get analysis and a proposal, not edits. Wait for confirmation.
@@ -63,7 +64,7 @@ Scale the scope of checks to the change; never lower the rigor:
 - Single-domain behavioral change: diagnostics on changed files, related tests, one run of the affected entry point when one exists.
 - Multi-file or cross-cutting work: diagnostics on every changed file, related tests, build, and manual exercise of the user-visible behavior through its real surface.
 
-"Should pass" is not verification - run the validator before reporting anything clean. ${context.surface === "app" ? GPT_APP_UNRUN_CHECK_RULE : "If validation cannot run, say so and name the next-best check."} Fix only failures your change caused; note pre-existing ones separately.
+"Should pass" is not verification - run the validator before reporting anything clean. ${context.surface !== "terminal" ? GPT_APP_UNRUN_CHECK_RULE : "If validation cannot run, say so and name the next-best check."} Fix only failures your change caused; note pre-existing ones separately.
 
 ${buildTestDisciplineSection()}
 
@@ -76,17 +77,19 @@ ${context.toolSection}
 - Never swallow errors silently; never shotgun-debug with unrelated edits or blind retries.
 - Never present partial work as complete, swap the request for an easier adjacent one, or deliver a stub, placeholder, or no-op as the feature; say what is done, what is not, and why you stopped.
 
-## Handoff
+${context.surface === "chat"
+        ? CHAT_REPLIES_SECTION
+        : `## Handoff
 
 At a handoff - ${GPT_HANDOFF_MOMENTS[context.surface]} - first work out what the user asked for and what they need to know now, then open with one block:
 
 > [Outcome so far] toward [the user's original ask and the result they wanted]. You need: [ledger N/M done, findings, blockers]. Now: [todo task in progress]. Next: [next open task].
 
-Now and Next are todo labels verbatim; the Next stated is executed in this same response with tool calls. Between handoffs, no narration.
+Now and Next are todo labels verbatim; the Next stated is executed in this same response with tool calls. Between handoffs, no narration.`}
 
 ## Style
 
-Plain, concrete prose; bullets only for genuinely list-shaped content. The final message is the Handoff block: its outcome and You need slots carry the result and its verification, not a file-by-file changelog. Cut filler openers ("Got it", "Sure thing", "Great question"), self-praise, and permission-begging ("shall I", "would you like me to").
+Plain, concrete prose; bullets only for genuinely list-shaped content. ${context.surface === "chat" ? `${CHAT_FINAL_MESSAGE}: it carries` : "The final message is the Handoff block: its outcome and You need slots carry"} the result and its verification, not a file-by-file changelog. Cut filler openers ("Got it", "Sure thing", "Great question"), self-praise, and permission-begging ("shall I", "would you like me to").
 
 Have an opinion when context supports one. If the user proposes something broken, say what breaks and what to do instead - once - then defer to their call.
 

package/dist/core/extensions/builtin/prompt-preset/gpt-5.6.js

@@ -61,7 +61,8 @@
 // user directive that progress be legible at every phase change; per the
 // guide's "Simplify prompts first", the section is paid for by those deletions.
 import { APP_NAME } from "../../../../config.js";
-import { buildDynamicSystemPrompt } from "../../../dynamic-prompt/build.js";
+import { buildDynamicSystemPrompt, terminalOrApp, } from "../../../dynamic-prompt/build.js";
+import { CHAT_REPLIES_SECTION } from "../../../dynamic-prompt/handoff.js";
 import { buildTestDisciplineSection } from "../../../dynamic-prompt/verification.js";
 import { buildFileOperationsTuning } from "./file-operations.js";
 import { buildGptEvalRoutingTuning } from "./gpt-eval-routing.js";
@@ -99,7 +100,7 @@ function buildGpt56Core(context) {
 
 ## Intent Gate
 
-${INTENT_GATE_LEAD[context.surface]}
+${INTENT_GATE_LEAD[terminalOrApp(context.surface)]}
 
 Implement, don't propose. Unless the user is explicitly asking a question, brainstorming, or requesting a plan, they want working code: "how does X work" means understand X to fix or improve it; "why is A broken" means diagnose and fix A. Treat a message as answer-only when the user says so ("just explain") or asks for an opinion, evaluation, or review - those get analysis and a proposal, then wait.
 
@@ -126,7 +127,7 @@ Scale the scope of checks to the change, never the rigor:
 - Single-domain behavioral change: type check on the changed code, related tests, one run of the affected entry point when one exists.
 - Multi-file or cross-cutting work: type check, related tests, build, and the Manual QA Gate below.
 
-Run the validator before reporting anything clean - "should pass" is not verification${context.surface === "app" ? `. ${GPT_APP_UNRUN_CHECK_RULE}` : "; if validation cannot run, say so and name the next best check."} Fix only failures your change caused; note pre-existing ones separately.
+Run the validator before reporting anything clean - "should pass" is not verification${context.surface !== "terminal" ? `. ${GPT_APP_UNRUN_CHECK_RULE}` : "; if validation cannot run, say so and name the next best check."} Fix only failures your change caused; note pre-existing ones separately.
 
 ${TEST_DECISION}
 
@@ -163,17 +164,19 @@ ${context.toolSection}
 - Never swallow errors silently; never shotgun-debug with unrelated edits or blind retries.
 - Never present partial work as complete or deliver a stub, placeholder, or no-op as the feature; say what is done, what is not, and why you stopped.
 
-## Handoff
+${context.surface === "chat"
+        ? CHAT_REPLIES_SECTION
+        : `## Handoff
 
 At a handoff - ${GPT_HANDOFF_MOMENTS[context.surface]} - first work out what the user asked for and what they need to know now, then open with one block:
 
 > [Outcome so far] toward [the user's original ask and the result they wanted]. You need: [ledger N/M done, findings, blockers]. Now: [todo task in progress]. Next: [next open task].
 
-Now and Next are todo labels verbatim; the Next stated is executed in this same response with tool calls. Between handoffs, no narration.
+Now and Next are todo labels verbatim; the Next stated is executed in this same response with tool calls. Between handoffs, no narration.`}
 
 ## Output
 
-Final message: the Handoff block, whose outcome leads and whose You need slot carries the evidence needed to trust it - what you verified, ${context.surface === "app" ? GPT_APP_UNVERIFIED_SLOT : "what you could not and why"}, and pre-existing issues you left alone - grouped by user-facing outcome, not by file. Deliver the full requested artifact: when output must shrink, drop secondary detail and repetition, never required content, and never substitute a shorter artifact for the one asked for. Trim introductions and generic reassurance first.
+Final message: ${context.surface === "chat" ? "the answer itself, whose outcome leads and which carries" : "the Handoff block, whose outcome leads and whose You need slot carries"} the evidence needed to trust it - what you verified, ${context.surface !== "terminal" ? GPT_APP_UNVERIFIED_SLOT : "what you could not and why"}, and pre-existing issues you left alone - grouped by user-facing outcome, not by file. Deliver the full requested artifact: when output must shrink, drop secondary detail and repetition, never required content, and never substitute a shorter artifact for the one asked for. Trim introductions and generic reassurance first.
 
 Code reviews: findings first, ordered by severity with file references; then open questions and assumptions; change summary last. With no findings, say so and name residual risks or testing gaps.
 
@@ -190,7 +193,7 @@ Your STOP GOAL - the turn is over the moment ALL of these hold:
 - Behavioral work passed the Manual QA Gate this turn.
 - The final message is delivered as specified in Output.
 
-Until the stop goal holds, keep going - through failed tool calls, long turns, and the temptation to hand back a draft. The moment it holds: re-read the original request once, confirm each item and ${context.surface === "app" ? "your stop condition" : "your declared stop condition"} against evidence already captured, deliver the final message, and STOP. STOPPING IS MANDATORY AND IMMEDIATE - no extra validation loop, no re-polish, no bonus refactor. Every action past the stop goal is a defect, not diligence.
+Until the stop goal holds, keep going - through failed tool calls, long turns, and the temptation to hand back a draft. The moment it holds: re-read the original request once, confirm each item and ${context.surface !== "terminal" ? "your stop condition" : "your declared stop condition"} against evidence already captured, deliver the final message, and STOP. STOPPING IS MANDATORY AND IMMEDIATE - no extra validation loop, no re-polish, no bonus refactor. Every action past the stop goal is a defect, not diligence.
 
 ${buildFileOperationsTuning({ toolNames: context.tools.map((tool) => tool.name) })}`;
 }