@pugi/cli 0.1.0-beta.9 → 0.1.0-beta.90
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +132 -0
- package/LICENSE +1 -1
- package/assets/pugi-prozr2-mascot.ansi +9 -0
- package/bin/run.js +33 -1
- package/dist/commands/deploy.js +40 -40
- package/dist/commands/flatten.js +191 -0
- package/dist/commands/jobs-watch.js +201 -0
- package/dist/commands/jobs.js +42 -27
- package/dist/commands/smoke.js +133 -0
- package/dist/core/agent-progress/cleanup.js +134 -0
- package/dist/core/agent-progress/schema.js +144 -0
- package/dist/core/agent-progress/writer.js +101 -0
- package/dist/core/agents/adaptive-router.js +330 -0
- package/dist/core/agents/query-decomposer.js +297 -0
- package/dist/core/agents/registry.js +3 -3
- package/dist/core/approvals/shortcut-resolver.js +98 -0
- package/dist/core/artifact-chain/dispatcher.js +148 -0
- package/dist/core/artifact-chain/exporter.js +164 -0
- package/dist/core/artifact-chain/state.js +243 -0
- package/dist/core/artifact-chain/steps.js +169 -0
- package/dist/core/ask-user/question.js +92 -0
- package/dist/core/audit/audit-trail.js +275 -0
- package/dist/core/auth/ensure-authenticated.js +129 -0
- package/dist/core/auth/env-provider.js +238 -0
- package/dist/core/auto-open-browser.js +4 -4
- package/dist/core/auto-update/channels.js +122 -0
- package/dist/core/auto-update/checker.js +241 -0
- package/dist/core/auto-update/state.js +235 -0
- package/dist/core/bare-mode/index.js +107 -0
- package/dist/core/bash/redirect.js +281 -0
- package/dist/core/bash-classifier.js +436 -40
- package/dist/core/checkpoint/resumer.js +149 -0
- package/dist/core/checkpoint/rewinder.js +291 -0
- package/dist/core/checkpoints/shadow-git.js +670 -0
- package/dist/core/citations/parser.js +109 -0
- package/dist/core/classifier/yolo-classifier.js +88 -0
- package/dist/core/codegraph/decision-store.js +248 -0
- package/dist/core/codegraph/detect-repo.js +459 -0
- package/dist/core/codegraph/install.js +134 -0
- package/dist/core/codegraph/offer-hook.js +220 -0
- package/dist/core/compact/auto-trigger.js +96 -0
- package/dist/core/compact/buffer-rewriter.js +115 -0
- package/dist/core/compact/summarizer.js +208 -0
- package/dist/core/compact/token-counter.js +108 -0
- package/dist/core/consensus/anvil-fanout.js +25 -25
- package/dist/core/consensus/diff-capture.js +121 -12
- package/dist/core/consensus/rubric.js +21 -21
- package/dist/core/context/builder.js +6 -6
- package/dist/core/context/compaction-events.js +8 -8
- package/dist/core/context/compaction.js +31 -31
- package/dist/core/context/index.js +15 -8
- package/dist/core/context/invariants.js +51 -51
- package/dist/core/context/markdown-loader.js +28 -10
- package/dist/core/context/markdown-traverse.js +255 -0
- package/dist/core/context/pugiignore.js +41 -41
- package/dist/core/context/repo-skeleton.js +37 -37
- package/dist/core/context/tool-eviction.js +55 -0
- package/dist/core/context/watcher.js +32 -32
- package/dist/core/context/working-set.js +23 -23
- package/dist/core/coordinator/agent-tools.js +77 -0
- package/dist/core/coordinator/agent-toolset.js +65 -0
- package/dist/core/coordinator/fsm.js +73 -0
- package/dist/core/coordinator/mode-fsm.js +70 -0
- package/dist/core/cost/rate-card.js +129 -0
- package/dist/core/cost/tracker.js +221 -0
- package/dist/core/credentials.js +13 -13
- package/dist/core/cron/scheduler.js +138 -0
- package/dist/core/denial-tracking/index.js +8 -0
- package/dist/core/denial-tracking/state.js +264 -0
- package/dist/core/diagnostics/probe-runner.js +93 -0
- package/dist/core/diagnostics/probes/api.js +46 -0
- package/dist/core/diagnostics/probes/auth.js +93 -0
- package/dist/core/diagnostics/probes/bare-mode.js +42 -0
- package/dist/core/diagnostics/probes/cli-version.js +127 -0
- package/dist/core/diagnostics/probes/config.js +72 -0
- package/dist/core/diagnostics/probes/denial-tracking.js +57 -0
- package/dist/core/diagnostics/probes/disk.js +81 -0
- package/dist/core/diagnostics/probes/engine-live.js +46 -0
- package/dist/core/diagnostics/probes/git.js +65 -0
- package/dist/core/diagnostics/probes/hooks.js +118 -0
- package/dist/core/diagnostics/probes/mcp.js +75 -0
- package/dist/core/diagnostics/probes/node.js +59 -0
- package/dist/core/diagnostics/probes/pnpm.js +36 -0
- package/dist/core/diagnostics/probes/pugi-md.js +89 -0
- package/dist/core/diagnostics/probes/sandbox.js +40 -0
- package/dist/core/diagnostics/probes/session.js +74 -0
- package/dist/core/diagnostics/probes/status-snapshot.js +488 -0
- package/dist/core/diagnostics/probes/workspace.js +63 -0
- package/dist/core/diagnostics/types.js +70 -0
- package/dist/core/dispatch/cache-cleanup.js +197 -0
- package/dist/core/dispatch/cache-handoff.js +295 -0
- package/dist/core/edits/apply-patch-layer-e.js +189 -0
- package/dist/core/edits/dispatch.js +333 -7
- package/dist/core/edits/format-detector.js +260 -0
- package/dist/core/edits/format-matrix.js +26 -0
- package/dist/core/edits/fuzzy-ladder.js +650 -0
- package/dist/core/edits/index.js +5 -1
- package/dist/core/edits/journal.js +199 -0
- package/dist/core/edits/layer-a-apply.js +15 -15
- package/dist/core/edits/layer-a-fuzzy-apply.js +198 -0
- package/dist/core/edits/layer-b-apply.js +9 -9
- package/dist/core/edits/layer-c-apply.js +6 -6
- package/dist/core/edits/layer-d-ast.js +557 -14
- package/dist/core/edits/marker-parser.js +12 -12
- package/dist/core/edits/security-gate.js +27 -27
- package/dist/core/edits/verify-hook.js +273 -0
- package/dist/core/edits/worktree.js +29 -29
- package/dist/core/engine/anvil-client.js +214 -26
- package/dist/core/engine/auto-compact.js +179 -0
- package/dist/core/engine/budgets.js +186 -0
- package/dist/core/engine/context-prefix.js +155 -0
- package/dist/core/engine/index.js +1 -1
- package/dist/core/engine/intensity.js +158 -0
- package/dist/core/engine/intent.js +260 -0
- package/dist/core/engine/native-pugi.js +1295 -227
- package/dist/core/engine/prompts.js +129 -19
- package/dist/core/engine/strip-internal-fields.js +124 -0
- package/dist/core/engine/tool-bridge.js +1731 -59
- package/dist/core/evaluation/golden-dataset.js +293 -0
- package/dist/core/feedback/queue.js +177 -0
- package/dist/core/feedback/submitter.js +145 -0
- package/dist/core/file-cache.js +113 -1
- package/dist/core/flatten/flatten-repo.js +439 -0
- package/dist/core/format/osc8-link.js +28 -0
- package/dist/core/hook-chains.js +392 -0
- package/dist/core/hooks/citation-verify-hook.js +138 -0
- package/dist/core/hooks/citation-verify.js +112 -0
- package/dist/core/hooks/events.js +46 -0
- package/dist/core/hooks/index.js +15 -0
- package/dist/core/hooks/registry.js +216 -0
- package/dist/core/hooks/runner.js +236 -0
- package/dist/core/hooks/v2/event-emitter.js +115 -0
- package/dist/core/hooks/v2/executor.js +282 -0
- package/dist/core/hooks/v2/index.js +25 -0
- package/dist/core/hooks/v2/lifecycle.js +104 -0
- package/dist/core/hooks/v2/loader.js +216 -0
- package/dist/core/hooks/v2/matcher.js +125 -0
- package/dist/core/hooks/v2/trust.js +143 -0
- package/dist/core/hooks/v2/types.js +86 -0
- package/dist/core/hooks/worktree-events.js +158 -0
- package/dist/core/image/renderer.js +71 -0
- package/dist/core/init/detector.js +582 -0
- package/dist/core/init/template-renderer.js +242 -0
- package/dist/core/jobs/registry.js +18 -18
- package/dist/core/ledger/results-tsv.js +142 -0
- package/dist/core/log-discipline/stdout-redirect.js +51 -0
- package/dist/core/lsp/cache.js +105 -0
- package/dist/core/lsp/client.js +551 -41
- package/dist/core/lsp/language-detect.js +66 -0
- package/dist/core/lsp/post-edit-diagnostics.js +171 -0
- package/dist/core/lsp/server-detect.js +173 -0
- package/dist/core/lsp/symbol-cache.js +162 -0
- package/dist/core/lsp/symbol-tools.js +664 -0
- package/dist/core/mcp/client.js +97 -28
- package/dist/core/mcp/http-server.js +553 -0
- package/dist/core/mcp/orchestrator-tools.js +662 -0
- package/dist/core/mcp/permission.js +190 -0
- package/dist/core/mcp/registry.js +39 -17
- package/dist/core/mcp/server-tools.js +219 -0
- package/dist/core/mcp/server.js +397 -0
- package/dist/core/mcp/trust.js +10 -10
- package/dist/core/memory/dual-write.js +416 -0
- package/dist/core/memory/passive-extract.js +130 -0
- package/dist/core/memory/phase1-kinds.js +20 -0
- package/dist/core/memory/secret-scanner.js +304 -0
- package/dist/core/memory-sync/queue.js +170 -0
- package/dist/core/metrics/extract.js +113 -0
- package/dist/core/modes/roo-modes.js +68 -0
- package/dist/core/onboarding/ensure-initialized.js +133 -0
- package/dist/core/onboarding/marker.js +111 -0
- package/dist/core/onboarding/telemetry-state.js +108 -0
- package/dist/core/output-style/presets.js +176 -0
- package/dist/core/output-style/state.js +185 -0
- package/dist/core/path-security.js +287 -5
- package/dist/core/permission.js +82 -22
- package/dist/core/permissions/auto-classifier.js +124 -0
- package/dist/core/permissions/bash-parser.js +371 -0
- package/dist/core/permissions/circuit-breaker.js +83 -0
- package/dist/core/permissions/constrained-edit.js +91 -0
- package/dist/core/permissions/gate.js +278 -0
- package/dist/core/permissions/index.js +20 -0
- package/dist/core/permissions/mode.js +174 -0
- package/dist/core/permissions/network-egress.js +137 -0
- package/dist/core/permissions/state.js +241 -0
- package/dist/core/permissions/tool-class.js +93 -0
- package/dist/core/plan-mode/ui-state.js +51 -0
- package/dist/core/plans/plan-artifact.js +721 -0
- package/dist/core/policy-limits/etag-store.js +122 -0
- package/dist/core/prd-check/parser.js +215 -0
- package/dist/core/prd-check/reporter.js +127 -0
- package/dist/core/prd-check/session-review.js +557 -0
- package/dist/core/prd-check/verifiers.js +223 -0
- package/dist/core/prompt-cache/client-cache.js +99 -0
- package/dist/core/prompts/assembly.js +29 -0
- package/dist/core/prompts/registry.js +364 -0
- package/dist/core/pugi-md/cc-compat-rules.js +735 -0
- package/dist/core/pugi-md/context-injector.js +76 -0
- package/dist/core/pugi-md/walk-up.js +207 -0
- package/dist/core/python/uv-installer.js +270 -0
- package/dist/core/python/uv-resolver.js +83 -0
- package/dist/core/rate-limit/narrator.js +146 -0
- package/dist/core/recipes/cli-types.js +20 -0
- package/dist/core/recipes/loader.js +103 -0
- package/dist/core/recipes/runner.js +345 -0
- package/dist/core/recipes/schema.js +587 -0
- package/dist/core/release-notes/parser.js +241 -0
- package/dist/core/release-notes/state.js +116 -0
- package/dist/core/repl/ask.js +37 -37
- package/dist/core/repl/cancellation.js +26 -26
- package/dist/core/repl/cap-warning.js +4 -4
- package/dist/core/repl/clipboard-read.js +11 -11
- package/dist/core/repl/dispatch-fsm.js +12 -12
- package/dist/core/repl/history-search.js +15 -15
- package/dist/core/repl/history.js +28 -18
- package/dist/core/repl/kill-ring.js +5 -5
- package/dist/core/repl/model-pricing.js +135 -0
- package/dist/core/repl/privacy-banner.js +22 -22
- package/dist/core/repl/session.js +2148 -217
- package/dist/core/repl/slash-commands.js +501 -41
- package/dist/core/repl/store/index.js +1 -1
- package/dist/core/repl/store/jsonl-log.js +22 -22
- package/dist/core/repl/store/lockfile.js +10 -10
- package/dist/core/repl/store/session-store.js +136 -107
- package/dist/core/repl/store/types.js +15 -15
- package/dist/core/repl/store/uuid-v7.js +12 -12
- package/dist/core/repl/workspace-context.js +43 -21
- package/dist/core/repo-map/build.js +125 -0
- package/dist/core/repo-map/cache.js +185 -0
- package/dist/core/repo-map/extractor.js +254 -0
- package/dist/core/repo-map/formatter.js +145 -0
- package/dist/core/repo-map/page-rank.js +105 -0
- package/dist/core/repo-map/scanner.js +211 -0
- package/dist/core/retry-budget/budget.js +284 -0
- package/dist/core/retry-budget/index.js +5 -0
- package/dist/core/retry-budget/retry-cap.js +74 -0
- package/dist/core/routing/lead-worker.js +43 -0
- package/dist/core/routing/pre-flight-estimator.js +108 -0
- package/dist/core/runs/run-tree.js +103 -0
- package/dist/core/security/injection-scanner.js +367 -0
- package/dist/core/security/output-filter.js +418 -0
- package/dist/core/session/env-file.js +105 -0
- package/dist/core/session/section-budgets.js +140 -0
- package/dist/core/session.js +92 -0
- package/dist/core/settings.js +324 -5
- package/dist/core/share/formatter.js +271 -0
- package/dist/core/share/redactor.js +221 -0
- package/dist/core/share/uploader.js +267 -0
- package/dist/core/skills/defaults.js +30 -30
- package/dist/core/skills/loader.js +22 -22
- package/dist/core/skills/sources.js +27 -27
- package/dist/core/smoke/headless-driver.js +174 -0
- package/dist/core/smoke/orchestrator.js +194 -0
- package/dist/core/smoke/runner.js +238 -0
- package/dist/core/smoke/scenario-parser.js +316 -0
- package/dist/core/statusline.js +99 -0
- package/dist/core/subagents/dispatcher-real.js +600 -0
- package/dist/core/subagents/dispatcher.js +132 -43
- package/dist/core/subagents/index.js +19 -6
- package/dist/core/subagents/isolation-matrix.js +213 -0
- package/dist/core/subagents/spawn.js +19 -4
- package/dist/core/telemetry/emitter.js +229 -0
- package/dist/core/telemetry/queue.js +251 -0
- package/dist/core/theme/context.js +91 -0
- package/dist/core/theme/presets.js +228 -0
- package/dist/core/theme/state.js +181 -0
- package/dist/core/todos/invariant.js +10 -0
- package/dist/core/todos/state.js +177 -0
- package/dist/core/tool-schema/compressor.js +89 -0
- package/dist/core/transport/version-interceptor.js +166 -0
- package/dist/core/trust.js +2 -2
- package/dist/core/tui/thinking-block.js +64 -0
- package/dist/core/vim/keymap.js +288 -0
- package/dist/core/vim/state.js +92 -0
- package/dist/core/watch-markers/marker-watcher.js +133 -0
- package/dist/core/worktree/include-parser.js +249 -0
- package/dist/core/worktree-manager/cleanup.js +123 -0
- package/dist/core/worktree-manager/manager.js +303 -0
- package/dist/index.js +36 -0
- package/dist/runtime/bootstrap.js +190 -0
- package/dist/runtime/cli.js +4185 -549
- package/dist/runtime/commands/agents.js +31 -31
- package/dist/runtime/commands/budget.js +5 -5
- package/dist/runtime/commands/cancel.js +231 -0
- package/dist/runtime/commands/chain.js +489 -0
- package/dist/runtime/commands/codegraph-status.js +227 -0
- package/dist/runtime/commands/compact.js +297 -0
- package/dist/runtime/commands/config.js +73 -39
- package/dist/runtime/commands/cost.js +199 -0
- package/dist/runtime/commands/delegate.js +27 -4
- package/dist/runtime/commands/dispatch.js +126 -0
- package/dist/runtime/commands/doctor.js +579 -0
- package/dist/runtime/commands/feedback.js +184 -0
- package/dist/runtime/commands/hooks.js +187 -0
- package/dist/runtime/commands/init.js +254 -0
- package/dist/runtime/commands/lsp.js +200 -38
- package/dist/runtime/commands/mcp.js +879 -0
- package/dist/runtime/commands/memory.js +582 -0
- package/dist/runtime/commands/model.js +237 -0
- package/dist/runtime/commands/onboarding.js +275 -0
- package/dist/runtime/commands/patch.js +12 -12
- package/dist/runtime/commands/permissions.js +112 -0
- package/dist/runtime/commands/plan.js +143 -0
- package/dist/runtime/commands/prd-check.js +285 -0
- package/dist/runtime/commands/privacy.js +17 -17
- package/dist/runtime/commands/recipe.js +325 -0
- package/dist/runtime/commands/redo-blob-store.js +92 -0
- package/dist/runtime/commands/redo.js +361 -0
- package/dist/runtime/commands/release-notes.js +229 -0
- package/dist/runtime/commands/repo-map.js +95 -0
- package/dist/runtime/commands/report.js +299 -0
- package/dist/runtime/commands/resume.js +118 -0
- package/dist/runtime/commands/review-consensus.js +68 -53
- package/dist/runtime/commands/rewind.js +333 -0
- package/dist/runtime/commands/roster.js +14 -14
- package/dist/runtime/commands/sessions.js +163 -0
- package/dist/runtime/commands/share.js +316 -0
- package/dist/runtime/commands/skills.js +31 -31
- package/dist/runtime/commands/status.js +186 -0
- package/dist/runtime/commands/stickers.js +82 -0
- package/dist/runtime/commands/style.js +194 -0
- package/dist/runtime/commands/theme.js +196 -0
- package/dist/runtime/commands/undo.js +54 -22
- package/dist/runtime/commands/update.js +289 -0
- package/dist/runtime/commands/vim.js +140 -0
- package/dist/runtime/commands/worktree.js +8 -8
- package/dist/runtime/commands/worktrees.js +155 -0
- package/dist/runtime/headless-repl.js +195 -0
- package/dist/runtime/headless.js +543 -0
- package/dist/runtime/load-hooks-or-exit.js +71 -0
- package/dist/runtime/plan-decompose.js +22 -22
- package/dist/runtime/sigint-guard.js +272 -0
- package/dist/runtime/update-check.js +28 -28
- package/dist/runtime/version.js +65 -0
- package/dist/runtime/worktree-bootstrap.js +579 -0
- package/dist/skills/bundled/batch.js +617 -0
- package/dist/skills/bundled/index.js +45 -0
- package/dist/skills/bundled/loop.js +358 -0
- package/dist/skills/bundled/remember.js +383 -0
- package/dist/skills/bundled/simplify.js +289 -0
- package/dist/skills/bundled/skillify.js +373 -0
- package/dist/skills/bundled/stuck.js +558 -0
- package/dist/skills/bundled/verify.js +439 -0
- package/dist/testing/vcr.js +486 -0
- package/dist/tools/agent-tool.js +229 -0
- package/dist/tools/apply-patch.js +89 -28
- package/dist/tools/ask-user-question.js +337 -0
- package/dist/tools/ask-user.js +115 -0
- package/dist/tools/bash.js +624 -46
- package/dist/tools/brief.js +224 -0
- package/dist/tools/enter-worktree.js +250 -0
- package/dist/tools/exit-worktree.js +147 -0
- package/dist/tools/file-tools.js +161 -44
- package/dist/tools/lsp-tools.js +377 -1
- package/dist/tools/mcp-tool.js +260 -0
- package/dist/tools/multi-edit.js +361 -0
- package/dist/tools/powershell.js +268 -0
- package/dist/tools/registry.js +86 -4
- package/dist/tools/skill-tool.js +96 -0
- package/dist/tools/sleep.js +99 -0
- package/dist/tools/synthetic-output.js +133 -0
- package/dist/tools/tasks.js +208 -0
- package/dist/tools/todo-write.js +184 -0
- package/dist/tools/verify-plan-execution.js +295 -0
- package/dist/tools/web-fetch-injection-scanner.js +207 -0
- package/dist/tools/web-fetch.js +195 -10
- package/dist/tools/web-search.js +458 -0
- package/dist/tui/agent-progress-card.js +111 -0
- package/dist/tui/agent-tree.js +11 -1
- package/dist/tui/ask-modal.js +14 -14
- package/dist/tui/ask-user-question-chips.js +315 -0
- package/dist/tui/ask-user-question-prompt.js +203 -0
- package/dist/tui/compact-banner.js +81 -0
- package/dist/tui/conversation-pane.js +85 -11
- package/dist/tui/cost-table.js +111 -0
- package/dist/tui/device-flow.js +2 -2
- package/dist/tui/doctor-table.js +46 -0
- package/dist/tui/feedback-prompt.js +156 -0
- package/dist/tui/input-box.js +247 -32
- package/dist/tui/login-picker.js +3 -3
- package/dist/tui/markdown-render.js +6 -6
- package/dist/tui/onboarding-wizard.js +240 -0
- package/dist/tui/permissions-picker.js +86 -0
- package/dist/tui/render.js +36 -1
- package/dist/tui/repl-render.js +176 -25
- package/dist/tui/repl-splash-art.js +16 -16
- package/dist/tui/repl-splash-mascot.js +48 -24
- package/dist/tui/repl-splash.js +22 -22
- package/dist/tui/repl.js +125 -45
- package/dist/tui/slash-palette.js +6 -6
- package/dist/tui/splash.js +2 -2
- package/dist/tui/status-bar.js +109 -31
- package/dist/tui/status-table.js +7 -0
- package/dist/tui/stickers-art.js +136 -0
- package/dist/tui/style-table.js +28 -0
- package/dist/tui/theme-table.js +29 -0
- package/dist/tui/thinking-spinner.js +123 -0
- package/dist/tui/tool-stream-pane.js +53 -4
- package/dist/tui/update-banner.js +27 -2
- package/dist/tui/vim-input.js +267 -0
- package/dist/tui/welcome-banner.js +107 -0
- package/dist/tui/welcome-data.js +293 -0
- package/dist/tui/workspace-context.js +2 -2
- package/package.json +31 -16
- package/test/scenarios/codegen-create-file.scenario.txt +13 -0
- package/test/scenarios/compact-force.scenario.txt +12 -0
- package/test/scenarios/identity.scenario.txt +12 -0
- package/test/scenarios/persona-handoff.scenario.txt +12 -0
- package/test/scenarios/walkback.scenario.txt +12 -0
- package/dist/core/engine/compaction-hook.js +0 -154
|
@@ -0,0 +1,650 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Layer A.5 — Aider-inspired fuzzy SEARCH/REPLACE ladder.
|
|
3
|
+
*
|
|
4
|
+
* Sits between Layer A strict-exact match and Layer B/C escalation. Off
|
|
5
|
+
* by default; opt-in via `--fuzzy-edits` CLI flag or `fuzzy: true` on
|
|
6
|
+
* the dispatcher options. The ladder fires ONLY after Layer A returned
|
|
7
|
+
* `no_match`; ambiguous / file_missing / write_error short-circuit
|
|
8
|
+
* straight through because a fuzzy retry on an ambiguous block would
|
|
9
|
+
* make a bad situation worse (silently picking one of N matches).
|
|
10
|
+
*
|
|
11
|
+
* Three tiers, tried in order. First success wins.
|
|
12
|
+
*
|
|
13
|
+
* 1. whitespace-flex — detect a UNIFORM leading-whitespace delta
|
|
14
|
+
* across every line of the SEARCH block and re-strip the source
|
|
15
|
+
* slice by the same amount. Matches the common LLM failure mode
|
|
16
|
+
* where the model dropped (or added) a consistent indent prefix
|
|
17
|
+
* relative to what the file actually contains.
|
|
18
|
+
*
|
|
19
|
+
* 2. ellipsis allowance — when the SEARCH block contains a bare
|
|
20
|
+
* `...` line, split на head + tail (or head + middle + tail),
|
|
21
|
+
* anchor head's start and tail's end in the source, preserve
|
|
22
|
+
* whatever sits in the middle, and rebuild the replacement by
|
|
23
|
+
* analogy. The model uses this when the block-to-replace spans
|
|
24
|
+
* a large stretch and only the boundaries are unique.
|
|
25
|
+
*
|
|
26
|
+
* 3. edit-distance match — slide a window of length comparable to
|
|
27
|
+
* the SEARCH block over the source. For each candidate run a
|
|
28
|
+
* longest-common-subsequence ratio (`SequenceMatcher.ratio()`
|
|
29
|
+
* equivalent — `2*M / (|A|+|B|)`). Best candidate must score
|
|
30
|
+
* >= 0.8 to count as a match; below that we fail LOUD rather
|
|
31
|
+
* than write the wrong region.
|
|
32
|
+
*
|
|
33
|
+
* Inspired by Aider editblock_coder.py (Apache-2.0). independent implementation
|
|
34
|
+
* implementation; no Aider source code copied.
|
|
35
|
+
*
|
|
36
|
+
* Pure functions throughout — every tier returns a structured result
|
|
37
|
+
* and never touches the filesystem. The dispatcher integration in
|
|
38
|
+
* `layer-a-apply-fuzzy.ts` (the actual disk-write wrapper) is the only
|
|
39
|
+
* code path that mutates state.
|
|
40
|
+
*/
|
|
41
|
+
const DEFAULT_MIN_RATIO = 0.8;
|
|
42
|
+
const DEFAULT_LENGTH_FLEX = 0.1;
|
|
43
|
+
/**
|
|
44
|
+
* Run the full ladder against `source` for the SEARCH/REPLACE pair.
|
|
45
|
+
*
|
|
46
|
+
* Returns the first tier that produces a unique match. If every tier
|
|
47
|
+
* fails, returns `no_match` with a composite detail. The dispatcher
|
|
48
|
+
* surfaces this as `fuzzy_no_match` so the model sees that even the
|
|
49
|
+
* relaxed matching could not anchor the block.
|
|
50
|
+
*/
|
|
51
|
+
export function tryFuzzyLadder(source, search, replace, opts = {}) {
|
|
52
|
+
// Empty search would match anywhere; we refuse the same way Layer A
|
|
53
|
+
// rejects empty oldString. Defensive; the dispatcher already gates
|
|
54
|
+
// on this upstream.
|
|
55
|
+
if (search.length === 0) {
|
|
56
|
+
return { kind: 'no_match', detail: 'empty search block' };
|
|
57
|
+
}
|
|
58
|
+
// Tier 1 — whitespace-flex.
|
|
59
|
+
const wsResult = tryWhitespaceFlex(source, search, replace);
|
|
60
|
+
if (wsResult.kind === 'matched' || wsResult.kind === 'ambiguous')
|
|
61
|
+
return wsResult;
|
|
62
|
+
// Tier 2 — ellipsis. Only meaningful when the search actually
|
|
63
|
+
// contains `...`; the helper short-circuits otherwise so the
|
|
64
|
+
// composite diagnostic stays clean.
|
|
65
|
+
const ellipsisResult = tryEllipsis(source, search, replace);
|
|
66
|
+
if (ellipsisResult.kind === 'matched' || ellipsisResult.kind === 'ambiguous')
|
|
67
|
+
return ellipsisResult;
|
|
68
|
+
// Tier 3 — edit distance. Final tier; failure here ends the ladder.
|
|
69
|
+
const distResult = tryEditDistance(source, search, replace, opts);
|
|
70
|
+
if (distResult.kind === 'matched' || distResult.kind === 'ambiguous')
|
|
71
|
+
return distResult;
|
|
72
|
+
return {
|
|
73
|
+
kind: 'no_match',
|
|
74
|
+
detail: `fuzzy ladder exhausted: ws=${wsResult.detail}; ellipsis=${ellipsisResult.detail}; edit-distance=${distResult.detail}`,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Tier 1 — whitespace-flex.
|
|
79
|
+
*
|
|
80
|
+
* The model's SEARCH block frequently differs from the source by a
|
|
81
|
+
* uniform leading-whitespace delta (e.g. the model emitted code at
|
|
82
|
+
* column 0 but the source is inside a 2-space-indented function body).
|
|
83
|
+
* We detect such a uniform delta and try the strict-equal match
|
|
84
|
+
* against the re-indented buffer.
|
|
85
|
+
*
|
|
86
|
+
* Algorithm:
|
|
87
|
+
* 1. Strip trailing newline / split source + search into lines.
|
|
88
|
+
* 2. Skip if any non-whitespace line of search is empty (the
|
|
89
|
+
* "uniform" claim is undefined).
|
|
90
|
+
* 3. Reject mixed indents (e.g. tab + space in the same block) so we
|
|
91
|
+
* don't silently translate semantics.
|
|
92
|
+
* 4. For each non-empty source line, compute the source-line
|
|
93
|
+
* leading-WS prefix. Find any window of consecutive source lines
|
|
94
|
+
* whose stripped-content matches the stripped search lines
|
|
95
|
+
* exactly, AND whose leading-WS prefix is uniform across the
|
|
96
|
+
* matched window.
|
|
97
|
+
* 5. Require EXACTLY ONE such window; multiple → ambiguous.
|
|
98
|
+
*
|
|
99
|
+
* If matched, rebuild the replacement by prepending the same uniform
|
|
100
|
+
* prefix to each replace line that already starts at column 0 (relative
|
|
101
|
+
* to the search), so the indent is preserved.
|
|
102
|
+
*/
|
|
103
|
+
export function tryWhitespaceFlex(source, search, replace) {
|
|
104
|
+
const searchLines = splitLinesKeepEnds(search);
|
|
105
|
+
const sourceLines = splitLinesKeepEnds(source);
|
|
106
|
+
if (searchLines.length === 0) {
|
|
107
|
+
return { kind: 'no_match', detail: 'whitespace-flex: empty search' };
|
|
108
|
+
}
|
|
109
|
+
// Mixed-indent guard — if the search block mixes leading tabs and
|
|
110
|
+
// leading spaces we refuse. Aider had the same defence; mixing the
|
|
111
|
+
// two breaks the "strip N chars off every line" invariant.
|
|
112
|
+
const stripped = [];
|
|
113
|
+
const searchPrefixes = [];
|
|
114
|
+
let hadTab = false;
|
|
115
|
+
let hadSpace = false;
|
|
116
|
+
for (const line of searchLines) {
|
|
117
|
+
const { prefix, rest } = splitLeadingWs(line);
|
|
118
|
+
if (prefix.includes('\t'))
|
|
119
|
+
hadTab = true;
|
|
120
|
+
if (prefix.includes(' '))
|
|
121
|
+
hadSpace = true;
|
|
122
|
+
searchPrefixes.push(prefix);
|
|
123
|
+
stripped.push(rest);
|
|
124
|
+
}
|
|
125
|
+
if (hadTab && hadSpace) {
|
|
126
|
+
return { kind: 'no_match', detail: 'whitespace-flex: mixed tab/space indent in search' };
|
|
127
|
+
}
|
|
128
|
+
// Slide a window across source lines.
|
|
129
|
+
const matches = [];
|
|
130
|
+
const lineOffsets = computeLineOffsets(source);
|
|
131
|
+
for (let i = 0; i + searchLines.length <= sourceLines.length; i += 1) {
|
|
132
|
+
let ok = true;
|
|
133
|
+
let sharedPrefix = null;
|
|
134
|
+
for (let j = 0; j < searchLines.length; j += 1) {
|
|
135
|
+
const sourceLine = sourceLines[i + j] ?? '';
|
|
136
|
+
const { prefix: srcPrefix, rest: srcRest } = splitLeadingWs(sourceLine);
|
|
137
|
+
const searchRest = stripped[j] ?? '';
|
|
138
|
+
const searchPrefix = searchPrefixes[j] ?? '';
|
|
139
|
+
// Compare stripped (line content + line terminator). We tolerate
|
|
140
|
+
// a missing trailing newline on the LAST search line — Anthropic
|
|
141
|
+
// + OpenAI marker parsers strip the trailing newline on the last
|
|
142
|
+
// body line, so a faithful round-trip search block ends without
|
|
143
|
+
// `\n`. Matching against a source line that DOES end in `\n` is
|
|
144
|
+
// the common case for in-file edits.
|
|
145
|
+
const isLastSearchLine = j === searchLines.length - 1;
|
|
146
|
+
const restEqual = srcRest === searchRest ||
|
|
147
|
+
(isLastSearchLine && srcRest === `${searchRest}\n`);
|
|
148
|
+
if (!restEqual) {
|
|
149
|
+
ok = false;
|
|
150
|
+
break;
|
|
151
|
+
}
|
|
152
|
+
// Per-line delta = source prefix minus the search prefix. Must
|
|
153
|
+
// be uniform across the entire block — either every line shares
|
|
154
|
+
// the same source prefix, or the search block already carries a
|
|
155
|
+
// matching shape (e.g. the search and source both have nested
|
|
156
|
+
// indent inside the block, but differ in the OUTER prefix).
|
|
157
|
+
const delta = computePrefixDelta(srcPrefix, searchPrefix);
|
|
158
|
+
if (delta === null) {
|
|
159
|
+
ok = false;
|
|
160
|
+
break;
|
|
161
|
+
}
|
|
162
|
+
if (sharedPrefix === null)
|
|
163
|
+
sharedPrefix = delta;
|
|
164
|
+
else if (sharedPrefix !== delta) {
|
|
165
|
+
ok = false;
|
|
166
|
+
break;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
if (ok && sharedPrefix !== null) {
|
|
170
|
+
const startOffset = lineOffsets[i] ?? 0;
|
|
171
|
+
const endLineEnd = lineOffsets[i + searchLines.length] ?? source.length;
|
|
172
|
+
matches.push({ start: i, end: i + searchLines.length, sourcePrefix: sharedPrefix, startOffset, endOffset: endLineEnd });
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
if (matches.length === 0) {
|
|
176
|
+
return { kind: 'no_match', detail: 'whitespace-flex: no uniform-indent candidate' };
|
|
177
|
+
}
|
|
178
|
+
if (matches.length > 1) {
|
|
179
|
+
return {
|
|
180
|
+
kind: 'ambiguous',
|
|
181
|
+
tier: 'whitespace-flex',
|
|
182
|
+
candidateCount: matches.length,
|
|
183
|
+
detail: `whitespace-flex: ${matches.length} candidates`,
|
|
184
|
+
};
|
|
185
|
+
}
|
|
186
|
+
const m = matches[0];
|
|
187
|
+
if (!m) {
|
|
188
|
+
return { kind: 'no_match', detail: 'whitespace-flex: internal — match array empty after length check' };
|
|
189
|
+
}
|
|
190
|
+
// Rebuild replacement: prepend the shared delta prefix to each
|
|
191
|
+
// replace line (keeping its own existing indent). Empty replacement
|
|
192
|
+
// lines stay empty (don't pad a blank with whitespace just for
|
|
193
|
+
// symmetry — would dirty the file).
|
|
194
|
+
const replaceLines = splitLinesKeepEnds(replace);
|
|
195
|
+
let rebuilt = replaceLines
|
|
196
|
+
.map((line) => {
|
|
197
|
+
const { rest } = splitLeadingWs(line);
|
|
198
|
+
if (rest.length === 0)
|
|
199
|
+
return line; // blank line untouched
|
|
200
|
+
// Preserve the line's own indent shape; prepend the delta. This
|
|
201
|
+
// matches Aider's behaviour: if the model emitted the replace at
|
|
202
|
+
// the same column as the search, the source's outer indent is
|
|
203
|
+
// re-applied.
|
|
204
|
+
const { prefix: replacePrefix } = splitLeadingWs(line);
|
|
205
|
+
return `${m.sourcePrefix}${replacePrefix}${rest}`;
|
|
206
|
+
})
|
|
207
|
+
.join('');
|
|
208
|
+
// If the source's matched span ended on a terminated line but the
|
|
209
|
+
// replace's last line is un-terminated, re-add the terminator. This
|
|
210
|
+
// matches the Anthropic / OpenAI parsers' habit of stripping the
|
|
211
|
+
// trailing newline on the last body line — we want к keep the
|
|
212
|
+
// source's line shape after rebuild.
|
|
213
|
+
const lastSourceLine = sourceLines[m.end - 1] ?? '';
|
|
214
|
+
if (lastSourceLine.endsWith('\n') && !rebuilt.endsWith('\n')) {
|
|
215
|
+
rebuilt += '\n';
|
|
216
|
+
}
|
|
217
|
+
const after = source.slice(0, m.startOffset) + rebuilt + source.slice(m.endOffset);
|
|
218
|
+
return {
|
|
219
|
+
kind: 'matched',
|
|
220
|
+
tier: 'whitespace-flex',
|
|
221
|
+
after,
|
|
222
|
+
score: 1,
|
|
223
|
+
startOffset: m.startOffset,
|
|
224
|
+
endOffset: m.endOffset,
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
/**
|
|
228
|
+
* Tier 2 — ellipsis allowance.
|
|
229
|
+
*
|
|
230
|
+
* Accept `...` on its own line (optionally with surrounding whitespace)
|
|
231
|
+
* as a wildcard span. Split the search into chunks; the first chunk's
|
|
232
|
+
* start must anchor in the source, the last chunk's end must anchor
|
|
233
|
+
* after the first chunk's match, and anything in between is preserved
|
|
234
|
+
* verbatim. With multiple `...` markers the same rule applies pairwise.
|
|
235
|
+
*
|
|
236
|
+
* Required invariants:
|
|
237
|
+
* - At least one `...` line exists (else degrade to no_match; this
|
|
238
|
+
* tier is a no-op for non-ellipsis blocks).
|
|
239
|
+
* - The head chunk + tail chunk are both non-empty (otherwise there
|
|
240
|
+
* is no anchor — the model owes us at least one line of context).
|
|
241
|
+
* - The head chunk's exact match is UNIQUE in the source (else we
|
|
242
|
+
* can't deterministically pick the window).
|
|
243
|
+
*
|
|
244
|
+
* On match the replacement is rebuilt by stitching the model's
|
|
245
|
+
* REPLACE chunks (parsed by the same ellipsis split) with the source's
|
|
246
|
+
* own middle preserved verbatim. The model is expected to also use
|
|
247
|
+
* `...` markers in the REPLACE block to indicate "keep the middle";
|
|
248
|
+
* if the REPLACE has no markers we treat it as a verbatim replacement
|
|
249
|
+
* for the entire matched span (head + middle + tail).
|
|
250
|
+
*/
|
|
251
|
+
export function tryEllipsis(source, search, replace) {
|
|
252
|
+
const searchParts = splitOnEllipsis(search);
|
|
253
|
+
if (searchParts.length < 2) {
|
|
254
|
+
return { kind: 'no_match', detail: 'ellipsis: no ... marker in search' };
|
|
255
|
+
}
|
|
256
|
+
const head = searchParts[0] ?? '';
|
|
257
|
+
const tail = searchParts[searchParts.length - 1] ?? '';
|
|
258
|
+
if (head.length === 0 || tail.length === 0) {
|
|
259
|
+
return { kind: 'no_match', detail: 'ellipsis: empty head or tail chunk' };
|
|
260
|
+
}
|
|
261
|
+
// Head must be uniquely findable. Use overlap-aware enumeration —
|
|
262
|
+
// plain `indexOf` then `indexOf(_, lastIdx + head.length)` would miss
|
|
263
|
+
// a second hit that overlaps the first by `head.length - 1` chars
|
|
264
|
+
// (e.g. head "aaa" in source "aaaa" has matches at both 0 and 1,
|
|
265
|
+
// but indexOf-stride scanning only sees the one at 0). Triple-review
|
|
266
|
+
// P1-2: a multi-occurrence head must surface as `ambiguous` so
|
|
267
|
+
// the dispatcher escalates rather than silently landing the wrong
|
|
268
|
+
// span.
|
|
269
|
+
const headMatches = enumerateMatches(source, head, /* maxNeeded */ 2);
|
|
270
|
+
if (headMatches.length === 0) {
|
|
271
|
+
return { kind: 'no_match', detail: 'ellipsis: head chunk not found' };
|
|
272
|
+
}
|
|
273
|
+
if (headMatches.length > 1) {
|
|
274
|
+
return {
|
|
275
|
+
kind: 'ambiguous',
|
|
276
|
+
tier: 'ellipsis',
|
|
277
|
+
candidateCount: headMatches.length,
|
|
278
|
+
detail: 'ellipsis: head chunk matches multiple times',
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
const headFirst = headMatches[0] ?? 0;
|
|
282
|
+
const innerAnchors = [];
|
|
283
|
+
let cursor = headFirst + head.length;
|
|
284
|
+
for (let i = 1; i < searchParts.length - 1; i += 1) {
|
|
285
|
+
const chunk = searchParts[i] ?? '';
|
|
286
|
+
if (chunk.length === 0) {
|
|
287
|
+
// Empty inner chunk would match anywhere — treat as "skip"
|
|
288
|
+
// (the preserved middle on each side is contiguous).
|
|
289
|
+
continue;
|
|
290
|
+
}
|
|
291
|
+
const found = source.indexOf(chunk, cursor);
|
|
292
|
+
if (found === -1) {
|
|
293
|
+
return { kind: 'no_match', detail: `ellipsis: inner chunk #${i} not found after cursor` };
|
|
294
|
+
}
|
|
295
|
+
innerAnchors.push({ start: found, end: found + chunk.length });
|
|
296
|
+
cursor = found + chunk.length;
|
|
297
|
+
}
|
|
298
|
+
// Find the tail occurrence strictly after the last inner anchor (or
|
|
299
|
+
// after head when no inner chunks). Anchor forwards AND require
|
|
300
|
+
// uniqueness in the trailing region. Without the uniqueness gate, an
|
|
301
|
+
// SLR/SLP block whose tail repeats further down the source would land
|
|
302
|
+
// the replacement in a syntactically-plausible-but-wrong spot.
|
|
303
|
+
// Triple-review P1-1: enumerate then require exactly one match;
|
|
304
|
+
// fall through to Tier 3 (edit-distance) when ambiguous so the model
|
|
305
|
+
// sees the disambiguation request, not a silent miswrite.
|
|
306
|
+
const tailMatches = enumerateMatches(source.slice(cursor), tail, /* maxNeeded */ 2);
|
|
307
|
+
if (tailMatches.length === 0) {
|
|
308
|
+
return { kind: 'no_match', detail: 'ellipsis: tail chunk not found after head' };
|
|
309
|
+
}
|
|
310
|
+
if (tailMatches.length > 1) {
|
|
311
|
+
return {
|
|
312
|
+
kind: 'ambiguous',
|
|
313
|
+
tier: 'ellipsis',
|
|
314
|
+
candidateCount: tailMatches.length,
|
|
315
|
+
detail: 'ellipsis: tail chunk matches multiple times after head',
|
|
316
|
+
};
|
|
317
|
+
}
|
|
318
|
+
const tailStart = (tailMatches[0] ?? 0) + cursor;
|
|
319
|
+
const matchStart = headFirst;
|
|
320
|
+
const matchEnd = tailStart + tail.length;
|
|
321
|
+
// Compute the preserved-middle segments — one between every pair
|
|
322
|
+
// of consecutive REPLACE chunks (head, inner_1, ..., inner_k, tail).
|
|
323
|
+
// For k inner anchors we end up with k+1 preserved segments:
|
|
324
|
+
// preserved[0] = source[headEnd .. innerAnchors[0].start]
|
|
325
|
+
// preserved[i] = source[innerAnchors[i-1].end .. innerAnchors[i].start]
|
|
326
|
+
// preserved[k] = source[innerAnchors[k-1].end .. tailStart]
|
|
327
|
+
const preserved = [];
|
|
328
|
+
let segStart = headFirst + head.length;
|
|
329
|
+
for (const a of innerAnchors) {
|
|
330
|
+
preserved.push(source.slice(segStart, a.start));
|
|
331
|
+
segStart = a.end;
|
|
332
|
+
}
|
|
333
|
+
preserved.push(source.slice(segStart, tailStart));
|
|
334
|
+
// Rebuild the replacement.
|
|
335
|
+
//
|
|
336
|
+
// Case A — REPLACE uses `...` AND has at least as many chunks as
|
|
337
|
+
// SEARCH: interleave preserved segments между REPLACE
|
|
338
|
+
// chunks at corresponding positions. This is the common
|
|
339
|
+
// case: model emits the same shape on both sides.
|
|
340
|
+
//
|
|
341
|
+
// Case B — REPLACE has fewer `...` chunks than SEARCH OR no `...`
|
|
342
|
+
// at all: treat REPLACE as the verbatim full replacement
|
|
343
|
+
// for the matched span. Lets the model collapse a span
|
|
344
|
+
// when the rewrite is small.
|
|
345
|
+
const replaceParts = splitOnEllipsis(replace);
|
|
346
|
+
let rebuilt;
|
|
347
|
+
if (replaceParts.length === searchParts.length && replaceParts.length >= 2) {
|
|
348
|
+
// Interleave: replaceParts[0] + preserved[0] + replaceParts[1] +
|
|
349
|
+
// preserved[1] + ... + replaceParts[last]
|
|
350
|
+
const pieces = [];
|
|
351
|
+
for (let i = 0; i < replaceParts.length; i += 1) {
|
|
352
|
+
pieces.push(replaceParts[i] ?? '');
|
|
353
|
+
if (i < preserved.length) {
|
|
354
|
+
pieces.push(preserved[i] ?? '');
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
rebuilt = pieces.join('');
|
|
358
|
+
}
|
|
359
|
+
else if (replaceParts.length >= 2) {
|
|
360
|
+
// Mismatched chunk count — splice preserved spans into the gaps
|
|
361
|
+
// we DO have, pad with the last preserved on overflow. Defensive
|
|
362
|
+
// path; production callers should match shape.
|
|
363
|
+
const rHead = replaceParts[0] ?? '';
|
|
364
|
+
const rTail = replaceParts[replaceParts.length - 1] ?? '';
|
|
365
|
+
const middleSpan = preserved.join('');
|
|
366
|
+
rebuilt = `${rHead}${middleSpan}${rTail}`;
|
|
367
|
+
}
|
|
368
|
+
else {
|
|
369
|
+
rebuilt = replace;
|
|
370
|
+
}
|
|
371
|
+
const after = source.slice(0, matchStart) + rebuilt + source.slice(matchEnd);
|
|
372
|
+
return {
|
|
373
|
+
kind: 'matched',
|
|
374
|
+
tier: 'ellipsis',
|
|
375
|
+
after,
|
|
376
|
+
score: 1,
|
|
377
|
+
startOffset: matchStart,
|
|
378
|
+
endOffset: matchEnd,
|
|
379
|
+
};
|
|
380
|
+
}
|
|
381
|
+
/**
|
|
382
|
+
* Tier 3 — edit-distance match via LCS ratio.
|
|
383
|
+
*
|
|
384
|
+
* Slide a window of length comparable к |search| across the source.
|
|
385
|
+
* For each candidate slice, compute the LCS-ratio
|
|
386
|
+
* `(2 * lcs(a, b)) / (|a| + |b|)`. Best-ratio candidate must score
|
|
387
|
+
* >= minRatio (default 0.8) to count as a match; ties on the best
|
|
388
|
+
* score → ambiguous.
|
|
389
|
+
*
|
|
390
|
+
* Optimisation: we only score candidates anchored at line boundaries.
|
|
391
|
+
* Sub-line windows produce essentially-random ratios and waste cycles.
|
|
392
|
+
*/
|
|
393
|
+
export function tryEditDistance(source, search, replace, opts = {}) {
|
|
394
|
+
const minRatio = clamp(opts.minRatio ?? DEFAULT_MIN_RATIO, 0, 1);
|
|
395
|
+
const lengthFlex = clamp(opts.lengthFlex ?? DEFAULT_LENGTH_FLEX, 0, 0.5);
|
|
396
|
+
if (source.length === 0) {
|
|
397
|
+
return { kind: 'no_match', detail: 'edit-distance: empty source' };
|
|
398
|
+
}
|
|
399
|
+
const lineOffsets = computeLineOffsets(source);
|
|
400
|
+
// Append the final EOF offset so the slice window covers the tail.
|
|
401
|
+
const anchors = [...lineOffsets];
|
|
402
|
+
if (anchors[anchors.length - 1] !== source.length)
|
|
403
|
+
anchors.push(source.length);
|
|
404
|
+
const minLen = Math.max(1, Math.floor(search.length * (1 - lengthFlex)));
|
|
405
|
+
const maxLen = Math.max(minLen, Math.ceil(search.length * (1 + lengthFlex)));
|
|
406
|
+
let bestRatio = 0;
|
|
407
|
+
let bestStart = -1;
|
|
408
|
+
let bestEnd = -1;
|
|
409
|
+
let bestCount = 0;
|
|
410
|
+
for (let i = 0; i < anchors.length; i += 1) {
|
|
411
|
+
const start = anchors[i] ?? 0;
|
|
412
|
+
for (let j = i + 1; j < anchors.length; j += 1) {
|
|
413
|
+
const end = anchors[j] ?? source.length;
|
|
414
|
+
const len = end - start;
|
|
415
|
+
if (len < minLen)
|
|
416
|
+
continue;
|
|
417
|
+
if (len > maxLen)
|
|
418
|
+
break; // anchors monotonic → no point continuing inner loop
|
|
419
|
+
const slice = source.slice(start, end);
|
|
420
|
+
const ratio = lcsRatio(slice, search);
|
|
421
|
+
if (ratio > bestRatio + 1e-9) {
|
|
422
|
+
bestRatio = ratio;
|
|
423
|
+
bestStart = start;
|
|
424
|
+
bestEnd = end;
|
|
425
|
+
bestCount = 1;
|
|
426
|
+
}
|
|
427
|
+
else if (Math.abs(ratio - bestRatio) <= 1e-9 && bestRatio >= minRatio) {
|
|
428
|
+
bestCount += 1;
|
|
429
|
+
}
|
|
430
|
+
}
|
|
431
|
+
}
|
|
432
|
+
if (bestRatio < minRatio || bestStart === -1) {
|
|
433
|
+
return { kind: 'no_match', detail: `edit-distance: best ratio ${bestRatio.toFixed(3)} < ${minRatio}` };
|
|
434
|
+
}
|
|
435
|
+
if (bestCount > 1) {
|
|
436
|
+
return { kind: 'ambiguous', tier: 'edit-distance', candidateCount: bestCount, detail: `edit-distance: ${bestCount} candidates at ratio ${bestRatio.toFixed(3)}` };
|
|
437
|
+
}
|
|
438
|
+
const after = source.slice(0, bestStart) + replace + source.slice(bestEnd);
|
|
439
|
+
return {
|
|
440
|
+
kind: 'matched',
|
|
441
|
+
tier: 'edit-distance',
|
|
442
|
+
after,
|
|
443
|
+
score: bestRatio,
|
|
444
|
+
startOffset: bestStart,
|
|
445
|
+
endOffset: bestEnd,
|
|
446
|
+
};
|
|
447
|
+
}
|
|
448
|
+
// ---------- helpers ----------
|
|
449
|
+
/** Clamp x to [lo, hi]. Returns NaN-safe value (NaN → lo). */
|
|
450
|
+
function clamp(x, lo, hi) {
|
|
451
|
+
if (!Number.isFinite(x))
|
|
452
|
+
return lo;
|
|
453
|
+
if (x < lo)
|
|
454
|
+
return lo;
|
|
455
|
+
if (x > hi)
|
|
456
|
+
return hi;
|
|
457
|
+
return x;
|
|
458
|
+
}
|
|
459
|
+
/**
|
|
460
|
+
* Split a string on line terminators, KEEPING the terminator on each
|
|
461
|
+
* line. So `"a\nb\n"` → `["a\n", "b\n"]`. A trailing line without a
|
|
462
|
+
* terminator is preserved as its own entry: `"a\nb"` → `["a\n", "b"]`.
|
|
463
|
+
*
|
|
464
|
+
* This matters because tier 1 compares line-by-line and rebuilds the
|
|
465
|
+
* buffer by joining without an extra separator — discarding the line
|
|
466
|
+
* terminator would corrupt CRLF / LF source files on rebuild.
|
|
467
|
+
*/
|
|
468
|
+
export function splitLinesKeepEnds(s) {
|
|
469
|
+
if (s.length === 0)
|
|
470
|
+
return [];
|
|
471
|
+
const out = [];
|
|
472
|
+
let start = 0;
|
|
473
|
+
for (let i = 0; i < s.length; i += 1) {
|
|
474
|
+
const ch = s.charCodeAt(i);
|
|
475
|
+
if (ch === 10 /* \n */) {
|
|
476
|
+
out.push(s.slice(start, i + 1));
|
|
477
|
+
start = i + 1;
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
if (start < s.length)
|
|
481
|
+
out.push(s.slice(start));
|
|
482
|
+
return out;
|
|
483
|
+
}
|
|
484
|
+
/**
|
|
485
|
+
* Split a line into `{ prefix, rest }` where `prefix` is the
|
|
486
|
+
* contiguous leading whitespace (spaces + tabs only — newlines are
|
|
487
|
+
* never leading WS in a single line).
|
|
488
|
+
*/
|
|
489
|
+
export function splitLeadingWs(line) {
|
|
490
|
+
let i = 0;
|
|
491
|
+
while (i < line.length) {
|
|
492
|
+
const ch = line.charCodeAt(i);
|
|
493
|
+
if (ch === 32 /* space */ || ch === 9 /* tab */)
|
|
494
|
+
i += 1;
|
|
495
|
+
else
|
|
496
|
+
break;
|
|
497
|
+
}
|
|
498
|
+
return { prefix: line.slice(0, i), rest: line.slice(i) };
|
|
499
|
+
}
|
|
500
|
+
/**
|
|
501
|
+
* Compute the line-start offsets for `s`. Index `i` holds the byte
|
|
502
|
+
* offset of the start of line `i`; line 0 always starts at 0. Used by
|
|
503
|
+
* tiers 1 + 3 to compute slice bounds without re-scanning.
|
|
504
|
+
*/
|
|
505
|
+
export function computeLineOffsets(s) {
|
|
506
|
+
const out = [0];
|
|
507
|
+
for (let i = 0; i < s.length; i += 1) {
|
|
508
|
+
if (s.charCodeAt(i) === 10)
|
|
509
|
+
out.push(i + 1);
|
|
510
|
+
}
|
|
511
|
+
return out;
|
|
512
|
+
}
|
|
513
|
+
/**
|
|
514
|
+
* Return the prefix delta from `searchPrefix` to `sourcePrefix` if
|
|
515
|
+
* `sourcePrefix` is a prefix-superset of `searchPrefix`, else null.
|
|
516
|
+
*
|
|
517
|
+
* Examples:
|
|
518
|
+
* searchPrefix="" sourcePrefix=" " → " "
|
|
519
|
+
* searchPrefix=" " sourcePrefix=" " → " "
|
|
520
|
+
* searchPrefix=" " sourcePrefix="\t" → null (different WS char)
|
|
521
|
+
* searchPrefix=" " sourcePrefix=" " → null (search deeper than source)
|
|
522
|
+
*/
|
|
523
|
+
export function computePrefixDelta(sourcePrefix, searchPrefix) {
|
|
524
|
+
if (!sourcePrefix.endsWith(searchPrefix)) {
|
|
525
|
+
// We allow the search prefix to be a SUFFIX of the source prefix —
|
|
526
|
+
// i.e. the source has additional leading indent. `endsWith` is the
|
|
527
|
+
// right check because we want `sourcePrefix = delta + searchPrefix`.
|
|
528
|
+
return null;
|
|
529
|
+
}
|
|
530
|
+
return sourcePrefix.slice(0, sourcePrefix.length - searchPrefix.length);
|
|
531
|
+
}
|
|
532
|
+
/**
|
|
533
|
+
* Split a SEARCH or REPLACE block on ellipsis markers — a line whose
|
|
534
|
+
* trimmed content is exactly `...`. Returns the chunks between markers
|
|
535
|
+
* (the markers themselves are dropped). A block with no marker returns
|
|
536
|
+
* a single-element array (caller treats that as "no ellipsis tier").
|
|
537
|
+
*
|
|
538
|
+
* Examples:
|
|
539
|
+
* "head\n...\ntail" → ["head\n", "\ntail"]
|
|
540
|
+
* "head\n...\nmid\n...\ntail" → ["head\n", "\nmid\n", "\ntail"]
|
|
541
|
+
* "no markers here" → ["no markers here"]
|
|
542
|
+
*/
|
|
543
|
+
export function splitOnEllipsis(s) {
|
|
544
|
+
const lines = splitLinesKeepEnds(s);
|
|
545
|
+
const chunks = [];
|
|
546
|
+
let current = '';
|
|
547
|
+
let foundMarker = false;
|
|
548
|
+
for (const line of lines) {
|
|
549
|
+
// Trim line content (without the terminator) for marker detection.
|
|
550
|
+
const noTerm = line.replace(/\r?\n$/, '');
|
|
551
|
+
if (noTerm.trim() === '...') {
|
|
552
|
+
foundMarker = true;
|
|
553
|
+
chunks.push(current);
|
|
554
|
+
current = '';
|
|
555
|
+
continue;
|
|
556
|
+
}
|
|
557
|
+
current += line;
|
|
558
|
+
}
|
|
559
|
+
chunks.push(current);
|
|
560
|
+
if (!foundMarker)
|
|
561
|
+
return [s];
|
|
562
|
+
return chunks;
|
|
563
|
+
}
|
|
564
|
+
/**
|
|
565
|
+
* Enumerate every start offset where `needle` appears in `haystack`,
|
|
566
|
+
* including overlapping positions. Caller passes `maxNeeded` so we can
|
|
567
|
+
* short-circuit as soon as we have enough hits to make the uniqueness
|
|
568
|
+
* decision (the typical case wants `maxNeeded = 2` — one for the match,
|
|
569
|
+
* two to prove ambiguity).
|
|
570
|
+
*
|
|
571
|
+
* Triple-review P1-2 — the previous `indexOf(needle, lastIdx +
|
|
572
|
+
* needle.length)` stride skipped overlapping matches. Stride-by-1
|
|
573
|
+
* scanning catches "aaa" inside "aaaa" (matches at indices 0 and 1).
|
|
574
|
+
* We deliberately do NOT use `String.prototype.matchAll` with an
|
|
575
|
+
* escaped regex because (a) it allocates a RegExp per call and a
|
|
576
|
+
* MatchAll iterator with internal global state we then have to thread
|
|
577
|
+
* through escape() correctness, and (b) a malicious operator-supplied
|
|
578
|
+
* needle containing regex metacharacters could otherwise cause an
|
|
579
|
+
* UNescape mismatch — the loop here operates on raw characters so the
|
|
580
|
+
* metacharacter risk does not exist.
|
|
581
|
+
*
|
|
582
|
+
* Returns the byte offsets where each occurrence STARTS, in ascending
|
|
583
|
+
* order. Empty `needle` returns []; the caller is expected to gate on
|
|
584
|
+
* non-empty inputs upstream.
|
|
585
|
+
*/
|
|
586
|
+
export function enumerateMatches(haystack, needle, maxNeeded) {
|
|
587
|
+
if (needle.length === 0 || maxNeeded <= 0)
|
|
588
|
+
return [];
|
|
589
|
+
const out = [];
|
|
590
|
+
let pos = haystack.indexOf(needle, 0);
|
|
591
|
+
while (pos !== -1) {
|
|
592
|
+
out.push(pos);
|
|
593
|
+
if (out.length >= maxNeeded)
|
|
594
|
+
return out;
|
|
595
|
+
// Stride by 1, NOT by needle.length — overlapping matches are
|
|
596
|
+
// semantically distinct anchor candidates for the ellipsis tier.
|
|
597
|
+
pos = haystack.indexOf(needle, pos + 1);
|
|
598
|
+
}
|
|
599
|
+
return out;
|
|
600
|
+
}
|
|
601
|
+
/**
|
|
602
|
+
* Longest-common-subsequence length between `a` and `b`. O(|a|*|b|)
|
|
603
|
+
* time, O(min(|a|,|b|)) space via the standard two-row DP. Pure stdlib;
|
|
604
|
+
* no Levenshtein npm pkg per the constraint.
|
|
605
|
+
*
|
|
606
|
+
* Operates on CODE POINTS (16-bit code units, equivalent for our use
|
|
607
|
+
* because we never normalise unicode and the LLM-emitted text uses
|
|
608
|
+
* ASCII-heavy code paths).
|
|
609
|
+
*/
|
|
610
|
+
export function lcsLength(a, b) {
|
|
611
|
+
if (a.length === 0 || b.length === 0)
|
|
612
|
+
return 0;
|
|
613
|
+
// Ensure inner loop runs over the shorter string (smaller DP row).
|
|
614
|
+
const [outer, inner] = a.length <= b.length ? [b, a] : [a, b];
|
|
615
|
+
const n = inner.length;
|
|
616
|
+
// Two rows: previous + current. Reused across outer iterations.
|
|
617
|
+
let prev = new Uint32Array(n + 1);
|
|
618
|
+
let curr = new Uint32Array(n + 1);
|
|
619
|
+
for (let i = 0; i < outer.length; i += 1) {
|
|
620
|
+
const outerCh = outer.charCodeAt(i);
|
|
621
|
+
curr[0] = 0;
|
|
622
|
+
for (let j = 0; j < n; j += 1) {
|
|
623
|
+
if (outerCh === inner.charCodeAt(j)) {
|
|
624
|
+
curr[j + 1] = (prev[j] ?? 0) + 1;
|
|
625
|
+
}
|
|
626
|
+
else {
|
|
627
|
+
const top = prev[j + 1] ?? 0;
|
|
628
|
+
const left = curr[j] ?? 0;
|
|
629
|
+
curr[j + 1] = top >= left ? top : left;
|
|
630
|
+
}
|
|
631
|
+
}
|
|
632
|
+
const tmp = prev;
|
|
633
|
+
prev = curr;
|
|
634
|
+
curr = tmp;
|
|
635
|
+
}
|
|
636
|
+
return prev[n] ?? 0;
|
|
637
|
+
}
|
|
638
|
+
/**
|
|
639
|
+
* LCS-ratio defined as `(2 * lcs(a, b)) / (|a| + |b|)`. Range [0, 1].
|
|
640
|
+
* Equivalent to Python's `difflib.SequenceMatcher.ratio()` on the
|
|
641
|
+
* worst case where every chunk size = 1; close enough for the
|
|
642
|
+
* fuzzy-edit gate (we only care about the >= 0.8 threshold).
|
|
643
|
+
*/
|
|
644
|
+
export function lcsRatio(a, b) {
|
|
645
|
+
const total = a.length + b.length;
|
|
646
|
+
if (total === 0)
|
|
647
|
+
return 1;
|
|
648
|
+
return (2 * lcsLength(a, b)) / total;
|
|
649
|
+
}
|
|
650
|
+
//# sourceMappingURL=fuzzy-ladder.js.map
|
package/dist/core/edits/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* diff escalation — public barrel.
|
|
3
3
|
*
|
|
4
4
|
* Surface for callers (CLI integration, future engine adapters, tests).
|
|
5
5
|
* Keeps the per-layer module path stable so β-tier additions (Layer D
|
|
@@ -7,9 +7,13 @@
|
|
|
7
7
|
* fallback) can land without churn at the import sites.
|
|
8
8
|
*/
|
|
9
9
|
export { applyLayerA, countOccurrences, } from './layer-a-apply.js';
|
|
10
|
+
export { applyLayerAFuzzy, } from './layer-a-fuzzy-apply.js';
|
|
11
|
+
export { tryFuzzyLadder, tryWhitespaceFlex, tryEllipsis, tryEditDistance, lcsLength, lcsRatio, splitLinesKeepEnds, splitLeadingWs, splitOnEllipsis, computeLineOffsets, computePrefixDelta, enumerateMatches, } from './fuzzy-ladder.js';
|
|
10
12
|
export { applyLayerB, } from './layer-b-apply.js';
|
|
11
13
|
export { applyLayerC, sha256OfUtf8, } from './layer-c-apply.js';
|
|
12
14
|
export { applyLayerD, LayerDDeferredError, } from './layer-d-ast.js';
|
|
13
15
|
export { MarkerParseError, detectFamily, parseMarkers, } from './marker-parser.js';
|
|
14
16
|
export { dispatchEdit, resolveFamily, } from './dispatch.js';
|
|
17
|
+
export { EDIT_FORMAT_MATRIX, pickEditFormat, } from './format-matrix.js';
|
|
18
|
+
export { detectEditFormat, detectModelFamily, familyDefaultChain, renderEditFormatHint, } from './format-detector.js';
|
|
15
19
|
//# sourceMappingURL=index.js.map
|