@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
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
|
+
import * as fs from "node:fs/promises";
|
|
3
|
+
import * as path from "node:path";
|
|
4
|
+
|
|
5
|
+
const ALLOCATION_ATTEMPTS = 8;
|
|
6
|
+
|
|
7
|
+
type PathApi = Pick<typeof path, "dirname" | "isAbsolute" | "relative" | "resolve" | "sep">;
|
|
8
|
+
|
|
9
|
+
function isErrno(error: unknown, code: string): boolean {
|
|
10
|
+
return typeof error === "object" && error !== null && "code" in error && error.code === code;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
function defaultToken(): string {
|
|
14
|
+
return randomBytes(9).toString("hex");
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Parent directory of `mergedDir`, but only when it is a single entry inside
|
|
19
|
+
* `worktreeRoot`. Root, empty, nested, and escaped paths are refused so
|
|
20
|
+
* cleanup cannot delete the worktree root or another session's tree by
|
|
21
|
+
* walking up.
|
|
22
|
+
*/
|
|
23
|
+
export function resolveIsolationRemovalTarget(
|
|
24
|
+
mergedDir: string,
|
|
25
|
+
worktreeRoot: string,
|
|
26
|
+
pathApi: PathApi = path,
|
|
27
|
+
): string {
|
|
28
|
+
if (mergedDir.length === 0) {
|
|
29
|
+
throw new Error("Refusing to remove an isolation directory for an empty merged path.");
|
|
30
|
+
}
|
|
31
|
+
if (worktreeRoot.length === 0) {
|
|
32
|
+
throw new Error("Refusing to remove an isolation directory without a worktree root.");
|
|
33
|
+
}
|
|
34
|
+
const baseDir = pathApi.resolve(pathApi.dirname(mergedDir));
|
|
35
|
+
const root = pathApi.resolve(worktreeRoot);
|
|
36
|
+
const relative = pathApi.relative(root, baseDir);
|
|
37
|
+
if (
|
|
38
|
+
relative.length === 0 ||
|
|
39
|
+
relative === "." ||
|
|
40
|
+
relative.startsWith("..") ||
|
|
41
|
+
pathApi.isAbsolute(relative) ||
|
|
42
|
+
relative.includes(pathApi.sep) ||
|
|
43
|
+
relative.includes("/") ||
|
|
44
|
+
relative.includes("\\")
|
|
45
|
+
) {
|
|
46
|
+
throw new Error("Refusing to remove an isolation directory that is not a single worktree entry.");
|
|
47
|
+
}
|
|
48
|
+
return baseDir;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Create an exclusive directory next to `canonicalBaseDir`. Never removes
|
|
53
|
+
* `canonicalBaseDir` or any path that already exists.
|
|
54
|
+
*/
|
|
55
|
+
export async function allocateDisjointIsolationDir(
|
|
56
|
+
canonicalBaseDir: string,
|
|
57
|
+
tokenFactory: () => string = defaultToken,
|
|
58
|
+
): Promise<string> {
|
|
59
|
+
const parent = path.dirname(canonicalBaseDir);
|
|
60
|
+
const stem = path.basename(canonicalBaseDir);
|
|
61
|
+
if (stem.length === 0 || stem === "." || stem === ".." || stem.includes("/") || stem.includes("\\")) {
|
|
62
|
+
throw new Error("Isolation directory name is not a single path segment.");
|
|
63
|
+
}
|
|
64
|
+
await fs.mkdir(parent, { recursive: true, mode: 0o700 });
|
|
65
|
+
|
|
66
|
+
for (let attempt = 0; attempt < ALLOCATION_ATTEMPTS; attempt++) {
|
|
67
|
+
const token = tokenFactory();
|
|
68
|
+
if (!/^[0-9a-f]+$/i.test(token)) {
|
|
69
|
+
throw new Error("Isolation directory token is not hexadecimal.");
|
|
70
|
+
}
|
|
71
|
+
const name = `${stem}-${token}`;
|
|
72
|
+
const baseDir = path.join(parent, name);
|
|
73
|
+
const relative = path.relative(parent, baseDir);
|
|
74
|
+
if (relative !== name || path.isAbsolute(relative)) {
|
|
75
|
+
throw new Error("Isolation directory escaped its parent.");
|
|
76
|
+
}
|
|
77
|
+
try {
|
|
78
|
+
await fs.mkdir(baseDir, { mode: 0o700 });
|
|
79
|
+
return baseDir;
|
|
80
|
+
} catch (error) {
|
|
81
|
+
if (isErrno(error, "EEXIST")) continue;
|
|
82
|
+
if (isErrno(error, "EPERM")) {
|
|
83
|
+
try {
|
|
84
|
+
await fs.lstat(baseDir);
|
|
85
|
+
continue;
|
|
86
|
+
} catch (statError) {
|
|
87
|
+
if (!isErrno(statError, "ENOENT")) throw statError;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
throw new Error("Failed to allocate a disjoint task isolation directory.");
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* Confirm native teardown may see `mergedDir`.
|
|
99
|
+
*
|
|
100
|
+
* `isoStop` deletes that path. The parent entry and `merged` itself must
|
|
101
|
+
* already be real directories, because native removal follows symlinks.
|
|
102
|
+
* A missing parent means there is nothing to stop. This does not close a
|
|
103
|
+
* replacement that happens after the lstat returns.
|
|
104
|
+
*/
|
|
105
|
+
export async function assertIsolationTeardownTarget(mergedDir: string, worktreeRoot: string): Promise<"stop" | "skip"> {
|
|
106
|
+
const baseDir = resolveIsolationRemovalTarget(mergedDir, worktreeRoot);
|
|
107
|
+
let baseInfo: { isSymbolicLink(): boolean };
|
|
108
|
+
try {
|
|
109
|
+
baseInfo = await fs.lstat(baseDir);
|
|
110
|
+
} catch (error) {
|
|
111
|
+
if (isErrno(error, "ENOENT")) return "skip";
|
|
112
|
+
throw error;
|
|
113
|
+
}
|
|
114
|
+
if (baseInfo.isSymbolicLink()) {
|
|
115
|
+
throw new Error("Refusing to remove a symlinked isolation directory.");
|
|
116
|
+
}
|
|
117
|
+
try {
|
|
118
|
+
const mergedInfo = await fs.lstat(mergedDir);
|
|
119
|
+
if (mergedInfo.isSymbolicLink()) {
|
|
120
|
+
throw new Error("Refusing to tear down a symlinked isolation merged directory.");
|
|
121
|
+
}
|
|
122
|
+
} catch (error) {
|
|
123
|
+
if (isErrno(error, "ENOENT")) return "stop";
|
|
124
|
+
throw error;
|
|
125
|
+
}
|
|
126
|
+
return "stop";
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/** Remove the isolation directory that owns `mergedDir`. Missing directories are ignored. */
|
|
130
|
+
export async function removeIsolationDirectory(mergedDir: string, worktreeRoot: string): Promise<void> {
|
|
131
|
+
const baseDir = resolveIsolationRemovalTarget(mergedDir, worktreeRoot);
|
|
132
|
+
let info: { isSymbolicLink(): boolean };
|
|
133
|
+
try {
|
|
134
|
+
info = await fs.lstat(baseDir);
|
|
135
|
+
} catch (error) {
|
|
136
|
+
if (isErrno(error, "ENOENT")) return;
|
|
137
|
+
throw error;
|
|
138
|
+
}
|
|
139
|
+
if (info.isSymbolicLink()) {
|
|
140
|
+
throw new Error("Refusing to remove a symlinked isolation directory.");
|
|
141
|
+
}
|
|
142
|
+
await fs.rm(baseDir, { recursive: true, force: true });
|
|
143
|
+
}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Keep a subagent role body inside the host [ROLE] block.
|
|
3
|
+
*
|
|
4
|
+
* The body is the agent instruction. It is inserted between host [ROLE] and
|
|
5
|
+
* [/ROLE]. A literal framing tag would end that block early. Only the four
|
|
6
|
+
* host framing names are rewritten; other brackets stay literal.
|
|
7
|
+
*
|
|
8
|
+
* One left-to-right scan: a gap run, a slash only when it is present, then
|
|
9
|
+
* one more gap run, then the word. A non-matching "[" does not hide a later tag.
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
const WORDS = ["completion", "context", "role", "coop"] as const;
|
|
13
|
+
|
|
14
|
+
function isGap(code: number): boolean {
|
|
15
|
+
return (
|
|
16
|
+
code === 0x09 ||
|
|
17
|
+
code === 0x0a ||
|
|
18
|
+
code === 0x0b ||
|
|
19
|
+
code === 0x0c ||
|
|
20
|
+
code === 0x0d ||
|
|
21
|
+
code === 0x20 ||
|
|
22
|
+
code === 0xa0 ||
|
|
23
|
+
code === 0x200b ||
|
|
24
|
+
code === 0x200c ||
|
|
25
|
+
code === 0x200d ||
|
|
26
|
+
code === 0x1680 ||
|
|
27
|
+
(code >= 0x2000 && code <= 0x200a) ||
|
|
28
|
+
code === 0x2028 ||
|
|
29
|
+
code === 0x2029 ||
|
|
30
|
+
code === 0x202f ||
|
|
31
|
+
code === 0x205f ||
|
|
32
|
+
code === 0x3000 ||
|
|
33
|
+
code === 0xfeff
|
|
34
|
+
);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function wordLengthAt(body: string, index: number): number {
|
|
38
|
+
const slice = body.slice(index, index + 10).toLowerCase();
|
|
39
|
+
for (const word of WORDS) {
|
|
40
|
+
if (!slice.startsWith(word)) continue;
|
|
41
|
+
const after = body.charCodeAt(index + word.length);
|
|
42
|
+
if (Number.isNaN(after) || isGap(after) || after === 0x5d) return word.length;
|
|
43
|
+
}
|
|
44
|
+
return 0;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** End index of a framing tag starting at "[", or -1. */
|
|
48
|
+
function framingTagEnd(body: string, start: number): number {
|
|
49
|
+
let index = start + 1;
|
|
50
|
+
while (index < body.length && isGap(body.charCodeAt(index))) index++;
|
|
51
|
+
if (body.charCodeAt(index) === 0x2f) {
|
|
52
|
+
index++;
|
|
53
|
+
while (index < body.length && isGap(body.charCodeAt(index))) index++;
|
|
54
|
+
}
|
|
55
|
+
const wordLength = wordLengthAt(body, index);
|
|
56
|
+
if (wordLength === 0) return -1;
|
|
57
|
+
index += wordLength;
|
|
58
|
+
while (index < body.length && isGap(body.charCodeAt(index))) index++;
|
|
59
|
+
return body.charCodeAt(index) === 0x5d ? index + 1 : -1;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export function containSubagentRoleBody(body: string): string {
|
|
63
|
+
const parts: string[] = [];
|
|
64
|
+
let plainStart = 0;
|
|
65
|
+
let index = 0;
|
|
66
|
+
while (index < body.length) {
|
|
67
|
+
if (body.charCodeAt(index) !== 0x5b) {
|
|
68
|
+
index++;
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
const end = framingTagEnd(body, index);
|
|
72
|
+
if (end < 0) {
|
|
73
|
+
index++;
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
if (plainStart < index) parts.push(body.slice(plainStart, index));
|
|
77
|
+
parts.push(body.slice(index, end).replaceAll("[", "[").replaceAll("]", "]"));
|
|
78
|
+
index = end;
|
|
79
|
+
plainStart = index;
|
|
80
|
+
}
|
|
81
|
+
if (plainStart === 0) return body;
|
|
82
|
+
if (plainStart < body.length) parts.push(body.slice(plainStart));
|
|
83
|
+
return parts.join("");
|
|
84
|
+
}
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
import { afterAll, describe, expect, it } from "bun:test";
|
|
2
|
+
import * as fs from "node:fs/promises";
|
|
3
|
+
import * as os from "node:os";
|
|
4
|
+
import * as path from "node:path";
|
|
5
|
+
import { persistTaskTokenLog, taskTokenLogFromChat } from "./token-log";
|
|
6
|
+
|
|
7
|
+
// Mode bits and final-component symlinks are POSIX. Windows ACLs are out of scope.
|
|
8
|
+
const skipPosix = process.platform === "win32";
|
|
9
|
+
const skipOwnerReadOnly = skipPosix || process.getuid?.() === 0;
|
|
10
|
+
const tempRoots: string[] = [];
|
|
11
|
+
|
|
12
|
+
async function tempDir(): Promise<string> {
|
|
13
|
+
const dir = await fs.mkdtemp(path.join(os.tmpdir(), "skc-token-log-mode-"));
|
|
14
|
+
tempRoots.push(dir);
|
|
15
|
+
return dir;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
afterAll(async () => {
|
|
19
|
+
await Promise.all(tempRoots.splice(0).map(dir => fs.rm(dir, { recursive: true, force: true })));
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
function entry(id: string) {
|
|
23
|
+
return taskTokenLogFromChat(
|
|
24
|
+
{ inputTokens: 1, outputTokens: 2, cachedInputTokens: 0, cacheWriteTokens: 0 },
|
|
25
|
+
{ subagentId: id, turn: 1, at: "2026-01-01T00:00:00.000Z" },
|
|
26
|
+
);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
async function modeOf(filePath: string): Promise<number> {
|
|
30
|
+
return (await fs.lstat(filePath)).mode & 0o777;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
describe("task token log mode", () => {
|
|
34
|
+
it.skipIf(skipPosix)("refuses a symlink token-log.jsonl", async () => {
|
|
35
|
+
const root = await tempDir();
|
|
36
|
+
const outside = path.join(root, "outside.jsonl");
|
|
37
|
+
await fs.writeFile(outside, "kept");
|
|
38
|
+
const dir = path.join(root, "logs");
|
|
39
|
+
await fs.mkdir(dir);
|
|
40
|
+
const link = path.join(dir, "token-log.jsonl");
|
|
41
|
+
await fs.symlink(outside, link);
|
|
42
|
+
|
|
43
|
+
await expect(persistTaskTokenLog(entry("root"), { dir })).rejects.toThrow(/not a regular file/);
|
|
44
|
+
expect(await fs.readFile(outside, "utf8")).toBe("kept");
|
|
45
|
+
expect((await fs.lstat(link)).isSymbolicLink()).toBe(true);
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it.skipIf(skipPosix)("refuses a symlink token-log directory", async () => {
|
|
49
|
+
const root = await tempDir();
|
|
50
|
+
const outside = path.join(root, "outside");
|
|
51
|
+
await fs.mkdir(outside);
|
|
52
|
+
const dir = path.join(root, "token-logs");
|
|
53
|
+
await fs.symlink(outside, dir);
|
|
54
|
+
|
|
55
|
+
await expect(persistTaskTokenLog(entry("root"), { dir })).rejects.toThrow(/not a directory/);
|
|
56
|
+
expect(await fs.readdir(outside)).toEqual([]);
|
|
57
|
+
expect((await fs.lstat(dir)).isSymbolicLink()).toBe(true);
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it.skipIf(skipPosix)("creates a token log as mode 0600 under a permissive umask", async () => {
|
|
61
|
+
const previous = process.umask(0);
|
|
62
|
+
try {
|
|
63
|
+
const root = await tempDir();
|
|
64
|
+
const dir = path.join(root, "logs");
|
|
65
|
+
await persistTaskTokenLog(entry("root"), { dir });
|
|
66
|
+
expect(await modeOf(dir)).toBe(0o700);
|
|
67
|
+
expect(await modeOf(path.join(dir, "token-log.jsonl"))).toBe(0o600);
|
|
68
|
+
} finally {
|
|
69
|
+
process.umask(previous);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
it.skipIf(skipPosix)("tightens an existing mode 0666 token log to 0600", async () => {
|
|
74
|
+
const root = await tempDir();
|
|
75
|
+
const dir = path.join(root, "logs");
|
|
76
|
+
await fs.mkdir(dir, { mode: 0o700 });
|
|
77
|
+
const file = path.join(dir, "token-log.jsonl");
|
|
78
|
+
await fs.writeFile(file, "", { mode: 0o666 });
|
|
79
|
+
await fs.chmod(file, 0o666);
|
|
80
|
+
|
|
81
|
+
await persistTaskTokenLog(entry("root"), { dir });
|
|
82
|
+
|
|
83
|
+
expect(await modeOf(file)).toBe(0o600);
|
|
84
|
+
expect(await fs.readFile(file, "utf8")).toContain('"subagentId":"root"');
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
it.skipIf(skipPosix)("tightens an existing mode 0777 token-log directory to 0700", async () => {
|
|
88
|
+
const root = await tempDir();
|
|
89
|
+
const dir = path.join(root, "logs");
|
|
90
|
+
await fs.mkdir(dir, { mode: 0o777 });
|
|
91
|
+
await fs.chmod(dir, 0o777);
|
|
92
|
+
|
|
93
|
+
await persistTaskTokenLog(entry("root"), { dir });
|
|
94
|
+
|
|
95
|
+
expect(await modeOf(dir)).toBe(0o700);
|
|
96
|
+
expect(await modeOf(path.join(dir, "token-log.jsonl"))).toBe(0o600);
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
it("still allows a second append to a regular token log", async () => {
|
|
100
|
+
const root = await tempDir();
|
|
101
|
+
const dir = path.join(root, "logs");
|
|
102
|
+
await persistTaskTokenLog(entry("one"), { dir });
|
|
103
|
+
await persistTaskTokenLog(entry("two"), { dir });
|
|
104
|
+
const text = await fs.readFile(path.join(dir, "token-log.jsonl"), "utf8");
|
|
105
|
+
expect(text).toContain('"subagentId":"one"');
|
|
106
|
+
expect(text).toContain('"subagentId":"two"');
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
it.skipIf(skipPosix)("still allows a token log through a symlinked parent", async () => {
|
|
110
|
+
const root = await tempDir();
|
|
111
|
+
const realParent = path.join(root, "real");
|
|
112
|
+
await fs.mkdir(realParent);
|
|
113
|
+
const via = path.join(root, "via");
|
|
114
|
+
await fs.symlink(realParent, via);
|
|
115
|
+
const dir = path.join(via, "token-logs");
|
|
116
|
+
|
|
117
|
+
await persistTaskTokenLog(entry("via"), { dir });
|
|
118
|
+
|
|
119
|
+
expect(await fs.readFile(path.join(realParent, "token-logs", "token-log.jsonl"), "utf8")).toContain(
|
|
120
|
+
'"subagentId":"via"',
|
|
121
|
+
);
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
it.skipIf(skipPosix)("keeps owner mode 0600 when appending a token log", async () => {
|
|
125
|
+
const root = await tempDir();
|
|
126
|
+
const dir = path.join(root, "logs");
|
|
127
|
+
await fs.mkdir(dir, { mode: 0o700 });
|
|
128
|
+
const file = path.join(dir, "token-log.jsonl");
|
|
129
|
+
await fs.writeFile(file, "", { mode: 0o600 });
|
|
130
|
+
|
|
131
|
+
await persistTaskTokenLog(entry("root"), { dir });
|
|
132
|
+
|
|
133
|
+
expect(await modeOf(file)).toBe(0o600);
|
|
134
|
+
expect(await fs.readFile(file, "utf8")).toContain('"subagentId":"root"');
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
it.skipIf(skipOwnerReadOnly)("still allows a token log in a mode 0300 directory", async () => {
|
|
138
|
+
const root = await tempDir();
|
|
139
|
+
const dir = path.join(root, "logs");
|
|
140
|
+
await fs.mkdir(dir, { mode: 0o700 });
|
|
141
|
+
await fs.chmod(dir, 0o300);
|
|
142
|
+
try {
|
|
143
|
+
await persistTaskTokenLog(entry("root"), { dir });
|
|
144
|
+
expect(await fs.readFile(path.join(dir, "token-log.jsonl"), "utf8")).toContain('"subagentId":"root"');
|
|
145
|
+
} finally {
|
|
146
|
+
await fs.chmod(dir, 0o700);
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
it.skipIf(skipOwnerReadOnly)("leaves a mode 0400 token log unchanged when the append cannot write", async () => {
|
|
151
|
+
const root = await tempDir();
|
|
152
|
+
const dir = path.join(root, "logs");
|
|
153
|
+
await fs.mkdir(dir, { mode: 0o700 });
|
|
154
|
+
const file = path.join(dir, "token-log.jsonl");
|
|
155
|
+
await fs.writeFile(file, "kept\n", { mode: 0o600 });
|
|
156
|
+
await fs.chmod(file, 0o400);
|
|
157
|
+
|
|
158
|
+
await expect(persistTaskTokenLog(entry("root"), { dir })).rejects.toThrow(/EACCES/);
|
|
159
|
+
expect(await fs.readFile(file, "utf8")).toBe("kept\n");
|
|
160
|
+
expect(await modeOf(file)).toBe(0o400);
|
|
161
|
+
});
|
|
162
|
+
});
|
package/src/task/token-log.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as fsSync from "node:fs";
|
|
1
2
|
import * as fs from "node:fs/promises";
|
|
2
3
|
import * as path from "node:path";
|
|
3
4
|
import type { ChatUsageSnapshot, CostEstimate } from "@sayknow-cli/agent-core";
|
|
@@ -6,6 +7,7 @@ import { resolveSkcSessionForRead, SessionResolutionError } from "../skc-runtime
|
|
|
6
7
|
import type { TaskTokenLog, TaskTokenMetrics } from "./types";
|
|
7
8
|
|
|
8
9
|
const TOKEN_LOG_FILE = "token-log.jsonl";
|
|
10
|
+
const NO_FOLLOW = process.platform === "win32" ? 0 : (fsSync.constants.O_NOFOLLOW ?? 0);
|
|
9
11
|
|
|
10
12
|
export interface TaskTokenLogChatBuckets {
|
|
11
13
|
readonly inputTokens: number;
|
|
@@ -92,9 +94,96 @@ export async function resolveTaskTokenLogDir(
|
|
|
92
94
|
throw error;
|
|
93
95
|
}
|
|
94
96
|
}
|
|
97
|
+
function errnoCode(error: unknown): string | undefined {
|
|
98
|
+
return isNodeError(error) ? error.code : undefined;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
function sameInode(left: fsSync.BigIntStats, right: fsSync.BigIntStats): boolean {
|
|
102
|
+
return left.dev === right.dev && left.ino === right.ino && left.nlink === right.nlink;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* Leaf directory mode 0700. `lstat` plus `chmod` does not need read permission, so a
|
|
107
|
+
* mode 0300 directory stays writable. A symlink leaf is refused before chmod.
|
|
108
|
+
* This does not pin the directory against a later rename in a writable parent.
|
|
109
|
+
*/
|
|
110
|
+
async function ensureOwnerDirectory(dir: string): Promise<void> {
|
|
111
|
+
await fs.mkdir(dir, { recursive: true, mode: 0o700 });
|
|
112
|
+
let current: fsSync.Stats;
|
|
113
|
+
try {
|
|
114
|
+
current = await fs.lstat(dir);
|
|
115
|
+
} catch (error) {
|
|
116
|
+
const code = errnoCode(error);
|
|
117
|
+
if (code === "ELOOP" || code === "ENOTDIR") throw new Error("token log directory is not a directory");
|
|
118
|
+
throw error;
|
|
119
|
+
}
|
|
120
|
+
if (current.isSymbolicLink() || !current.isDirectory()) throw new Error("token log directory is not a directory");
|
|
121
|
+
if (process.platform === "win32" || (current.mode & 0o077) === 0) return;
|
|
122
|
+
await fs.chmod(dir, 0o700);
|
|
123
|
+
const tightened = await fs.lstat(dir);
|
|
124
|
+
if (tightened.isSymbolicLink() || !tightened.isDirectory() || (tightened.mode & 0o777) !== 0o700) {
|
|
125
|
+
throw new Error("token log directory could not be tightened to mode 0700");
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Append like the workflow owner-only writer: mode 0600, `O_NOFOLLOW` when the file
|
|
131
|
+
* exists, `O_EXCL` when it does not, and chmod to 0600 when group or other bits are set.
|
|
132
|
+
*/
|
|
133
|
+
async function appendOwnerOnly(filePath: string, text: string): Promise<void> {
|
|
134
|
+
await ensureOwnerDirectory(path.dirname(filePath));
|
|
135
|
+
let handle: fs.FileHandle | undefined;
|
|
136
|
+
let initial: fsSync.BigIntStats | undefined;
|
|
137
|
+
for (let attempt = 0; attempt < 2; attempt++) {
|
|
138
|
+
initial = undefined;
|
|
139
|
+
try {
|
|
140
|
+
initial = await fs.lstat(filePath, { bigint: true });
|
|
141
|
+
if (initial.isSymbolicLink() || !initial.isFile()) throw new Error("token log path is not a regular file");
|
|
142
|
+
} catch (error) {
|
|
143
|
+
if (errnoCode(error) !== "ENOENT") throw error;
|
|
144
|
+
}
|
|
145
|
+
const flags = initial
|
|
146
|
+
? fsSync.constants.O_WRONLY | fsSync.constants.O_APPEND | NO_FOLLOW
|
|
147
|
+
: fsSync.constants.O_WRONLY | fsSync.constants.O_APPEND | fsSync.constants.O_CREAT | fsSync.constants.O_EXCL;
|
|
148
|
+
try {
|
|
149
|
+
handle = await fs.open(filePath, flags, 0o600);
|
|
150
|
+
break;
|
|
151
|
+
} catch (error) {
|
|
152
|
+
const code = errnoCode(error);
|
|
153
|
+
if (code === "ELOOP") throw new Error("token log path is not a regular file");
|
|
154
|
+
if (initial === undefined && code === "EEXIST" && attempt === 0) continue;
|
|
155
|
+
throw error;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
if (!handle) throw new Error("token log path identity changed before append");
|
|
159
|
+
try {
|
|
160
|
+
const opened = await handle.stat({ bigint: true });
|
|
161
|
+
const named = await fs.lstat(filePath, { bigint: true });
|
|
162
|
+
if (
|
|
163
|
+
opened.isSymbolicLink() ||
|
|
164
|
+
!opened.isFile() ||
|
|
165
|
+
named.isSymbolicLink() ||
|
|
166
|
+
!named.isFile() ||
|
|
167
|
+
(initial !== undefined && !sameInode(initial, opened)) ||
|
|
168
|
+
!sameInode(opened, named)
|
|
169
|
+
) {
|
|
170
|
+
throw new Error("token log path identity changed before append");
|
|
171
|
+
}
|
|
172
|
+
if (process.platform !== "win32" && (Number(opened.mode) & 0o077) !== 0) {
|
|
173
|
+
await handle.chmod(0o600);
|
|
174
|
+
const tightened = await handle.stat({ bigint: true });
|
|
175
|
+
if ((Number(tightened.mode) & 0o777) !== 0o600) {
|
|
176
|
+
throw new Error("token log path could not be tightened to mode 0600");
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
await handle.writeFile(text, "utf8");
|
|
180
|
+
} finally {
|
|
181
|
+
await handle.close();
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
95
185
|
export async function persistTaskTokenLog(entry: TaskTokenLog, opts: { dir: string }): Promise<void> {
|
|
96
|
-
await
|
|
97
|
-
await fs.appendFile(path.join(opts.dir, TOKEN_LOG_FILE), `${JSON.stringify(entry)}\n`, "utf-8");
|
|
186
|
+
await appendOwnerOnly(path.join(opts.dir, TOKEN_LOG_FILE), `${JSON.stringify(entry)}\n`);
|
|
98
187
|
}
|
|
99
188
|
|
|
100
189
|
export async function readTaskTokenLogs(dir: string): Promise<TaskTokenLog[]> {
|
package/src/task/worktree.ts
CHANGED
|
@@ -3,8 +3,9 @@ import * as fs from "node:fs/promises";
|
|
|
3
3
|
import * as os from "node:os";
|
|
4
4
|
import * as path from "node:path";
|
|
5
5
|
import * as natives from "@sayknow-cli/natives";
|
|
6
|
-
import { getWorktreeDir, hashPath, logger, Snowflake } from "@sayknow-cli/utils";
|
|
6
|
+
import { getWorktreeDir, getWorktreesDir, hashPath, logger, Snowflake } from "@sayknow-cli/utils";
|
|
7
7
|
import * as git from "../utils/git";
|
|
8
|
+
import { allocateDisjointIsolationDir, assertIsolationTeardownTarget, removeIsolationDirectory } from "./isolation-dir";
|
|
8
9
|
|
|
9
10
|
const { IsoBackendKind } = natives;
|
|
10
11
|
type IsoBackendKind = natives.IsoBackendKind;
|
|
@@ -312,15 +313,20 @@ export async function ensureIsolation(
|
|
|
312
313
|
preferred?: IsoBackendKind,
|
|
313
314
|
): Promise<IsolationHandle> {
|
|
314
315
|
const repoRoot = await getRepoRoot(baseCwd);
|
|
315
|
-
|
|
316
|
+
// Task ids are allocated inside one session, so `<id>-<repo hash>` is shared
|
|
317
|
+
// by every fresh session's first task. Never remove that canonical directory.
|
|
318
|
+
// Each attempt gets an exclusive sibling and only that sibling is removed.
|
|
319
|
+
const canonicalBaseDir = getWorktreeDir(`${id}-${hashPath(repoRoot)}`);
|
|
320
|
+
const baseDir = await allocateDisjointIsolationDir(canonicalBaseDir);
|
|
316
321
|
const mergedDir = path.join(baseDir, "merged");
|
|
322
|
+
const worktreeRoot = getWorktreesDir();
|
|
317
323
|
|
|
318
324
|
const resolution = natives.isoResolve(preferred ?? null);
|
|
319
325
|
const candidates = resolution.candidates.length > 0 ? resolution.candidates : [resolution.kind];
|
|
320
326
|
let fallbackReason = resolution.reason ?? null;
|
|
321
327
|
|
|
322
328
|
for (const candidate of candidates) {
|
|
323
|
-
await
|
|
329
|
+
await removeIsolationDirectory(mergedDir, worktreeRoot);
|
|
324
330
|
try {
|
|
325
331
|
await natives.isoStart(candidate, repoRoot, mergedDir);
|
|
326
332
|
return {
|
|
@@ -330,7 +336,7 @@ export async function ensureIsolation(
|
|
|
330
336
|
fallbackReason,
|
|
331
337
|
};
|
|
332
338
|
} catch (err) {
|
|
333
|
-
await
|
|
339
|
+
await removeIsolationDirectory(mergedDir, worktreeRoot);
|
|
334
340
|
const message = errorMessage(err);
|
|
335
341
|
if (!natives.isoIsUnavailableError(message)) {
|
|
336
342
|
throw err;
|
|
@@ -344,6 +350,11 @@ export async function ensureIsolation(
|
|
|
344
350
|
|
|
345
351
|
/** Tear down a handle returned by {@link ensureIsolation}. */
|
|
346
352
|
export async function cleanupIsolation(handle: IsolationHandle): Promise<void> {
|
|
353
|
+
const worktreeRoot = getWorktreesDir();
|
|
354
|
+
// Native isoStop removes `mergedDir` and follows symlinks. Refuse a
|
|
355
|
+
// symlink that is already present before that call.
|
|
356
|
+
const teardown = await assertIsolationTeardownTarget(handle.mergedDir, worktreeRoot);
|
|
357
|
+
if (teardown === "skip") return;
|
|
347
358
|
try {
|
|
348
359
|
try {
|
|
349
360
|
await natives.isoStop(handle.backend, handle.mergedDir);
|
|
@@ -355,9 +366,7 @@ export async function cleanupIsolation(handle: IsolationHandle): Promise<void> {
|
|
|
355
366
|
});
|
|
356
367
|
}
|
|
357
368
|
} finally {
|
|
358
|
-
|
|
359
|
-
const baseDir = path.dirname(handle.mergedDir);
|
|
360
|
-
await fs.rm(baseDir, { recursive: true, force: true });
|
|
369
|
+
await removeIsolationDirectory(handle.mergedDir, worktreeRoot);
|
|
361
370
|
}
|
|
362
371
|
}
|
|
363
372
|
|