@tduyng/pi-edit-path 0.0.0-stage → 0.0.2

package/LICENSE

@@ -0,0 +1,178 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+Use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+Copyright 2026 tduyng

package/README.md

@@ -1,3 +1,39 @@
-# Temporary Holding Version
+# @tduyng/pi-edit-path
 
-This version is a temporary placeholder for this package. An operational version to replace this has been submitted for review and is awaiting a staged release.
+Two halves of one edit path. `then_run` fuses the validation command into the edit that needs it, and the edit hint names the region on disk a failed edit meant, so the retry lands without a re-read.
+
+## then_run
+
+`then_run` is an optional parameter on `edit` and `write`: an object with `command` and `timeout` (seconds), or the command as a plain string. It runs after the mutation succeeds and is skipped if the mutation fails.
+
+A string carrying an object literal, `then_run: '{command: "npm test"}'`, is read for its `command` and `timeout` rather than handed to bash, which used to run the braces and answer `command not found`. A string with no key in it stays the command. A literal naming no command is reported as a `then_run` failure after the mutation has landed, so the model is told the file changed and what the argument should have been.
+
+Success and failure use sentinel markers. On success the command output is appended to the mutation result preceded by `[then_run:succeeded]`. On failure the mutation output is reported first, followed by `[then_run:failed]` and the error message, all wrapped in a single thrown error so the mutation result is not lost.
+
+The tool definitions are extended, not replaced: the built-in `edit` and `write` schemas keep their properties and gain an optional `then_run`. Each working directory gets its own cached tool definition.
+
+Two guidelines ride on the tool prompts. Pass `then_run` when the check follows from the same file the edit or write just changed. Use a separate `bash` call when the check does not follow from the edit, spans files not yet written, or when the model needs to read the edit result before deciding what to run.
+
+## The edit hint
+
+On a `tool_result` where pi's own edit could not find the old text or matched it more than once, the hint appends what the read was for: the closest region as it reads on disk now, with line numbers and current text, or the line of every match when the old text matches more than once. The retry copies old text from those lines.
+
+The hint reports, it never repairs. A miss that survives pi's fuzzy matching is a real mismatch, and silently applying a guess there would write code nobody asked for.
+
+A region is found by line agreement, not by character count. Every distinctive line of old text (at least four characters, so a lone `}` never votes) is looked up in the file as pi's own matcher would read it, and the window of oldText's height holding the most of them wins. Under half agreeing means no region is shown, because a weak guess invites an edit against the wrong lines.
+
+Agreement alone hides the commonest cause. On a miss where every distinctive line of a doc comment was present in the file, the model had re-wrapped a paragraph at a different column and written one word from memory. A line-for-line search cannot see a re-wrap, so the lines that are in no way on disk are listed by name next to the region.
+
+## Cost
+
+The hint adds no tool, no schema and no prompt text. It reads the file pi already named in the error. A file over 2MB is not read. `then_run` costs two guideline bullets on the `edit` and `write` prompts and saves one provider round trip per fused check.
+
+`PI_HINT_EDIT_HINT=0` disables the hint. It accepts `false`, `no`, and `off` too.
+
+## Install
+
+```bash
+pi install npm:@tduyng/pi-edit-path
+```
+
+Local checkout: `pi install /path/to/dotfiles/pi/agent/extensions/pi-edit-path`

package/package.json

@@ -1,6 +1,45 @@
 {
   "name": "@tduyng/pi-edit-path",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
-}
+  "version": "0.0.2",
+  "description": "Two halves of one edit path: fuse the validation command into the edit that needs it, and name the region on disk a failed edit meant so the retry lands without a re-read.",
+  "keywords": [
+    "pi",
+    "pi-package",
+    "pi-extension",
+    "pi-coding-agent",
+    "edit",
+    "round-trip",
+    "tokens"
+  ],
+  "homepage": "https://gitlab.com/tduyng/pi-agent/-/tree/main/extensions/pi-edit-path#readme",
+  "bugs": "https://gitlab.com/tduyng/pi-agent/-/issues",
+  "license": "Apache-2.0",
+  "author": "tduyng",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/tduyng/pi-agent.git",
+    "directory": "extensions/pi-edit-path"
+  },
+  "type": "module",
+  "files": [
+    "src",
+    "!src/**/*.test.ts",
+    "README.md",
+    "LICENSE"
+  ],
+  "peerDependencies": {
+    "@earendil-works/pi-coding-agent": "*"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "pi": {
+    "extensions": [
+      "./src/edit-hint.ts",
+      "./src/action-fusion.ts"
+    ]
+  },
+  "dependencies": {
+    "ata-validator": "^1.62.1"
+  }
+}

package/src/action-fusion.ts

@@ -0,0 +1,221 @@
+import {
+    type AgentToolResult,
+    createEditToolDefinition,
+    createWriteToolDefinition,
+    type ExtensionAPI,
+    type ExtensionToolContext
+} from '@earendil-works/pi-coding-agent'
+import { Validator } from 'ata-validator'
+import { t } from 'ata-validator/t'
+
+const isString = new Validator(t.string()).isValidObject
+
+const SUCCEEDED = '[then_run:succeeded]'
+const FAILED = '[then_run:failed]'
+
+const GUIDELINES = [
+    'Use then_run for a check that follows this edit or write.',
+    'Use bash when the check needs other files or the mutation result.'
+]
+
+const EDIT_GUIDELINES = [
+    'Use edit for precise changes (edits[].oldText must match exactly)',
+    'Batch disjoint edits; keep oldText small and unique.'
+]
+
+interface ThenRun {
+    command: string
+    timeout?: number
+}
+
+interface EditArgs {
+    path: string
+    edits: Array<{ oldText: string; newText: string }>
+    then_run?: ThenRun | string
+}
+
+interface WriteArgs {
+    path: string
+    content: string
+    then_run?: ThenRun | string
+}
+
+const thenRunValue = t.object({
+    command: t.string(),
+    timeout: t.optional(t.number())
+})
+const isThenRunValue = new Validator(thenRunValue).isValidObject
+const isCommandObject = new Validator(t.object({ command: t.string() })).isValidObject
+
+const thenRunSchema = t.optional(t.union([t.string(), thenRunValue]))
+
+const NO_COMMAND =
+    'then_run named no command, so nothing ran. Pass the command as a string, or as {command, timeout}, not as a serialised object.'
+
+export function coerceThenRun(value: ThenRun | string | undefined): ThenRun | undefined {
+    if (value === undefined) return undefined
+    if (isString(value)) return commandFrom(value)
+    if (isThenRunValue(value) && value.command.trim() !== '') return value
+    throw new Error(NO_COMMAND)
+}
+
+function commandFrom(literal: string): ThenRun {
+    const trimmed = literal.trim()
+    if (trimmed === '') throw new Error(NO_COMMAND)
+    if (!/^[{[]/.test(trimmed)) return { command: trimmed }
+    const command = literalCommand(trimmed)
+    if (command === undefined) throw new Error(NO_COMMAND)
+    const ran: ThenRun = { command }
+    const timeout = /\btimeout"?\s*:\s*(\d+(?:\.\d+)?)/.exec(trimmed)
+    if (timeout) ran.timeout = Number(timeout[1])
+    return ran
+}
+
+function literalCommand(literal: string): string | undefined {
+    let parsed: unknown
+    try {
+        parsed = JSON.parse(literal)
+    } catch {
+        parsed = undefined
+    }
+    if (isCommandObject(parsed)) return parsed.command.trim()
+    const match = /"?command"?\s*:\s*(?:"([^"]*)"|'([^']*)'|([^,}]*))/.exec(literal)
+    const command = (match?.[1] ?? match?.[2] ?? match?.[3] ?? '').trim()
+    return command === '' ? undefined : command
+}
+
+const MAX_OUTPUT_CHARS = 12_000
+
+type JsonValue = null | boolean | number | string | JsonValue[] | JsonObject
+
+interface JsonObject {
+    [key: string]: JsonValue
+}
+
+const ObjectRecordSchema = t.object({}, { additionalProperties: true })
+const isObjectRecordSchema = new Validator(ObjectRecordSchema).isValidObject
+
+function isJsonObject(value: unknown): value is JsonObject {
+    return isObjectRecordSchema(value)
+}
+
+function isJsonRecord(value: JsonValue): value is JsonObject {
+    return isObjectRecordSchema(value)
+}
+
+export function normalizeEditInput(input: JsonObject): JsonObject {
+    const edits = input['edits']
+    if (!Array.isArray(edits)) return input
+    let nestedPath: string | undefined
+    let nestedThenRun: JsonValue | undefined
+    const normalizedEdits = edits.map((edit) => {
+        if (!isJsonRecord(edit) || Array.isArray(edit)) return edit
+        const { path, then_run, ...rest } = edit
+        if (nestedPath === undefined && isString(path)) nestedPath = path
+        if (then_run !== undefined && nestedThenRun === undefined) nestedThenRun = then_run
+        return rest
+    })
+    const result: JsonObject = { ...input, edits: normalizedEdits }
+    if (result['path'] === undefined && nestedPath !== undefined) result['path'] = nestedPath
+    if (result['then_run'] === undefined && nestedThenRun !== undefined) result['then_run'] = nestedThenRun
+    return result
+}
+
+export function resultText(result: AgentToolResult<unknown>): string {
+    return result.content.flatMap((block) => (block.type === 'text' ? [block.text] : [])).join('\n')
+}
+
+export function fuseResults<T>(mutation: AgentToolResult<T>, ran: AgentToolResult<unknown>): AgentToolResult<T> {
+    const raw = resultText(ran)
+    const output =
+        raw.length > MAX_OUTPUT_CHARS
+            ? `${raw.slice(-MAX_OUTPUT_CHARS)}\n[then_run output truncated to the last ${MAX_OUTPUT_CHARS} characters]`
+            : raw
+    return {
+        ...mutation,
+        content: [...mutation.content, { type: 'text' as const, text: output ? `${SUCCEEDED}\n${output}` : SUCCEEDED }]
+    }
+}
+
+export function fusedFailure(mutation: AgentToolResult<unknown>, reason: string): string {
+    return [resultText(mutation), FAILED, reason].filter(Boolean).join('\n\n')
+}
+
+async function appendThenRun<T>(
+    mutation: AgentToolResult<T>,
+    thenRun: ThenRun | string | undefined,
+    signal: AbortSignal | undefined,
+    ctx: ExtensionToolContext
+): Promise<AgentToolResult<T>> {
+    try {
+        const coerced = coerceThenRun(thenRun)
+        if (coerced === undefined) return mutation
+        const outcome = await ctx.executeTool('bash', coerced, { signal })
+        if (outcome.isError) throw new Error(resultText(outcome.result))
+        return fuseResults(mutation, outcome.result)
+    } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error)
+        throw new Error(fusedFailure(mutation, reason), { cause: error })
+    }
+}
+
+function perCwd<T>(create: (cwd: string) => T): (cwd: string) => T {
+    const cache = new Map<string, T>()
+    return (cwd) => {
+        let cached = cache.get(cwd)
+        if (!cached) {
+            cached = create(cwd)
+            cache.set(cwd, cached)
+        }
+        return cached
+    }
+}
+
+export default function actionFusionExtension(pi: ExtensionAPI): void {
+    if (process.env['PI_ACTION_FUSION'] === '0') return
+
+    const editFor = perCwd((cwd: string) => createEditToolDefinition(cwd))
+    const writeFor = perCwd((cwd: string) => createWriteToolDefinition(cwd))
+
+    const editBuiltin = editFor(process.cwd())
+    pi.registerTool({
+        ...editBuiltin,
+        description:
+            'Edit one file by replacing exact, unique, non-overlapping text. Batch disjoint edits in one call; keep oldText small and do not pad it.',
+        promptGuidelines: [...EDIT_GUIDELINES, ...GUIDELINES],
+        annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+        parameters: t.object({
+            path: t.string(),
+            edits: t.array(t.object({ oldText: t.string(), newText: t.string() })),
+            then_run: thenRunSchema
+        }),
+        prepareArguments: (input) => {
+            const prepared = editBuiltin.prepareArguments?.(input) ?? input
+            return (isJsonObject(prepared) ? normalizeEditInput(prepared) : prepared) as EditArgs
+        },
+        async execute(toolCallId, input: EditArgs, signal, onUpdate, ctx) {
+            const { then_run, ...mutation } = input as typeof input & { then_run?: ThenRun }
+            const result = await editFor(ctx.cwd).execute(toolCallId, mutation, signal, onUpdate, ctx)
+            return then_run === undefined ? result : await appendThenRun(result, then_run, signal, ctx)
+        }
+    })
+
+    const writeBuiltin = writeFor(process.cwd())
+    pi.registerTool({
+        ...writeBuiltin,
+        description: 'Create or overwrite a file, making parent directories.',
+        promptGuidelines: [...(writeBuiltin.promptGuidelines ?? []), ...GUIDELINES],
+        annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+        parameters: t.object({
+            path: t.string(),
+            content: t.string(),
+            then_run: thenRunSchema
+        }),
+        prepareArguments: (input) => (isJsonObject(input) ? normalizeEditInput(input) : input) as WriteArgs,
+        async execute(toolCallId, input: WriteArgs, signal, onUpdate, ctx) {
+            const { then_run, ...mutation } = input as typeof input & { then_run?: ThenRun }
+            const result = await writeFor(ctx.cwd).execute(toolCallId, mutation, signal, onUpdate, ctx)
+            return then_run === undefined ? result : await appendThenRun(result, then_run, signal, ctx)
+        }
+    })
+}

package/src/edit-hint.ts

@@ -0,0 +1,194 @@
+import { readFileSync, statSync } from 'node:fs'
+import { isAbsolute, resolve } from 'node:path'
+import {
+    isEditToolResult,
+    type EditToolInput,
+    type ExtensionAPI,
+    type ToolResultEvent
+} from '@earendil-works/pi-coding-agent'
+
+const MIN_LINE = 4
+const CONTEXT = 2
+const MAX_REGION_LINES = 80
+const MAX_LISTED = 10
+const MAX_MISSING = 3
+const MAX_FILE_CHARS = 2_000_000
+
+const NOT_FOUND = /Could not find (?:the exact text|edits\[(\d+)\]) in /
+const DUPLICATE = /Found (\d+) occurrences of (?:the text|edits\[(\d+)\]) in /
+
+export interface EditError {
+    kind: 'not-found' | 'duplicate'
+    index: number
+}
+
+export function parseEditError(message: string): EditError | null {
+    const missing = NOT_FOUND.exec(message)
+    if (missing) return { kind: 'not-found', index: Number(missing[1] ?? 0) }
+    const duplicate = DUPLICATE.exec(message)
+    if (duplicate) return { kind: 'duplicate', index: Number(duplicate[2] ?? 0) }
+    return null
+}
+
+function toLines(text: string): string[] {
+    const lines = text.replace(/\r\n?/g, '\n').split('\n')
+    if (lines.length > 1 && lines[lines.length - 1] === '') lines.pop()
+    return lines
+}
+
+function fuzzy(line: string): string {
+    return line
+        .normalize('NFKC')
+        .trimEnd()
+        .replace(/[\u2018\u2019\u201a\u201b]/g, "'")
+        .replace(/[\u201c\u201d\u201e\u201f]/g, '"')
+        .replace(/[\u2010\u2011\u2012\u2013\u2014\u2015\u2212]/g, '-')
+        .replace(/[\u00a0\u2002-\u200a\u202f\u205f\u3000]/g, ' ')
+}
+
+export interface Region {
+    start: number
+    end: number
+    agreeing: number
+    distinctive: number
+}
+
+export function nearestRegion(content: string, oldText: string): Region | null {
+    const file = toLines(content)
+    const oldLines = toLines(oldText)
+    const wanted = new Set(oldLines.map(fuzzy).filter((line) => line.trim().length >= MIN_LINE))
+    if (wanted.size === 0) return null
+
+    const height = Math.min(oldLines.length, file.length)
+    const strict = bestWindow(file, wanted, height, false)
+    const best = strict && strict.agreeing * 2 >= wanted.size ? strict : bestWindow(file, wanted, height, true)
+    if (!best || best.agreeing * 2 < wanted.size) return null
+    return { start: best.start + 1, end: best.start + height, agreeing: best.agreeing, distinctive: wanted.size }
+}
+
+function bestWindow(
+    file: string[],
+    wanted: Set<string>,
+    height: number,
+    trim: boolean
+): { start: number; agreeing: number } | null {
+    const needles = trim ? new Set([...wanted].map((line) => line.trim())) : wanted
+    const matched = file.map((raw) => {
+        const line = fuzzy(raw)
+        return needles.has(trim ? line.trim() : line) ? line : undefined
+    })
+    const counts = new Map<string, number>()
+    let distinct = 0
+    const slide = (line: string | undefined, delta: 1 | -1): void => {
+        if (line === undefined) return
+        const before = counts.get(line) ?? 0
+        const after = before + delta
+        if (after === 0) counts.delete(line)
+        else counts.set(line, after)
+        if (before === 0 && after > 0) distinct++
+        if (before > 0 && after === 0) distinct--
+    }
+    let best: { start: number; agreeing: number } | null = null
+    for (let end = 0; end < matched.length; end++) {
+        slide(matched[end], 1)
+        if (end >= height) slide(matched[end - height], -1)
+        const start = end - height + 1
+        if (start < 0) continue
+        if (!best || distinct > best.agreeing) best = { start, agreeing: distinct }
+    }
+    return best
+}
+
+export function missingLines(content: string, oldText: string): string[] {
+    const inFile = new Set(toLines(content).map(fuzzy))
+    const absent = new Set<string>()
+    for (const line of toLines(oldText)) {
+        if (line.trim().length >= MIN_LINE && !inFile.has(fuzzy(line))) absent.add(line)
+    }
+    return [...absent]
+}
+
+export function occurrenceLines(content: string, oldText: string): number[] {
+    const strip = (text: string): string =>
+        toLines(text)
+            .map((line) => line.replace(/\s+$/, ''))
+            .join('\n')
+    const haystack = strip(content)
+    const needle = strip(oldText)
+    if (!needle) return []
+    const lines: number[] = []
+    for (let at = haystack.indexOf(needle); at !== -1; at = haystack.indexOf(needle, at + 1)) {
+        lines.push(haystack.slice(0, at).split('\n').length)
+    }
+    return lines
+}
+
+export function buildHint(content: string, oldText: string, error: EditError, label: string): string | null {
+    if (error.kind === 'duplicate') {
+        const lines = occurrenceLines(content, oldText)
+        if (lines.length < 2) return null
+        const listed = lines.slice(0, MAX_LISTED).join(', ')
+        const more = lines.length > MAX_LISTED ? ` and ${lines.length - MAX_LISTED} more` : ''
+        return `[hint: ${label} matches at lines ${listed}${more}. Add a neighbouring line that only one of them has.]`
+    }
+
+    const region = nearestRegion(content, oldText)
+    if (!region) {
+        return `[hint: no region of the file shares at least half the distinctive lines of ${label}. The file may have changed, or this is the wrong file.]`
+    }
+    const absent = missingLines(content, oldText)
+    const named = absent
+        .slice(0, MAX_MISSING)
+        .map((line) => JSON.stringify(line))
+        .join(', ')
+    const why =
+        absent.length === 0
+            ? ''
+            : ` ${absent.length} of them are not in the file: ${named}` +
+              `${absent.length > MAX_MISSING ? `, and ${absent.length - MAX_MISSING} more` : ''}. ` +
+              'Copy them from the region below, spacing included.'
+    const file = toLines(content)
+    const from = Math.max(1, region.start - CONTEXT)
+    const to = Math.min(file.length, region.end + CONTEXT, from + MAX_REGION_LINES - 1)
+    const cut = to < Math.min(file.length, region.end + CONTEXT) ? '\n[region cut]' : ''
+    return (
+        `[hint: closest match for ${label} is lines ${region.start}-${region.end} ` +
+        `(${region.agreeing} of ${region.distinctive} distinctive lines agree).${why} ` +
+        `Lines ${from}-${to} as they read now:]\n` +
+        '```\n' +
+        file.slice(from - 1, to).join('\n') +
+        `\n\`\`\`${cut}\n` +
+        'Copy oldText from these lines and retry, no re-read needed.'
+    )
+}
+
+export default function editHint(pi: ExtensionAPI): void {
+    if (/^(0|false|no|off)$/i.test(process.env['PI_HINT_EDIT_HINT'] ?? '')) return
+
+    pi.on('tool_result', (event: ToolResultEvent, ctx) => {
+        if (!isEditToolResult(event) || !event.isError || !Array.isArray(event.content)) return undefined
+        const message = event.content.flatMap((part) => (part.type === 'text' ? [part.text] : [])).join('\n')
+        const error = parseEditError(message)
+        if (!error) return undefined
+
+        const input = event.input as EditToolInput
+        const oldText = input.edits[error.index]?.oldText
+        const requested = input.path
+        if (!oldText || !requested) return undefined
+
+        let content: string
+        try {
+            const path = isAbsolute(requested) ? requested : resolve(ctx?.cwd ?? process.cwd(), requested)
+            if (statSync(path).size > MAX_FILE_CHARS) return undefined
+            content = readFileSync(path, 'utf8')
+        } catch {
+            return undefined
+        }
+        if (content.length > MAX_FILE_CHARS) return undefined
+
+        const label = message.includes('edits[') ? `edits[${error.index}]` : 'oldText'
+        const hint = buildHint(content, oldText, error, label)
+        if (!hint) return undefined
+        return { content: [...event.content, { type: 'text' as const, text: hint }] }
+    })
+}