@sayknow-cli/coding-agent 0.7.11 → 0.7.13
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 +16 -0
- package/dist/types/async/result-formatting.d.ts +2 -0
- package/dist/types/capability/fs.d.ts +22 -3
- package/dist/types/capability/mcp.d.ts +2 -0
- package/dist/types/cli/append-system-prompt.d.ts +6 -0
- package/dist/types/cli/update-cli.d.ts +3 -0
- package/dist/types/commands/contribution-prep.d.ts +0 -3
- package/dist/types/commands/migrate.d.ts +1 -1
- package/dist/types/commands/sdk.d.ts +9 -0
- package/dist/types/commit/changelog/index.d.ts +1 -0
- package/dist/types/config/settings-schema.d.ts +14 -0
- package/dist/types/config/settings.d.ts +7 -1
- package/dist/types/coordinator-mcp/session-reaper.d.ts +5 -0
- package/dist/types/cursor-delete-path.d.ts +1 -0
- package/dist/types/cursor-mcp-name.d.ts +8 -0
- package/dist/types/dap/config.d.ts +8 -4
- package/dist/types/dap/session.d.ts +11 -2
- package/dist/types/debug/report-bundle-parent.d.ts +2 -0
- package/dist/types/debug/system-info.d.ts +6 -1
- package/dist/types/discovery/helpers.d.ts +11 -3
- package/dist/types/discovery/mcp-json.d.ts +1 -0
- package/dist/types/edit/file-read-cache.d.ts +4 -0
- package/dist/types/edit/modes/patch.d.ts +14 -0
- package/dist/types/edit/modes/replace.d.ts +8 -0
- package/dist/types/eval/py/runtime.d.ts +9 -0
- package/dist/types/exa/mcp-client.d.ts +11 -6
- package/dist/types/exec/bash-executor.d.ts +18 -1
- package/dist/types/export/html/css-color.d.ts +2 -0
- package/dist/types/export/html/html-export-destination.d.ts +2 -0
- package/dist/types/export/html/template.generated.d.ts +1 -1
- package/dist/types/extensibility/custom-tools/loader.d.ts +3 -2
- package/dist/types/extensibility/custom-tools/types.d.ts +3 -1
- package/dist/types/extensibility/plugins/marketplace/cache.d.ts +2 -0
- package/dist/types/extensibility/plugins/plugin-link-path.d.ts +2 -0
- package/dist/types/goals/runtime.d.ts +6 -0
- package/dist/types/harness-control-plane/receipt-spool.d.ts +4 -0
- package/dist/types/hindsight/content.d.ts +5 -6
- package/dist/types/internal-urls/skill-path.d.ts +1 -0
- package/dist/types/internal-urls/types.d.ts +2 -0
- package/dist/types/lsp/clients/swiftlint-client.d.ts +0 -4
- package/dist/types/lsp/config.d.ts +8 -5
- package/dist/types/lsp/workspace-path.d.ts +1 -0
- package/dist/types/migrate/adapters/codex.d.ts +2 -1
- package/dist/types/migrate/adapters/index.d.ts +10 -1
- package/dist/types/migrate/executor.d.ts +3 -1
- package/dist/types/migrate/types.d.ts +15 -3
- package/dist/types/modes/components/custom-editor.d.ts +6 -0
- package/dist/types/modes/components/extensions/state-manager.d.ts +4 -3
- package/dist/types/modes/components/model-selector.d.ts +46 -0
- package/dist/types/modes/controllers/input-controller.d.ts +9 -0
- package/dist/types/modes/interactive-mode.d.ts +1 -0
- package/dist/types/modes/utils/macos-option-forwarding.d.ts +17 -0
- package/dist/types/runtime-mcp/content-limits.d.ts +4 -0
- package/dist/types/runtime-mcp/manager.d.ts +9 -1
- package/dist/types/runtime-mcp/mcp-redirect.d.ts +9 -0
- package/dist/types/runtime-mcp/oauth-public-url.d.ts +1 -0
- package/dist/types/runtime-mcp/plugin-mcp-name-filter.d.ts +22 -0
- package/dist/types/runtime-mcp/plugin-network-boundary.d.ts +1 -0
- package/dist/types/runtime-mcp/project-host-values.d.ts +33 -0
- package/dist/types/runtime-mcp/smithery-registry.d.ts +24 -0
- package/dist/types/runtime-mcp/tool-bridge.d.ts +4 -0
- package/dist/types/runtime-mcp/types.d.ts +6 -0
- package/dist/types/sdk/broker/ensure.d.ts +2 -0
- package/dist/types/sdk/broker/lifecycle-ledger.d.ts +5 -1
- package/dist/types/sdk/broker/runtime.d.ts +1 -1
- package/dist/types/sdk/bus/chat-daemon-control.d.ts +3 -1
- package/dist/types/sdk/bus/telegram-daemon-contract.d.ts +3 -1
- package/dist/types/sdk/bus/telegram-daemon.d.ts +1 -0
- package/dist/types/sdk/host/events.d.ts +4 -0
- package/dist/types/session/agent-session.d.ts +22 -2
- package/dist/types/session/auto-resume.d.ts +5 -0
- package/dist/types/session/messages.d.ts +5 -1
- package/dist/types/session/session-manager.d.ts +13 -0
- package/dist/types/session/session-storage.d.ts +8 -0
- package/dist/types/session/streaming-output.d.ts +11 -0
- package/dist/types/session-import/redact.d.ts +1 -1
- package/dist/types/skc-runtime/managed-owner-admission.d.ts +3 -0
- package/dist/types/skc-runtime/psmux-detect.d.ts +5 -4
- package/dist/types/skc-runtime/ralplan-runtime.d.ts +5 -0
- package/dist/types/skc-runtime/sidecar-bootstrap-env.d.ts +6 -0
- package/dist/types/skc-runtime/state-writer.d.ts +4 -1
- package/dist/types/skc-runtime/tmux-sessions.d.ts +24 -0
- package/dist/types/skc-runtime/ultragoal-runtime.d.ts +4 -0
- package/dist/types/skill-state/workflow-mutation-guard.d.ts +20 -1
- package/dist/types/slash-commands/helpers/mcp.d.ts +5 -0
- package/dist/types/ssh/ssh-executor.d.ts +3 -1
- package/dist/types/system-prompt.d.ts +5 -2
- package/dist/types/task/executor.d.ts +17 -3
- package/dist/types/task/isolation-dir.d.ts +26 -0
- package/dist/types/task/role-body.d.ts +11 -0
- package/dist/types/task/token-log-mode.test.d.ts +1 -0
- package/dist/types/tools/ask.d.ts +77 -254
- package/dist/types/tools/ast-edit-write-path.d.ts +23 -0
- package/dist/types/tools/atomic-file-write.d.ts +74 -0
- package/dist/types/tools/auto-generated-guard.d.ts +5 -2
- package/dist/types/tools/bash-allowed-prefixes.d.ts +16 -0
- package/dist/types/tools/bash-interactive.d.ts +2 -0
- package/dist/types/tools/bash-skill-urls.d.ts +5 -1
- package/dist/types/tools/bash.d.ts +1 -0
- package/dist/types/tools/browser/cdp-url.d.ts +2 -0
- package/dist/types/tools/browser/tab-worker.d.ts +2 -0
- package/dist/types/tools/debug.d.ts +2 -2
- package/dist/types/tools/explicit-artifact.d.ts +8 -0
- package/dist/types/tools/fetch.d.ts +7 -4
- package/dist/types/tools/github-side-effect.d.ts +22 -0
- package/dist/types/tools/index.d.ts +3 -0
- package/dist/types/tools/monitor-mutation.d.ts +9 -0
- package/dist/types/tools/recipe/index.d.ts +2 -0
- package/dist/types/tools/recipe/recipe-guard.d.ts +7 -0
- package/dist/types/tools/restricted-cwd.d.ts +1 -0
- package/dist/types/tools/reverse-engineer.d.ts +81 -0
- package/dist/types/tools/search-tool-bm25.d.ts +2 -0
- package/dist/types/tools/tmux-self-injection-guard.d.ts +17 -0
- package/dist/types/tools/untrusted-content.d.ts +12 -0
- package/dist/types/utils/file-mentions.d.ts +5 -0
- package/dist/types/utils/open.d.ts +0 -1
- package/dist/types/utils/shell-snapshot.d.ts +2 -0
- package/dist/types/utils/title-generator.d.ts +12 -2
- package/dist/types/utils/tools-checksum.d.ts +7 -0
- package/dist/types/utils/xml-escape.d.ts +2 -0
- package/dist/types/web/scrapers/types.d.ts +8 -1
- package/dist/types/web/search/providers/codex.d.ts +6 -7
- package/dist/types/web/search/providers/insane.d.ts +7 -1
- package/dist/types/web/search/providers/kimi.d.ts +2 -0
- package/dist/types/web/search/providers/searxng.d.ts +7 -0
- package/dist/types/web/search/providers/xai.d.ts +2 -0
- package/package.json +7 -7
- package/scripts/generate-sdk-operation-inventory.ts +4 -0
- package/src/async/job-manager.ts +23 -9
- package/src/async/result-formatting.ts +40 -0
- package/src/capability/fs.ts +78 -11
- package/src/capability/mcp.ts +2 -0
- package/src/cli/append-system-prompt.ts +12 -0
- package/src/cli/auth-broker-cli.ts +22 -12
- package/src/cli/config-cli.ts +8 -18
- package/src/cli/migrate-cli.ts +7 -5
- package/src/cli/ssh-cli.ts +6 -3
- package/src/cli/stats-cli.ts +9 -4
- package/src/cli/update-cli.ts +42 -0
- package/src/cli/web-search-cli.ts +9 -3
- package/src/cli.ts +5 -9
- package/src/commands/commit.ts +2 -2
- package/src/commands/contribution-prep.ts +1 -3
- package/src/commands/harness.ts +25 -15
- package/src/commands/launch.ts +1 -1
- package/src/commands/migrate.ts +3 -3
- package/src/commands/sdk.ts +115 -14
- package/src/commands/ultragoal.ts +14 -8
- package/src/commit/agentic/agent.ts +6 -6
- package/src/commit/analysis/conventional.ts +14 -5
- package/src/commit/changelog/index.ts +39 -1
- package/src/commit/message.ts +10 -3
- package/src/config/config-file.ts +106 -3
- package/src/config/keybindings.ts +154 -7
- package/src/config/mcp-schema.json +4 -0
- package/src/config/model-registry.ts +10 -2
- package/src/config/settings-schema.ts +18 -0
- package/src/config/settings.ts +32 -4
- package/src/coordinator-mcp/policy.ts +14 -4
- package/src/coordinator-mcp/server.ts +44 -4
- package/src/coordinator-mcp/session-reaper.ts +9 -1
- package/src/cursor-delete-path.ts +10 -0
- package/src/cursor-mcp-name.ts +15 -0
- package/src/cursor.ts +13 -2
- package/src/dap/client.ts +9 -2
- package/src/dap/config.ts +33 -13
- package/src/dap/defaults.json +1 -1
- package/src/dap/session.ts +161 -36
- package/src/debug/crash-diagnostics.ts +89 -6
- package/src/debug/report-bundle-parent.ts +22 -0
- package/src/debug/report-bundle.ts +100 -3
- package/src/debug/system-info.ts +21 -4
- package/src/defaults/skc/extensions/grok-cli-vendor/src/shared/base-url.ts +21 -7
- package/src/defaults/skc/skills/deep-interview/SKILL.md +1 -1
- package/src/discovery/agents-md.ts +3 -2
- package/src/discovery/agents.ts +3 -2
- package/src/discovery/builtin.ts +21 -11
- package/src/discovery/claude.ts +5 -4
- package/src/discovery/cline.ts +2 -2
- package/src/discovery/codex.ts +6 -5
- package/src/discovery/cursor.ts +11 -2
- package/src/discovery/gemini.ts +4 -3
- package/src/discovery/github.ts +2 -2
- package/src/discovery/helpers.ts +51 -11
- package/src/discovery/mcp-json.ts +28 -12
- package/src/discovery/opencode.ts +2 -1
- package/src/discovery/ssh.ts +11 -6
- package/src/discovery/substitute-plugin-root.ts +3 -1
- package/src/discovery/vscode.ts +3 -3
- package/src/edit/apply-patch/index.ts +12 -1
- package/src/edit/file-read-cache.ts +24 -6
- package/src/edit/index.ts +90 -20
- package/src/edit/modes/patch.ts +215 -9
- package/src/edit/modes/replace.ts +141 -0
- package/src/eval/js/context-manager.ts +29 -3
- package/src/eval/js/worker-entry.ts +51 -18
- package/src/eval/py/runner.py +144 -5
- package/src/eval/py/runtime.ts +44 -4
- package/src/eval/py/tool-bridge.ts +4 -0
- package/src/exa/mcp-client.ts +53 -11
- package/src/exec/bash-executor.ts +87 -4
- package/src/exec/non-interactive-env.ts +0 -1
- package/src/export/html/css-color.ts +9 -0
- package/src/export/html/html-export-destination.ts +16 -0
- package/src/export/html/index.ts +102 -8
- package/src/export/html/template.generated.ts +1 -1
- package/src/extensibility/custom-tools/loader.ts +13 -3
- package/src/extensibility/custom-tools/types.ts +3 -1
- package/src/extensibility/custom-tools/wrapper.ts +3 -1
- package/src/extensibility/plugins/manager.ts +3 -2
- package/src/extensibility/plugins/marketplace/cache.ts +15 -0
- package/src/extensibility/plugins/marketplace/fetcher.ts +2 -2
- package/src/extensibility/plugins/marketplace/manager.ts +5 -3
- package/src/extensibility/plugins/plugin-link-path.ts +12 -0
- package/src/extensibility/skc-plugins/mcp-policy.ts +2 -1
- package/src/goals/runtime.ts +30 -8
- package/src/harness-control-plane/finalize.ts +10 -0
- package/src/harness-control-plane/operate.ts +12 -4
- package/src/harness-control-plane/owner.ts +8 -1
- package/src/harness-control-plane/receipt-spool.ts +105 -28
- package/src/harness-control-plane/storage.ts +124 -6
- package/src/hashline/execute.ts +3 -3
- package/src/hashline/recovery.ts +85 -2
- package/src/hindsight/config.ts +9 -3
- package/src/hindsight/content.ts +116 -16
- package/src/hindsight/mental-models.ts +22 -10
- package/src/hindsight/state.ts +7 -4
- package/src/hooks/native-skill-hook.ts +17 -12
- package/src/i18n/messages/de.settings.ts +3 -0
- package/src/i18n/messages/es.settings.ts +3 -0
- package/src/i18n/messages/fr.settings.ts +3 -0
- package/src/i18n/messages/ja.settings.ts +3 -0
- package/src/i18n/messages/ko.settings.ts +3 -0
- package/src/i18n/messages/zh.settings.ts +3 -0
- package/src/internal-urls/artifact-protocol.ts +3 -1
- package/src/internal-urls/docs-index.generated.ts +10 -10
- package/src/internal-urls/local-protocol.ts +167 -8
- package/src/internal-urls/skill-path.ts +18 -0
- package/src/internal-urls/skill-protocol.ts +2 -0
- package/src/internal-urls/types.ts +2 -0
- package/src/lsp/client.ts +2 -1
- package/src/lsp/clients/biome-client.ts +2 -0
- package/src/lsp/clients/swiftlint-client.ts +2 -0
- package/src/lsp/config.ts +18 -62
- package/src/lsp/edits.ts +6 -0
- package/src/lsp/index.ts +29 -0
- package/src/lsp/workspace-path.ts +75 -0
- package/src/main.ts +33 -11
- package/src/memories/index.ts +141 -9
- package/src/migrate/action-planner.ts +57 -0
- package/src/migrate/adapters/claude-code.ts +23 -4
- package/src/migrate/adapters/codex.ts +22 -4
- package/src/migrate/adapters/index.ts +22 -4
- package/src/migrate/adapters/opencode.ts +6 -1
- package/src/migrate/executor.ts +84 -7
- package/src/migrate/report.ts +19 -2
- package/src/migrate/types.ts +14 -4
- package/src/modes/DESIGN.md +5 -0
- package/src/modes/acp/acp-agent.ts +35 -2
- package/src/modes/acp/permission-mode.ts +18 -1
- package/src/modes/components/custom-editor.ts +14 -0
- package/src/modes/components/extensions/extension-dashboard.ts +2 -2
- package/src/modes/components/extensions/inspector-panel.ts +9 -5
- package/src/modes/components/extensions/state-manager.ts +15 -5
- package/src/modes/components/model-selector.ts +144 -94
- package/src/modes/components/welcome.ts +3 -2
- package/src/modes/controllers/command-controller.ts +300 -9
- package/src/modes/controllers/event-controller.ts +1 -1
- package/src/modes/controllers/extension-ui-controller.ts +32 -19
- package/src/modes/controllers/input-controller.ts +62 -26
- package/src/modes/controllers/plan-mode-controller.ts +17 -7
- package/src/modes/controllers/runtime-mcp-command-controller.ts +25 -20
- package/src/modes/controllers/ssh-command-controller.ts +3 -1
- package/src/modes/interactive-mode.ts +10 -0
- package/src/modes/utils/macos-option-forwarding.ts +80 -0
- package/src/prompts/system/irc-incoming.md +3 -1
- package/src/prompts/system/project-prompt.md +19 -0
- package/src/prompts/system/system-prompt.md +3 -0
- package/src/prompts/tools/ask.md +2 -0
- package/src/prompts/tools/debug.md +1 -1
- package/src/prompts/tools/monitor.md +7 -5
- package/src/prompts/tools/reverse-engineer.md +29 -0
- package/src/runtime-credential-selector.ts +2 -2
- package/src/runtime-mcp/config-writer.ts +10 -6
- package/src/runtime-mcp/config.ts +1 -0
- package/src/runtime-mcp/content-limits.ts +7 -0
- package/src/runtime-mcp/json-rpc.ts +2 -1
- package/src/runtime-mcp/manager.ts +57 -9
- package/src/runtime-mcp/mcp-redirect.ts +73 -0
- package/src/runtime-mcp/oauth-flow.ts +43 -5
- package/src/runtime-mcp/oauth-public-url.ts +8 -0
- package/src/runtime-mcp/plugin-mcp-name-filter.ts +62 -0
- package/src/runtime-mcp/plugin-network-boundary.ts +4 -0
- package/src/runtime-mcp/project-host-values.ts +50 -0
- package/src/runtime-mcp/render.ts +16 -1
- package/src/runtime-mcp/smithery-registry.ts +22 -3
- package/src/runtime-mcp/tool-bridge.ts +194 -21
- package/src/runtime-mcp/transports/http.ts +4 -3
- package/src/runtime-mcp/transports/stdio.ts +2 -1
- package/src/runtime-mcp/types.ts +6 -0
- package/src/sdk/broker/broker.ts +11 -2
- package/src/sdk/broker/ensure.ts +131 -10
- package/src/sdk/broker/lifecycle-ledger.ts +18 -3
- package/src/sdk/broker/lifecycle.ts +21 -19
- package/src/sdk/broker/runtime.ts +1 -1
- package/src/sdk/bus/chat-daemon-cli.ts +38 -1
- package/src/sdk/bus/chat-daemon-control.ts +5 -3
- package/src/sdk/bus/index.ts +5 -3
- package/src/sdk/bus/lifecycle-control-runtime.ts +9 -2
- package/src/sdk/bus/session-control.ts +2 -0
- package/src/sdk/bus/slack-daemon.ts +8 -1
- package/src/sdk/bus/slack-live-provider.ts +3 -1
- package/src/sdk/bus/telegram-daemon-contract.ts +3 -1
- package/src/sdk/bus/telegram-daemon-control.ts +17 -12
- package/src/sdk/bus/telegram-daemon.ts +41 -1
- package/src/sdk/host/events.ts +67 -4
- package/src/sdk/mcp/server.ts +16 -3
- package/src/sdk/protocol/operation-inventory.generated.json +22 -0
- package/src/sdk/session.ts +18 -25
- package/src/secrets/obfuscator.ts +92 -12
- package/src/session/agent-session.ts +466 -100
- package/src/session/artifacts.ts +3 -1
- package/src/session/auto-resume.ts +45 -8
- package/src/session/history-storage.ts +172 -8
- package/src/session/internal/managed-session-scope.ts +130 -52
- package/src/session/messages.ts +47 -6
- package/src/session/session-manager.ts +116 -8
- package/src/session/session-storage.ts +31 -1
- package/src/session/streaming-output.ts +263 -4
- package/src/session-import/redact.ts +76 -3
- package/src/setup/hermes-setup.ts +4 -1
- package/src/skc-runtime/gc-runtime.ts +26 -4
- package/src/skc-runtime/launch-tmux.ts +21 -11
- package/src/skc-runtime/launch-worktree.ts +42 -3
- package/src/skc-runtime/managed-owner-admission.ts +46 -2
- package/src/skc-runtime/psmux-detect.ts +29 -5
- package/src/skc-runtime/ralplan-runtime.ts +14 -1
- package/src/skc-runtime/session-resolution.ts +38 -6
- package/src/skc-runtime/sidecar-bootstrap-env.ts +19 -0
- package/src/skc-runtime/state-writer.ts +134 -16
- package/src/skc-runtime/tmux-sessions.ts +85 -4
- package/src/skc-runtime/ultragoal-change-set.ts +18 -2
- package/src/skc-runtime/ultragoal-guard.ts +9 -1
- package/src/skc-runtime/ultragoal-runtime.ts +26 -9
- package/src/skill-state/active-state.ts +13 -0
- package/src/skill-state/workflow-mutation-guard.ts +3297 -180
- package/src/slash-commands/builtin-registry.ts +14 -8
- package/src/slash-commands/helpers/mcp.ts +20 -7
- package/src/ssh/ssh-executor.ts +3 -1
- package/src/stt/recorder.ts +26 -9
- package/src/system-prompt.ts +65 -16
- package/src/task/commands.ts +3 -1
- package/src/task/executor.ts +52 -7
- package/src/task/index.ts +28 -0
- package/src/task/isolation-dir.ts +143 -0
- package/src/task/role-body.ts +84 -0
- package/src/task/token-log-mode.test.ts +162 -0
- package/src/task/token-log.ts +91 -2
- package/src/task/worktree.ts +16 -7
- package/src/tools/archive-reader.ts +653 -31
- package/src/tools/ask.ts +86 -14
- package/src/tools/ast-edit-write-path.ts +133 -0
- package/src/tools/ast-edit.ts +27 -1
- package/src/tools/ast-grep.ts +7 -2
- package/src/tools/atomic-file-write.ts +625 -0
- package/src/tools/auto-generated-guard.ts +28 -8
- package/src/tools/bash-allowed-prefixes.ts +225 -6
- package/src/tools/bash-interactive.ts +12 -0
- package/src/tools/bash-skill-urls.ts +113 -7
- package/src/tools/bash.ts +152 -20
- package/src/tools/browser/cdp-url.ts +18 -0
- package/src/tools/browser/tab-worker.ts +49 -14
- package/src/tools/browser.ts +25 -8
- package/src/tools/cron.ts +10 -1
- package/src/tools/debug.ts +16 -8
- package/src/tools/eval.ts +71 -34
- package/src/tools/explicit-artifact.ts +89 -0
- package/src/tools/fetch.ts +26 -17
- package/src/tools/gh.ts +40 -12
- package/src/tools/github-side-effect.ts +112 -0
- package/src/tools/image-gen.ts +24 -10
- package/src/tools/index.ts +6 -0
- package/src/tools/monitor-mutation.ts +27 -0
- package/src/tools/monitor.ts +28 -1
- package/src/tools/output-meta.ts +74 -5
- package/src/tools/read.ts +24 -36
- package/src/tools/recipe/index.ts +12 -0
- package/src/tools/recipe/recipe-guard.ts +19 -0
- package/src/tools/recipe/runner.ts +23 -12
- package/src/tools/render-utils.ts +2 -2
- package/src/tools/restricted-cwd.ts +10 -0
- package/src/tools/reverse-engineer.ts +497 -0
- package/src/tools/search-tool-bm25.ts +14 -3
- package/src/tools/search.ts +3 -2
- package/src/tools/ssh.ts +235 -8
- package/src/tools/subagent-render.ts +43 -7
- package/src/tools/subagent.ts +7 -3
- package/src/tools/tmux-self-injection-guard.ts +3538 -0
- package/src/tools/todo-write.ts +41 -3
- package/src/tools/untrusted-content.ts +23 -0
- package/src/tools/vim.ts +2 -2
- package/src/tools/write.ts +37 -4
- package/src/tui/tree-list.ts +15 -1
- package/src/utils/commit-message-generator.ts +9 -2
- package/src/utils/external-editor.ts +21 -7
- package/src/utils/file-mentions.ts +75 -7
- package/src/utils/git.ts +38 -7
- package/src/utils/open.ts +73 -4
- package/src/utils/shell-snapshot.ts +9 -1
- package/src/utils/title-generator.ts +61 -16
- package/src/utils/tools-checksum.ts +34 -0
- package/src/utils/tools-manager.ts +24 -6
- package/src/utils/xml-escape.ts +14 -0
- package/src/web/insane/url-guard.ts +2 -1
- package/src/web/scrapers/types.ts +8 -0
- package/src/web/scrapers/youtube.ts +3 -2
- package/src/web/search/index.ts +4 -3
- package/src/web/search/providers/anthropic.ts +4 -4
- package/src/web/search/providers/codex.ts +31 -34
- package/src/web/search/providers/insane.ts +145 -28
- package/src/web/search/providers/kimi.ts +15 -5
- package/src/web/search/providers/searxng.ts +47 -4
- package/src/web/search/providers/xai.ts +7 -2
- package/dist/types/cli/shell-cli.d.ts +0 -8
- package/dist/types/commands/shell.d.ts +0 -21
- package/src/cli/shell-cli.ts +0 -176
- package/src/commands/shell.ts +0 -29
package/src/discovery/vscode.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { registerProvider } from "../capability";
|
|
|
9
9
|
import { readFile } from "../capability/fs";
|
|
10
10
|
import { type MCPServer, mcpCapability } from "../capability/mcp";
|
|
11
11
|
import type { LoadContext, LoadResult } from "../capability/types";
|
|
12
|
-
import { createSourceMeta, expandEnvVarsDeep, getProjectPath } from "./helpers";
|
|
12
|
+
import { createSourceMeta, expandEnvVarsDeep, getProjectPath, getReadOptions } from "./helpers";
|
|
13
13
|
|
|
14
14
|
const PROVIDER_ID = "vscode";
|
|
15
15
|
const DISPLAY_NAME = "VS Code";
|
|
@@ -45,14 +45,14 @@ registerProvider<MCPServer>(mcpCapability.id, {
|
|
|
45
45
|
* VS Code uses nested structure: { "mcp": { "servers": { ... } } }
|
|
46
46
|
*/
|
|
47
47
|
async function loadMCPConfig(
|
|
48
|
-
|
|
48
|
+
ctx: LoadContext,
|
|
49
49
|
path: string,
|
|
50
50
|
level: "user" | "project",
|
|
51
51
|
): Promise<LoadResult<MCPServer>> {
|
|
52
52
|
const items: MCPServer[] = [];
|
|
53
53
|
const warnings: string[] = [];
|
|
54
54
|
|
|
55
|
-
const content = await readFile(path);
|
|
55
|
+
const content = await readFile(path, getReadOptions(ctx, level));
|
|
56
56
|
if (!content) {
|
|
57
57
|
warnings.push(`Failed to read ${path}`);
|
|
58
58
|
return { items, warnings };
|
|
@@ -12,7 +12,13 @@
|
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
14
|
import { ApplyPatchError } from "../diff";
|
|
15
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
type ApplyPatchOptions,
|
|
17
|
+
type ApplyPatchResult,
|
|
18
|
+
applyPatch,
|
|
19
|
+
type PatchInput,
|
|
20
|
+
preflightPatchMkdir,
|
|
21
|
+
} from "../modes/patch";
|
|
16
22
|
import { parseApplyPatch } from "./parser";
|
|
17
23
|
|
|
18
24
|
export * from "./parser";
|
|
@@ -48,6 +54,11 @@ export async function applyCodexPatch(patchText: string, options: ApplyPatchOpti
|
|
|
48
54
|
deleted: [] as string[],
|
|
49
55
|
};
|
|
50
56
|
|
|
57
|
+
// Containment is checked for every hunk before the first write. A later
|
|
58
|
+
// I/O failure still leaves earlier hunks applied, per spec §6.1.
|
|
59
|
+
for (const hunk of hunks) {
|
|
60
|
+
await preflightPatchMkdir(hunk, options);
|
|
61
|
+
}
|
|
51
62
|
for (const hunk of hunks) {
|
|
52
63
|
const result = await applyPatch(hunk, options);
|
|
53
64
|
results.push(result);
|
|
@@ -23,6 +23,8 @@ const MAX_PATHS_PER_SESSION = 30;
|
|
|
23
23
|
export interface FileReadSnapshot {
|
|
24
24
|
/** 1-indexed line number → exact line content as observed by `read`/`search`. */
|
|
25
25
|
lines: Map<number, string>;
|
|
26
|
+
/** Total line count when the snapshot is known to cover the whole file. */
|
|
27
|
+
lineCount?: number;
|
|
26
28
|
recordedAt: number;
|
|
27
29
|
}
|
|
28
30
|
|
|
@@ -41,6 +43,12 @@ export class FileReadCache {
|
|
|
41
43
|
this.#record(absPath, entries);
|
|
42
44
|
}
|
|
43
45
|
|
|
46
|
+
/** Record the complete content of a file (e.g. the result of an edit this session wrote). */
|
|
47
|
+
recordFull(absPath: string, lines: readonly string[]): void {
|
|
48
|
+
const entries: Array<readonly [number, string]> = lines.map((line, idx) => [idx + 1, line] as const);
|
|
49
|
+
this.#record(absPath, entries, lines.length);
|
|
50
|
+
}
|
|
51
|
+
|
|
44
52
|
/** Record sparse `(lineNumber, content)` pairs (e.g. `search` matches plus context). */
|
|
45
53
|
recordSparse(absPath: string, entries: Iterable<readonly [number, string]>): void {
|
|
46
54
|
const arr = Array.from(entries);
|
|
@@ -58,28 +66,38 @@ export class FileReadCache {
|
|
|
58
66
|
this.#snapshots.clear();
|
|
59
67
|
}
|
|
60
68
|
|
|
61
|
-
#record(absPath: string, entries: ReadonlyArray<readonly [number, string]
|
|
69
|
+
#record(absPath: string, entries: ReadonlyArray<readonly [number, string]>, lineCount?: number): void {
|
|
62
70
|
const existing = this.#snapshots.get(absPath);
|
|
63
|
-
if (existing && hasConflict(existing
|
|
71
|
+
if (existing && hasConflict(existing, entries, lineCount)) {
|
|
64
72
|
// File content has changed since we last recorded. Drop the stale
|
|
65
73
|
// snapshot and start fresh with whatever we just observed.
|
|
66
|
-
this.#snapshots.set(absPath, { lines: new Map(entries), recordedAt: Date.now() });
|
|
74
|
+
this.#snapshots.set(absPath, { lines: new Map(entries), lineCount, recordedAt: Date.now() });
|
|
67
75
|
return;
|
|
68
76
|
}
|
|
69
77
|
if (existing) {
|
|
70
78
|
for (const [lineNum, content] of entries) existing.lines.set(lineNum, content);
|
|
79
|
+
if (lineCount !== undefined) existing.lineCount = lineCount;
|
|
71
80
|
existing.recordedAt = Date.now();
|
|
72
81
|
// `get` above already touched LRU recency for this key.
|
|
73
82
|
return;
|
|
74
83
|
}
|
|
75
|
-
this.#snapshots.set(absPath, { lines: new Map(entries), recordedAt: Date.now() });
|
|
84
|
+
this.#snapshots.set(absPath, { lines: new Map(entries), lineCount, recordedAt: Date.now() });
|
|
76
85
|
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
|
-
function hasConflict(
|
|
88
|
+
function hasConflict(
|
|
89
|
+
existing: FileReadSnapshot,
|
|
90
|
+
incoming: ReadonlyArray<readonly [number, string]>,
|
|
91
|
+
incomingLineCount: number | undefined,
|
|
92
|
+
): boolean {
|
|
80
93
|
for (const [lineNum, content] of incoming) {
|
|
81
|
-
const prior = existing.get(lineNum);
|
|
94
|
+
const prior = existing.lines.get(lineNum);
|
|
82
95
|
if (prior !== undefined && prior !== content) return true;
|
|
96
|
+
if (existing.lineCount !== undefined && lineNum > existing.lineCount) return true;
|
|
97
|
+
}
|
|
98
|
+
if (incomingLineCount !== undefined) {
|
|
99
|
+
if (existing.lineCount !== undefined && existing.lineCount !== incomingLineCount) return true;
|
|
100
|
+
for (const lineNum of existing.lines.keys()) if (lineNum > incomingLineCount) return true;
|
|
83
101
|
}
|
|
84
102
|
return false;
|
|
85
103
|
}
|
package/src/edit/index.ts
CHANGED
|
@@ -21,13 +21,15 @@ import hashlineDescription from "../prompts/tools/hashline.md" with { type: "tex
|
|
|
21
21
|
import patchDescription from "../prompts/tools/patch.md" with { type: "text" };
|
|
22
22
|
import replaceDescription from "../prompts/tools/replace.md" with { type: "text" };
|
|
23
23
|
import type { ToolSession } from "../tools";
|
|
24
|
+
import { assertEditableFile } from "../tools/auto-generated-guard";
|
|
25
|
+
import { resolvePlanPath } from "../tools/plan-mode-guard";
|
|
24
26
|
import { VimTool, vimSchema } from "../tools/vim";
|
|
25
27
|
import { type EditMode, normalizeEditMode, resolveEditMode } from "../utils/edit-mode";
|
|
26
28
|
import type { VimToolDetails } from "../vim/types";
|
|
27
29
|
import { type ApplyPatchParams, applyPatchSchema, expandApplyPatchToEntries } from "./modes/apply-patch";
|
|
28
30
|
import applyPatchGrammar from "./modes/apply-patch.lark" with { type: "text" };
|
|
29
31
|
import { executePatchSingle, type PatchEditEntry, type PatchParams, patchEditSchema } from "./modes/patch";
|
|
30
|
-
import {
|
|
32
|
+
import { executeReplaceEntries, type ReplaceEditEntry, type ReplaceParams, replaceEditSchema } from "./modes/replace";
|
|
31
33
|
import { type EditToolDetails, type EditToolPerFileResult, getLspBatchRequest, type LspBatchRequest } from "./renderer";
|
|
32
34
|
|
|
33
35
|
export { DEFAULT_EDIT_MODE, type EditMode, normalizeEditMode } from "../utils/edit-mode";
|
|
@@ -180,6 +182,56 @@ function createEditWritethrough(session: ToolSession): WritethroughCallback {
|
|
|
180
182
|
return enableLsp ? createLspWritethrough(session.cwd, { enableFormat, enableDiagnostics }) : writethroughNoop;
|
|
181
183
|
}
|
|
182
184
|
|
|
185
|
+
type PatchGuardFailure = { path: string; errorText: string };
|
|
186
|
+
|
|
187
|
+
/**
|
|
188
|
+
* Refuse a generated source or rename destination before any entry writes.
|
|
189
|
+
* A single entry still throws. Several entries return the per-entry errors
|
|
190
|
+
* the patch aggregators already use, and the caller writes nothing.
|
|
191
|
+
*/
|
|
192
|
+
async function collectPatchGuardFailures(
|
|
193
|
+
session: ToolSession,
|
|
194
|
+
entries: { path: string; rename?: string }[],
|
|
195
|
+
signal?: AbortSignal,
|
|
196
|
+
): Promise<PatchGuardFailure[] | undefined> {
|
|
197
|
+
const failures: PatchGuardFailure[] = [];
|
|
198
|
+
const aggregate = entries.length > 1;
|
|
199
|
+
for (const entry of entries) {
|
|
200
|
+
signal?.throwIfAborted();
|
|
201
|
+
try {
|
|
202
|
+
const resolvedPath = resolvePlanPath(session, entry.path);
|
|
203
|
+
await assertEditableFile(resolvedPath, entry.path, session.settings);
|
|
204
|
+
signal?.throwIfAborted();
|
|
205
|
+
if (!entry.rename) continue;
|
|
206
|
+
const resolvedRename = resolvePlanPath(session, entry.rename);
|
|
207
|
+
if (resolvedRename === resolvedPath) continue;
|
|
208
|
+
await assertEditableFile(resolvedRename, entry.rename, session.settings);
|
|
209
|
+
signal?.throwIfAborted();
|
|
210
|
+
} catch (err) {
|
|
211
|
+
signal?.throwIfAborted();
|
|
212
|
+
if (!aggregate || (err instanceof Error && err.name === "AbortError")) throw err;
|
|
213
|
+
failures.push({ path: entry.path, errorText: err instanceof Error ? err.message : String(err) });
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
return failures.length > 0 ? failures : undefined;
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
function refusedPatchEntriesResult(
|
|
220
|
+
failures: PatchGuardFailure[],
|
|
221
|
+
details: { path?: string; perFileResults?: EditToolPerFileResult[] },
|
|
222
|
+
): AgentToolResult<EditToolDetails, TInput> {
|
|
223
|
+
return {
|
|
224
|
+
content: [
|
|
225
|
+
{
|
|
226
|
+
type: "text",
|
|
227
|
+
text: failures.map(failure => `Error editing ${failure.path}: ${failure.errorText}`).join("\n"),
|
|
228
|
+
},
|
|
229
|
+
],
|
|
230
|
+
details: { diff: "", ...details },
|
|
231
|
+
isError: true,
|
|
232
|
+
};
|
|
233
|
+
}
|
|
234
|
+
|
|
183
235
|
/** Run apply_patch file operations and aggregate their multi-file result. */
|
|
184
236
|
async function executeApplyPatchPerFile(
|
|
185
237
|
fileEntries: {
|
|
@@ -414,7 +466,7 @@ export class EditTool implements AgentTool<TInput> {
|
|
|
414
466
|
patch: {
|
|
415
467
|
description: () => prompt.render(patchDescription),
|
|
416
468
|
parameters: patchEditSchema,
|
|
417
|
-
execute: (
|
|
469
|
+
execute: async (
|
|
418
470
|
tool: EditTool,
|
|
419
471
|
params: EditParams,
|
|
420
472
|
signal: AbortSignal | undefined,
|
|
@@ -422,7 +474,14 @@ export class EditTool implements AgentTool<TInput> {
|
|
|
422
474
|
onUpdate?: (partialResult: AgentToolResult<EditToolDetails, TInput>) => void,
|
|
423
475
|
) => {
|
|
424
476
|
const { edits, path } = params as PatchParams;
|
|
425
|
-
const
|
|
477
|
+
const patchEdits = edits as PatchEditEntry[];
|
|
478
|
+
const guardFailures = await collectPatchGuardFailures(
|
|
479
|
+
tool.session,
|
|
480
|
+
patchEdits.map(entry => ({ path, rename: entry.rename })),
|
|
481
|
+
signal,
|
|
482
|
+
);
|
|
483
|
+
if (guardFailures) return refusedPatchEntriesResult(guardFailures, { path });
|
|
484
|
+
const runs = patchEdits.map(
|
|
426
485
|
entry => (br: LspBatchRequest | undefined) =>
|
|
427
486
|
executePatchSingle({
|
|
428
487
|
session: tool.session,
|
|
@@ -442,7 +501,7 @@ export class EditTool implements AgentTool<TInput> {
|
|
|
442
501
|
apply_patch: {
|
|
443
502
|
description: () => prompt.render(applyPatchDescription),
|
|
444
503
|
parameters: applyPatchSchema,
|
|
445
|
-
execute: (
|
|
504
|
+
execute: async (
|
|
446
505
|
tool: EditTool,
|
|
447
506
|
params: EditParams,
|
|
448
507
|
signal: AbortSignal | undefined,
|
|
@@ -450,6 +509,21 @@ export class EditTool implements AgentTool<TInput> {
|
|
|
450
509
|
onUpdate?: (partialResult: AgentToolResult<EditToolDetails, TInput>) => void,
|
|
451
510
|
) => {
|
|
452
511
|
const entries = expandApplyPatchToEntries(params as ApplyPatchParams);
|
|
512
|
+
const guardFailures = await collectPatchGuardFailures(
|
|
513
|
+
tool.session,
|
|
514
|
+
entries.map(entry => ({ path: entry.path, rename: entry.rename })),
|
|
515
|
+
signal,
|
|
516
|
+
);
|
|
517
|
+
if (guardFailures) {
|
|
518
|
+
return refusedPatchEntriesResult(guardFailures, {
|
|
519
|
+
perFileResults: guardFailures.map(failure => ({
|
|
520
|
+
path: failure.path,
|
|
521
|
+
diff: "",
|
|
522
|
+
isError: true,
|
|
523
|
+
errorText: failure.errorText,
|
|
524
|
+
})),
|
|
525
|
+
});
|
|
526
|
+
}
|
|
453
527
|
const perFile = entries.map(entry => {
|
|
454
528
|
const { path, ...patchParams } = entry;
|
|
455
529
|
return {
|
|
@@ -501,24 +575,20 @@ export class EditTool implements AgentTool<TInput> {
|
|
|
501
575
|
params: EditParams,
|
|
502
576
|
signal: AbortSignal | undefined,
|
|
503
577
|
batchRequest: LspBatchRequest | undefined,
|
|
504
|
-
|
|
578
|
+
_onUpdate?: (partialResult: AgentToolResult<EditToolDetails, TInput>) => void,
|
|
505
579
|
) => {
|
|
506
580
|
const { edits, path } = params as ReplaceParams;
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
beginDeferredDiagnosticsForPath: p => tool.#beginDeferredDiagnosticsForPath(p),
|
|
519
|
-
}),
|
|
520
|
-
);
|
|
521
|
-
return executeSinglePathEntries(path, runs, batchRequest, onUpdate);
|
|
581
|
+
return executeReplaceEntries({
|
|
582
|
+
session: tool.session,
|
|
583
|
+
path,
|
|
584
|
+
edits: edits as ReplaceEditEntry[],
|
|
585
|
+
signal,
|
|
586
|
+
batchRequest,
|
|
587
|
+
allowFuzzy: tool.#allowFuzzy,
|
|
588
|
+
fuzzyThreshold: tool.#fuzzyThreshold,
|
|
589
|
+
writethrough: tool.#writethrough,
|
|
590
|
+
beginDeferredDiagnosticsForPath: p => tool.#beginDeferredDiagnosticsForPath(p),
|
|
591
|
+
});
|
|
522
592
|
},
|
|
523
593
|
},
|
|
524
594
|
vim: {
|
package/src/edit/modes/patch.ts
CHANGED
|
@@ -6,10 +6,12 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import * as fs from "node:fs";
|
|
9
|
+
import * as os from "node:os";
|
|
9
10
|
import * as path from "node:path";
|
|
10
11
|
import type { AgentToolResult } from "@sayknow-cli/agent-core";
|
|
11
12
|
import { isEnoent } from "@sayknow-cli/utils";
|
|
12
13
|
import * as z from "zod/v4";
|
|
14
|
+
import type { Settings } from "../../config/settings";
|
|
13
15
|
import {
|
|
14
16
|
type FileDiagnosticsResult,
|
|
15
17
|
flushLspWritethroughBatch,
|
|
@@ -103,6 +105,17 @@ export interface ApplyPatchOptions {
|
|
|
103
105
|
* object identity is not a durable-lock capability probe.
|
|
104
106
|
*/
|
|
105
107
|
crossProcessLock?: boolean;
|
|
108
|
+
/** Explicit artifacts `local` root for this call. The caller session owns it. */
|
|
109
|
+
localRoot?: string;
|
|
110
|
+
signal?: AbortSignal;
|
|
111
|
+
/**
|
|
112
|
+
* Recheck a rename destination while this call holds the path mutation lock.
|
|
113
|
+
* The request preflight runs before that lock.
|
|
114
|
+
*/
|
|
115
|
+
destinationGuard?: {
|
|
116
|
+
settings: Pick<Settings, "get">;
|
|
117
|
+
displayPath: string;
|
|
118
|
+
};
|
|
106
119
|
}
|
|
107
120
|
|
|
108
121
|
// ═══════════════════════════════════════════════════════════════════════════
|
|
@@ -1006,6 +1019,117 @@ function applyTrailingNewlinePolicy(content: string, hadFinalNewline: boolean):
|
|
|
1006
1019
|
return content.replace(/\n+$/u, "");
|
|
1007
1020
|
}
|
|
1008
1021
|
|
|
1022
|
+
function explicitLocalRootForSession(session: ToolSession): string | undefined {
|
|
1023
|
+
const artifactsDir = session.getArtifactsDir?.();
|
|
1024
|
+
if (!artifactsDir || session.isManagedSessionDestination?.()) return undefined;
|
|
1025
|
+
return path.resolve(artifactsDir, "local");
|
|
1026
|
+
}
|
|
1027
|
+
|
|
1028
|
+
function pathIsWithin(target: string, root: string): boolean {
|
|
1029
|
+
const relative = path.relative(root, target);
|
|
1030
|
+
return relative === "" || (relative !== ".." && !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative));
|
|
1031
|
+
}
|
|
1032
|
+
|
|
1033
|
+
/**
|
|
1034
|
+
* Trust root for a delete. `localRoot` is the caller session's explicit
|
|
1035
|
+
* artifacts root. `skc-local/<id>` is recognized from the path. Else `cwd`.
|
|
1036
|
+
*/
|
|
1037
|
+
function boundaryForPatchDelete(cwd: string, absolutePath: string, localRoot?: string): string {
|
|
1038
|
+
const resolved = path.resolve(absolutePath);
|
|
1039
|
+
if (localRoot) {
|
|
1040
|
+
const explicit = path.resolve(localRoot);
|
|
1041
|
+
if (pathIsWithin(resolved, explicit)) return explicit;
|
|
1042
|
+
}
|
|
1043
|
+
const managedParent = path.join(os.tmpdir(), "skc-local");
|
|
1044
|
+
if (pathIsWithin(resolved, managedParent)) {
|
|
1045
|
+
const rest = resolved.slice(managedParent.length + path.sep.length);
|
|
1046
|
+
const sessionSegment = rest.split(path.sep, 1)[0] ?? "";
|
|
1047
|
+
if (sessionSegment.length > 0) return path.join(managedParent, sessionSegment);
|
|
1048
|
+
}
|
|
1049
|
+
return path.resolve(cwd);
|
|
1050
|
+
}
|
|
1051
|
+
|
|
1052
|
+
/**
|
|
1053
|
+
* `unlink` follows a directory symlink. Resolve the parent only, then delete
|
|
1054
|
+
* that real parent plus the final name so a file symlink is removed as a link.
|
|
1055
|
+
*/
|
|
1056
|
+
async function resolvePatchDeletePath(
|
|
1057
|
+
root: string,
|
|
1058
|
+
absolutePath: string,
|
|
1059
|
+
displayPath: string,
|
|
1060
|
+
signal?: AbortSignal,
|
|
1061
|
+
): Promise<string> {
|
|
1062
|
+
signal?.throwIfAborted();
|
|
1063
|
+
let realRoot: string;
|
|
1064
|
+
try {
|
|
1065
|
+
realRoot = await fs.promises.realpath(root);
|
|
1066
|
+
} catch (error) {
|
|
1067
|
+
if (isEnoent(error)) throw new ApplyPatchError(`File not found: ${displayPath}`);
|
|
1068
|
+
throw error;
|
|
1069
|
+
}
|
|
1070
|
+
signal?.throwIfAborted();
|
|
1071
|
+
let realParent: string;
|
|
1072
|
+
try {
|
|
1073
|
+
realParent = await fs.promises.realpath(path.dirname(absolutePath));
|
|
1074
|
+
} catch (error) {
|
|
1075
|
+
if (isEnoent(error)) throw new ApplyPatchError(`File not found: ${displayPath}`);
|
|
1076
|
+
throw error;
|
|
1077
|
+
}
|
|
1078
|
+
signal?.throwIfAborted();
|
|
1079
|
+
if (!pathIsWithin(realParent, realRoot)) {
|
|
1080
|
+
throw new ApplyPatchError(`Delete target resolves outside its root: ${displayPath}`);
|
|
1081
|
+
}
|
|
1082
|
+
return path.join(realParent, path.basename(absolutePath));
|
|
1083
|
+
}
|
|
1084
|
+
|
|
1085
|
+
/**
|
|
1086
|
+
* `mkdir` follows a directory symlink. Walk to the nearest existing ancestor
|
|
1087
|
+
* and return its real path plus the missing suffix. A parent that is already
|
|
1088
|
+
* lexically outside the workspace or session local root is unchanged.
|
|
1089
|
+
*/
|
|
1090
|
+
async function resolvePatchMkdirPath(
|
|
1091
|
+
cwd: string,
|
|
1092
|
+
absolutePath: string,
|
|
1093
|
+
localRoot: string | undefined,
|
|
1094
|
+
parentDir: string,
|
|
1095
|
+
displayPath: string,
|
|
1096
|
+
signal?: AbortSignal,
|
|
1097
|
+
): Promise<string> {
|
|
1098
|
+
signal?.throwIfAborted();
|
|
1099
|
+
const boundary = path.resolve(boundaryForPatchDelete(cwd, absolutePath, localRoot));
|
|
1100
|
+
const lexicalParent = path.resolve(parentDir);
|
|
1101
|
+
if (!pathIsWithin(lexicalParent, boundary)) return parentDir;
|
|
1102
|
+
// A root that does not exist yet is not an escape. Keep the missing suffix
|
|
1103
|
+
// under its real ancestor, which is what mkdir did before this check.
|
|
1104
|
+
const realRoot = await realpathThroughExistingAncestor(boundary, signal);
|
|
1105
|
+
signal?.throwIfAborted();
|
|
1106
|
+
const realParent = await realpathThroughExistingAncestor(lexicalParent, signal);
|
|
1107
|
+
signal?.throwIfAborted();
|
|
1108
|
+
if (!pathIsWithin(realParent, realRoot)) {
|
|
1109
|
+
throw new ApplyPatchError(`Parent directory resolves outside its root: ${displayPath}`);
|
|
1110
|
+
}
|
|
1111
|
+
return realParent;
|
|
1112
|
+
}
|
|
1113
|
+
|
|
1114
|
+
async function realpathThroughExistingAncestor(target: string, signal?: AbortSignal): Promise<string> {
|
|
1115
|
+
const resolved = path.resolve(target);
|
|
1116
|
+
const missing: string[] = [];
|
|
1117
|
+
let cursor = resolved;
|
|
1118
|
+
for (;;) {
|
|
1119
|
+
signal?.throwIfAborted();
|
|
1120
|
+
try {
|
|
1121
|
+
const real = await fs.promises.realpath(cursor);
|
|
1122
|
+
return missing.length === 0 ? real : path.join(real, ...missing.reverse());
|
|
1123
|
+
} catch (error) {
|
|
1124
|
+
if (!isEnoent(error)) throw error;
|
|
1125
|
+
const parent = path.dirname(cursor);
|
|
1126
|
+
if (parent === cursor) return resolved;
|
|
1127
|
+
missing.push(path.basename(cursor));
|
|
1128
|
+
cursor = parent;
|
|
1129
|
+
}
|
|
1130
|
+
}
|
|
1131
|
+
}
|
|
1132
|
+
|
|
1009
1133
|
async function readExistingPatchFile(fileSystem: FileSystem, absolutePath: string, path: string): Promise<string> {
|
|
1010
1134
|
try {
|
|
1011
1135
|
return await fileSystem.read(absolutePath);
|
|
@@ -1432,6 +1556,9 @@ export async function applyPatch(input: PatchInput, options: ApplyPatchOptions):
|
|
|
1432
1556
|
const destPath = resolvePath(input.rename);
|
|
1433
1557
|
if (destPath !== absolutePath) mutationPaths.push(destPath);
|
|
1434
1558
|
}
|
|
1559
|
+
// The cross-process lock creates missing parent directories for `<path>.lock`.
|
|
1560
|
+
// Check every locked create/move path, including a rename on create, first.
|
|
1561
|
+
await preflightPatchMkdir(input, options);
|
|
1435
1562
|
const usingDefaultFs = options.fs === undefined || options.fs === defaultFileSystem;
|
|
1436
1563
|
// dryRun/preview must stay read-only: never create durable `<path>.lock` dirs
|
|
1437
1564
|
// (would fail on read-only parents and mutate the FS during preview) (#2900 review).
|
|
@@ -1439,6 +1566,36 @@ export async function applyPatch(input: PatchInput, options: ApplyPatchOptions):
|
|
|
1439
1566
|
return withEditPathMutation(mutationPaths, () => applyNormalizedPatch(input, options), { crossProcess });
|
|
1440
1567
|
}
|
|
1441
1568
|
|
|
1569
|
+
/** Read-only mkdir check for one patch hunk. Does not create directories. */
|
|
1570
|
+
export async function preflightPatchMkdir(input: PatchInput, options: ApplyPatchOptions): Promise<void> {
|
|
1571
|
+
const resolvePath = (p: string): string => resolveToCwd(p, options.cwd);
|
|
1572
|
+
const absolutePath = resolvePath(input.path);
|
|
1573
|
+
const op = input.op ?? "update";
|
|
1574
|
+
if (op === "create") {
|
|
1575
|
+
await rejectPatchMkdirEscape(options.cwd, absolutePath, options.localRoot, input.path, options.signal);
|
|
1576
|
+
}
|
|
1577
|
+
if (input.rename) {
|
|
1578
|
+
const destPath = resolvePath(input.rename);
|
|
1579
|
+
if (destPath !== absolutePath) {
|
|
1580
|
+
// The source is locked too. Check it before that lock can mkdir through a symlink.
|
|
1581
|
+
await rejectPatchMkdirEscape(options.cwd, absolutePath, options.localRoot, input.path, options.signal);
|
|
1582
|
+
await rejectPatchMkdirEscape(options.cwd, destPath, options.localRoot, input.rename, options.signal);
|
|
1583
|
+
}
|
|
1584
|
+
}
|
|
1585
|
+
}
|
|
1586
|
+
|
|
1587
|
+
async function rejectPatchMkdirEscape(
|
|
1588
|
+
cwd: string,
|
|
1589
|
+
absolutePath: string,
|
|
1590
|
+
localRoot: string | undefined,
|
|
1591
|
+
displayPath: string,
|
|
1592
|
+
signal?: AbortSignal,
|
|
1593
|
+
): Promise<void> {
|
|
1594
|
+
const parentDir = path.dirname(absolutePath);
|
|
1595
|
+
if (!parentDir || parentDir === ".") return;
|
|
1596
|
+
await resolvePatchMkdirPath(cwd, absolutePath, localRoot, parentDir, displayPath, signal);
|
|
1597
|
+
}
|
|
1598
|
+
|
|
1442
1599
|
/**
|
|
1443
1600
|
* Apply a normalized patch operation to the filesystem.
|
|
1444
1601
|
* Caller must already hold path mutation rights when concurrent writers exist.
|
|
@@ -1451,6 +1608,8 @@ async function applyNormalizedPatch(input: PatchInput, options: ApplyPatchOption
|
|
|
1451
1608
|
fs = defaultFileSystem,
|
|
1452
1609
|
fuzzyThreshold = DEFAULT_FUZZY_THRESHOLD,
|
|
1453
1610
|
allowFuzzy = true,
|
|
1611
|
+
localRoot,
|
|
1612
|
+
signal,
|
|
1454
1613
|
} = options;
|
|
1455
1614
|
|
|
1456
1615
|
const resolvePath = (p: string): string => resolveToCwd(p, cwd);
|
|
@@ -1473,11 +1632,17 @@ async function applyNormalizedPatch(input: PatchInput, options: ApplyPatchOption
|
|
|
1473
1632
|
const normalizedContent = normalizeCreateContent(input.diff);
|
|
1474
1633
|
const content = normalizedContent.endsWith("\n") ? normalizedContent : `${normalizedContent}\n`;
|
|
1475
1634
|
|
|
1635
|
+
const parentDir = path.dirname(absolutePath);
|
|
1636
|
+
const mkdirPath =
|
|
1637
|
+
parentDir && parentDir !== "."
|
|
1638
|
+
? await resolvePatchMkdirPath(cwd, absolutePath, localRoot, parentDir, input.path, signal)
|
|
1639
|
+
: undefined;
|
|
1476
1640
|
if (!dryRun) {
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
await fs.mkdir(
|
|
1641
|
+
if (mkdirPath) {
|
|
1642
|
+
signal?.throwIfAborted();
|
|
1643
|
+
await fs.mkdir(mkdirPath);
|
|
1480
1644
|
}
|
|
1645
|
+
signal?.throwIfAborted();
|
|
1481
1646
|
await fs.write(absolutePath, content);
|
|
1482
1647
|
}
|
|
1483
1648
|
|
|
@@ -1492,9 +1657,14 @@ async function applyNormalizedPatch(input: PatchInput, options: ApplyPatchOption
|
|
|
1492
1657
|
|
|
1493
1658
|
// Handle DELETE operation
|
|
1494
1659
|
if (op === "delete") {
|
|
1495
|
-
|
|
1660
|
+
signal?.throwIfAborted();
|
|
1661
|
+
const boundary = boundaryForPatchDelete(cwd, absolutePath, localRoot);
|
|
1662
|
+
const deletePath = await resolvePatchDeletePath(boundary, absolutePath, input.path, signal);
|
|
1663
|
+
signal?.throwIfAborted();
|
|
1664
|
+
const oldContent = await readExistingPatchFile(fs, deletePath, input.path);
|
|
1665
|
+
signal?.throwIfAborted();
|
|
1496
1666
|
if (!dryRun) {
|
|
1497
|
-
await fs.delete(
|
|
1667
|
+
await fs.delete(deletePath);
|
|
1498
1668
|
}
|
|
1499
1669
|
|
|
1500
1670
|
return {
|
|
@@ -1538,6 +1708,20 @@ async function applyNormalizedPatch(input: PatchInput, options: ApplyPatchOption
|
|
|
1538
1708
|
const finalContent = bom + restoreLineEndings(newContent, lineEnding);
|
|
1539
1709
|
const destPath = input.rename ? resolvePath(input.rename) : absolutePath;
|
|
1540
1710
|
const isMove = Boolean(input.rename) && destPath !== absolutePath;
|
|
1711
|
+
let moveParent: string | undefined;
|
|
1712
|
+
if (isMove) {
|
|
1713
|
+
const parentDir = path.dirname(destPath);
|
|
1714
|
+
if (parentDir && parentDir !== ".") {
|
|
1715
|
+
moveParent = await resolvePatchMkdirPath(
|
|
1716
|
+
cwd,
|
|
1717
|
+
destPath,
|
|
1718
|
+
localRoot,
|
|
1719
|
+
parentDir,
|
|
1720
|
+
input.rename ?? input.path,
|
|
1721
|
+
signal,
|
|
1722
|
+
);
|
|
1723
|
+
}
|
|
1724
|
+
}
|
|
1541
1725
|
|
|
1542
1726
|
if (!dryRun) {
|
|
1543
1727
|
// Commit-time CAS: reject if another writer mutated the file after our
|
|
@@ -1547,10 +1731,18 @@ async function applyNormalizedPatch(input: PatchInput, options: ApplyPatchOption
|
|
|
1547
1731
|
throw new ApplyPatchError(`concurrent edit conflict: file changed since read: ${input.path}`);
|
|
1548
1732
|
}
|
|
1549
1733
|
if (isMove) {
|
|
1550
|
-
|
|
1551
|
-
|
|
1552
|
-
|
|
1734
|
+
// Preflight can pass, then another writer holding this lock can
|
|
1735
|
+
// turn a handwritten destination into a generated file.
|
|
1736
|
+
if (options.destinationGuard) {
|
|
1737
|
+
signal?.throwIfAborted();
|
|
1738
|
+
await assertEditableFile(destPath, options.destinationGuard.displayPath, options.destinationGuard.settings);
|
|
1739
|
+
signal?.throwIfAborted();
|
|
1553
1740
|
}
|
|
1741
|
+
if (moveParent) {
|
|
1742
|
+
signal?.throwIfAborted();
|
|
1743
|
+
await fs.mkdir(moveParent);
|
|
1744
|
+
}
|
|
1745
|
+
signal?.throwIfAborted();
|
|
1554
1746
|
await fs.write(destPath, finalContent);
|
|
1555
1747
|
await fs.delete(absolutePath);
|
|
1556
1748
|
} else {
|
|
@@ -1745,7 +1937,15 @@ export async function executePatchSingle(
|
|
|
1745
1937
|
const resolvedPath = resolvePlanPath(session, path);
|
|
1746
1938
|
const resolvedRename = rename ? resolvePlanPath(session, rename) : undefined;
|
|
1747
1939
|
|
|
1748
|
-
|
|
1940
|
+
signal?.throwIfAborted();
|
|
1941
|
+
await assertEditableFile(resolvedPath, path, session.settings);
|
|
1942
|
+
// The rename destination is the path that is written. The source call above
|
|
1943
|
+
// already uses this helper, including generated names that do not exist yet.
|
|
1944
|
+
signal?.throwIfAborted();
|
|
1945
|
+
if (resolvedRename && rename && resolvedRename !== resolvedPath) {
|
|
1946
|
+
await assertEditableFile(resolvedRename, rename, session.settings);
|
|
1947
|
+
signal?.throwIfAborted();
|
|
1948
|
+
}
|
|
1749
1949
|
|
|
1750
1950
|
// Capture pre-edit content so we can verify the write actually hit disk.
|
|
1751
1951
|
// `LspFileSystem.writeFile` delegates to a writethrough callback that, in
|
|
@@ -1771,12 +1971,18 @@ export async function executePatchSingle(
|
|
|
1771
1971
|
// not `defaultFileSystem` by object identity. Force durable cross-process
|
|
1772
1972
|
// locking so multi-process agents cannot silently race past the path mutex
|
|
1773
1973
|
// (#2900 review: do not infer lock capability from FileSystem identity).
|
|
1974
|
+
const localRoot = explicitLocalRootForSession(session);
|
|
1774
1975
|
const result = await applyPatch(input, {
|
|
1775
1976
|
cwd: session.cwd,
|
|
1776
1977
|
fs: patchFileSystem,
|
|
1777
1978
|
fuzzyThreshold,
|
|
1778
1979
|
allowFuzzy,
|
|
1779
1980
|
crossProcessLock: true,
|
|
1981
|
+
localRoot,
|
|
1982
|
+
signal,
|
|
1983
|
+
...(op === "update" && resolvedRename && rename && resolvedRename !== resolvedPath
|
|
1984
|
+
? { destinationGuard: { settings: session.settings, displayPath: rename } }
|
|
1985
|
+
: {}),
|
|
1780
1986
|
});
|
|
1781
1987
|
|
|
1782
1988
|
// Post-write verification: only meaningful for in-place updates where the
|