@qduc/term2 0.12.0 → 0.14.0
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/README.md +6 -1
- package/dist/agent.d.ts +3 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +38 -14
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +91 -17
- package/dist/app.js.map +1 -1
- package/dist/cli.js +34 -23
- package/dist/cli.js.map +1 -1
- package/dist/commands/auto-approve-command.d.ts.map +1 -1
- package/dist/commands/auto-approve-command.js +12 -4
- package/dist/commands/auto-approve-command.js.map +1 -1
- package/dist/commands/compact-command.d.ts +6 -0
- package/dist/commands/compact-command.d.ts.map +1 -0
- package/dist/commands/compact-command.js +12 -0
- package/dist/commands/compact-command.js.map +1 -0
- package/dist/commands/copy-command.d.ts +3 -1
- package/dist/commands/copy-command.d.ts.map +1 -1
- package/dist/commands/copy-command.js +36 -9
- package/dist/commands/copy-command.js.map +1 -1
- package/dist/commands/sandbox-command.d.ts.map +1 -1
- package/dist/commands/sandbox-command.js +6 -1
- package/dist/commands/sandbox-command.js.map +1 -1
- package/dist/components/InputBox.d.ts +1 -2
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +5 -1
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/input/ApplicationInputSurface.d.ts +7 -2
- package/dist/components/input/ApplicationInputSurface.d.ts.map +1 -1
- package/dist/components/input/ApplicationInputSurface.js +7 -1
- package/dist/components/input/ApplicationInputSurface.js.map +1 -1
- package/dist/components/input/CopyMenuSession.d.ts +16 -0
- package/dist/components/input/CopyMenuSession.d.ts.map +1 -0
- package/dist/components/input/CopyMenuSession.js +49 -0
- package/dist/components/input/CopyMenuSession.js.map +1 -0
- package/dist/components/input/FirstRunSetupPrompt.d.ts +9 -0
- package/dist/components/input/FirstRunSetupPrompt.d.ts.map +1 -0
- package/dist/components/input/FirstRunSetupPrompt.js +20 -0
- package/dist/components/input/FirstRunSetupPrompt.js.map +1 -0
- package/dist/components/input/MentorPoolMenuSession.d.ts +9 -0
- package/dist/components/input/MentorPoolMenuSession.d.ts.map +1 -0
- package/dist/components/input/MentorPoolMenuSession.js +131 -0
- package/dist/components/input/MentorPoolMenuSession.js.map +1 -0
- package/dist/components/input/MenuSurface.d.ts.map +1 -1
- package/dist/components/input/MenuSurface.js +16 -2
- package/dist/components/input/MenuSurface.js.map +1 -1
- package/dist/components/input/ModelMenuSession.d.ts.map +1 -1
- package/dist/components/input/ModelMenuSession.js +11 -1
- package/dist/components/input/ModelMenuSession.js.map +1 -1
- package/dist/components/input/ProviderMenuSession.d.ts.map +1 -1
- package/dist/components/input/ProviderMenuSession.js +8 -2
- package/dist/components/input/ProviderMenuSession.js.map +1 -1
- package/dist/components/input/SettingsMenuSession.d.ts.map +1 -1
- package/dist/components/input/SettingsMenuSession.js +35 -22
- package/dist/components/input/SettingsMenuSession.js.map +1 -1
- package/dist/components/input/SkillsMenuSession.d.ts +3 -0
- package/dist/components/input/SkillsMenuSession.d.ts.map +1 -1
- package/dist/components/input/SkillsMenuSession.js +6 -12
- package/dist/components/input/SkillsMenuSession.js.map +1 -1
- package/dist/components/input/SlashMenuSession.d.ts +11 -3
- package/dist/components/input/SlashMenuSession.d.ts.map +1 -1
- package/dist/components/input/SlashMenuSession.js +54 -42
- package/dist/components/input/SlashMenuSession.js.map +1 -1
- package/dist/components/input/menu-controller.d.ts.map +1 -1
- package/dist/components/input/menu-controller.js +18 -1
- package/dist/components/input/menu-controller.js.map +1 -1
- package/dist/components/input/menu-registry.d.ts.map +1 -1
- package/dist/components/input/menu-registry.js +4 -0
- package/dist/components/input/menu-registry.js.map +1 -1
- package/dist/components/input/menu-types.d.ts +12 -0
- package/dist/components/input/menu-types.d.ts.map +1 -1
- package/dist/components/input/triggers.d.ts.map +1 -1
- package/dist/components/input/triggers.js +33 -0
- package/dist/components/input/triggers.js.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.js +28 -10
- package/dist/components/layout/BackgroundTaskManager.js.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts +4 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.js +58 -12
- package/dist/components/layout/BackgroundTasksPanel.js.map +1 -1
- package/dist/components/layout/BottomArea.d.ts +16 -2
- package/dist/components/layout/BottomArea.d.ts.map +1 -1
- package/dist/components/layout/BottomArea.js +7 -4
- package/dist/components/layout/BottomArea.js.map +1 -1
- package/dist/components/layout/StatusBar.d.ts.map +1 -1
- package/dist/components/layout/StatusBar.js +66 -51
- package/dist/components/layout/StatusBar.js.map +1 -1
- package/dist/components/menu/CopyMenu.d.ts +10 -0
- package/dist/components/menu/CopyMenu.d.ts.map +1 -0
- package/dist/components/menu/CopyMenu.js +20 -0
- package/dist/components/menu/CopyMenu.js.map +1 -0
- package/dist/components/menu/MentorPoolSelectionMenu.d.ts +13 -0
- package/dist/components/menu/MentorPoolSelectionMenu.d.ts.map +1 -0
- package/dist/components/menu/MentorPoolSelectionMenu.js +98 -0
- package/dist/components/menu/MentorPoolSelectionMenu.js.map +1 -0
- package/dist/components/menu/ModelSelectionMenu.d.ts +2 -0
- package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +26 -7
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.d.ts +1 -0
- package/dist/components/menu/ProviderSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.js +12 -4
- package/dist/components/menu/ProviderSelectionMenu.js.map +1 -1
- package/dist/components/menu/SlashCommandMenu.d.ts.map +1 -1
- package/dist/components/menu/SlashCommandMenu.js +12 -9
- package/dist/components/menu/SlashCommandMenu.js.map +1 -1
- package/dist/components/message/CommandMessage.js +4 -0
- package/dist/components/message/CommandMessage.js.map +1 -1
- package/dist/components/message/SubagentActivityMessage.d.ts +1 -0
- package/dist/components/message/SubagentActivityMessage.d.ts.map +1 -1
- package/dist/components/message/SubagentActivityMessage.js +14 -1
- package/dist/components/message/SubagentActivityMessage.js.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.js +0 -25
- package/dist/components/prompt/ApprovalPrompt.js.map +1 -1
- package/dist/context/InputContext.d.ts +1 -1
- package/dist/context/InputContext.d.ts.map +1 -1
- package/dist/context/InputContext.js +4 -0
- package/dist/context/InputContext.js.map +1 -1
- package/dist/contracts/application-stream.d.ts +13 -0
- package/dist/contracts/application-stream.d.ts.map +1 -1
- package/dist/contracts/provider-input.d.ts +15 -0
- package/dist/contracts/provider-input.d.ts.map +1 -1
- package/dist/contracts/provider-input.js +6 -1
- package/dist/contracts/provider-input.js.map +1 -1
- package/dist/hooks/conversation-ui-reducer.d.ts +6 -0
- package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.js +3 -0
- package/dist/hooks/conversation-ui-reducer.js.map +1 -1
- package/dist/hooks/settings-completion-config.d.ts.map +1 -1
- package/dist/hooks/settings-completion-config.js +12 -2
- package/dist/hooks/settings-completion-config.js.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +4 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +6 -2
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts +7 -1
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.js +77 -7
- package/dist/hooks/use-app-keyboard-shortcuts.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +6 -2
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +21 -4
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-debounced-value.d.ts +13 -0
- package/dist/hooks/use-debounced-value.d.ts.map +1 -0
- package/dist/hooks/use-debounced-value.js +27 -0
- package/dist/hooks/use-debounced-value.js.map +1 -0
- package/dist/hooks/use-first-run-setup.d.ts +24 -0
- package/dist/hooks/use-first-run-setup.d.ts.map +1 -0
- package/dist/hooks/use-first-run-setup.js +114 -0
- package/dist/hooks/use-first-run-setup.js.map +1 -0
- package/dist/hooks/use-mentor-pool-selection.d.ts +103 -0
- package/dist/hooks/use-mentor-pool-selection.d.ts.map +1 -0
- package/dist/hooks/use-mentor-pool-selection.js +642 -0
- package/dist/hooks/use-mentor-pool-selection.js.map +1 -0
- package/dist/hooks/use-model-selection.d.ts +1 -0
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +44 -1
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-provider-selection.d.ts +5 -1
- package/dist/hooks/use-provider-selection.d.ts.map +1 -1
- package/dist/hooks/use-provider-selection.js +37 -12
- package/dist/hooks/use-provider-selection.js.map +1 -1
- package/dist/hooks/use-slash-commands.d.ts +0 -1
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +1 -9
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/lib/agent-chat-service.d.ts +3 -6
- package/dist/lib/agent-chat-service.d.ts.map +1 -1
- package/dist/lib/agent-chat-service.js +20 -6
- package/dist/lib/agent-chat-service.js.map +1 -1
- package/dist/lib/agent-client.d.ts +20 -2
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +147 -3
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +3 -0
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +5 -0
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +3 -0
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +15 -6
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/input-owner.d.ts +3 -0
- package/dist/lib/input-owner.d.ts.map +1 -1
- package/dist/lib/input-owner.js +5 -0
- package/dist/lib/input-owner.js.map +1 -1
- package/dist/lib/subagent-bridge.d.ts +2 -0
- package/dist/lib/subagent-bridge.d.ts.map +1 -1
- package/dist/lib/subagent-bridge.js +4 -1
- package/dist/lib/subagent-bridge.js.map +1 -1
- package/dist/prompts/background-shell.d.ts +3 -0
- package/dist/prompts/background-shell.d.ts.map +1 -0
- package/dist/prompts/background-shell.js +11 -0
- package/dist/prompts/background-shell.js.map +1 -0
- package/dist/prompts/background-shell.ts +10 -0
- package/dist/prompts/context-compaction.d.ts +4 -0
- package/dist/prompts/context-compaction.d.ts.map +1 -0
- package/dist/prompts/context-compaction.js +18 -0
- package/dist/prompts/context-compaction.js.map +1 -0
- package/dist/prompts/context-compaction.ts +23 -0
- package/dist/prompts/explorer-delegation-contract.test.ts +22 -0
- package/dist/prompts/gpt-5.6.md +1 -1
- package/dist/prompts/kimi.md +1 -1
- package/dist/prompts/orchestrator-prompt.test.ts +7 -0
- package/dist/prompts/orchestrator.md +1 -1
- package/dist/prompts/plan-mode-info.md +2 -2
- package/dist/prompts/prompt-constructor.d.ts +1 -0
- package/dist/prompts/prompt-constructor.d.ts.map +1 -1
- package/dist/prompts/prompt-constructor.js +5 -1
- package/dist/prompts/prompt-constructor.js.map +1 -1
- package/dist/prompts/prompt-constructor.test.ts +16 -1
- package/dist/prompts/prompt-constructor.ts +7 -0
- package/dist/prompts/subagent-delegation.d.ts.map +1 -1
- package/dist/prompts/subagent-delegation.js +5 -3
- package/dist/prompts/subagent-delegation.js.map +1 -1
- package/dist/prompts/subagent-delegation.test.ts +10 -0
- package/dist/prompts/subagent-delegation.ts +5 -3
- package/dist/prompts/subagents/explorer.md +10 -5
- package/dist/prompts/subagents/librarian.md +1 -1
- package/dist/prompts/subagents/worker.md +2 -2
- package/dist/providers/aborted-stream-recorder.d.ts +20 -0
- package/dist/providers/aborted-stream-recorder.d.ts.map +1 -0
- package/dist/providers/aborted-stream-recorder.js +63 -0
- package/dist/providers/aborted-stream-recorder.js.map +1 -0
- package/dist/providers/codex-auth.d.ts +6 -0
- package/dist/providers/codex-auth.d.ts.map +1 -0
- package/dist/providers/codex-auth.js +35 -0
- package/dist/providers/codex-auth.js.map +1 -0
- package/dist/providers/codex-responses-model.d.ts +7 -2
- package/dist/providers/codex-responses-model.d.ts.map +1 -1
- package/dist/providers/codex-responses-model.js +88 -48
- package/dist/providers/codex-responses-model.js.map +1 -1
- package/dist/providers/codex.provider.d.ts +5 -3
- package/dist/providers/codex.provider.d.ts.map +1 -1
- package/dist/providers/codex.provider.js +27 -39
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/model-catalog/catalog.d.ts +35 -2
- package/dist/providers/model-catalog/catalog.d.ts.map +1 -1
- package/dist/providers/model-catalog/catalog.generated.d.ts +406 -166
- package/dist/providers/model-catalog/catalog.generated.d.ts.map +1 -1
- package/dist/providers/model-catalog/catalog.generated.js +406 -166
- package/dist/providers/model-catalog/catalog.generated.js.map +1 -1
- package/dist/providers/model-catalog/catalog.js +93 -29
- package/dist/providers/model-catalog/catalog.js.map +1 -1
- package/dist/providers/openai-chat-completions-model.d.ts +2 -1
- package/dist/providers/openai-chat-completions-model.d.ts.map +1 -1
- package/dist/providers/openai-chat-completions-model.js +223 -53
- package/dist/providers/openai-chat-completions-model.js.map +1 -1
- package/dist/providers/openai-compatible-lazy.d.ts.map +1 -1
- package/dist/providers/openai-compatible-lazy.js +2 -1
- package/dist/providers/openai-compatible-lazy.js.map +1 -1
- package/dist/providers/openai-compatible-middleware.d.ts.map +1 -1
- package/dist/providers/openai-compatible-middleware.js +1 -13
- package/dist/providers/openai-compatible-middleware.js.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.d.ts +5 -4
- package/dist/providers/openai-compatible-response-normalizer.d.ts.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.js +6 -17
- package/dist/providers/openai-compatible-response-normalizer.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts +1 -0
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +13 -4
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai-responses-model.d.ts +9 -1
- package/dist/providers/openai-responses-model.d.ts.map +1 -1
- package/dist/providers/openai-responses-model.js +34 -12
- package/dist/providers/openai-responses-model.js.map +1 -1
- package/dist/providers/provider-service.d.ts +1 -0
- package/dist/providers/provider-service.d.ts.map +1 -1
- package/dist/providers/provider-service.js +4 -0
- package/dist/providers/provider-service.js.map +1 -1
- package/dist/scripts/eval-context-compaction/runner.d.ts +2 -0
- package/dist/scripts/eval-context-compaction/runner.d.ts.map +1 -0
- package/dist/scripts/eval-context-compaction/runner.js +159 -0
- package/dist/scripts/eval-context-compaction/runner.js.map +1 -0
- package/dist/services/agent-runtime/application-run-loop.d.ts +30 -0
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +251 -107
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/context-compaction/index.d.ts +56 -0
- package/dist/services/agent-runtime/context-compaction/index.d.ts.map +1 -0
- package/dist/services/agent-runtime/context-compaction/index.js +131 -0
- package/dist/services/agent-runtime/context-compaction/index.js.map +1 -0
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.d.ts +76 -0
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.d.ts.map +1 -0
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.js +146 -0
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.js.map +1 -0
- package/dist/services/agent-runtime/generation-guard.d.ts +15 -1
- package/dist/services/agent-runtime/generation-guard.d.ts.map +1 -1
- package/dist/services/agent-runtime/generation-guard.js +34 -2
- package/dist/services/agent-runtime/generation-guard.js.map +1 -1
- package/dist/services/agent-runtime/scope-resolver.d.ts.map +1 -1
- package/dist/services/agent-runtime/scope-resolver.js +2 -1
- package/dist/services/agent-runtime/scope-resolver.js.map +1 -1
- package/dist/services/agent-stream.d.ts.map +1 -1
- package/dist/services/agent-stream.js +2 -1
- package/dist/services/agent-stream.js.map +1 -1
- package/dist/services/approval/approval-decision-executor.d.ts.map +1 -1
- package/dist/services/approval/approval-decision-executor.js +5 -2
- package/dist/services/approval/approval-decision-executor.js.map +1 -1
- package/dist/services/approval/approval-decision-policy.d.ts.map +1 -1
- package/dist/services/approval/approval-decision-policy.js +0 -2
- package/dist/services/approval/approval-decision-policy.js.map +1 -1
- package/dist/services/approval/session-read-access.d.ts.map +1 -1
- package/dist/services/approval/session-read-access.js +2 -1
- package/dist/services/approval/session-read-access.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.js +9 -1
- package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.js +2 -1
- package/dist/services/approval/tool-approval-batch-coordinator.js.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.d.ts.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.js +20 -18
- package/dist/services/conversation/conversation-admission-workflow.js.map +1 -1
- package/dist/services/conversation/conversation-decoder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-decoder.js +6 -0
- package/dist/services/conversation/conversation-decoder.js.map +1 -1
- package/dist/services/conversation/conversation-events.d.ts +34 -1
- package/dist/services/conversation/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation/conversation-message-projection.d.ts.map +1 -1
- package/dist/services/conversation/conversation-message-projection.js +7 -3
- package/dist/services/conversation/conversation-message-projection.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts +2 -0
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +113 -1
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts +3 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts.map +1 -1
- package/dist/services/conversation/conversation-replay.d.ts.map +1 -1
- package/dist/services/conversation/conversation-replay.js +45 -0
- package/dist/services/conversation/conversation-replay.js.map +1 -1
- package/dist/services/conversation/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-result-builder.js +14 -2
- package/dist/services/conversation/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +1 -0
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +74 -0
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation/conversation-state-projector.d.ts +7 -1
- package/dist/services/conversation/conversation-state-projector.d.ts.map +1 -1
- package/dist/services/conversation/conversation-state-projector.js +20 -3
- package/dist/services/conversation/conversation-state-projector.js.map +1 -1
- package/dist/services/conversation/conversation-state-schema.d.ts +8 -4
- package/dist/services/conversation/conversation-state-schema.d.ts.map +1 -1
- package/dist/services/conversation/conversation-state-schema.js +24 -2
- package/dist/services/conversation/conversation-state-schema.js.map +1 -1
- package/dist/services/conversation/conversation-store.d.ts +11 -0
- package/dist/services/conversation/conversation-store.d.ts.map +1 -1
- package/dist/services/conversation/conversation-store.js +23 -3
- package/dist/services/conversation/conversation-store.js.map +1 -1
- package/dist/services/conversation-agent-client.d.ts +9 -0
- package/dist/services/conversation-agent-client.d.ts.map +1 -1
- package/dist/services/cost/model-cost.d.ts +13 -2
- package/dist/services/cost/model-cost.d.ts.map +1 -1
- package/dist/services/cost/model-cost.js +1 -0
- package/dist/services/cost/model-cost.js.map +1 -1
- package/dist/services/cost/pricing.d.ts.map +1 -1
- package/dist/services/cost/pricing.js +26 -20
- package/dist/services/cost/pricing.js.map +1 -1
- package/dist/services/execution-context.d.ts +31 -0
- package/dist/services/execution-context.d.ts.map +1 -1
- package/dist/services/execution-context.js +59 -0
- package/dist/services/execution-context.js.map +1 -1
- package/dist/services/file-service.d.ts.map +1 -1
- package/dist/services/file-service.js +12 -3
- package/dist/services/file-service.js.map +1 -1
- package/dist/services/large-uncached-input-guard.d.ts +26 -1
- package/dist/services/large-uncached-input-guard.d.ts.map +1 -1
- package/dist/services/large-uncached-input-guard.js +73 -38
- package/dist/services/large-uncached-input-guard.js.map +1 -1
- package/dist/services/logging/conversation-log-events.d.ts +15 -2
- package/dist/services/logging/conversation-log-events.d.ts.map +1 -1
- package/dist/services/logging/conversation-log-events.js.map +1 -1
- package/dist/services/logging/conversation-logger.d.ts.map +1 -1
- package/dist/services/logging/conversation-logger.js +11 -0
- package/dist/services/logging/conversation-logger.js.map +1 -1
- package/dist/services/logging/logging-contract.d.ts.map +1 -1
- package/dist/services/logging/logging-contract.js +4 -0
- package/dist/services/logging/logging-contract.js.map +1 -1
- package/dist/services/logging/provider-traffic.d.ts +1 -1
- package/dist/services/logging/provider-traffic.d.ts.map +1 -1
- package/dist/services/logging/provider-traffic.js +10 -3
- package/dist/services/logging/provider-traffic.js.map +1 -1
- package/dist/services/model-service.d.ts +7 -0
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +21 -0
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/models/model-catalog-session.d.ts +2 -0
- package/dist/services/models/model-catalog-session.d.ts.map +1 -1
- package/dist/services/models/model-catalog-session.js +9 -2
- package/dist/services/models/model-catalog-session.js.map +1 -1
- package/dist/services/provider-continuity.d.ts +15 -0
- package/dist/services/provider-continuity.d.ts.map +1 -1
- package/dist/services/provider-continuity.js +33 -0
- package/dist/services/provider-continuity.js.map +1 -1
- package/dist/services/retry/recovery-executor.d.ts.map +1 -1
- package/dist/services/retry/recovery-executor.js +12 -5
- package/dist/services/retry/recovery-executor.js.map +1 -1
- package/dist/services/retry/retry-classifier.d.ts.map +1 -1
- package/dist/services/retry/retry-classifier.js +2 -1
- package/dist/services/retry/retry-classifier.js.map +1 -1
- package/dist/services/retry/retry-error-classification.d.ts +19 -0
- package/dist/services/retry/retry-error-classification.d.ts.map +1 -1
- package/dist/services/retry/retry-error-classification.js +54 -0
- package/dist/services/retry/retry-error-classification.js.map +1 -1
- package/dist/services/service-interfaces.d.ts +15 -0
- package/dist/services/service-interfaces.d.ts.map +1 -1
- package/dist/services/session/background-task-control.d.ts +7 -2
- package/dist/services/session/background-task-control.d.ts.map +1 -1
- package/dist/services/session/background-task-control.js +43 -9
- package/dist/services/session/background-task-control.js.map +1 -1
- package/dist/services/session/background-task-liveness.d.ts +24 -0
- package/dist/services/session/background-task-liveness.d.ts.map +1 -0
- package/dist/services/session/background-task-liveness.js +23 -0
- package/dist/services/session/background-task-liveness.js.map +1 -0
- package/dist/services/session/session-access-state.d.ts.map +1 -1
- package/dist/services/session/session-access-state.js +5 -4
- package/dist/services/session/session-access-state.js.map +1 -1
- package/dist/services/session/session-client-factory.d.ts +11 -1
- package/dist/services/session/session-client-factory.d.ts.map +1 -1
- package/dist/services/session/session-client-factory.js +28 -1
- package/dist/services/session/session-client-factory.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +7 -0
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +80 -0
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-input-planner.d.ts +16 -0
- package/dist/services/session/session-input-planner.d.ts.map +1 -1
- package/dist/services/session/session-input-planner.js +117 -10
- package/dist/services/session/session-input-planner.js.map +1 -1
- package/dist/services/session/session-manager.d.ts +3 -0
- package/dist/services/session/session-manager.d.ts.map +1 -1
- package/dist/services/session/session-manager.js +6 -0
- package/dist/services/session/session-manager.js.map +1 -1
- package/dist/services/session/session-stream-processor.d.ts +1 -0
- package/dist/services/session/session-stream-processor.d.ts.map +1 -1
- package/dist/services/session/session-stream-processor.js +16 -1
- package/dist/services/session/session-stream-processor.js.map +1 -1
- package/dist/services/session/session-tool-tracker.d.ts +21 -4
- package/dist/services/session/session-tool-tracker.d.ts.map +1 -1
- package/dist/services/session/session-tool-tracker.js +26 -5
- package/dist/services/session/session-tool-tracker.js.map +1 -1
- package/dist/services/session/terminal-result-collector.d.ts.map +1 -1
- package/dist/services/session/terminal-result-collector.js +12 -0
- package/dist/services/session/terminal-result-collector.js.map +1 -1
- package/dist/services/session/turn-workflow.d.ts.map +1 -1
- package/dist/services/session/turn-workflow.js +4 -0
- package/dist/services/session/turn-workflow.js.map +1 -1
- package/dist/services/settings/settings-path.d.ts +6 -0
- package/dist/services/settings/settings-path.d.ts.map +1 -0
- package/dist/services/settings/settings-path.js +15 -0
- package/dist/services/settings/settings-path.js.map +1 -0
- package/dist/services/settings/settings-schema.d.ts +59 -1
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +44 -3
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-service.d.ts +8 -0
- package/dist/services/settings/settings-service.d.ts.map +1 -1
- package/dist/services/settings/settings-service.js +82 -4
- package/dist/services/settings/settings-service.js.map +1 -1
- package/dist/services/settings/settings-sources.d.ts.map +1 -1
- package/dist/services/settings/settings-sources.js +3 -0
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/shell/background-shell-output-store.d.ts +90 -0
- package/dist/services/shell/background-shell-output-store.d.ts.map +1 -0
- package/dist/services/shell/background-shell-output-store.js +207 -0
- package/dist/services/shell/background-shell-output-store.js.map +1 -0
- package/dist/services/shell/background-shell-registry.d.ts +18 -0
- package/dist/services/shell/background-shell-registry.d.ts.map +1 -1
- package/dist/services/shell/background-shell-registry.js +17 -2
- package/dist/services/shell/background-shell-registry.js.map +1 -1
- package/dist/services/shell/background-shell-watches.d.ts +141 -0
- package/dist/services/shell/background-shell-watches.d.ts.map +1 -0
- package/dist/services/shell/background-shell-watches.js +245 -0
- package/dist/services/shell/background-shell-watches.js.map +1 -0
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +31 -1
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/subagents/execution-runner.d.ts.map +1 -1
- package/dist/services/subagents/execution-runner.js +73 -4
- package/dist/services/subagents/execution-runner.js.map +1 -1
- package/dist/services/subagents/mentor-runner.d.ts.map +1 -1
- package/dist/services/subagents/mentor-runner.js +120 -15
- package/dist/services/subagents/mentor-runner.js.map +1 -1
- package/dist/services/subagents/nested-runner.d.ts.map +1 -1
- package/dist/services/subagents/nested-runner.js +106 -29
- package/dist/services/subagents/nested-runner.js.map +1 -1
- package/dist/services/subagents/role-loader.d.ts +6 -0
- package/dist/services/subagents/role-loader.d.ts.map +1 -1
- package/dist/services/subagents/role-loader.js +6 -1
- package/dist/services/subagents/role-loader.js.map +1 -1
- package/dist/services/subagents/subagent-async-registry.d.ts.map +1 -1
- package/dist/services/subagents/subagent-async-registry.js +39 -5
- package/dist/services/subagents/subagent-async-registry.js.map +1 -1
- package/dist/services/subagents/subagent-notification-store.d.ts +20 -1
- package/dist/services/subagents/subagent-notification-store.d.ts.map +1 -1
- package/dist/services/subagents/subagent-notification-store.js +22 -0
- package/dist/services/subagents/subagent-notification-store.js.map +1 -1
- package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js +6 -5
- package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js.map +1 -1
- package/dist/services/subagents/tool-policy.d.ts +3 -1
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +16 -12
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/types.d.ts +15 -0
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/services/subagents/utils.d.ts +17 -0
- package/dist/services/subagents/utils.d.ts.map +1 -1
- package/dist/services/subagents/utils.js +39 -0
- package/dist/services/subagents/utils.js.map +1 -1
- package/dist/services/subagents/worker-worktree.d.ts +25 -0
- package/dist/services/subagents/worker-worktree.d.ts.map +1 -0
- package/dist/services/subagents/worker-worktree.js +74 -0
- package/dist/services/subagents/worker-worktree.js.map +1 -0
- package/dist/services/tool-execution-ledger.d.ts +26 -1
- package/dist/services/tool-execution-ledger.d.ts.map +1 -1
- package/dist/services/tool-execution-ledger.js +103 -33
- package/dist/services/tool-execution-ledger.js.map +1 -1
- package/dist/services/workspace/active-workspace-root.d.ts +5 -0
- package/dist/services/workspace/active-workspace-root.d.ts.map +1 -0
- package/dist/services/workspace/active-workspace-root.js +24 -0
- package/dist/services/workspace/active-workspace-root.js.map +1 -0
- package/dist/services/workspace/parse-worktree-list.d.ts +24 -0
- package/dist/services/workspace/parse-worktree-list.d.ts.map +1 -0
- package/dist/services/workspace/parse-worktree-list.js +59 -0
- package/dist/services/workspace/parse-worktree-list.js.map +1 -0
- package/dist/services/workspace/worktree-inventory.d.ts +10 -0
- package/dist/services/workspace/worktree-inventory.d.ts.map +1 -0
- package/dist/services/workspace/worktree-inventory.js +28 -0
- package/dist/services/workspace/worktree-inventory.js.map +1 -0
- package/dist/services/workspace/worktree-transition.d.ts +85 -0
- package/dist/services/workspace/worktree-transition.d.ts.map +1 -0
- package/dist/services/workspace/worktree-transition.js +70 -0
- package/dist/services/workspace/worktree-transition.js.map +1 -0
- package/dist/tools/agent/activate-skill.d.ts.map +1 -1
- package/dist/tools/agent/activate-skill.js +1 -0
- package/dist/tools/agent/activate-skill.js.map +1 -1
- package/dist/tools/agent/ask-mentor.d.ts.map +1 -1
- package/dist/tools/agent/ask-mentor.js +5 -1
- package/dist/tools/agent/ask-mentor.js.map +1 -1
- package/dist/tools/agent/run-subagent-async.d.ts +1 -1
- package/dist/tools/agent/run-subagent-async.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent-async.js +21 -4
- package/dist/tools/agent/run-subagent-async.js.map +1 -1
- package/dist/tools/agent/run-subagent.d.ts +3 -1
- package/dist/tools/agent/run-subagent.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent.js +34 -7
- package/dist/tools/agent/run-subagent.js.map +1 -1
- package/dist/tools/file/apply-patch.d.ts.map +1 -1
- package/dist/tools/file/apply-patch.js +6 -3
- package/dist/tools/file/apply-patch.js.map +1 -1
- package/dist/tools/file/code-context.d.ts.map +1 -1
- package/dist/tools/file/code-context.js +2 -0
- package/dist/tools/file/code-context.js.map +1 -1
- package/dist/tools/file/glob.d.ts.map +1 -1
- package/dist/tools/file/glob.js +1 -0
- package/dist/tools/file/glob.js.map +1 -1
- package/dist/tools/file/grep.d.ts.map +1 -1
- package/dist/tools/file/grep.js +1 -0
- package/dist/tools/file/grep.js.map +1 -1
- package/dist/tools/file/read-file.d.ts +2 -0
- package/dist/tools/file/read-file.d.ts.map +1 -1
- package/dist/tools/file/read-file.js +36 -15
- package/dist/tools/file/read-file.js.map +1 -1
- package/dist/tools/system/shell.d.ts +42 -1
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +285 -10
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/system/worktree.d.ts +22 -0
- package/dist/tools/system/worktree.d.ts.map +1 -0
- package/dist/tools/system/worktree.js +138 -0
- package/dist/tools/system/worktree.js.map +1 -0
- package/dist/tools/types.d.ts +5 -0
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/types.js.map +1 -1
- package/dist/tools/utils.d.ts.map +1 -1
- package/dist/tools/utils.js +3 -2
- package/dist/tools/utils.js.map +1 -1
- package/dist/tools/web/web-fetch.d.ts.map +1 -1
- package/dist/tools/web/web-fetch.js +10 -12
- package/dist/tools/web/web-fetch.js.map +1 -1
- package/dist/tools/web/web-search.d.ts.map +1 -1
- package/dist/tools/web/web-search.js +1 -0
- package/dist/tools/web/web-search.js.map +1 -1
- package/dist/utils/ai/provider-credentials.d.ts +31 -2
- package/dist/utils/ai/provider-credentials.d.ts.map +1 -1
- package/dist/utils/ai/provider-credentials.js +119 -11
- package/dist/utils/ai/provider-credentials.js.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.js +13 -1
- package/dist/utils/conversation/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation/message-utils.d.ts +8 -2
- package/dist/utils/conversation/message-utils.d.ts.map +1 -1
- package/dist/utils/conversation/message-utils.js +38 -21
- package/dist/utils/conversation/message-utils.js.map +1 -1
- package/dist/utils/copy-selections.d.ts +8 -0
- package/dist/utils/copy-selections.d.ts.map +1 -0
- package/dist/utils/copy-selections.js +42 -0
- package/dist/utils/copy-selections.js.map +1 -0
- package/dist/utils/output/bound-tool-result.d.ts +42 -0
- package/dist/utils/output/bound-tool-result.d.ts.map +1 -0
- package/dist/utils/output/bound-tool-result.js +81 -0
- package/dist/utils/output/bound-tool-result.js.map +1 -0
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +22 -2
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/shell/command-safety/path-analysis.d.ts.map +1 -1
- package/dist/utils/shell/command-safety/path-analysis.js +5 -1
- package/dist/utils/shell/command-safety/path-analysis.js.map +1 -1
- package/dist/utils/shell/execute-shell.d.ts +25 -0
- package/dist/utils/shell/execute-shell.d.ts.map +1 -1
- package/dist/utils/shell/execute-shell.js +22 -5
- package/dist/utils/shell/execute-shell.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-env.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-env.js +2 -1
- package/dist/utils/shell/sandbox/sandbox-env.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-network-store.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-network-store.js +3 -2
- package/dist/utils/shell/sandbox/sandbox-network-store.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js +2 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js.map +1 -1
- package/dist/utils/shell/shell-output.d.ts +11 -0
- package/dist/utils/shell/shell-output.d.ts.map +1 -1
- package/dist/utils/shell/shell-output.js +18 -8
- package/dist/utils/shell/shell-output.js.map +1 -1
- package/dist/utils/value-suggestions.d.ts.map +1 -1
- package/dist/utils/value-suggestions.js +6 -0
- package/dist/utils/value-suggestions.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { listGitWorktrees } from '../../services/workspace/worktree-inventory.js';
|
|
4
|
+
import { enterableWorktrees, resolveEnterWorktree, resolveExitWorktree, } from '../../services/workspace/worktree-transition.js';
|
|
5
|
+
import { getCallIdFromItem, getOutputText, normalizeToolArguments, createBaseMessage } from '../format-helpers.js';
|
|
6
|
+
const ENTER_WORKTREE_DESCRIPTION = "Switch this session into one of the repository's existing git worktrees. Every subsequent shell command, file read, and file edit resolves against that worktree instead of the main checkout, and the shell sandbox only permits writes there. " +
|
|
7
|
+
'Use this immediately after creating a worktree for a task, before making any edits — creating a worktree with `git worktree add` does NOT move you into it, and edits made without this tool land in the main checkout. ' +
|
|
8
|
+
'Identify the worktree by its directory name or its branch name; call with an unknown name to see the available list. ' +
|
|
9
|
+
'Use exit_worktree to return to the main checkout. Approvals granted in one worktree do not carry over to another.';
|
|
10
|
+
const EXIT_WORKTREE_DESCRIPTION = 'Return this session to the main checkout it started in, undoing enter_worktree. Subsequent commands, reads, and edits resolve against the main checkout again. ' +
|
|
11
|
+
'Use this when work in the worktree is committed and you need to merge it back, or when the task that owned the worktree is finished.';
|
|
12
|
+
const enterWorktreeSchema = z.object({
|
|
13
|
+
name: z
|
|
14
|
+
.string()
|
|
15
|
+
.describe('Directory name or branch name of an existing worktree. Call with an unknown name to list the options.'),
|
|
16
|
+
});
|
|
17
|
+
const exitWorktreeSchema = z.object({});
|
|
18
|
+
function describeWorktree(worktree) {
|
|
19
|
+
const name = path.basename(worktree.path);
|
|
20
|
+
const label = worktree.branch ? `${name} (branch ${worktree.branch})` : `${name} (detached)`;
|
|
21
|
+
return ` - ${label}\n ${worktree.path}`;
|
|
22
|
+
}
|
|
23
|
+
function describeJobs(jobs) {
|
|
24
|
+
return jobs.map((job) => ` - ${job.id}: ${job.command}`).join('\n');
|
|
25
|
+
}
|
|
26
|
+
function busyMessage(action, jobs) {
|
|
27
|
+
return (`Refused to ${action}: ${jobs.length} background shell job(s) are still running under the current root.\n` +
|
|
28
|
+
`${describeJobs(jobs)}\n\n` +
|
|
29
|
+
'These jobs captured their working directory when they launched, so switching now would leave them writing to the old root. ' +
|
|
30
|
+
'Wait for them to finish or cancel them, then retry.');
|
|
31
|
+
}
|
|
32
|
+
export function createWorktreeToolDefinitions(dependencies) {
|
|
33
|
+
const { executionContext, listWorktrees = listGitWorktrees, getRunningJobs } = dependencies;
|
|
34
|
+
const enter = {
|
|
35
|
+
name: 'enter_worktree',
|
|
36
|
+
description: ENTER_WORKTREE_DESCRIPTION,
|
|
37
|
+
parameters: enterWorktreeSchema,
|
|
38
|
+
needsApproval: () => false,
|
|
39
|
+
execute: async (params) => {
|
|
40
|
+
const homeRoot = executionContext.getHomeWorkspace();
|
|
41
|
+
let worktrees;
|
|
42
|
+
try {
|
|
43
|
+
worktrees = await listWorktrees(homeRoot);
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
return `Error: could not list worktrees (${error?.message ?? error}). Is ${homeRoot} inside a git repository?`;
|
|
47
|
+
}
|
|
48
|
+
const outcome = resolveEnterWorktree({
|
|
49
|
+
name: params.name,
|
|
50
|
+
homeRoot,
|
|
51
|
+
worktrees,
|
|
52
|
+
activeWorkspace: executionContext.getActiveWorkspace(),
|
|
53
|
+
runningJobs: getRunningJobs(),
|
|
54
|
+
});
|
|
55
|
+
switch (outcome.kind) {
|
|
56
|
+
case 'entered':
|
|
57
|
+
executionContext.enterWorkspace(outcome.worktree.path);
|
|
58
|
+
return (`Entered worktree ${path.basename(outcome.worktree.path)}${outcome.worktree.branch ? ` (branch ${outcome.worktree.branch})` : ''}.\n` +
|
|
59
|
+
`All shell commands, reads, and edits now resolve against ${outcome.worktree.path}.\n` +
|
|
60
|
+
'Use exit_worktree to return to the main checkout.');
|
|
61
|
+
case 'already_active':
|
|
62
|
+
return `Already in worktree ${path.basename(outcome.worktree.path)} (${outcome.worktree.path}). No change.`;
|
|
63
|
+
case 'not_found': {
|
|
64
|
+
if (outcome.available.length === 0) {
|
|
65
|
+
return (`Worktree '${params.name}' not found, and this repository has no worktrees besides the main checkout.\n` +
|
|
66
|
+
'Create one with `git worktree add .worktrees/<slug> -b <slug>`, then call enter_worktree again.');
|
|
67
|
+
}
|
|
68
|
+
return `Worktree '${params.name}' not found. Available worktrees:\n${outcome.available
|
|
69
|
+
.map(describeWorktree)
|
|
70
|
+
.join('\n')}`;
|
|
71
|
+
}
|
|
72
|
+
case 'ambiguous':
|
|
73
|
+
return (`Worktree name '${params.name}' is ambiguous — it matches ${outcome.candidates.length} worktrees:\n` +
|
|
74
|
+
`${outcome.candidates.map(describeWorktree).join('\n')}\n\n` +
|
|
75
|
+
'Call enter_worktree again with the branch name to disambiguate.');
|
|
76
|
+
case 'unavailable':
|
|
77
|
+
return (`Worktree '${params.name}' is registered at ${outcome.worktree.path} but its directory is missing. ` +
|
|
78
|
+
'Run `git worktree prune` to clear the stale record, or recreate the worktree.');
|
|
79
|
+
case 'busy':
|
|
80
|
+
return busyMessage(`enter worktree '${params.name}'`, outcome.jobs);
|
|
81
|
+
}
|
|
82
|
+
},
|
|
83
|
+
formatCommandMessage: (item, index, toolCallArgumentsById) => {
|
|
84
|
+
const callId = getCallIdFromItem(item);
|
|
85
|
+
const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
|
|
86
|
+
const args = normalizeToolArguments(item?.rawItem?.arguments ?? item?.arguments) ??
|
|
87
|
+
normalizeToolArguments(fallbackArgs) ??
|
|
88
|
+
{};
|
|
89
|
+
const output = getOutputText(item) || '';
|
|
90
|
+
return [
|
|
91
|
+
createBaseMessage(item, index, 0, false, {
|
|
92
|
+
command: `enter_worktree "${args?.name ?? 'unknown'}"`,
|
|
93
|
+
output,
|
|
94
|
+
success: output.startsWith('Entered') || output.startsWith('Already in'),
|
|
95
|
+
toolName: 'enter_worktree',
|
|
96
|
+
toolArgs: args,
|
|
97
|
+
}),
|
|
98
|
+
];
|
|
99
|
+
},
|
|
100
|
+
};
|
|
101
|
+
const exit = {
|
|
102
|
+
name: 'exit_worktree',
|
|
103
|
+
description: EXIT_WORKTREE_DESCRIPTION,
|
|
104
|
+
parameters: exitWorktreeSchema,
|
|
105
|
+
needsApproval: () => false,
|
|
106
|
+
execute: async () => {
|
|
107
|
+
const outcome = resolveExitWorktree({
|
|
108
|
+
homeRoot: executionContext.getHomeWorkspace(),
|
|
109
|
+
activeWorkspace: executionContext.getActiveWorkspace(),
|
|
110
|
+
runningJobs: getRunningJobs(),
|
|
111
|
+
});
|
|
112
|
+
switch (outcome.kind) {
|
|
113
|
+
case 'exited':
|
|
114
|
+
executionContext.exitWorkspace();
|
|
115
|
+
return `Left the worktree. All shell commands, reads, and edits now resolve against ${outcome.homeRoot}.`;
|
|
116
|
+
case 'not_in_worktree':
|
|
117
|
+
return `Not in a worktree — the session is already in its main checkout (${outcome.homeRoot}). No change.`;
|
|
118
|
+
case 'busy':
|
|
119
|
+
return busyMessage('exit the worktree', outcome.jobs);
|
|
120
|
+
}
|
|
121
|
+
},
|
|
122
|
+
formatCommandMessage: (item, index) => {
|
|
123
|
+
const output = getOutputText(item) || '';
|
|
124
|
+
return [
|
|
125
|
+
createBaseMessage(item, index, 0, false, {
|
|
126
|
+
command: 'exit_worktree',
|
|
127
|
+
output,
|
|
128
|
+
success: output.startsWith('Left') || output.startsWith('Not in a worktree'),
|
|
129
|
+
toolName: 'exit_worktree',
|
|
130
|
+
toolArgs: {},
|
|
131
|
+
}),
|
|
132
|
+
];
|
|
133
|
+
},
|
|
134
|
+
};
|
|
135
|
+
return { enter, exit };
|
|
136
|
+
}
|
|
137
|
+
export { enterableWorktrees };
|
|
138
|
+
//# sourceMappingURL=worktree.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../../source/tools/system/worktree.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/types.d.ts
CHANGED
|
@@ -76,6 +76,8 @@ export interface SchemaToolDefinition<TSchema extends ZodTypeAny> {
|
|
|
76
76
|
name: string;
|
|
77
77
|
description: string;
|
|
78
78
|
parameters: TSchema;
|
|
79
|
+
/** Opt-in capability for independent, auto-approved calls in one model response. */
|
|
80
|
+
parallelSafe?: boolean | ((params: z.infer<TSchema>, context?: unknown) => Promise<boolean> | boolean);
|
|
79
81
|
/** Optional provider-facing schema when a strict transport cannot express the runtime contract. */
|
|
80
82
|
strictParameters?: ZodTypeAny;
|
|
81
83
|
argumentParsing?: 'repair' | 'strict';
|
|
@@ -116,6 +118,9 @@ export interface AnyToolDefinition {
|
|
|
116
118
|
name: string;
|
|
117
119
|
description: string;
|
|
118
120
|
parameters: ToolParameterSchema;
|
|
121
|
+
/** Opt-in capability for independent, auto-approved calls in one model response. */
|
|
122
|
+
/** `never` keeps heterogeneous schema-derived predicates assignable at the erased boundary. */
|
|
123
|
+
parallelSafe?: boolean | ((params: never, context?: unknown) => Promise<boolean> | boolean);
|
|
119
124
|
strictParameters?: ZodTypeAny;
|
|
120
125
|
argumentParsing?: 'repair' | 'strict';
|
|
121
126
|
approvalPresentation?: ApprovalPresentationCapability;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../source/tools/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AACzC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAE1E;;;GAGG;AACH,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;CAChC;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,CAAC,OAAO,EAAE,6BAA6B,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,KAAK,CAAC,OAAO,EAAE,6BAA6B,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvG,KAAK,CACH,OAAO,EAAE,6BAA6B,EACtC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,sBAAsB,EAAE,OAAO,GAC9B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,oBAAoB,GAAG,CACjC,IAAI,EAAE,OAAO,qBAAqB,EAAE,cAAc,EAClD,KAAK,EAAE,MAAM,EACb,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KACxC,cAAc,EAAE,CAAC;AAEtB,gFAAgF;AAChF,MAAM,WAAW,wBAAwB,CAAC,MAAM,GAAG,OAAO;IACxD,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,MAAM,EAAE,OAAO,CAAC;IAChB,sFAAsF;IACtF,OAAO,EAAE,OAAO,CAAC;IACjB,qFAAqF;IACrF,YAAY,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,MAAM,MAAM,iBAAiB,CAAC,MAAM,GAAG,OAAO,IAAI,CAChD,OAAO,EAAE,wBAAwB,CAAC,MAAM,CAAC,KACtC,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;AAEhC,0EAA0E;AAC1E,MAAM,WAAW,0BAA0B,CAAC,MAAM,GAAG,OAAO;IAC1D,QAAQ,CACN,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,OAAO,GACf;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,kBAAkB,CAAA;KAAE,GAAG,IAAI,CAAC;IACvF,OAAO,CAAC,CAAC,OAAO,EAAE,wBAAwB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAChH;AAED,mGAAmG;AACnG,MAAM,WAAW,0BAA0B;IACzC,OAAO,CAAC,OAAO,SAAS,UAAU,EAChC,UAAU,EAAE,oBAAoB,CAAC,OAAO,CAAC,GACxC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACnD,mFAAmF;IACnF,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CAChF;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,UAAU;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,mGAAmG;IACnG,gBAAgB,CAAC,EAAE,UAAU,CAAC;IAC9B,eAAe,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACtC,oBAAoB,CAAC,EAAE,8BAA8B,CAAC;IACtD,aAAa,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC3F,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACxG,WAAW,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAClD,qFAAqF;IACrF,gBAAgB,CAAC,EAAE,0BAA0B,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE;;;;;;OAMG;IACH,oBAAoB,EAAE,oBAAoB,CAAC;CAC5C;AAED,uFAAuF;AACvF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEvD,qEAAqE;AACrE,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAEhE,wFAAwF;AACxF,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,UAAU,CAE9E;AAED;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAEpG;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,mBAAmB,CAAC;IAChC,gBAAgB,CAAC,EAAE,UAAU,CAAC;IAC9B,eAAe,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACtC,oBAAoB,CAAC,EAAE,8BAA8B,CAAC;IACtD,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC9E,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC3F,uFAAuF;IACvF,mBAAmB,CAAC,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC/C,WAAW,CAAC,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACrF,gBAAgB,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACvD,oBAAoB,EAAE,oBAAoB,CAAC;CAC5C;AAED,mFAAmF;AACnF,MAAM,MAAM,YAAY,GAAG,SAAS,iBAAiB,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../source/tools/types.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/tools/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/tools/types.ts"],"names":[],"mappings":"AA+HA,wFAAwF;AACxF,MAAM,UAAU,wBAAwB,CAAC,MAAe;IACtD,OAAO,OAAQ,MAAyC,EAAE,SAAS,KAAK,UAAU,CAAC;AACrF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,MAAiC,EAC1C,OAAO,CAAC,EAAE;IACR;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,GACA,MAAM,CAkDR;AA8CD;;;;;;;;GAQG;AACH,wBAAsB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAYjH;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,GAAE,MAAiC,GAAG,OAAO,CAQjH;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,6BAAoB,CAAC"}
|
package/dist/tools/utils.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
|
+
import { getActiveWorkspaceRoot } from '../services/workspace/active-workspace-root.js';
|
|
2
3
|
import { homedir } from 'os';
|
|
3
4
|
import { lstat, realpath } from 'fs/promises';
|
|
4
5
|
import { z } from 'zod';
|
|
@@ -7,7 +8,7 @@ import { SANDBOX_TEMP_DIR } from '../utils/shell/temp-dir.js';
|
|
|
7
8
|
/**
|
|
8
9
|
* Resolves a relative path and ensures it's within the workspace
|
|
9
10
|
*/
|
|
10
|
-
export function resolveWorkspacePath(relativePath, baseDir =
|
|
11
|
+
export function resolveWorkspacePath(relativePath, baseDir = getActiveWorkspaceRoot(), options) {
|
|
11
12
|
const allowOutsideWorkspace = options?.allowOutsideWorkspace ?? false;
|
|
12
13
|
const allowDiscoveredSkillFolders = options?.allowDiscoveredSkillFolders ?? false;
|
|
13
14
|
// Expand ~ if the path starts with it
|
|
@@ -113,7 +114,7 @@ export async function isWorkspacePathPhysicallyInside(targetPath, workspaceRoot)
|
|
|
113
114
|
* hook loading/trust: trusting a project permits execution, never silent model
|
|
114
115
|
* mutation.
|
|
115
116
|
*/
|
|
116
|
-
export function isProtectedHookPath(targetPath, workspaceRoot =
|
|
117
|
+
export function isProtectedHookPath(targetPath, workspaceRoot = getActiveWorkspaceRoot()) {
|
|
117
118
|
const normalizedTarget = path.resolve(targetPath);
|
|
118
119
|
const roots = [path.join(homedir(), '.term2', 'hooks'), path.join(path.resolve(workspaceRoot), '.term2', 'hooks')];
|
|
119
120
|
return roots.some((root) => {
|
package/dist/tools/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,YAAoB,EACpB,OAAO,GAAW,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch.d.ts","sourceRoot":"","sources":["../../../source/tools/web/web-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"web-fetch.d.ts","sourceRoot":"","sources":["../../../source/tools/web/web-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAe9F,QAAA,MAAM,cAAc;;;;;iBAkBlB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,oBAoB1C,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU;IACjD,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACjC,KAAG,cAAc,CAAC,OAAO,cAAc,CAiEvC,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { writeFile } from 'fs/promises';
|
|
3
|
-
import os from 'os';
|
|
4
|
-
import path from 'path';
|
|
5
2
|
import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem } from '../format-helpers.js';
|
|
3
|
+
import { boundToolResultText } from '../../utils/output/bound-tool-result.js';
|
|
4
|
+
import { formatFullOutputSavedNote, saveOutputArtifact } from '../../utils/shell/shell-output.js';
|
|
6
5
|
const WEB_FETCH_DESCRIPTION = 'Fetch a web page and convert its HTML content to Markdown. ' +
|
|
7
6
|
'Use this when you need the full content of a specific URL referenced by web_search or the user. ' +
|
|
8
7
|
'Do NOT use this for broad queries; use web_search. ' +
|
|
9
8
|
'Returns the page title, URL, table of contents, and extracted Markdown. ' +
|
|
10
|
-
'Initial fetches are truncated to max_chars; the full content is saved to a temporary file when exceeded
|
|
9
|
+
'Initial fetches are truncated to max_chars; the full content is saved to a temporary file when exceeded ' +
|
|
10
|
+
'(look for "Full output saved to" and read that path when you need more).';
|
|
11
11
|
const DEFAULT_MAX_CHARS = 10000;
|
|
12
12
|
const MAX_CHARS_LIMIT = 200000;
|
|
13
13
|
const webFetchSchema = z.object({
|
|
@@ -57,6 +57,7 @@ export const createWebFetchToolDefinition = (deps) => {
|
|
|
57
57
|
name: 'web_fetch',
|
|
58
58
|
description: WEB_FETCH_DESCRIPTION,
|
|
59
59
|
parameters: webFetchSchema,
|
|
60
|
+
parallelSafe: true,
|
|
60
61
|
needsApproval: () => false,
|
|
61
62
|
execute: async (params) => {
|
|
62
63
|
const { url, max_chars = DEFAULT_MAX_CHARS, heading: targetHeadings, continuation_token } = params;
|
|
@@ -75,12 +76,7 @@ export const createWebFetchToolDefinition = (deps) => {
|
|
|
75
76
|
let tempFilePath = null;
|
|
76
77
|
// For initial fetches, if content exceeds the user's requested max, save full to temp file
|
|
77
78
|
if (!isContinuation && result.markdown.length > max_chars) {
|
|
78
|
-
|
|
79
|
-
const timestamp = Date.now();
|
|
80
|
-
const rand = Math.random().toString(36).slice(2, 8);
|
|
81
|
-
const tmpDir = os.tmpdir();
|
|
82
|
-
tempFilePath = path.join(tmpDir, `term2-web-fetch-${safeName}-${timestamp}-${rand}.md`);
|
|
83
|
-
await writeFile(tempFilePath, result.markdown, 'utf-8');
|
|
79
|
+
tempFilePath = await saveOutputArtifact(result.markdown, { filenamePrefix: 'web-fetch' });
|
|
84
80
|
// Truncate the displayed markdown at a clean boundary near max_chars
|
|
85
81
|
const truncated = result.markdown.slice(0, max_chars);
|
|
86
82
|
const lastNewline = truncated.lastIndexOf('\n');
|
|
@@ -96,9 +92,11 @@ export const createWebFetchToolDefinition = (deps) => {
|
|
|
96
92
|
output += `\n\n**Note: Content still truncated. Use continuation_token: "${result.continuationToken}" to fetch more.**`;
|
|
97
93
|
}
|
|
98
94
|
if (tempFilePath) {
|
|
99
|
-
output += `\n
|
|
95
|
+
output += `\n${formatFullOutputSavedNote(tempFilePath)}`;
|
|
100
96
|
}
|
|
101
|
-
|
|
97
|
+
// Final hard bound so even max_chars near the upper limit cannot blow context alone.
|
|
98
|
+
const bounded = await boundToolResultText({ fullText: output });
|
|
99
|
+
return bounded.text;
|
|
102
100
|
}
|
|
103
101
|
catch (error) {
|
|
104
102
|
loggingService.error('Web fetch failed', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch.js","sourceRoot":"","sources":["../../../source/tools/web/web-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"web-fetch.js","sourceRoot":"","sources":["../../../source/tools/web/web-fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-search.d.ts","sourceRoot":"","sources":["../../../source/tools/web/web-search.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExE,OAAO,EAAkC,KAAK,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7G,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAQ9F,QAAA,MAAM,eAAe;;iBAEnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CA4B3E;AAED;;GAEG;AACH,eAAO,MAAM,6BAA6B,EAAE,oBAoB3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,SAAU;IAClD,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACjC,KAAG,cAAc,CAAC,OAAO,eAAe,
|
|
1
|
+
{"version":3,"file":"web-search.d.ts","sourceRoot":"","sources":["../../../source/tools/web/web-search.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExE,OAAO,EAAkC,KAAK,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7G,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAQ9F,QAAA,MAAM,eAAe;;iBAEnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CA4B3E;AAED;;GAEG;AACH,eAAO,MAAM,6BAA6B,EAAE,oBAoB3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,SAAU;IAClD,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACjC,KAAG,cAAc,CAAC,OAAO,eAAe,CA0CxC,CAAC"}
|
|
@@ -72,6 +72,7 @@ export const createWebSearchToolDefinition = (deps) => {
|
|
|
72
72
|
name: 'web_search',
|
|
73
73
|
description: WEB_SEARCH_DESCRIPTION,
|
|
74
74
|
parameters: webSearchSchema,
|
|
75
|
+
parallelSafe: true,
|
|
75
76
|
needsApproval: () => false, // Web search is read-only, safe operation
|
|
76
77
|
execute: async (params) => {
|
|
77
78
|
const { query } = params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../../source/tools/web/web-search.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../../source/tools/web/web-search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,39 @@
|
|
|
1
1
|
import type { ISettingsService } from '../../services/service-interfaces.js';
|
|
2
|
+
export declare const PROVIDER_CREDENTIAL_SETTING_KEYS: {
|
|
3
|
+
readonly openai: 'agent.openai.apiKey';
|
|
4
|
+
readonly openrouter: 'agent.openrouter.apiKey';
|
|
5
|
+
};
|
|
6
|
+
export declare const getProviderCredentialSettingKey: (providerId: string) => string | undefined;
|
|
7
|
+
export declare const getProviderIdForCredentialSettingKey: (settingKey: string | undefined) => string | undefined;
|
|
8
|
+
export type ProviderCredentialResolution = {
|
|
9
|
+
required: boolean;
|
|
10
|
+
configured: boolean;
|
|
11
|
+
source: 'setting' | 'environment' | 'stored' | 'token-file' | 'local' | 'external' | 'missing';
|
|
12
|
+
unavailableReason?: 'missing-credentials' | 'missing-codex-login';
|
|
13
|
+
settingKey?: string;
|
|
14
|
+
environmentKey?: string;
|
|
15
|
+
credentialPath?: string | null;
|
|
16
|
+
};
|
|
2
17
|
/**
|
|
3
|
-
*
|
|
18
|
+
* Resolve provider readiness from the same credential sources the provider
|
|
19
|
+
* runtime consumes. Local loopback custom providers and llama.cpp are
|
|
20
|
+
* explicitly no-auth; remote custom providers require a stored or type-level
|
|
21
|
+
* environment credential. Codex uses its local auth file as a presence-only
|
|
22
|
+
* credential. Unknown registered providers retain their external auth contract
|
|
23
|
+
* and are not blocked by this API-key predicate.
|
|
24
|
+
*/
|
|
25
|
+
export declare const resolveProviderCredentials: (settingsService: ISettingsService, providerId: string) => ProviderCredentialResolution;
|
|
26
|
+
/** Resolve the actual credential value for runtime-compatible provider setup. */
|
|
27
|
+
export declare const resolveProviderCredentialValue: (settingsService: ISettingsService, providerId: string) => string | undefined;
|
|
28
|
+
/**
|
|
29
|
+
* Check credential presence only. This deliberately does not contact a
|
|
30
|
+
* provider or validate the credential; invalid credentials fail at request
|
|
31
|
+
* time where the provider can report the real error.
|
|
4
32
|
*/
|
|
5
33
|
export declare const hasProviderCredentials: (settingsService: ISettingsService, providerId: string) => boolean;
|
|
6
34
|
/**
|
|
7
|
-
* Get
|
|
35
|
+
* Get provider IDs that are locally runnable according to credential
|
|
36
|
+
* presence. The name is retained for compatibility with existing callers.
|
|
8
37
|
*/
|
|
9
38
|
export declare const getAvailableProviderIds: (settingsService: ISettingsService, allProviderIds: string[]) => string[];
|
|
10
39
|
//# sourceMappingURL=provider-credentials.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-credentials.d.ts","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-credentials.d.ts","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAW7E,eAAO,MAAM,gCAAgC;aAC3C,MAAM,EAAE,qBAAqB;aAC7B,UAAU,EAAE,yBAAyB;CAC7B,CAAC;AAEX,eAAO,MAAM,+BAA+B,eAAgB,MAAM,KAAG,MAAM,GAAG,SACiB,CAAC;AAEhG,eAAO,MAAM,oCAAoC,eAAgB,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAK9F,CAAC;AAQF,MAAM,MAAM,4BAA4B,GAAG;IACzC,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IAC/F,iBAAiB,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,CAAC;IAClE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAmDF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,oBACpB,gBAAgB,cACrB,MAAM,KACjB,4BA+BF,CAAC;AAEF,iFAAiF;AACjF,eAAO,MAAM,8BAA8B,oBACxB,gBAAgB,cACrB,MAAM,KACjB,MAAM,GAAG,SAkBX,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,oBAAqB,gBAAgB,cAAc,MAAM,KAAG,OAG9F,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,gBAAgB,kBAAkB,MAAM,EAAE,KAAG,MAAM,EAE3G,CAAC"}
|
|
@@ -1,20 +1,128 @@
|
|
|
1
|
+
import { decodeStoredCustomProviderConfigs, normalizeProviderIdentifier, } from '../../services/settings/custom-provider-normalization.js';
|
|
2
|
+
import { getProvider } from '../../providers/registry.js';
|
|
3
|
+
import { resolveCodexTokenPath } from '../../providers/codex-auth.js';
|
|
4
|
+
const hasConfiguredCredential = (value) => typeof value === 'string' && value.trim().length > 0;
|
|
5
|
+
export const PROVIDER_CREDENTIAL_SETTING_KEYS = {
|
|
6
|
+
openai: 'agent.openai.apiKey',
|
|
7
|
+
openrouter: 'agent.openrouter.apiKey',
|
|
8
|
+
};
|
|
9
|
+
export const getProviderCredentialSettingKey = (providerId) => PROVIDER_CREDENTIAL_SETTING_KEYS[providerId];
|
|
10
|
+
export const getProviderIdForCredentialSettingKey = (settingKey) => {
|
|
11
|
+
if (!settingKey)
|
|
12
|
+
return undefined;
|
|
13
|
+
return Object.entries(PROVIDER_CREDENTIAL_SETTING_KEYS).find(([, key]) => key === settingKey)?.[0];
|
|
14
|
+
};
|
|
15
|
+
const CUSTOM_PROVIDER_ENV_KEYS = {
|
|
16
|
+
anthropic: 'ANTHROPIC_API_KEY',
|
|
17
|
+
google: 'GOOGLE_GENERATIVE_AI_API_KEY',
|
|
18
|
+
opencode: 'OPENCODE_API_KEY',
|
|
19
|
+
};
|
|
20
|
+
const isConfigured = hasConfiguredCredential;
|
|
21
|
+
const isLoopbackBaseUrl = (baseUrl) => {
|
|
22
|
+
if (!baseUrl)
|
|
23
|
+
return false;
|
|
24
|
+
try {
|
|
25
|
+
const hostname = new URL(baseUrl).hostname.toLowerCase();
|
|
26
|
+
return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '[::1]' || hostname === '::1';
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
const getStoredCustomProvider = (settingsService, providerId) => {
|
|
33
|
+
const raw = settingsService.getDynamic('providers');
|
|
34
|
+
const normalizedProviderId = normalizeProviderIdentifier(providerId);
|
|
35
|
+
return decodeStoredCustomProviderConfigs(raw).find((provider) => provider.id === providerId ||
|
|
36
|
+
provider.name === providerId ||
|
|
37
|
+
provider.id === normalizedProviderId ||
|
|
38
|
+
provider.name === normalizedProviderId);
|
|
39
|
+
};
|
|
40
|
+
const resolveCredentialSources = (settingsService, settingKey, storedKey, environmentKey) => {
|
|
41
|
+
if (settingKey && isConfigured(settingsService.getDynamic(settingKey))) {
|
|
42
|
+
return { required: true, configured: true, source: 'setting', settingKey, environmentKey };
|
|
43
|
+
}
|
|
44
|
+
if (isConfigured(storedKey)) {
|
|
45
|
+
return { required: true, configured: true, source: 'stored', settingKey, environmentKey };
|
|
46
|
+
}
|
|
47
|
+
if (environmentKey && isConfigured(process.env[environmentKey])) {
|
|
48
|
+
return { required: true, configured: true, source: 'environment', settingKey, environmentKey };
|
|
49
|
+
}
|
|
50
|
+
return {
|
|
51
|
+
required: true,
|
|
52
|
+
configured: false,
|
|
53
|
+
source: 'missing',
|
|
54
|
+
unavailableReason: 'missing-credentials',
|
|
55
|
+
settingKey,
|
|
56
|
+
environmentKey,
|
|
57
|
+
};
|
|
58
|
+
};
|
|
1
59
|
/**
|
|
2
|
-
*
|
|
60
|
+
* Resolve provider readiness from the same credential sources the provider
|
|
61
|
+
* runtime consumes. Local loopback custom providers and llama.cpp are
|
|
62
|
+
* explicitly no-auth; remote custom providers require a stored or type-level
|
|
63
|
+
* environment credential. Codex uses its local auth file as a presence-only
|
|
64
|
+
* credential. Unknown registered providers retain their external auth contract
|
|
65
|
+
* and are not blocked by this API-key predicate.
|
|
3
66
|
*/
|
|
4
|
-
export const
|
|
5
|
-
if (providerId === '
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
67
|
+
export const resolveProviderCredentials = (settingsService, providerId) => {
|
|
68
|
+
if (providerId === 'codex') {
|
|
69
|
+
const credentialPath = resolveCodexTokenPath();
|
|
70
|
+
return {
|
|
71
|
+
required: true,
|
|
72
|
+
configured: credentialPath !== null,
|
|
73
|
+
source: credentialPath ? 'token-file' : 'missing',
|
|
74
|
+
unavailableReason: credentialPath ? undefined : 'missing-codex-login',
|
|
75
|
+
credentialPath,
|
|
76
|
+
};
|
|
9
77
|
}
|
|
10
|
-
|
|
11
|
-
|
|
78
|
+
const settingKey = getProviderCredentialSettingKey(providerId);
|
|
79
|
+
if (settingKey) {
|
|
80
|
+
const environmentKey = providerId === 'openai' ? 'OPENAI_API_KEY' : 'OPENROUTER_API_KEY';
|
|
81
|
+
return resolveCredentialSources(settingsService, settingKey, undefined, environmentKey);
|
|
12
82
|
}
|
|
13
|
-
|
|
14
|
-
|
|
83
|
+
const custom = getStoredCustomProvider(settingsService, providerId);
|
|
84
|
+
if (!custom) {
|
|
85
|
+
const definition = getProvider(providerId);
|
|
86
|
+
return definition?.isRuntimeDefined
|
|
87
|
+
? { required: true, configured: false, source: 'missing', unavailableReason: 'missing-credentials' }
|
|
88
|
+
: { required: false, configured: true, source: 'external' };
|
|
89
|
+
}
|
|
90
|
+
if (custom.type === 'llama.cpp' || isLoopbackBaseUrl(custom.baseUrl)) {
|
|
91
|
+
return { required: false, configured: true, source: 'local' };
|
|
92
|
+
}
|
|
93
|
+
return resolveCredentialSources(settingsService, undefined, custom.apiKey, CUSTOM_PROVIDER_ENV_KEYS[custom.type]);
|
|
94
|
+
};
|
|
95
|
+
/** Resolve the actual credential value for runtime-compatible provider setup. */
|
|
96
|
+
export const resolveProviderCredentialValue = (settingsService, providerId) => {
|
|
97
|
+
const custom = getStoredCustomProvider(settingsService, providerId);
|
|
98
|
+
const resolution = resolveProviderCredentials(settingsService, providerId);
|
|
99
|
+
if (custom?.apiKey && resolution.source === 'local') {
|
|
100
|
+
return custom.apiKey;
|
|
101
|
+
}
|
|
102
|
+
if (resolution.source === 'setting' && resolution.settingKey) {
|
|
103
|
+
const value = settingsService.getDynamic(resolution.settingKey);
|
|
104
|
+
return typeof value === 'string' ? value : undefined;
|
|
105
|
+
}
|
|
106
|
+
if (resolution.source === 'environment' && resolution.environmentKey) {
|
|
107
|
+
return process.env[resolution.environmentKey];
|
|
108
|
+
}
|
|
109
|
+
if (resolution.source === 'stored') {
|
|
110
|
+
return custom?.apiKey;
|
|
111
|
+
}
|
|
112
|
+
return undefined;
|
|
113
|
+
};
|
|
114
|
+
/**
|
|
115
|
+
* Check credential presence only. This deliberately does not contact a
|
|
116
|
+
* provider or validate the credential; invalid credentials fail at request
|
|
117
|
+
* time where the provider can report the real error.
|
|
118
|
+
*/
|
|
119
|
+
export const hasProviderCredentials = (settingsService, providerId) => {
|
|
120
|
+
const resolution = resolveProviderCredentials(settingsService, providerId);
|
|
121
|
+
return !resolution.required || resolution.configured;
|
|
15
122
|
};
|
|
16
123
|
/**
|
|
17
|
-
* Get
|
|
124
|
+
* Get provider IDs that are locally runnable according to credential
|
|
125
|
+
* presence. The name is retained for compatibility with existing callers.
|
|
18
126
|
*/
|
|
19
127
|
export const getAvailableProviderIds = (settingsService, allProviderIds) => {
|
|
20
128
|
return allProviderIds.filter((id) => hasProviderCredentials(settingsService, id));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-credentials.js","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider-credentials.js","sourceRoot":"","sources":["../../../source/utils/ai/provider-credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-event-handler.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-event-handler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAEV,cAAc,EACd,OAAO,EAIR,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-event-handler.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-event-handler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAEV,cAAc,EACd,OAAO,EAIR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAyC,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAarG,MAAM,WAAW,4BAA4B;IAC3C,kBAAkB,EAAE;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,cAAc,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC9C,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,IAAI,CAAC;IAC/D,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC;IACjD,sBAAsB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,cAAc,CAAC;CACjE;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,4BAA4B,EAClC,KAAK,EAAE,cAAc,GACpB,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CA+nBpC"}
|