codeep 3.4.0 → 3.5.0

package/dist/renderer/agentExecution.js

@@ -14,6 +14,8 @@ import { takeRunFromPhone } from '../utils/telegramInbox.js';
 import { isFlatFeeProvider } from '../config/providers.js';
 import { raceApproval } from '../utils/approvalRace.js';
 import { describeAuditTarget } from '../utils/auditLog.js';
+import { trustBearingWrite, forgetHooksDirectory } from '../utils/toolExecution.js';
+import { shellCommandEnv } from '../utils/shell.js';
 import { charWidth } from './ansi.js';
 import { config, autoSaveSession, getCurrentSessionId } from '../config/index.js';
 import { reportStats, syncSession, generateProjectId } from '../utils/codeepCloud.js';
@@ -235,75 +237,95 @@ export async function executeAgentTask(task, dryRun, ctx) {
         const asksPerTool = confirmationMode === 'dangerous' || confirmationMode === 'always';
         // Read the Telegram credentials once for the whole run rather than per tool
         // call: they come from the OS keychain, and paying that on every dangerous
-        // tool would put a keychain round-trip in front of each confirmation.
-        // Null means the feature is off or half-configured, and the terminal is
-        // then the only place the question appears — exactly as before.
-        const telegramCredentials = asksPerTool
-            ? await loadTelegramCredentials()
-            : null;
-        // The finish notice does not depend on the confirmation mode — a run with
-        // confirmations off is exactly the one you are most likely to walk away
-        // from. Reuse the credentials already read above when there are any, so
-        // this costs a second keychain round-trip only when there are not.
-        const noticeCredentials = telegramCredentials ?? await loadTelegramCredentials();
+        // tool would put a keychain round-trip in front of each confirmation. Read
+        // in every mode, for the finish notice — and because 'never' now asks
+        // about a file that decides what runs later, which is exactly the kind of
+        // run someone has walked away from. Null means the feature is off or
+        // half-configured, and the terminal is then the only place the question
+        // appears — exactly as before.
+        const telegramCredentials = await loadTelegramCredentials();
         const runStartedAt = Date.now();
-        const onRequestPermission = asksPerTool
-            ? async (toolCall) => {
-                // `parameters.command` is the binary alone — `git`, not `git status`.
-                // Showing that asks someone to approve a command they have not been
-                // shown, which is the one thing this gate must not do. The audit
-                // record already joins the binary with its arguments; reuse it rather
-                // than writing a second, subtly different answer.
-                const target = describeAuditTarget(toolCall);
-                // Indented by two in the dialog.
-                const targetLines = wrapConfirmTarget(target, (process.stdout.columns || 80) - 4)
-                    .map(line => `  ${line}`);
-                const inTerminal = {
-                    answer: new Promise((resolve) => {
-                        app.showConfirm({
-                            title: '⚠️  Confirm Action',
-                            message: [
-                                'The agent wants to execute:',
-                                '',
-                                `  ${showControls(toolCall.tool)}`,
-                                ...targetLines,
-                                '',
-                                telegramCredentials ? 'Allow this action? (or answer on Telegram)' : 'Allow this action?',
-                            ],
-                            confirmLabel: 'Allow',
-                            cancelLabel: 'Deny',
-                            extraOption: { label: 'Always Allow', onSelect: () => resolve('allow_always') },
-                            onConfirm: () => resolve('allow_once'),
-                            onCancel: () => resolve('reject_always'),
-                        });
-                    }),
-                    // Answered on the phone: take the dialog down without running either
-                    // callback, since the decision is already made and taken.
-                    withdraw: (winner) => app.dismissConfirm(`Answered on Telegram — ${winner}.`),
+        // 'never' still gets a callback. A write to a file that decides what runs
+        // later — `.git/config`, a hook, an MCP server list — is asked about in
+        // every mode (the agent gate decides which calls those are), and "never
+        // ask" is then answered here for everything else, exactly as before:
+        // without a callback the agent would have to refuse those writes instead.
+        const onRequestPermission = async (toolCall, 
+        // What the agent gate already worked out about this call, passed rather
+        // than worked out twice: trustBearingWrite() stats the path, resolves a
+        // symlinked ancestor and may ask git where this repo keeps its hooks.
+        // Undefined means the question came from somewhere that has not looked
+        // — a skill's shell line asks through this same callback — so it is
+        // only then that this side looks for itself. `null` is an answer.
+        known) => {
+            const trustBearing = known !== undefined ? known : trustBearingWrite(toolCall, context.root || process.cwd());
+            if (!asksPerTool && !trustBearing)
+                return 'allow_once';
+            // `parameters.command` is the binary alone — `git`, not `git status`.
+            // Showing that asks someone to approve a command they have not been
+            // shown, which is the one thing this gate must not do. The audit
+            // record already joins the binary with its arguments; reuse it rather
+            // than writing a second, subtly different answer.
+            const target = describeAuditTarget(toolCall);
+            // Indented by two in the dialog.
+            const targetLines = wrapConfirmTarget(target, (process.stdout.columns || 80) - 4)
+                .map(line => `  ${line}`);
+            const inTerminal = {
+                answer: new Promise((resolve) => {
+                    app.showConfirm({
+                        title: '⚠️  Confirm Action',
+                        message: [
+                            'The agent wants to execute:',
+                            '',
+                            `  ${showControls(toolCall.tool)}`,
+                            ...targetLines,
+                            // What the file does, not that it is "sensitive": someone
+                            // deciding in one second needs the consequence, not a label.
+                            ...(trustBearing ? ['', ...wrapConfirmTarget(`⚠️  ${trustBearing.reason}`, (process.stdout.columns || 80) - 4)] : []),
+                            '',
+                            telegramCredentials ? 'Allow this action? (or answer on Telegram)' : 'Allow this action?',
+                        ],
+                        confirmLabel: 'Allow',
+                        cancelLabel: 'Deny',
+                        // No "Always Allow" for one of those files: the agent answers
+                        // about this file only and would not remember it anyway.
+                        extraOption: trustBearing ? undefined : { label: 'Always Allow', onSelect: () => resolve('allow_always') },
+                        onConfirm: () => resolve('allow_once'),
+                        // The one "no" there is, and it answers reject_always. For one of
+                        // those files the agent remembers that against the FILE rather
+                        // than the tool, so refusing a `.git/config` prompt does not also
+                        // switch delete_file off for the rest of the run.
+                        onCancel: () => resolve('reject_always'),
+                    });
+                }),
+                // Answered on the phone: take the dialog down without running either
+                // callback, since the decision is already made and taken.
+                withdraw: (winner) => app.dismissConfirm(`Answered on Telegram — ${winner}.`),
+            };
+            let onPhone = null;
+            if (telegramCredentials) {
+                // Report a failure to *ask* once, in the terminal. Without this a
+                // wrong chat id looks exactly like a phone nobody picked up.
+                const telegram = new TelegramApproval(telegramCredentials, reason => app.notifyWarn(`Telegram: ${reason}`));
+                onPhone = {
+                    answer: telegram
+                        // The reason goes with it: a phone showing less than the terminal
+                        // asks for a decision on less than the terminal had.
+                        .ask(target, toolCall.tool, true, undefined, trustBearing?.reason)
+                        .then(answer => (answer ? outcomeForAnswer(answer) : null))
+                        // A phone that cannot be reached is not a denial. Step aside and
+                        // let the terminal decide, however long that takes.
+                        .catch(() => null),
+                    withdraw: (winner) => telegram.withdraw(winner),
                 };
-                let onPhone = null;
-                if (telegramCredentials) {
-                    // Report a failure to *ask* once, in the terminal. Without this a
-                    // wrong chat id looks exactly like a phone nobody picked up.
-                    const telegram = new TelegramApproval(telegramCredentials, reason => app.notifyWarn(`Telegram: ${reason}`));
-                    onPhone = {
-                        answer: telegram
-                            .ask(target, toolCall.tool, true)
-                            .then(answer => (answer ? outcomeForAnswer(answer) : null))
-                            // A phone that cannot be reached is not a denial. Step aside and
-                            // let the terminal decide, however long that takes.
-                            .catch(() => null),
-                        withdraw: (winner) => telegram.withdraw(winner),
-                    };
-                }
-                const { answer } = await raceApproval(inTerminal, onPhone, outcome => describePermissionOutcome(outcome));
-                // Nobody answered — neither side could even ask. `classifyPermissionOutcome`
-                // fails closed on anything it does not recognise, and this is spelled
-                // out rather than left to that: a question that was never put must
-                // never read as a yes.
-                return answer ?? 'reject_once';
             }
-            : undefined;
+            const { answer } = await raceApproval(inTerminal, onPhone, outcome => describePermissionOutcome(outcome));
+            // Nobody answered — neither side could even ask. `classifyPermissionOutcome`
+            // fails closed on anything it does not recognise, and this is spelled
+            // out rather than left to that: a question that was never put must
+            // never read as a yes.
+            return answer ?? 'reject_once';
+        };
         const result = await runAgent(enrichedTask, context, {
             dryRun,
             onRequestPermission,
@@ -558,7 +580,7 @@ export async function executeAgentTask(task, dryRun, ctx) {
         // Told once the run is over, and only when it ran long enough that you
         // could plausibly have stopped watching. Awaited so the process does not
         // exit from under the request, but never allowed to fail the run.
-        if (noticeCredentials) {
+        if (telegramCredentials) {
             const elapsedMs = Date.now() - runStartedAt;
             const fromPhone = startedFromPhone;
             // The one-minute threshold exists so a phone is not buzzed about work you
@@ -578,7 +600,7 @@ export async function executeAgentTask(task, dryRun, ctx) {
                     costUsd: payPerUse.reduce((sum, e) => sum + e.estimatedCost, 0),
                 });
                 for (const message of messages) {
-                    await sendTelegramNotice(noticeCredentials, message).catch(() => false);
+                    await sendTelegramNotice(telegramCredentials, message).catch(() => false);
                 }
             }
         }
@@ -657,12 +679,37 @@ export async function runSkill(nameOrShortcut, args, ctx) {
     try {
         const result = await executeSkill(skill, params, {
             onCommand: async (cmd) => {
+                const cwd = ctx.projectPath || process.cwd();
+                // A raw process.env here handed the repository's own `.git/config`
+                // back to git: `/commit` runs `git commit`, and a repo-scope
+                // `gpg.program` that Codeep's own commit path neutralises executed
+                // through this spawn instead.
+                //
+                // Built before the spawn, and caught: shellCommandEnv() refuses a git
+                // line in a repository whose config names a program no override
+                // switches off, and a refusal escaping here would abort the whole
+                // skill rather than fail the step that asked for git. A step that
+                // cannot run is reported the same way a step that failed is.
+                let env;
+                try {
+                    env = shellCommandEnv(cmd, cwd);
+                }
+                catch (error) {
+                    const why = error instanceof Error ? error.message : String(error);
+                    ctx.app.addMessage({ role: 'system', content: `\`${cmd}\` was not run:\n\`\`\`\n${why}\n\`\`\`` });
+                    throw new Error(why);
+                }
+                // A command line is the one thing in a skill that can move this
+                // repository's hooks (`git config core.hooksPath .evil`), and the
+                // write gate caches where they are for the run.
+                forgetHooksDirectory();
                 const proc = spawnSync(cmd, {
-                    cwd: ctx.projectPath || process.cwd(),
+                    cwd,
                     encoding: 'utf-8',
                     timeout: 60000,
                     shell: true,
                     stdio: ['pipe', 'pipe', 'pipe'],
+                    env,
                 });
                 const stdout = (proc.stdout || '').trim();
                 const stderr = (proc.stderr || '').trim();

package/dist/renderer/commands.js

@@ -9,7 +9,7 @@ import { config, getCurrentProvider, getModelsForCurrentProvider, PROTOCOLS, LAN
 import { setTelegramToken, clearTelegramToken, hasTelegramToken } from '../utils/telegramCredentials.js';
 import { getProjectContext } from '../utils/project.js';
 import { getCurrentVersion } from '../utils/update.js';
-import { getProviderList, getProvider, modelSupportsReasoningEffort, reasoningParamsFor, availableReasoningTiers, resolveReasoningTier, REASONING_TIERS } from '../config/providers.js';
+import { getProviderList, getProvider, modelSupportsReasoningEffort, reasoningParamsFor, availableReasoningTiers, resolveReasoningTier, agentTurnReasoningNote, replacementModelFor, REASONING_TIERS } from '../config/providers.js';
 import { setProjectContext } from '../api/index.js';
 import { runSkill, runCommandChain } from './agentExecution.js';
 import { loadProjectIntelligence, saveProjectIntelligence, INTELLIGENCE_NOT_SAVED } from '../utils/projectIntelligence.js';
@@ -301,14 +301,15 @@ export async function handleCommand(command, args, ctx) {
                     ctx.app.notify('Thinking effort: auto — each model uses its own default.');
                 }
                 else if (!supported) {
-                    ctx.app.notify(`Thinking effort set to "${sub}", but ${model} has no graded thinking control — it will be ignored until you switch to a model that does (e.g. Opus 5, GPT-5.x or GPT-6, Gemini 3, DeepSeek V4.1 Flash, GLM-5.x, Kimi K3).`);
+                    ctx.app.notify(`Thinking effort set to "${sub}", but ${model} has no graded thinking control — it will be ignored until you switch to a model that does (e.g. Opus 5.5, GPT-5.x or GPT-6, Gemini 3, DeepSeek V4, GLM-5.x, Kimi K3).`);
                 }
                 else {
                     // Tell the user what THIS model will actually run (the tier may
                     // collapse onto a level the model distinguishes, e.g. medium→high on Kimi K3).
                     const resolved = resolveReasoningTier(providerId, model, sub);
                     const note = resolved === sub ? '' : ` (${model} runs this as "${resolved}")`;
-                    ctx.app.notify(`Thinking effort: ${sub}${note} — sending ${JSON.stringify(reasoningParamsFor(providerId, model, sub))}.`);
+                    const agentNote = agentTurnReasoningNote(providerId, model);
+                    ctx.app.notify(`Thinking effort: ${sub}${note} — sending ${JSON.stringify(reasoningParamsFor(providerId, model, sub))}.${agentNote ? ` ${agentNote}` : ''}`);
                 }
                 break;
             }
@@ -333,8 +334,11 @@ export async function handleCommand(command, args, ctx) {
             }
             if (supported)
                 tLines.push(`**Available**  ${available.join(' · ')}`);
+            const agentNote = agentTurnReasoningNote(providerId, model);
+            if (agentNote)
+                tLines.push(`**Agent turns**  reasoning off — ${agentNote}`);
             tLines.push('');
-            tLines.push('Sets how hard the model reasons. Each model offers only the levels it distinguishes (DeepSeek → high · max; Kimi K3 → low · high · max; Gemini → low · high; Opus/Sonnet & GPT-5.x → the full set). The setting is global and clamps to the active model, so it never sends a value the API rejects. `/effort` is an alias.');
+            tLines.push('Sets how hard the model reasons. Each model offers only the levels it distinguishes (DeepSeek & Kimi K3 → low · high · max; Gemini → low · medium · high; Opus/Sonnet & GPT-5.x/6 → the full set). The setting is global and clamps to the active model, so it never sends a value the API rejects. `/effort` is an alias.');
             ctx.app.addMessage({ role: 'system', content: tLines.join('\n') });
             break;
         }
@@ -1215,9 +1219,25 @@ Format: use headers per category, only include categories where you found issues
                 ctx.app.notify('Usage: /git-commit <message>');
                 return;
             }
-            // Use execFile to avoid shell injection — pass commit message as a direct argument
-            import('child_process').then(({ execFile }) => {
-                execFile('git', ['commit', '-m', message], { cwd: ctx.projectPath, encoding: 'utf-8' }, (err) => {
+            // Use execFile to avoid shell injection — pass commit message as a direct argument.
+            // hardenedGitEnv() on top of that: the repo's own .git/config can name programs
+            // git would run for this commit (core.fsmonitor, core.hooksPath, …).
+            Promise.all([import('child_process'), import('../utils/git.js')]).then(([{ execFile }, { hardenedGitEnv }]) => {
+                // The SAME cwd the commit runs in. Called with no argument, the scan
+                // read process.cwd() instead — so a project opened anywhere other
+                // than the directory Codeep was launched from was "hardened" against
+                // a different repository's config entirely.
+                let env;
+                try {
+                    env = hardenedGitEnv({ cwd: ctx.projectPath });
+                }
+                catch (error) {
+                    // It refuses rather than hand git a half-scanned environment, and
+                    // its message names the key and what to do about it.
+                    ctx.app.notify(error instanceof Error ? error.message : 'Commit failed');
+                    return;
+                }
+                execFile('git', ['commit', '-m', message], { cwd: ctx.projectPath, encoding: 'utf-8', env }, (err) => {
                     if (err) {
                         ctx.app.notify(`Commit failed: ${err.message}`);
                     }
@@ -1721,14 +1741,19 @@ Format: use headers per category, only include categories where you found issues
             const replacedCount = ctx.app.getMessages().length;
             ctx.app.setMessages(cp.messages);
             saveSession(ctx.sessionId, cp.messages, ctx.projectPath);
-            // Switch provider/model back to checkpoint state if different.
+            // Switch provider/model back to checkpoint state if different. A
+            // checkpoint predates any later retirement, so its model goes through the
+            // same map as a stored config (`gpt-6-astra` comes back as `gpt-6-sol`),
+            // looked up on the provider actually active after the switch.
             if (cp.provider && cp.provider !== getCurrentProvider().id)
                 setProvider(cp.provider);
-            if (cp.model && cp.model !== config.get('model'))
-                config.set('model', cp.model);
+            const cpModel = cp.model && (replacementModelFor(config.get('provider'), cp.model) ?? cp.model);
+            if (cpModel && cpModel !== config.get('model'))
+                config.set('model', cpModel);
+            const movedNote = cpModel !== cp.model ? ` (the checkpoint's \`${cp.model}\` is no longer offered)` : '';
             ctx.app.addMessage({
                 role: 'system',
-                content: `# Rewound to ${cp.name ? `**${cp.name}**` : `\`${cp.id}\``}\n\nRestored ${cp.messages.length} message${cp.messages.length === 1 ? '' : 's'} (was ${replacedCount}). Provider: \`${cp.provider}\` · Model: \`${cp.model}\`\n\n${buildRewindGitHint(cp)}`,
+                content: `# Rewound to ${cp.name ? `**${cp.name}**` : `\`${cp.id}\``}\n\nRestored ${cp.messages.length} message${cp.messages.length === 1 ? '' : 's'} (was ${replacedCount}). Provider: \`${cp.provider}\` · Model: \`${cpModel}\`${movedNote}\n\n${buildRewindGitHint(cp)}`,
             });
             break;
         }

package/dist/renderer/main.d.ts

@@ -6,7 +6,31 @@
  * commands.ts and agent execution in agentExecution.ts.
  */
 import { App } from './App';
+import { type GitStatus } from '../utils/git';
 import type { McpServer } from '../acp/protocol';
+/**
+ * What to tell the user when git would not run in this project, or null when
+ * there is nothing to tell them.
+ *
+ * Without it the only symptom is the branch quietly missing from the header,
+ * which reads as "not a repository" — so a repository whose own `.git/config`
+ * names a program git would run looks like an ordinary folder, and the one
+ * thing the user has to do (remove that key) is never said anywhere. The
+ * refusal names the key and the `git config --unset` that clears it, so it is
+ * passed through verbatim rather than summarised into "git failed".
+ *
+ * Read off `refusal` and NOT off `error`, which is the field an earlier cut
+ * of this used. `error` is every way git can fail in a repository, and the
+ * commonest of them is a brand-new `git init` with no commit yet: `git
+ * rev-parse --abbrev-ref HEAD` answers `fatal: ambiguous argument 'HEAD'`
+ * there (git 2.54), so the first thing a user does in a new project met a
+ * warning made of git internals telling them to remove a config key that does
+ * not exist. `refusal` is filled on the hardening path and nowhere else, so
+ * an ordinary git failure stays as silent as it was before this notice
+ * existed — the branch is simply missing from the header, which is what it
+ * has always done.
+ */
+export declare function gitRefusalNotice(status: GitStatus): string | null;
 /** Derive a short display name from a user message (first ~5 words, max 48 chars). */
 export declare function deriveSessionName(message: string): string;
 /**

package/dist/renderer/main.js

@@ -31,8 +31,13 @@ import { symlinkedCodeepNotice } from '../utils/projectPaths.js';
 // ─── Global state ─────────────────────────────────────────────────────────────
 let projectPath = process.cwd();
 /** Cached header branch. Resolved on first use so `--version`/`--help` never
- *  shell out to git, and cached because getStatus runs on every render frame. */
+ *  shell out to git, and cached because getStatus runs on every render frame.
+ *  `refusal` is the message getGitStatus carries back when git would not run
+ *  here at all — see reportGitRefusal(). */
 let gitBranchCache = null;
+/** Projects whose refusal has already been put in the transcript, so a cache
+ *  dropped after every agent run does not repeat it once a minute. */
+const gitRefusalReported = new Set();
 let projectContext = null;
 let hasWriteAccess = false;
 let sessionId = getCurrentSessionId();
@@ -51,10 +56,60 @@ const addedFiles = new Map();
  *  or an agent run finished (an agent can check out a different branch). */
 function getHeaderBranch() {
     if (!gitBranchCache || gitBranchCache.path !== projectPath) {
-        gitBranchCache = { path: projectPath, branch: getGitStatus(projectPath).branch };
+        const status = getGitStatus(projectPath);
+        const refusal = gitRefusalNotice(status);
+        gitBranchCache = { path: projectPath, branch: status.branch, refusal: refusal ?? undefined };
+        reportGitRefusal(projectPath, refusal);
     }
     return gitBranchCache.branch;
 }
+/**
+ * What to tell the user when git would not run in this project, or null when
+ * there is nothing to tell them.
+ *
+ * Without it the only symptom is the branch quietly missing from the header,
+ * which reads as "not a repository" — so a repository whose own `.git/config`
+ * names a program git would run looks like an ordinary folder, and the one
+ * thing the user has to do (remove that key) is never said anywhere. The
+ * refusal names the key and the `git config --unset` that clears it, so it is
+ * passed through verbatim rather than summarised into "git failed".
+ *
+ * Read off `refusal` and NOT off `error`, which is the field an earlier cut
+ * of this used. `error` is every way git can fail in a repository, and the
+ * commonest of them is a brand-new `git init` with no commit yet: `git
+ * rev-parse --abbrev-ref HEAD` answers `fatal: ambiguous argument 'HEAD'`
+ * there (git 2.54), so the first thing a user does in a new project met a
+ * warning made of git internals telling them to remove a config key that does
+ * not exist. `refusal` is filled on the hardening path and nowhere else, so
+ * an ordinary git failure stays as silent as it was before this notice
+ * existed — the branch is simply missing from the header, which is what it
+ * has always done.
+ */
+export function gitRefusalNotice(status) {
+    const refusal = status.isRepo ? status.refusal : undefined;
+    if (!refusal)
+        return null;
+    return `⚠️  ${refusal}\n\nUntil then the header shows no branch, and everything Codeep does with git here — the status line, \`@git\`, \`/commit\`, the review hook — is off.`;
+}
+/**
+ * Put that message in the transcript once per project.
+ *
+ * A transcript message and not notify(): a toast is gone in three seconds,
+ * and this is a thing to act on, not a thing to glance at. Once per project
+ * because the cache it rides on is dropped after every agent run, and a
+ * warning repeated after each run is one the user learns to scroll past.
+ *
+ * Queued rather than added inline because the only caller runs inside
+ * getStatus(), which the render loop calls — pushing a message onto the list
+ * the frame is reading would tear that frame. The microtask lands before the
+ * next one.
+ */
+function reportGitRefusal(path, notice) {
+    if (!notice || gitRefusalReported.has(path))
+        return;
+    gitRefusalReported.add(path);
+    queueMicrotask(() => { app?.addMessage({ role: 'system', content: notice }); });
+}
 /** Derive a short display name from a user message (first ~5 words, max 48 chars). */
 export function deriveSessionName(message) {
     const clean = message.replace(/\s+/g, ' ').trim();

package/dist/utils/agent.d.ts

@@ -10,9 +10,26 @@ import { type Personality } from './personalities';
 export { loadProjectRules, loadProgressLog, writeProgressLog, formatChatHistoryForAgent };
 export type { AgentChatResponse };
 import { ToolCall, ToolResult, ActionLog } from './tools';
+import { type TrustBearingWrite } from './toolExecution';
 import { undoLastAction, undoAllActions, getCurrentSession, getRecentSessions, formatSession, ActionSession } from './history';
 import { VerifyResult } from './verify';
 import { TaskPlan, SubTask } from './taskPlanner';
+/**
+ * The text an assistant turn is kept as in the history sent back next time.
+ *
+ * The loop stores each turn as plain text, and a turn that only called tools
+ * has none: Claude often skips the narration, and Opus 5.5 and Fable 5.1 move
+ * it into thinking blocks, which the stream parser does not keep. Stored as
+ * '', that turn is an empty non-final message on the next request, which
+ * Anthropic's Messages API refuses with a 400 ("all messages must have
+ * non-empty content except for the optional final assistant message").
+ * agentChat turns that 400 into the text-tool fallback, which sends the same
+ * history and fails the same way, so the run died on its second iteration.
+ * Naming the tools keeps the turn truthful and non-empty.
+ */
+export declare function assistantHistoryText(content: string, toolCalls: ReadonlyArray<{
+    tool: string;
+}>): string;
 export type PermissionOutcome = 'allow_once' | 'allow_always' | 'reject_once' | 'reject_always';
 export type PermissionDecision = 'allow-once' | 'allow-always' | 'deny-once' | 'deny-always';
 /**
@@ -65,7 +82,18 @@ export interface AgentOptions {
     onVerification?: (results: VerifyResult[]) => void;
     onTaskPlan?: (plan: TaskPlan) => void;
     onTaskUpdate?: (task: SubTask) => void;
-    onRequestPermission?: (toolCall: ToolCall) => Promise<PermissionOutcome>;
+    /**
+     * Ask the user about one tool call.
+     *
+     * `trustBearing` is what this run already worked out about the call — the
+     * file it would write that decides what runs later, or null when it writes
+     * no such file. It is passed so the side putting up the dialog can word it
+     * without calling trustBearingWrite() a second time: that call stats the
+     * path, follows a symlink and may ask git where the repo's hooks live.
+     * Optional, so a caller that would rather work it out itself (or was not
+     * called from the gate below) still type-checks.
+     */
+    onRequestPermission?: (toolCall: ToolCall, trustBearing?: TrustBearingWrite | null) => Promise<PermissionOutcome>;
     /** Tool names to force into the per-run dangerous set, on top of the global
      *  agentConfirm* settings. ACP manual mode passes ['write_file','edit_file']
      *  here to gate them for THIS run only, instead of mutating global config. */
@@ -123,10 +151,13 @@ export interface AgentOptions {
     roleAddendum?: string;
     /** "Always allow" / "always deny" answers shared with a delegating parent,
      *  so a sub-agent neither asks again about a tool the user already decided
-     *  on nor runs one the user refused. */
+     *  on nor runs one the user refused. `alwaysRejectedPaths` holds the same
+     *  for a single file that decides what runs later, which is refused by name
+     *  rather than by tool. */
     permissionMemory?: {
         alwaysAllowed: Set<string>;
         alwaysRejected: Set<string>;
+        alwaysRejectedPaths?: Set<string>;
     };
     /** Provider/model for this run only, used in place of the global selection.
      *  A sub-agent with its own `model:` runs on it this way; the global config