tonedial 0.1.3 → 0.1.4

package/dist/cli.js

@@ -36,7 +36,7 @@ export const JSON_SCHEMA = 3;
  * run time is the one thing that breaks all three binary packagers at once. A test asserts this
  * equals the manifest, which is the cheap half of the trade.
  */
-export const VERSION = "0.1.3";
+export const VERSION = "0.1.4";
 const FLAG_NAMES = ["project", "check", "explain", "global", "here", "migrateLegacy", "auto", "dryRun", "fix", "rollback", "fromOperation", "fromPreset", "restorePreset", "preset", "slug", "acceptUsage", "lang", "commands", "tools"];
 /** Command-line spelling for each flag, where it differs from the field name. */
 const FLAG_SPELLING = {

package/dist/commands/doctor.js

@@ -515,11 +515,34 @@ async function doctorReport(ctx, showRollbackCommands = true, showCodexAction =
         operations: inspected.journals.map(({ operationId, state }) => ({ operationId, state })),
     };
     if (inspected.lock.state !== "none" || inspected.journals.some(({ state }) => state === "pending" || state === "invalid")) {
+        const owner = inspected.lock.owner;
+        const blocking = inspected.journals.filter(({ state }) => state === "pending" || state === "invalid");
+        const shown = ctx.flags.verbose ? inspected.journals : inspected.journals.filter(({ operationId, state }) => state === "pending" || state === "invalid" || operationId === owner?.operationId);
+        const lines = [
+            ...wrap(ctx.t.doctor.recoveryPending, ctx.ui.width - 2).map(line => `  ${ctx.ui.warn(line)}`),
+            ...shown.map(({ operationId, state }) => `  ${operationId}  ${ctx.t.doctor.operationState[state]}`),
+        ];
+        if (owner !== null && !shown.some(({ operationId }) => operationId === owner.operationId))
+            lines.push(`  ${owner.operationId}`);
+        if (inspected.lock.state === "live" || inspected.lock.state === "unknown" || inspected.lock.state === "invalid") {
+            lines.push(...wrap(ctx.t.doctor.rollbackStatus[inspected.lock.state === "live" ? "busy" : "unresolved"], ctx.ui.width - 2)
+                .map(line => `  ${line}`));
+        }
+        else if (inspected.lock.state === "dead" && owner?.kind === "mutation") {
+            const entry = inspected.journals.find(({ operationId }) => operationId === owner.operationId);
+            if (entry?.journal && entry.journal.owner.nonce === owner.nonce) {
+                const selection = inspectRollback(ctx.paths, owner.operationId);
+                if (entry.state === "pending" && !selection.synthetic && blocking.every(({ operationId, journal }) => operationId === owner.operationId && journal !== null)) {
+                    lines.push("", `  ${ctx.t.doctor.resumeOperation}`, ...nextStep(repairCommand(ctx, `doctor --fix --from-operation ${owner.operationId}`), ctx.ui).slice(1));
+                }
+                if (showRollbackCommands && previewRollback(ctx.paths, owner.operationId, ctx.t).status === "ready") {
+                    lines.push("", ...receiptLines(ctx.t.recovery.rollback(owner.operationId), ctx.ui.width - 2).map(line => `  ${line}`));
+                }
+            }
+        }
+        lines.push(...nextStep(`${repairCommand(ctx, "doctor")} --json`, ctx.ui));
         return {
-            lines: [
-                ...wrap(ctx.t.doctor.recoveryPending, ctx.ui.width - 2).map((line) => `  ${ctx.ui.warn(line)}`),
-                ...recovery.operations.map(({ operationId, state }) => `  ${operationId}  ${ctx.t.doctor.operationState[state]}`),
-            ],
+            lines,
             // The damaged config is deliberately not parsed here. `operation` is the only safe context
             // fact to expose until the owner-selected rollback or recovery has completed.
             json: {

package/dist/commands/rebuild.js

@@ -8,7 +8,7 @@ import { compile } from "../core/compile.js";
 import { toCompileInput } from "../core/resolve.js";
 import { isLanguage, LANGUAGES } from "../core/i18n.js";
 import { recoverLegacyTone } from "../core/legacy-tone.js";
-import { exportAliasesState, stateOverlapsInstructions } from "../core/paths.js";
+import { connectionScopeFlag, exportAliasesState, stateOverlapsInstructions } from "../core/paths.js";
 import { applyPreset, matchesPreset, assertPresetSelection, BUNDLED, customPresetDir, inspectPresetLibrary, parsePreset, PRESET_MAX_BYTES, resolvePreset, serializePreset, SLUG_PATTERN, } from "../core/presets.js";
 import { contextArtifactTargets, generatedSeedSelection, planGeneratedSeedRebuild, seedFiles, SEED_VERSION, } from "../core/seeds.js";
 import { inspectOperations, readJournal, retireOperationForAppRebuild, } from "../core/operations.js";
@@ -254,9 +254,14 @@ export async function runAppRebuild(ctx) {
             else if (!ctx.flags.auto && ctx.canPrompt) {
                 const input = createInterface({ input: process.stdin, output: process.stdout });
                 try {
-                    process.stdout.write(`  ${t.doctor.recoveryPending}\n  ${owner.operationId}\n`);
-                    if ((await input.question("  > ")).trim() !== owner.operationId)
-                        throw new ConfigError(t.doctor.recoveryPending);
+                    const operation = t.recovery.resumeOperation(owner.operationId).split("\n").flatMap(line => line === owner.operationId ? [line] : wrap(line, ctx.ui.width - 2));
+                    process.stdout.write(`${operation.map(line => `  ${line}`).join("\n")}\n`);
+                    const question = wrap(t.recovery.resumeQuestion, ctx.ui.width - 3).map(line => `  ${line}`).join("\n");
+                    const answer = (await input.question(`${question} `)).trim();
+                    if (answer === "")
+                        throw new ConfigError(t.recovery.cancelled);
+                    if (answer !== owner.operationId)
+                        throw new ConfigError(t.recovery.operationMismatch);
                     retirementId = owner.operationId;
                 }
                 finally {
@@ -394,6 +399,8 @@ export async function runAppRebuild(ctx) {
     }
     const seedsSelection = generatedSeedSelection(ctx.paths, config, ctx.flags.tools !== null && ctx.flags.tools !== "none", t);
     const seeds = planGeneratedSeedRebuild(ctx.paths, config.managedSeeds, seedsSelection, t);
+    const generatedSeeds = seedFiles(ctx.paths, seedsSelection);
+    const rewrittenGenerated = new Set(generatedSeeds.filter(seed => seeds.operationActions.some(({ action }) => action.path === seed.path || (object(action.after)?.type === "directory" && seed.path.startsWith(`${action.path}${sep}`)))).map(seed => seed.path));
     checks.push(...seeds.checks);
     config.managedSeeds = seeds.records;
     config.seedVersion = SEED_VERSION;
@@ -457,40 +464,54 @@ export async function runAppRebuild(ctx) {
         auto: ctx.flags.auto, dryRun: ctx.flags.dryRun, verbose: ctx.flags.verbose, ui: ctx.ui, t,
         heading: t.recovery.heading,
         interactive: () => ctx.canPrompt, ...(ctx.canPrompt ? {} : { out: () => { } }),
-        recoveryPresentation: { lines: presentation, failureMessage: t.recovery.failure },
+        recoveryPresentation: { lines: presentation,
+            failureMessage: (id, phase, path, code) => `${t.recovery.failure(id, phase, path, code)}\ntonedial doctor ${connectionScopeFlag(ctx.agent)} --json` },
         verify: () => {
+            let verificationPath = ctx.paths.config;
+            const mismatch = () => new ConfigError(t.recovery.sourceInvalid, { cause: { code: "VERIFY_MISMATCH", path: verificationPath } });
             try {
                 const repaired = parseConfig(capturedText(captureRawEntry(ctx.paths.config, t, { within: ctx.paths.root })) ?? "", t);
                 if (!isConfigV2(repaired) || serializeConfig(repaired, t) !== serializeConfig(config, t))
-                    throw new ConfigError(t.recovery.sourceInvalid);
-                for (const seed of seedFiles(ctx.paths, seedsSelection)) {
+                    throw mismatch();
+                for (const seed of generatedSeeds) {
+                    verificationPath = seed.path;
                     const now = captureRawEntry(seed.path, t, { within: ctx.paths.root });
                     if (capturedText(now) !== seed.contents)
-                        throw new ConfigError(t.recovery.sourceInvalid);
+                        throw mismatch();
                 }
-                for (const target of artifacts)
+                for (const target of artifacts) {
+                    verificationPath = target.path;
                     if (capturedText(captureRawEntry(target.path, t, { within: ctx.paths.root })) !== artifact)
-                        throw new ConfigError(t.recovery.sourceInvalid);
+                        throw mismatch();
+                }
+                verificationPath = ctx.paths.tone;
                 if (capturedText(captureRawEntry(ctx.paths.tone, t, { within: ctx.paths.root })) !== artifact)
-                    throw new ConfigError(t.recovery.sourceInvalid);
+                    throw mismatch();
                 for (const entry of library.entries) {
                     for (const before of entry.selectionReads) {
-                        if (before.path === restoredPreset?.capture.path)
+                        // Rewritten generated entries were checked against their new bytes above.
+                        if (before.path === restoredPreset?.capture.path || rewrittenGenerated.has(before.path))
                             continue;
+                        verificationPath = before.path;
                         const now = captureRawEntry(before.path, t, { within: ctx.paths.root, maxBytes: PRESET_MAX_BYTES });
                         if (now.type !== before.type || now.identity !== before.identity || now.mode !== before.mode ||
                             (now.bytes === null ? before.bytes !== null : before.bytes === null || !now.bytes.equals(before.bytes))) {
-                            throw new ConfigError(t.recovery.sourceInvalid);
+                            throw mismatch();
                         }
                     }
                 }
                 for (const slug of [...copies, ...(restoredPreset ? [restoredPreset.slug] : [])]) {
+                    verificationPath = slug === restoredPreset?.slug ? restoredPreset.capture.path
+                        : library.recoveryCopies.find(copy => copy.preset.slug === slug).path;
                     if (resolvePreset(ctx.paths.presets, slug, t) === null)
-                        throw new ConfigError(t.recovery.sourceInvalid);
+                        throw mismatch();
                 }
             }
-            catch {
-                throw new ConfigError(t.recovery.sourceInvalid);
+            catch (cause) {
+                if (cause instanceof ConfigError && cause.cause?.code === "VERIFY_MISMATCH")
+                    throw cause;
+                const code = cause !== null && typeof cause === "object" && "code" in cause ? cause.code : undefined;
+                throw new ConfigError(t.recovery.sourceInvalid, { cause: { code, path: verificationPath, cause } });
             }
         },
     };

package/dist/core/i18n.js

@@ -126,7 +126,11 @@ const enMessages = {
         rollbackOrder: "Restore connections first, then application files:",
         noSnapshot: (id) => `${id}: no valid settings snapshot for this state root`,
         retire: (id) => `Retire stopped operation ${id} as history before a new application rebuild. Its external changes are not certified or undone.`,
-        failure: (id) => `Application recovery did not finish. Keep operation ${id}; run tonedial doctor for the recovery choices.`,
+        resumeOperation: (id) => `Stopped operation:\n${id}`,
+        resumeQuestion: "Type the full operation ID above to continue; Enter cancels:",
+        cancelled: "Recovery cancelled. No files were changed.",
+        operationMismatch: "The operation ID did not match. No files were changed.",
+        failure: (id, phase, path, code) => `Application recovery failed during ${({ prepare: "preparation", write: "file writes", verify: "verification", finalize: "completion" })[phase]} (${code}).${path ? `\n${path}` : ""}\nSome file changes may already be applied. Keep operation ${id}.`,
     },
     persona: {
         defaults: role("I", "you", "The person requesting help with a task.", "A general-purpose assistant helping with the requested task."),
@@ -275,7 +279,8 @@ const enMessages = {
         seedsOk: (version) => `version ${version}`,
         seedsNotRun: "no bundled files · init has not run here",
         seedsAttention: "bundled files need attention",
-        recoveryPending: "An operation is active or needs recovery. Nothing was changed. Run tonedial doctor --json to inspect IDs. A recorded rollback uses doctor --fix --rollback ID; a stopped valid operation can be explicitly selected for app rebuild with doctor --fix --from-operation ID. Live or ambiguous owners stay protected.",
+        recoveryPending: "An operation is active or needs recovery. No files were changed by this command.",
+        resumeOperation: "Continue application repair:",
         contextCurrent: "AGENTS.md and TONE.md layout is current.",
         contextRepair: "Managed context files need repair. Check the guide and tone-file diagnostics.",
         contextSize: (guide, total) => total === null
@@ -775,7 +780,11 @@ const koMessages = {
         rollbackOrder: "연결 파일을 먼저 되돌린 뒤 앱 파일을 되돌리세요:",
         noSnapshot: (id) => `${id}: 이 상태 경로에서 쓸 수 있는 설정 기록이 없습니다`,
         retire: (id) => `중단된 작업 ${id}를 기록으로 보관한 뒤 새 앱 복구를 시작합니다. 그 작업의 외부 파일 변경은 확인하거나 되돌리지 않습니다.`,
-        failure: (id) => `앱 복구가 끝나지 않았습니다. 작업 ${id}를 보존하고 tonedial doctor에서 복구 방법을 확인하세요.`,
+        resumeOperation: (id) => `중단된 작업:\n${id}`,
+        resumeQuestion: "계속하려면 위 작업 ID 전체를 입력하세요. Enter를 누르면 취소합니다:",
+        cancelled: "복구를 취소했습니다. 파일은 바꾸지 않았습니다.",
+        operationMismatch: "작업 ID가 일치하지 않습니다. 파일은 바꾸지 않았습니다.",
+        failure: (id, phase, path, code) => `앱 복구의 ${({ prepare: "준비", write: "파일 쓰기", verify: "결과 검증", finalize: "완료 처리" })[phase]} 단계에서 실패했습니다 (${code}).${path ? `\n${path}` : ""}\n일부 파일 변경이 이미 적용되었을 수 있습니다. 작업 ${id}의 기록을 보존해 주세요.`,
     },
     persona: {
         defaults: role("저", "사용자님", "작업에 필요한 도움을 요청하는 사용자.", "요청한 작업을 돕는 범용 조수."),
@@ -927,7 +936,8 @@ const koMessages = {
         seedsOk: (version) => `버전 ${version}`,
         seedsNotRun: "기본 파일 없음 · init으로 준비하세요",
         seedsAttention: "기본 파일 확인 필요",
-        recoveryPending: "진행 중이거나 복구가 필요한 작업이 있습니다. 아무것도 바꾸지 않았습니다. tonedial doctor --json으로 ID를 확인하세요. 기록된 롤백은 doctor --fix --rollback ID로, 중단된 유효한 작업을 선택해 앱을 다시 만들 때는 doctor --fix --from-operation ID로 진행하세요. 실행 중이거나 소유자가 불확실한 작업은 유지합니다.",
+        recoveryPending: "진행 중이거나 복구가 필요한 작업이 있습니다. 이번 실행에서는 파일을 바꾸지 않았습니다.",
+        resumeOperation: "앱 복구를 이어가려면:",
         contextCurrent: "AGENTS.md와 TONE.md 구성이 최신입니다.",
         contextRepair: "관리 중인 컨텍스트 파일을 복구해야 합니다. 안내 파일과 톤 파일의 진단을 확인해 주세요.",
         contextSize: (guide, total) => total === null

package/dist/core/locales/es.js

@@ -115,7 +115,11 @@ const messages = {
         rollbackOrder: "Restaura primero las conexiones y después los archivos de la aplicación:",
         noSnapshot: (id) => `${id}: no hay una instantánea válida para este directorio de estado`,
         retire: (id) => `Archiva la operación detenida ${id} antes de reconstruir. Sus cambios externos no se certifican ni se deshacen.`,
-        failure: (id) => `La recuperación no terminó. Conserva la operación ${id} y ejecuta tonedial doctor para ver las opciones.`,
+        resumeOperation: (id) => `Operación detenida:\n${id}`,
+        resumeQuestion: "Para continuar, escribe el ID completo de arriba; Enter cancela:",
+        cancelled: "Recuperación cancelada. No se cambió ningún archivo.",
+        operationMismatch: "El ID de operación no coincide. No se cambió ningún archivo.",
+        failure: (id, phase, path, code) => `La recuperación falló durante la ${({ prepare: "preparación", write: "escritura de archivos", verify: "verificación", finalize: "finalización" })[phase]} (${code}).${path ? `\n${path}` : ""}\nEs posible que algunos cambios ya estén aplicados. Conserva el registro de la operación ${id}.`,
     },
     persona: {
         defaults: role("yo", "tú", "La persona que solicita ayuda con una tarea.", "Un asistente general que ayuda con la tarea solicitada."),
@@ -264,7 +268,8 @@ const messages = {
         seedsOk: (version) => `versión ${version}`,
         seedsNotRun: "sin archivos incluidos · aquí no se ha ejecutado init",
         seedsAttention: "los archivos incluidos requieren atención",
-        recoveryPending: "Hay una operación activa o pendiente de recuperación. No se cambió nada. Consulta los ID con tonedial doctor --json. Revierte con doctor --fix --rollback ID o reconstruye desde una operación válida detenida con doctor --fix --from-operation ID. Los propietarios activos o ambiguos siguen protegidos.",
+        recoveryPending: "Hay una operación en curso o que necesita recuperación. Esta ejecución no cambió archivos.",
+        resumeOperation: "Continuar la reparación de la aplicación:",
         contextCurrent: "La estructura de AGENTS.md y TONE.md está al día.",
         contextRepair: "Los archivos de contexto gestionados necesitan reparación. Revisa el diagnóstico de la guía y del tono.",
         contextSize: (guide, total) => total === null

package/dist/core/locales/ja.js

@@ -115,7 +115,11 @@ const messages = {
         rollbackOrder: "先に接続を復元し、その後アプリケーションのファイルを復元してください：",
         noSnapshot: (id) => `${id}: この状態ルート用の有効な設定スナップショットがありません`,
         retire: (id) => `停止した操作 ${id} を履歴に移してから再構築してください。外部への変更は検証も取り消しもされません。`,
-        failure: (id) => `復旧が完了しませんでした。操作 ${id} を保持し、tonedial doctor で復旧方法を確認してください。`,
+        resumeOperation: (id) => `停止した操作:\n${id}`,
+        resumeQuestion: "続行するには上の操作ID全体を入力してください。Enterで中止:",
+        cancelled: "復旧を中止しました。ファイルは変更していません。",
+        operationMismatch: "操作IDが一致しません。ファイルは変更していません。",
+        failure: (id, phase, path, code) => `アプリ復旧の${({ prepare: "準備", write: "ファイル書き込み", verify: "結果の検証", finalize: "完了処理" })[phase]}で失敗しました (${code})。${path ? `\n${path}` : ""}\n一部のファイル変更が適用済みの場合があります。操作 ${id} の記録を保持してください。`,
     },
     persona: {
         defaults: role("私", "あなた", "作業の支援を求めている利用者。", "依頼された作業を手伝う汎用アシスタント。"),
@@ -264,7 +268,8 @@ const messages = {
         seedsOk: (version) => `バージョン ${version}`,
         seedsNotRun: "同梱ファイルなし · ここでは init 未実行",
         seedsAttention: "同梱ファイルの確認が必要",
-        recoveryPending: "実行中または復旧待ちの操作があります。変更はしていません。tonedial doctor --json でIDを確認してください。記録済みの復元は doctor --fix --rollback ID、停止済みの有効な操作からの再構築は doctor --fix --from-operation ID を使います。実行中または所有者不明の操作は保護されます。",
+        recoveryPending: "実行中または復旧が必要な操作があります。この実行ではファイルを変更していません。",
+        resumeOperation: "アプリ復旧を続けるには:",
         contextCurrent: "AGENTS.md と TONE.md の構成は最新です。",
         contextRepair: "管理対象のコンテキストファイルに修復が必要です。ガイドと口調ファイルの診断を確認してください。",
         contextSize: (guide, total) => total === null

package/dist/core/locales/zh.js

@@ -115,7 +115,11 @@ const messages = {
         rollbackOrder: "请先恢复连接，再恢复应用文件：",
         noSnapshot: (id) => `${id}：没有此状态根目录的有效设置快照`,
         retire: (id) => `重建应用前，请将已停止的操作 ${id} 归档为历史。其外部变更不会被认证或撤销。`,
-        failure: (id) => `应用恢复未完成。请保留操作 ${id}，运行 tonedial doctor 查看恢复方式。`,
+        resumeOperation: (id) => `已停止的操作：\n${id}`,
+        resumeQuestion: "要继续，请输入上方完整的操作 ID；按 Enter 取消：",
+        cancelled: "已取消恢复，未更改文件。",
+        operationMismatch: "操作 ID 不匹配，未更改文件。",
+        failure: (id, phase, path, code) => `应用恢复在${({ prepare: "准备", write: "写入文件", verify: "验证结果", finalize: "完成处理" })[phase]}阶段失败 (${code})。${path ? `\n${path}` : ""}\n部分文件更改可能已应用。请保留操作 ${id} 的记录。`,
     },
     persona: {
         defaults: role("我", "你", "请求任务协助的用户。", "协助完成所请求任务的通用助手。"),
@@ -264,7 +268,8 @@ const messages = {
         seedsOk: (version) => `版本 ${version}`,
         seedsNotRun: "无内置文件 · 尚未在此运行 init",
         seedsAttention: "内置文件需要处理",
-        recoveryPending: "有操作正在运行或需要恢复，未作任何修改。请用 tonedial doctor --json 查看 ID。已有回滚记录用 doctor --fix --rollback ID；已停止的有效操作可用 doctor --fix --from-operation ID 重建应用。运行中或所有者不明确的操作仍受保护。",
+        recoveryPending: "有操作正在运行或需要恢复。本次执行未更改文件。",
+        resumeOperation: "继续应用恢复：",
         contextCurrent: "AGENTS.md 与 TONE.md 布局已是最新。",
         contextRepair: "受管理的上下文文件需要修复，请检查指南和语气文件诊断。",
         contextSize: (guide, total) => total === null

package/dist/core/presets.js

@@ -274,6 +274,9 @@ export function inspectPresetLibrary(presetsDir, t) {
             unavailable.push({ slug: retired.slug, path, reason: read.reason });
             continue;
         }
+        // Exact packaged bytes need no copy; edited labels or formatting still stay preserved.
+        if (read.text === `${JSON.stringify(retired, null, 2)}\n`)
+            continue;
         let preset;
         try {
             preset = parsePreset(read.text, retired.slug, t);

package/dist/core/seeds.js

@@ -11,7 +11,7 @@ import { captureRawEntry, caseRenameMatchesCurrent, isNoop, planChange, planEntr
 import { BUNDLED, builtinPresetDir, LEGACY_BUILTIN_SLUGS, RETIRED_PRESETS } from "./presets.js";
 import { SKILL_MD, SKILL_NAME, SKILL_TRAITS_MD } from "./skill.js";
 // Bump for changed generated content; freshness also checks each managed seed's bytes/provenance.
-export const SEED_VERSION = 19;
+export const SEED_VERSION = 20;
 /** The state-root operating boundaries. The compiler owns the current tone separately. */
 export const GUIDE_MD = `${GUIDE_FORMAT_MARKER}
 ToneDial changes manner only; it never expands task scope or permissions.
@@ -73,7 +73,7 @@ export function seedFiles(paths, selection) {
     };
     const native = [
         reader,
-        { id: "skill/body", version: 19, path: join(paths.skill, SKILL_NAME, "SKILL.md"), label: `skill/${SKILL_NAME}/SKILL.md`, contents: SKILL_MD },
+        { id: "skill/body", version: 20, path: join(paths.skill, SKILL_NAME, "SKILL.md"), label: `skill/${SKILL_NAME}/SKILL.md`, contents: SKILL_MD },
         {
             id: "skill/traits",
             version: 11,

package/dist/core/skill.js

@@ -177,6 +177,14 @@ an active association needs the user's explicit choice and must not reset saved
 Do not edit files, change the state root, remove locks or grant hook trust yourself.
 The user chooses native tools and scope separately; foreign provider containers are not
 application outputs. A successful app rebuild can still report native attention.
+If repair fails, report its phase, affected path, safe error code and operation ID.
+Some file changes may already be applied; a failure is not evidence that all files stayed unchanged.
+Preserve the operation record and follow the reported scoped read-only diagnosis.
+Default doctor output focuses on blockers; \`--verbose\` and JSON retain the operation history.
+For an explicitly selected stopped operation, \`doctor --fix --from-operation <id>\` continues
+application repair using valid current settings first; it does not undo the earlier changes.
+Preview that exact ID and scope with \`--dry-run\` before applying the approved repair.
+Interactive selection requires the full displayed ID; Enter cancels without writing.
 \`doctor --fix --dry-run\` previews app and selected native changes without writing or
 printing private prior values. Keep both reported IDs when recovery changes app and native
 files; follow the receipt and roll back native connections before application files.
@@ -415,7 +423,7 @@ Profanity grades actual swearing; bravado grades effort claims.
  * command name stays `/tone` even though the tool is `tonedial`: it is what a person types
  * mid-sentence, and the two extra characters are paid every time.
  */
-export const TONE_COMMAND_VERSION = 11;
+export const TONE_COMMAND_VERSION = 12;
 export const TONE_COMMAND_MD = `---
 description: Check, change, or reload this agent's tone, preset, or ToneDial settings
 ---

package/dist/wiring/apply.js

@@ -2358,6 +2358,8 @@ export async function gate(changes, opts) {
     actions.push(...effects.final.map((effect, index) => effectAction(effect, "final", index)));
     const done = [];
     let journalStarted = false;
+    let phase = "prepare";
+    let target = null;
     try {
         handle = acquireOperation(opts.paths, "mutation");
         // Revalidate every target, including content-equal/no-op changes, while this owner is held.
@@ -2372,6 +2374,8 @@ export async function gate(changes, opts) {
         const createdParents = new Map();
         for (let index = 0; index < effects.initial.length; index++) {
             const change = effects.initial[index].change;
+            phase = "write";
+            target = change.path;
             try {
                 actions[index] = prepareFileWrite(change, actions[index], opts.t);
                 checkpointJournal(handle, completed, actions);
@@ -2382,12 +2386,14 @@ export async function gate(changes, opts) {
                 checkpointJournal(handle, completed, actions);
             }
             catch (cause) {
-                throw new ConfigError(opts.t.errors.couldNotWrite(change.path, cause.message, done));
+                throw new ConfigError(opts.t.errors.couldNotWrite(change.path, cause.message, done), { cause });
             }
         }
         for (let index = 0; index < operationActions.length; index++) {
             const planned = operationActions[index];
             const actionIndex = effects.initial.length + index;
+            phase = "write";
+            target = planned.action.path;
             try {
                 assertWrittenAliases(actions, completed, opts.t);
                 planned.prepare?.((action) => {
@@ -2401,12 +2407,14 @@ export async function gate(changes, opts) {
                 checkpointJournal(handle, completed, actions);
             }
             catch (cause) {
-                throw new ConfigError(opts.t.errors.couldNotWrite(planned.action.path, cause.message, done));
+                throw new ConfigError(opts.t.errors.couldNotWrite(planned.action.path, cause.message, done), { cause });
             }
         }
         for (let index = 0; index < effects.final.length; index++) {
             const change = effects.final[index].change;
             const actionIndex = effects.initial.length + operationActions.length + index;
+            phase = "write";
+            target = change.path;
             try {
                 assertWrittenAliases(actions, completed, opts.t);
                 actions[actionIndex] = prepareFileWrite(change, actions[actionIndex], opts.t);
@@ -2418,12 +2426,28 @@ export async function gate(changes, opts) {
                 checkpointJournal(handle, completed, actions);
             }
             catch (cause) {
-                throw new ConfigError(opts.t.errors.couldNotWrite(change.path, cause.message, done));
+                throw new ConfigError(opts.t.errors.couldNotWrite(change.path, cause.message, done), { cause });
             }
         }
+        phase = "verify";
+        target = null;
         await opts.verify?.();
+        for (const index of completed) {
+            const action = actions[index];
+            if (action.kind !== "entry-rebuild")
+                continue;
+            target = action.path;
+            const { metadata } = validateEntryRebuildAction(action, true);
+            if (!entrySnapshotMatches(action.path, action.after, metadata, opts.t)) {
+                throw new ConfigError(opts.t.errors.staleTarget(action.path), { cause: { code: "VERIFY_MISMATCH", path: action.path } });
+            }
+        }
+        target = null;
         assertWrittenAliases(actions, completed, opts.t);
+        phase = "finalize";
+        target = join(opts.paths.operations, `${handle.owner.operationId}.json`);
         finishJournal(handle, "complete");
+        target = opts.paths.operationsLock;
         releaseOperation(handle);
         return { applied: true, lines, reason: "written", diff, operationId: handle.owner.operationId };
     }
@@ -2444,9 +2468,35 @@ export async function gate(changes, opts) {
         }
         if (opts.recoveryPresentation && journalStarted) {
             const operationId = handle.owner.operationId;
+            const knownCodes = [
+                "EACCES", "EPERM", "ENOSPC", "EROFS", "ENOENT", "EIO", "ESTALE", "EEXIST",
+                "ENOTDIR", "EISDIR", "ENOTEMPTY", "EBUSY", "VERIFY_MISMATCH",
+            ];
+            // Only planned paths and owned bookkeeping may leave the recovery error boundary.
+            const paths = [...new Set([
+                    ...[...changes, ...finalChanges].flatMap(change => [change.path, change.realPath]),
+                    ...actions.flatMap(action => [action.path, action.realPath]),
+                    opts.paths.operationsLock, join(opts.paths.operations, `${operationId}.json`),
+                ])].sort((left, right) => right.length - left.length);
+            let detail = cause;
+            let code = "UNKNOWN";
+            let reported = null;
+            // shortcut: inspect four cause layers; extend if another recovery wrapper nests deeper.
+            for (let depth = 0; depth < 4 && detail !== null && typeof detail === "object"; depth++) {
+                const error = detail;
+                if (code === "UNKNOWN" && typeof error.code === "string" && knownCodes.includes(error.code))
+                    code = error.code;
+                if (reported === null && typeof error.path === "string" && isAbsolute(error.path)) {
+                    const candidate = error.path;
+                    reported = paths.find(path => path === candidate) ?? paths.find(path => lexicallyInside(candidate, path)) ?? null;
+                }
+                detail = error.cause;
+            }
+            const affected = reported ?? target;
+            const path = affected === null ? null : humanText(affected);
             throw new ConfigError(typeof opts.recoveryPresentation === "object" && opts.recoveryPresentation.failureMessage !== undefined
-                ? opts.recoveryPresentation.failureMessage(operationId)
-                : `app rebuild did not complete; preserve operation ${operationId} for recovery`);
+                ? opts.recoveryPresentation.failureMessage(operationId, phase, path, code)
+                : opts.t.recovery.failure(operationId, phase, path, code));
         }
         if (cause instanceof ConfigError)
             throw cause;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tonedial",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Set a coding agent's manner once and keep it across every project.",
   "license": "MIT",
   "type": "module",