@qduc/term2 0.1.7 → 0.2.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/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +5 -3
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts +1 -5
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +31 -274
- package/dist/app.js.map +1 -1
- package/dist/app.parseInput.test.js +1 -9
- package/dist/app.parseInput.test.js.map +1 -1
- package/dist/cli.js +6 -0
- package/dist/cli.js.map +1 -1
- package/dist/components/ApprovalPrompt.d.ts +2 -1
- package/dist/components/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/ApprovalPrompt.js +15 -0
- package/dist/components/ApprovalPrompt.js.map +1 -1
- package/dist/components/BottomArea.d.ts +2 -9
- package/dist/components/BottomArea.d.ts.map +1 -1
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/Input/determine-active-menu.d.ts +23 -0
- package/dist/components/Input/determine-active-menu.d.ts.map +1 -0
- package/dist/components/Input/determine-active-menu.js +57 -0
- package/dist/components/Input/determine-active-menu.js.map +1 -0
- package/dist/components/Input/input-width.d.ts +7 -0
- package/dist/components/Input/input-width.d.ts.map +1 -0
- package/dist/components/Input/input-width.js +20 -0
- package/dist/components/Input/input-width.js.map +1 -0
- package/dist/components/Input/insertions.d.ts +34 -0
- package/dist/components/Input/insertions.d.ts.map +1 -0
- package/dist/components/Input/insertions.js +52 -0
- package/dist/components/Input/insertions.js.map +1 -0
- package/dist/components/Input/popup-props.d.ts +18 -0
- package/dist/components/Input/popup-props.d.ts.map +1 -0
- package/dist/components/Input/popup-props.js +42 -0
- package/dist/components/Input/popup-props.js.map +1 -0
- package/dist/components/Input/triggers.d.ts +9 -0
- package/dist/components/Input/triggers.d.ts.map +1 -0
- package/dist/components/Input/triggers.js +25 -0
- package/dist/components/Input/triggers.js.map +1 -0
- package/dist/components/InputBox.d.ts +2 -0
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +118 -384
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/InputBox.menu-logic.test.js +82 -99
- package/dist/components/InputBox.menu-logic.test.js.map +1 -1
- package/dist/components/InputBox.test.js +10 -1
- package/dist/components/InputBox.test.js.map +1 -1
- package/dist/components/MarkdownRenderer.d.ts.map +1 -1
- package/dist/components/MarkdownRenderer.js +96 -23
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/MessageList.d.ts +8 -0
- package/dist/components/MessageList.d.ts.map +1 -1
- package/dist/components/MessageList.js +25 -7
- package/dist/components/MessageList.js.map +1 -1
- package/dist/components/MessageList.test.js +48 -1
- package/dist/components/MessageList.test.js.map +1 -1
- package/dist/components/StatusBar.d.ts +1 -1
- package/dist/components/StatusBar.d.ts.map +1 -1
- package/dist/components/StatusBar.js +49 -38
- package/dist/components/StatusBar.js.map +1 -1
- package/dist/contracts/conversation.d.ts +36 -0
- package/dist/contracts/conversation.d.ts.map +1 -0
- package/dist/contracts/conversation.js +2 -0
- package/dist/contracts/conversation.js.map +1 -0
- package/dist/hooks/message-id.d.ts +3 -0
- package/dist/hooks/message-id.d.ts.map +1 -0
- package/dist/hooks/message-id.js +17 -0
- package/dist/hooks/message-id.js.map +1 -0
- package/dist/hooks/message-id.test.d.ts +2 -0
- package/dist/hooks/message-id.test.d.ts.map +1 -0
- package/dist/hooks/message-id.test.js +17 -0
- package/dist/hooks/message-id.test.js.map +1 -0
- package/dist/hooks/use-app-commands.d.ts +20 -0
- package/dist/hooks/use-app-commands.d.ts.map +1 -0
- package/dist/hooks/use-app-commands.js +197 -0
- package/dist/hooks/use-app-commands.js.map +1 -0
- package/dist/hooks/use-app-commands.test.d.ts +2 -0
- package/dist/hooks/use-app-commands.test.d.ts.map +1 -0
- package/dist/hooks/use-app-commands.test.js +34 -0
- package/dist/hooks/use-app-commands.test.js.map +1 -0
- package/dist/hooks/use-conversation.d.ts +14 -25
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +28 -97
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-escape-key.d.ts +24 -0
- package/dist/hooks/use-escape-key.d.ts.map +1 -0
- package/dist/hooks/use-escape-key.js +60 -0
- package/dist/hooks/use-escape-key.js.map +1 -0
- package/dist/hooks/use-escape-key.test.d.ts +2 -0
- package/dist/hooks/use-escape-key.test.d.ts.map +1 -0
- package/dist/hooks/use-escape-key.test.js +49 -0
- package/dist/hooks/use-escape-key.test.js.map +1 -0
- package/dist/hooks/use-mode-handlers.d.ts +35 -0
- package/dist/hooks/use-mode-handlers.d.ts.map +1 -0
- package/dist/hooks/use-mode-handlers.js +79 -0
- package/dist/hooks/use-mode-handlers.js.map +1 -0
- package/dist/hooks/use-model-selection.d.ts +6 -3
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +19 -16
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-model-selection.test.d.ts +2 -0
- package/dist/hooks/use-model-selection.test.d.ts.map +1 -0
- package/dist/hooks/use-model-selection.test.js +59 -0
- package/dist/hooks/use-model-selection.test.js.map +1 -0
- package/dist/hooks/use-path-completion.d.ts.map +1 -1
- package/dist/hooks/use-path-completion.js +5 -36
- package/dist/hooks/use-path-completion.js.map +1 -1
- package/dist/hooks/use-runtime-settings.d.ts +12 -0
- package/dist/hooks/use-runtime-settings.d.ts.map +1 -0
- package/dist/hooks/use-runtime-settings.js +68 -0
- package/dist/hooks/use-runtime-settings.js.map +1 -0
- package/dist/hooks/use-selection.d.ts +8 -0
- package/dist/hooks/use-selection.d.ts.map +1 -0
- package/dist/hooks/use-selection.js +31 -0
- package/dist/hooks/use-selection.js.map +1 -0
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +15 -30
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.test.js +9 -9
- package/dist/hooks/use-settings-completion.test.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-value-completion.js +30 -28
- package/dist/hooks/use-settings-value-completion.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.test.js +13 -0
- package/dist/hooks/use-settings-value-completion.test.js.map +1 -1
- package/dist/hooks/use-shell-mode.d.ts +31 -0
- package/dist/hooks/use-shell-mode.d.ts.map +1 -0
- package/dist/hooks/use-shell-mode.js +85 -0
- package/dist/hooks/use-shell-mode.js.map +1 -0
- package/dist/hooks/use-slash-commands.d.ts +1 -0
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +32 -23
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/hooks/use-terminal-width.d.ts +7 -0
- package/dist/hooks/use-terminal-width.d.ts.map +1 -0
- package/dist/hooks/use-terminal-width.js +33 -0
- package/dist/hooks/use-terminal-width.js.map +1 -0
- package/dist/hooks/use-trigger-detection.d.ts +40 -0
- package/dist/hooks/use-trigger-detection.d.ts.map +1 -0
- package/dist/hooks/use-trigger-detection.js +45 -0
- package/dist/hooks/use-trigger-detection.js.map +1 -0
- package/dist/lib/editor-impl.js +6 -6
- package/dist/lib/editor-impl.js.map +1 -1
- package/dist/lib/openai-agent-client.d.ts +2 -0
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +187 -191
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-agent-client.public-methods.test.js +61 -13
- package/dist/lib/openai-agent-client.public-methods.test.js.map +1 -1
- package/dist/lib/retry-executor.d.ts +16 -0
- package/dist/lib/retry-executor.d.ts.map +1 -0
- package/dist/lib/retry-executor.js +71 -0
- package/dist/lib/retry-executor.js.map +1 -0
- package/dist/lib/retry-executor.test.d.ts +2 -0
- package/dist/lib/retry-executor.test.d.ts.map +1 -0
- package/dist/lib/retry-executor.test.js +178 -0
- package/dist/lib/retry-executor.test.js.map +1 -0
- package/dist/lib/tool-invoke.d.ts +13 -0
- package/dist/lib/tool-invoke.d.ts.map +1 -1
- package/dist/lib/tool-invoke.js +61 -3
- package/dist/lib/tool-invoke.js.map +1 -1
- package/dist/lib/tool-invoke.test.js +139 -1
- package/dist/lib/tool-invoke.test.js.map +1 -1
- package/dist/lib/tool-selection-policy.d.ts +14 -0
- package/dist/lib/tool-selection-policy.d.ts.map +1 -0
- package/dist/lib/tool-selection-policy.js +17 -0
- package/dist/lib/tool-selection-policy.js.map +1 -0
- package/dist/lib/tool-selection-policy.test.d.ts +2 -0
- package/dist/lib/tool-selection-policy.test.d.ts.map +1 -0
- package/dist/lib/tool-selection-policy.test.js +69 -0
- package/dist/lib/tool-selection-policy.test.js.map +1 -0
- package/dist/prompts/simple.md +4 -0
- package/dist/providers/index.d.ts +1 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +1 -1
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai-compatible/model.d.ts.map +1 -1
- package/dist/providers/openai-compatible/model.js +68 -7
- package/dist/providers/openai-compatible/model.js.map +1 -1
- package/dist/providers/openai-compatible/reasoning-content.test.js +107 -6
- package/dist/providers/openai-compatible/reasoning-content.test.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai.provider.js +2 -0
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/openrouter/converters.d.ts.map +1 -1
- package/dist/providers/openrouter/converters.js +8 -6
- package/dist/providers/openrouter/converters.js.map +1 -1
- package/dist/providers/openrouter/converters.test.js +24 -0
- package/dist/providers/openrouter/converters.test.js.map +1 -1
- package/dist/providers/openrouter/model.d.ts.map +1 -1
- package/dist/providers/openrouter/model.js +13 -5
- package/dist/providers/openrouter/model.js.map +1 -1
- package/dist/providers/openrouter/reasoning-content.test.js +48 -2
- package/dist/providers/openrouter/reasoning-content.test.js.map +1 -1
- package/dist/providers/openrouter.provider.createRunner.test.js +17 -9
- package/dist/providers/openrouter.provider.createRunner.test.js.map +1 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/openrouter.test.js +0 -2
- package/dist/providers/openrouter.test.js.map +1 -1
- package/dist/providers/registry.d.ts +17 -8
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +9 -0
- package/dist/providers/registry.js.map +1 -1
- package/dist/providers/web-search/exa.provider.d.ts +15 -0
- package/dist/providers/web-search/exa.provider.d.ts.map +1 -0
- package/dist/providers/web-search/exa.provider.js +82 -0
- package/dist/providers/web-search/exa.provider.js.map +1 -0
- package/dist/providers/web-search/exa.provider.test.d.ts +2 -0
- package/dist/providers/web-search/exa.provider.test.d.ts.map +1 -0
- package/dist/providers/web-search/exa.provider.test.js +67 -0
- package/dist/providers/web-search/exa.provider.test.js.map +1 -0
- package/dist/providers/web-search/index.d.ts +1 -0
- package/dist/providers/web-search/index.d.ts.map +1 -1
- package/dist/providers/web-search/index.js +1 -0
- package/dist/providers/web-search/index.js.map +1 -1
- package/dist/scripts/eval-auto-approval/cache.d.ts +9 -0
- package/dist/scripts/eval-auto-approval/cache.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/cache.js +64 -0
- package/dist/scripts/eval-auto-approval/cache.js.map +1 -0
- package/dist/scripts/eval-auto-approval/dataset.d.ts +45 -0
- package/dist/scripts/eval-auto-approval/dataset.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/dataset.js +65 -0
- package/dist/scripts/eval-auto-approval/dataset.js.map +1 -0
- package/dist/scripts/eval-auto-approval/dataset.test.d.ts +2 -0
- package/dist/scripts/eval-auto-approval/dataset.test.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/dataset.test.js +88 -0
- package/dist/scripts/eval-auto-approval/dataset.test.js.map +1 -0
- package/dist/scripts/eval-auto-approval/leaderboard.d.ts +92 -0
- package/dist/scripts/eval-auto-approval/leaderboard.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/leaderboard.js +402 -0
- package/dist/scripts/eval-auto-approval/leaderboard.js.map +1 -0
- package/dist/scripts/eval-auto-approval/leaderboard.test.d.ts +2 -0
- package/dist/scripts/eval-auto-approval/leaderboard.test.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/leaderboard.test.js +689 -0
- package/dist/scripts/eval-auto-approval/leaderboard.test.js.map +1 -0
- package/dist/scripts/eval-auto-approval/metrics.d.ts +34 -0
- package/dist/scripts/eval-auto-approval/metrics.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/metrics.js +74 -0
- package/dist/scripts/eval-auto-approval/metrics.js.map +1 -0
- package/dist/scripts/eval-auto-approval/metrics.test.d.ts +2 -0
- package/dist/scripts/eval-auto-approval/metrics.test.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/metrics.test.js +79 -0
- package/dist/scripts/eval-auto-approval/metrics.test.js.map +1 -0
- package/dist/scripts/eval-auto-approval/report.d.ts +5 -0
- package/dist/scripts/eval-auto-approval/report.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/report.js +51 -0
- package/dist/scripts/eval-auto-approval/report.js.map +1 -0
- package/dist/scripts/eval-auto-approval/report.test.d.ts +2 -0
- package/dist/scripts/eval-auto-approval/report.test.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/report.test.js +23 -0
- package/dist/scripts/eval-auto-approval/report.test.js.map +1 -0
- package/dist/scripts/eval-auto-approval/runner-utils.d.ts +41 -0
- package/dist/scripts/eval-auto-approval/runner-utils.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/runner-utils.js +187 -0
- package/dist/scripts/eval-auto-approval/runner-utils.js.map +1 -0
- package/dist/scripts/eval-auto-approval/runner-utils.test.d.ts +2 -0
- package/dist/scripts/eval-auto-approval/runner-utils.test.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/runner-utils.test.js +135 -0
- package/dist/scripts/eval-auto-approval/runner-utils.test.js.map +1 -0
- package/dist/scripts/eval-auto-approval/runner.d.ts +2 -0
- package/dist/scripts/eval-auto-approval/runner.d.ts.map +1 -0
- package/dist/scripts/eval-auto-approval/runner.js +326 -0
- package/dist/scripts/eval-auto-approval/runner.js.map +1 -0
- package/dist/services/agent-stream.d.ts +11 -0
- package/dist/services/agent-stream.d.ts.map +1 -0
- package/dist/services/agent-stream.js +2 -0
- package/dist/services/agent-stream.js.map +1 -0
- package/dist/services/approval-flow-coordinator.d.ts +43 -0
- package/dist/services/approval-flow-coordinator.d.ts.map +1 -0
- package/dist/services/approval-flow-coordinator.js +120 -0
- package/dist/services/approval-flow-coordinator.js.map +1 -0
- package/dist/services/approval-flow-coordinator.test.d.ts +2 -0
- package/dist/services/approval-flow-coordinator.test.d.ts.map +1 -0
- package/dist/services/approval-flow-coordinator.test.js +168 -0
- package/dist/services/approval-flow-coordinator.test.js.map +1 -0
- package/dist/services/approval-presentation-policy.d.ts +17 -0
- package/dist/services/approval-presentation-policy.d.ts.map +1 -0
- package/dist/services/approval-presentation-policy.js +44 -0
- package/dist/services/approval-presentation-policy.js.map +1 -0
- package/dist/services/approval-presentation-policy.test.d.ts +2 -0
- package/dist/services/approval-presentation-policy.test.d.ts.map +1 -0
- package/dist/services/approval-presentation-policy.test.js +74 -0
- package/dist/services/approval-presentation-policy.test.js.map +1 -0
- package/dist/services/approval-rejection-interceptor.d.ts +16 -0
- package/dist/services/approval-rejection-interceptor.d.ts.map +1 -0
- package/dist/services/approval-rejection-interceptor.js +20 -0
- package/dist/services/approval-rejection-interceptor.js.map +1 -0
- package/dist/services/approval-rejection-interceptor.test.d.ts +2 -0
- package/dist/services/approval-rejection-interceptor.test.d.ts.map +1 -0
- package/dist/services/approval-rejection-interceptor.test.js +60 -0
- package/dist/services/approval-rejection-interceptor.test.js.map +1 -0
- package/dist/services/approval-state.d.ts +4 -4
- package/dist/services/approval-state.d.ts.map +1 -1
- package/dist/services/conversation-events.d.ts +13 -8
- package/dist/services/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation-result-builder.d.ts +41 -0
- package/dist/services/conversation-result-builder.d.ts.map +1 -0
- package/dist/services/conversation-result-builder.js +98 -0
- package/dist/services/conversation-result-builder.js.map +1 -0
- package/dist/services/conversation-result-builder.test.d.ts +2 -0
- package/dist/services/conversation-result-builder.test.d.ts.map +1 -0
- package/dist/services/conversation-result-builder.test.js +156 -0
- package/dist/services/conversation-result-builder.test.js.map +1 -0
- package/dist/services/conversation-retry-policy.d.ts +37 -0
- package/dist/services/conversation-retry-policy.d.ts.map +1 -0
- package/dist/services/conversation-retry-policy.js +51 -0
- package/dist/services/conversation-retry-policy.js.map +1 -0
- package/dist/services/conversation-retry-policy.test.d.ts +2 -0
- package/dist/services/conversation-retry-policy.test.d.ts.map +1 -0
- package/dist/services/conversation-retry-policy.test.js +79 -0
- package/dist/services/conversation-retry-policy.test.js.map +1 -0
- package/dist/services/conversation-service.d.ts +9 -6
- package/dist/services/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation-service.js +1 -1
- package/dist/services/conversation-service.js.map +1 -1
- package/dist/services/conversation-session.auto-approval.test.d.ts +2 -0
- package/dist/services/conversation-session.auto-approval.test.d.ts.map +1 -0
- package/dist/services/conversation-session.auto-approval.test.js +617 -0
- package/dist/services/conversation-session.auto-approval.test.js.map +1 -0
- package/dist/services/conversation-session.d.ts +10 -27
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +189 -778
- package/dist/services/conversation-session.js.map +1 -1
- package/dist/services/conversation-store.d.ts +6 -0
- package/dist/services/conversation-store.d.ts.map +1 -1
- package/dist/services/conversation-store.js +13 -0
- package/dist/services/conversation-store.js.map +1 -1
- package/dist/services/interruption-info.d.ts +13 -0
- package/dist/services/interruption-info.d.ts.map +1 -0
- package/dist/services/interruption-info.js +89 -0
- package/dist/services/interruption-info.js.map +1 -0
- package/dist/services/interruption-info.test.d.ts +2 -0
- package/dist/services/interruption-info.test.d.ts.map +1 -0
- package/dist/services/interruption-info.test.js +84 -0
- package/dist/services/interruption-info.test.js.map +1 -0
- package/dist/services/logging-contract.d.ts +1 -1
- package/dist/services/logging-service.d.ts +6 -2
- package/dist/services/logging-service.d.ts.map +1 -1
- package/dist/services/logging-service.js +48 -91
- package/dist/services/logging-service.js.map +1 -1
- package/dist/services/settings-env.d.ts.map +1 -1
- package/dist/services/settings-env.js +3 -0
- package/dist/services/settings-env.js.map +1 -1
- package/dist/services/settings-schema.d.ts +34 -0
- package/dist/services/settings-schema.d.ts.map +1 -1
- package/dist/services/settings-schema.js +37 -0
- package/dist/services/settings-schema.js.map +1 -1
- package/dist/services/settings-service.d.ts.map +1 -1
- package/dist/services/settings-service.js +12 -166
- package/dist/services/settings-service.js.map +1 -1
- package/dist/services/settings-sources.d.ts +5 -0
- package/dist/services/settings-sources.d.ts.map +1 -0
- package/dist/services/settings-sources.js +92 -0
- package/dist/services/settings-sources.js.map +1 -0
- package/dist/services/settings-sources.test.d.ts +2 -0
- package/dist/services/settings-sources.test.d.ts.map +1 -0
- package/dist/services/settings-sources.test.js +34 -0
- package/dist/services/settings-sources.test.js.map +1 -0
- package/dist/services/shell-auto-approval-evaluator.d.ts +19 -0
- package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -0
- package/dist/services/shell-auto-approval-evaluator.js +207 -0
- package/dist/services/shell-auto-approval-evaluator.js.map +1 -0
- package/dist/services/shell-auto-approval-evaluator.test.d.ts +2 -0
- package/dist/services/shell-auto-approval-evaluator.test.d.ts.map +1 -0
- package/dist/services/shell-auto-approval-evaluator.test.js +211 -0
- package/dist/services/shell-auto-approval-evaluator.test.js.map +1 -0
- package/dist/services/shell-auto-approval-resolver.d.ts +24 -0
- package/dist/services/shell-auto-approval-resolver.d.ts.map +1 -0
- package/dist/services/shell-auto-approval-resolver.js +59 -0
- package/dist/services/shell-auto-approval-resolver.js.map +1 -0
- package/dist/services/shell-auto-approval-resolver.test.d.ts +2 -0
- package/dist/services/shell-auto-approval-resolver.test.d.ts.map +1 -0
- package/dist/services/shell-auto-approval-resolver.test.js +110 -0
- package/dist/services/shell-auto-approval-resolver.test.js.map +1 -0
- package/dist/services/ssh-service.test.js +2 -2
- package/dist/services/ssh-service.test.js.map +1 -1
- package/dist/services/stream-event-processor.d.ts +27 -0
- package/dist/services/stream-event-processor.d.ts.map +1 -0
- package/dist/services/stream-event-processor.js +205 -0
- package/dist/services/stream-event-processor.js.map +1 -0
- package/dist/services/stream-event-processor.test.d.ts +2 -0
- package/dist/services/stream-event-processor.test.d.ts.map +1 -0
- package/dist/services/stream-event-processor.test.js +170 -0
- package/dist/services/stream-event-processor.test.js.map +1 -0
- package/dist/services/terminal-result-collector.d.ts +12 -0
- package/dist/services/terminal-result-collector.d.ts.map +1 -0
- package/dist/services/terminal-result-collector.js +64 -0
- package/dist/services/terminal-result-collector.js.map +1 -0
- package/dist/services/terminal-result-collector.test.d.ts +2 -0
- package/dist/services/terminal-result-collector.test.d.ts.map +1 -0
- package/dist/services/terminal-result-collector.test.js +93 -0
- package/dist/services/terminal-result-collector.test.js.map +1 -0
- package/dist/tools/apply-patch.js +5 -5
- package/dist/tools/apply-patch.js.map +1 -1
- package/dist/tools/create-file.js +2 -2
- package/dist/tools/create-file.js.map +1 -1
- package/dist/tools/edit-healing.d.ts.map +1 -1
- package/dist/tools/edit-healing.js +4 -1
- package/dist/tools/edit-healing.js.map +1 -1
- package/dist/tools/edit-healing.test.js +22 -0
- package/dist/tools/edit-healing.test.js.map +1 -1
- package/dist/tools/read-file.test.js +15 -0
- package/dist/tools/read-file.test.js.map +1 -1
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +223 -147
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +215 -0
- package/dist/tools/search-replace.test.js.map +1 -1
- package/dist/tools/shell.js +2 -2
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/shell.test.js +0 -5
- package/dist/tools/shell.test.js.map +1 -1
- package/dist/tools/tool-capabilities.d.ts +6 -0
- package/dist/tools/tool-capabilities.d.ts.map +1 -0
- package/dist/tools/tool-capabilities.js +17 -0
- package/dist/tools/tool-capabilities.js.map +1 -0
- package/dist/tools/types.d.ts +4 -2
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/utils.d.ts.map +1 -1
- package/dist/tools/utils.js +4 -1
- package/dist/tools/utils.js.map +1 -1
- package/dist/tools/utils.test.d.ts.map +1 -0
- package/dist/tools/utils.test.js +26 -0
- package/dist/tools/utils.test.js.map +1 -0
- package/dist/tools/web-fetch.test.js +3 -3
- package/dist/tools/web-fetch.test.js.map +1 -1
- package/dist/utils/clipboard.d.ts +16 -0
- package/dist/utils/clipboard.d.ts.map +1 -0
- package/dist/utils/clipboard.js +55 -0
- package/dist/utils/clipboard.js.map +1 -0
- package/dist/utils/clipboard.test.d.ts +2 -0
- package/dist/utils/clipboard.test.d.ts.map +1 -0
- package/dist/utils/clipboard.test.js +59 -0
- package/dist/utils/clipboard.test.js.map +1 -0
- package/dist/utils/command-safety/constants.d.ts.map +1 -1
- package/dist/utils/command-safety/constants.js +3 -21
- package/dist/utils/command-safety/constants.js.map +1 -1
- package/dist/utils/command-safety/find-helpers.d.ts.map +1 -1
- package/dist/utils/command-safety/find-helpers.js +13 -95
- package/dist/utils/command-safety/find-helpers.js.map +1 -1
- package/dist/utils/command-safety/handlers/sed-handler.d.ts.map +1 -1
- package/dist/utils/command-safety/handlers/sed-handler.js +2 -4
- package/dist/utils/command-safety/handlers/sed-handler.js.map +1 -1
- package/dist/utils/command-safety/index.d.ts +9 -0
- package/dist/utils/command-safety/index.d.ts.map +1 -1
- package/dist/utils/command-safety/index.js +12 -2
- package/dist/utils/command-safety/index.js.map +1 -1
- package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
- package/dist/utils/command-safety/path-analysis.js +7 -6
- package/dist/utils/command-safety/path-analysis.js.map +1 -1
- package/dist/utils/command-safety.find.test.js +56 -39
- package/dist/utils/command-safety.find.test.js.map +1 -1
- package/dist/utils/command-safety.path.test.js +7 -7
- package/dist/utils/command-safety.path.test.js.map +1 -1
- package/dist/utils/command-safety.red-yellow-policy.test.d.ts +2 -0
- package/dist/utils/command-safety.red-yellow-policy.test.d.ts.map +1 -0
- package/dist/utils/command-safety.red-yellow-policy.test.js +36 -0
- package/dist/utils/command-safety.red-yellow-policy.test.js.map +1 -0
- package/dist/utils/conversation-event-handler.d.ts +19 -12
- package/dist/utils/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation-event-handler.js +19 -5
- package/dist/utils/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation-event-handler.test.js +24 -0
- package/dist/utils/conversation-event-handler.test.js.map +1 -1
- package/dist/utils/conversation-utils.d.ts +1 -1
- package/dist/utils/execute-shell.d.ts +10 -0
- package/dist/utils/execute-shell.d.ts.map +1 -1
- package/dist/utils/execute-shell.js +3 -3
- package/dist/utils/execute-shell.js.map +1 -1
- package/dist/utils/execute-shell.test.js +19 -3
- package/dist/utils/execute-shell.test.js.map +1 -1
- package/dist/utils/input-parser.d.ts +13 -0
- package/dist/utils/input-parser.d.ts.map +1 -0
- package/dist/utils/input-parser.js +10 -0
- package/dist/utils/input-parser.js.map +1 -0
- package/dist/utils/model-provider-arg.d.ts +5 -0
- package/dist/utils/model-provider-arg.d.ts.map +1 -0
- package/dist/utils/model-provider-arg.js +15 -0
- package/dist/utils/model-provider-arg.js.map +1 -0
- package/dist/utils/model-provider-arg.test.d.ts +2 -0
- package/dist/utils/model-provider-arg.test.d.ts.map +1 -0
- package/dist/utils/model-provider-arg.test.js +21 -0
- package/dist/utils/model-provider-arg.test.js.map +1 -0
- package/dist/utils/model-settings.d.ts +12 -0
- package/dist/utils/model-settings.d.ts.map +1 -0
- package/dist/utils/model-settings.js +35 -0
- package/dist/utils/model-settings.js.map +1 -0
- package/dist/utils/provider-traffic-extractor.d.ts +1 -0
- package/dist/utils/provider-traffic-extractor.d.ts.map +1 -1
- package/dist/utils/provider-traffic-extractor.js +90 -5
- package/dist/utils/provider-traffic-extractor.js.map +1 -1
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +10 -8
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/streaming-session-factory.d.ts +9 -9
- package/dist/utils/streaming-session-factory.d.ts.map +1 -1
- package/dist/utils/streaming-session-factory.js +12 -4
- package/dist/utils/streaming-session-factory.js.map +1 -1
- package/dist/utils/streaming-session-factory.test.js +2 -2
- package/dist/utils/streaming-session-factory.test.js.map +1 -1
- package/dist/utils/streaming-updater.d.ts +2 -1
- package/dist/utils/streaming-updater.d.ts.map +1 -1
- package/dist/utils/streaming-updater.js +2 -2
- package/dist/utils/streaming-updater.js.map +1 -1
- package/dist/utils/synchronized-output.d.ts +35 -0
- package/dist/utils/synchronized-output.d.ts.map +1 -0
- package/dist/utils/synchronized-output.js +66 -0
- package/dist/utils/synchronized-output.js.map +1 -0
- package/dist/utils/synchronized-output.test.d.ts +2 -0
- package/dist/utils/synchronized-output.test.d.ts.map +1 -0
- package/dist/utils/synchronized-output.test.js +70 -0
- package/dist/utils/synchronized-output.test.js.map +1 -0
- package/dist/utils/throttle.d.ts +6 -1
- package/dist/utils/throttle.d.ts.map +1 -1
- package/dist/utils/throttle.js +11 -6
- package/dist/utils/throttle.js.map +1 -1
- package/dist/utils/viewport.d.ts +6 -0
- package/dist/utils/viewport.d.ts.map +1 -0
- package/dist/utils/viewport.js +20 -0
- package/dist/utils/viewport.js.map +1 -0
- package/dist/utils/viewport.test.d.ts +2 -0
- package/dist/utils/viewport.test.d.ts.map +1 -0
- package/dist/utils/viewport.test.js +43 -0
- package/dist/utils/viewport.test.js.map +1 -0
- package/package.json +5 -4
- package/dist/agent.lite-mode.test.d.ts +0 -2
- package/dist/agent.lite-mode.test.d.ts.map +0 -1
- package/dist/agent.lite-mode.test.js +0 -39
- package/dist/agent.lite-mode.test.js.map +0 -1
- package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts +0 -2
- package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts.map +0 -1
- package/dist/components/ModelSelectionMenu.error-tabs.test.js +0 -18
- package/dist/components/ModelSelectionMenu.error-tabs.test.js.map +0 -1
- package/dist/components/TextInput.d.ts +0 -42
- package/dist/components/TextInput.d.ts.map +0 -1
- package/dist/components/TextInput.js +0 -398
- package/dist/components/TextInput.js.map +0 -1
- package/dist/components/TextInput.test.d.ts +0 -2
- package/dist/components/TextInput.test.d.ts.map +0 -1
- package/dist/components/TextInput.test.js +0 -75
- package/dist/components/TextInput.test.js.map +0 -1
- package/dist/debug_ask_mentor.d.ts +0 -2
- package/dist/debug_ask_mentor.d.ts.map +0 -1
- package/dist/debug_ask_mentor.js +0 -73
- package/dist/debug_ask_mentor.js.map +0 -1
- package/dist/lib/shell.d.ts +0 -7
- package/dist/lib/shell.d.ts.map +0 -1
- package/dist/lib/shell.js +0 -56
- package/dist/lib/shell.js.map +0 -1
- package/dist/modes/companion/command-index.d.ts +0 -26
- package/dist/modes/companion/command-index.d.ts.map +0 -1
- package/dist/modes/companion/command-index.js +0 -50
- package/dist/modes/companion/command-index.js.map +0 -1
- package/dist/modes/companion/command-index.test.d.ts +0 -2
- package/dist/modes/companion/command-index.test.d.ts.map +0 -1
- package/dist/modes/companion/command-index.test.js +0 -86
- package/dist/modes/companion/command-index.test.js.map +0 -1
- package/dist/modes/companion/companion-app.d.ts +0 -12
- package/dist/modes/companion/companion-app.d.ts.map +0 -1
- package/dist/modes/companion/companion-app.js +0 -297
- package/dist/modes/companion/companion-app.js.map +0 -1
- package/dist/modes/companion/companion-session.d.ts +0 -63
- package/dist/modes/companion/companion-session.d.ts.map +0 -1
- package/dist/modes/companion/companion-session.js +0 -146
- package/dist/modes/companion/companion-session.js.map +0 -1
- package/dist/modes/companion/companion-session.test.d.ts +0 -2
- package/dist/modes/companion/companion-session.test.d.ts.map +0 -1
- package/dist/modes/companion/companion-session.test.js +0 -28
- package/dist/modes/companion/companion-session.test.js.map +0 -1
- package/dist/modes/companion/components/status-bar.d.ts +0 -13
- package/dist/modes/companion/components/status-bar.d.ts.map +0 -1
- package/dist/modes/companion/components/status-bar.js +0 -26
- package/dist/modes/companion/components/status-bar.js.map +0 -1
- package/dist/modes/companion/context-buffer.d.ts +0 -65
- package/dist/modes/companion/context-buffer.d.ts.map +0 -1
- package/dist/modes/companion/context-buffer.js +0 -156
- package/dist/modes/companion/context-buffer.js.map +0 -1
- package/dist/modes/companion/context-buffer.test.d.ts +0 -2
- package/dist/modes/companion/context-buffer.test.d.ts.map +0 -1
- package/dist/modes/companion/context-buffer.test.js +0 -154
- package/dist/modes/companion/context-buffer.test.js.map +0 -1
- package/dist/modes/companion/event-detector.d.ts +0 -46
- package/dist/modes/companion/event-detector.d.ts.map +0 -1
- package/dist/modes/companion/event-detector.js +0 -169
- package/dist/modes/companion/event-detector.js.map +0 -1
- package/dist/modes/companion/event-detector.test.d.ts +0 -2
- package/dist/modes/companion/event-detector.test.d.ts.map +0 -1
- package/dist/modes/companion/event-detector.test.js +0 -121
- package/dist/modes/companion/event-detector.test.js.map +0 -1
- package/dist/modes/companion/index.d.ts +0 -33
- package/dist/modes/companion/index.d.ts.map +0 -1
- package/dist/modes/companion/index.js +0 -21
- package/dist/modes/companion/index.js.map +0 -1
- package/dist/modes/companion/input-key-mapper.d.ts +0 -3
- package/dist/modes/companion/input-key-mapper.d.ts.map +0 -1
- package/dist/modes/companion/input-key-mapper.js +0 -31
- package/dist/modes/companion/input-key-mapper.js.map +0 -1
- package/dist/modes/companion/input-key-mapper.test.d.ts +0 -2
- package/dist/modes/companion/input-key-mapper.test.d.ts.map +0 -1
- package/dist/modes/companion/input-key-mapper.test.js +0 -26
- package/dist/modes/companion/input-key-mapper.test.js.map +0 -1
- package/dist/modes/companion/input-parser.d.ts +0 -53
- package/dist/modes/companion/input-parser.d.ts.map +0 -1
- package/dist/modes/companion/input-parser.js +0 -114
- package/dist/modes/companion/input-parser.js.map +0 -1
- package/dist/modes/companion/input-parser.test.d.ts +0 -2
- package/dist/modes/companion/input-parser.test.d.ts.map +0 -1
- package/dist/modes/companion/input-parser.test.js +0 -123
- package/dist/modes/companion/input-parser.test.js.map +0 -1
- package/dist/modes/companion/mode-manager.d.ts +0 -41
- package/dist/modes/companion/mode-manager.d.ts.map +0 -1
- package/dist/modes/companion/mode-manager.js +0 -56
- package/dist/modes/companion/mode-manager.js.map +0 -1
- package/dist/modes/companion/mode-manager.test.d.ts +0 -2
- package/dist/modes/companion/mode-manager.test.d.ts.map +0 -1
- package/dist/modes/companion/mode-manager.test.js +0 -65
- package/dist/modes/companion/mode-manager.test.js.map +0 -1
- package/dist/modes/companion/output-classifier.d.ts +0 -15
- package/dist/modes/companion/output-classifier.d.ts.map +0 -1
- package/dist/modes/companion/output-classifier.js +0 -77
- package/dist/modes/companion/output-classifier.js.map +0 -1
- package/dist/modes/companion/output-classifier.test.d.ts +0 -2
- package/dist/modes/companion/output-classifier.test.d.ts.map +0 -1
- package/dist/modes/companion/output-classifier.test.js +0 -133
- package/dist/modes/companion/output-classifier.test.js.map +0 -1
- package/dist/modes/companion/pty-wrapper.d.ts +0 -46
- package/dist/modes/companion/pty-wrapper.d.ts.map +0 -1
- package/dist/modes/companion/pty-wrapper.js +0 -143
- package/dist/modes/companion/pty-wrapper.js.map +0 -1
- package/dist/modes/companion/safety-classifier.d.ts +0 -31
- package/dist/modes/companion/safety-classifier.d.ts.map +0 -1
- package/dist/modes/companion/safety-classifier.js +0 -140
- package/dist/modes/companion/safety-classifier.js.map +0 -1
- package/dist/modes/companion/safety-classifier.test.d.ts +0 -2
- package/dist/modes/companion/safety-classifier.test.d.ts.map +0 -1
- package/dist/modes/companion/safety-classifier.test.js +0 -151
- package/dist/modes/companion/safety-classifier.test.js.map +0 -1
- package/dist/modes/companion/summarizer.d.ts +0 -24
- package/dist/modes/companion/summarizer.d.ts.map +0 -1
- package/dist/modes/companion/summarizer.js +0 -132
- package/dist/modes/companion/summarizer.js.map +0 -1
- package/dist/modes/companion/terminal-history.d.ts +0 -27
- package/dist/modes/companion/terminal-history.d.ts.map +0 -1
- package/dist/modes/companion/terminal-history.js +0 -142
- package/dist/modes/companion/terminal-history.js.map +0 -1
- package/dist/prompts/simple-mentor.md +0 -215
- package/dist/providers/github-copilot/converters.d.ts +0 -45
- package/dist/providers/github-copilot/converters.d.ts.map +0 -1
- package/dist/providers/github-copilot/converters.js +0 -118
- package/dist/providers/github-copilot/converters.js.map +0 -1
- package/dist/providers/github-copilot/converters.test.d.ts +0 -2
- package/dist/providers/github-copilot/converters.test.d.ts.map +0 -1
- package/dist/providers/github-copilot/converters.test.js +0 -162
- package/dist/providers/github-copilot/converters.test.js.map +0 -1
- package/dist/providers/github-copilot/github-copilot.provider.d.ts +0 -2
- package/dist/providers/github-copilot/github-copilot.provider.d.ts.map +0 -1
- package/dist/providers/github-copilot/github-copilot.provider.js +0 -75
- package/dist/providers/github-copilot/github-copilot.provider.js.map +0 -1
- package/dist/providers/github-copilot/github-copilot.provider.test.d.ts +0 -2
- package/dist/providers/github-copilot/github-copilot.provider.test.d.ts.map +0 -1
- package/dist/providers/github-copilot/github-copilot.provider.test.js +0 -26
- package/dist/providers/github-copilot/github-copilot.provider.test.js.map +0 -1
- package/dist/providers/github-copilot/index.d.ts +0 -4
- package/dist/providers/github-copilot/index.d.ts.map +0 -1
- package/dist/providers/github-copilot/index.js +0 -4
- package/dist/providers/github-copilot/index.js.map +0 -1
- package/dist/providers/github-copilot/model.d.ts +0 -24
- package/dist/providers/github-copilot/model.d.ts.map +0 -1
- package/dist/providers/github-copilot/model.delta.test.d.ts +0 -2
- package/dist/providers/github-copilot/model.delta.test.d.ts.map +0 -1
- package/dist/providers/github-copilot/model.delta.test.js +0 -15
- package/dist/providers/github-copilot/model.delta.test.js.map +0 -1
- package/dist/providers/github-copilot/model.js +0 -498
- package/dist/providers/github-copilot/model.js.map +0 -1
- package/dist/providers/github-copilot/model.test.d.ts +0 -2
- package/dist/providers/github-copilot/model.test.d.ts.map +0 -1
- package/dist/providers/github-copilot/model.test.js +0 -63
- package/dist/providers/github-copilot/model.test.js.map +0 -1
- package/dist/providers/github-copilot/provider.d.ts +0 -15
- package/dist/providers/github-copilot/provider.d.ts.map +0 -1
- package/dist/providers/github-copilot/provider.js +0 -25
- package/dist/providers/github-copilot/provider.js.map +0 -1
- package/dist/providers/github-copilot/provider.test.d.ts +0 -2
- package/dist/providers/github-copilot/provider.test.d.ts.map +0 -1
- package/dist/providers/github-copilot/provider.test.js +0 -52
- package/dist/providers/github-copilot/provider.test.js.map +0 -1
- package/dist/providers/github-copilot/utils.d.ts +0 -20
- package/dist/providers/github-copilot/utils.d.ts.map +0 -1
- package/dist/providers/github-copilot/utils.js +0 -142
- package/dist/providers/github-copilot/utils.js.map +0 -1
- package/dist/providers/github-copilot/utils.test.d.ts.map +0 -1
- package/dist/providers/github-copilot/utils.test.js +0 -21
- package/dist/providers/github-copilot/utils.test.js.map +0 -1
- package/dist/safety-checker.js +0 -57
- package/dist/services/check_mock.d.ts +0 -2
- package/dist/services/check_mock.d.ts.map +0 -1
- package/dist/services/check_mock.js +0 -22
- package/dist/services/check_mock.js.map +0 -1
- package/dist/services/conversation-service.test.d.ts +0 -2
- package/dist/services/conversation-service.test.d.ts.map +0 -1
- package/dist/services/conversation-service.test.js +0 -156
- package/dist/services/conversation-service.test.js.map +0 -1
- package/dist/tools/bash.d.ts +0 -10
- package/dist/tools/bash.d.ts.map +0 -1
- package/dist/tools/bash.js +0 -55
- package/dist/tools/bash.js.map +0 -1
- package/dist/utils/command-safety.d.ts +0 -21
- package/dist/utils/command-safety.d.ts.map +0 -1
- package/dist/utils/command-safety.devnull.test.d.ts +0 -2
- package/dist/utils/command-safety.devnull.test.d.ts.map +0 -1
- package/dist/utils/command-safety.devnull.test.js +0 -13
- package/dist/utils/command-safety.devnull.test.js.map +0 -1
- package/dist/utils/command-safety.js +0 -348
- package/dist/utils/command-safety.js.map +0 -1
- package/dist/utils/extract-command-messages.test.d.ts +0 -2
- package/dist/utils/extract-command-messages.test.d.ts.map +0 -1
- package/dist/utils/extract-command-messages.test.js +0 -64
- package/dist/utils/extract-command-messages.test.js.map +0 -1
- /package/dist/{providers/github-copilot → tools}/utils.test.d.ts +0 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { CommandMessage } from '../tools/types.js';
|
|
2
2
|
import type { NormalizedUsage } from '../utils/token-usage.js';
|
|
3
|
-
|
|
3
|
+
import type { ApprovalDescriptor, LLMAdvisory } from '../contracts/conversation.js';
|
|
4
|
+
export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent;
|
|
4
5
|
export interface RetryEvent {
|
|
5
6
|
type: 'retry';
|
|
6
7
|
toolName: string;
|
|
@@ -35,18 +36,22 @@ export interface ToolStartedEvent {
|
|
|
35
36
|
type: 'tool_started';
|
|
36
37
|
toolCallId: string;
|
|
37
38
|
toolName: string;
|
|
38
|
-
arguments:
|
|
39
|
+
arguments: unknown;
|
|
39
40
|
}
|
|
40
41
|
export interface ApprovalRequiredEvent {
|
|
41
42
|
type: 'approval_required';
|
|
42
|
-
approval: {
|
|
43
|
-
|
|
44
|
-
toolName: string;
|
|
45
|
-
argumentsText: string;
|
|
46
|
-
/** Optional provider-specific tool call id (when available). */
|
|
47
|
-
callId?: string;
|
|
43
|
+
approval: Omit<ApprovalDescriptor, 'rawInterruption'> & {
|
|
44
|
+
llmAdvisory?: LLMAdvisory;
|
|
48
45
|
};
|
|
49
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Emitted when token usage information is received during streaming.
|
|
49
|
+
* Allows UI to display token usage in real-time rather than waiting for final response.
|
|
50
|
+
*/
|
|
51
|
+
export interface UsageUpdateEvent {
|
|
52
|
+
type: 'usage_update';
|
|
53
|
+
usage: NormalizedUsage;
|
|
54
|
+
}
|
|
50
55
|
export interface CommandMessageEvent {
|
|
51
56
|
type: 'command_message';
|
|
52
57
|
message: CommandMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEpF,MAAM,MAAM,iBAAiB,GACzB,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,qBAAqB,GACrB,gBAAgB,GAChB,kBAAkB,GAClB,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,GAAG;QACtD,WAAW,CAAC,EAAE,WAAW,CAAC;KAC3B,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,4DAA4D;IAC5D,eAAe,CAAC,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;IACnD,iCAAiC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { ConversationEvent } from './conversation-events.js';
|
|
2
|
+
import type { ConversationTerminal, LLMAdvisory } from '../contracts/conversation.js';
|
|
3
|
+
import type { ILoggingService } from './service-interfaces.js';
|
|
4
|
+
import type { NormalizedUsage } from '../utils/token-usage.js';
|
|
5
|
+
import type { AgentStream } from './agent-stream.js';
|
|
6
|
+
import type { ApprovalFlowCoordinator } from './approval-flow-coordinator.js';
|
|
7
|
+
import type { ShellAutoApprovalResolver } from './shell-auto-approval-resolver.js';
|
|
8
|
+
export type ConversationResult = ConversationTerminal;
|
|
9
|
+
export type BuildResultOutcome = {
|
|
10
|
+
kind: 'response';
|
|
11
|
+
result: Extract<ConversationResult, {
|
|
12
|
+
type: 'response';
|
|
13
|
+
}>;
|
|
14
|
+
} | {
|
|
15
|
+
kind: 'approval_required';
|
|
16
|
+
result: Extract<ConversationResult, {
|
|
17
|
+
type: 'approval_required';
|
|
18
|
+
}>;
|
|
19
|
+
} | {
|
|
20
|
+
kind: 'auto_approve';
|
|
21
|
+
advisory: LLMAdvisory;
|
|
22
|
+
callId: string | undefined;
|
|
23
|
+
argumentsText: string;
|
|
24
|
+
};
|
|
25
|
+
export interface ResultBuilderDeps {
|
|
26
|
+
approvalFlow: ApprovalFlowCoordinator;
|
|
27
|
+
shellAutoApproval: ShellAutoApprovalResolver;
|
|
28
|
+
logger: ILoggingService;
|
|
29
|
+
sessionId: string;
|
|
30
|
+
}
|
|
31
|
+
export interface ResultBuilderInput {
|
|
32
|
+
result: AgentStream;
|
|
33
|
+
finalOutputOverride?: string;
|
|
34
|
+
reasoningOutputOverride?: string;
|
|
35
|
+
emittedCommandIds?: Set<string>;
|
|
36
|
+
usage?: NormalizedUsage;
|
|
37
|
+
toolCallArgumentsById: Map<string, unknown>;
|
|
38
|
+
}
|
|
39
|
+
export declare function buildConversationResult(input: ResultBuilderInput, deps: ResultBuilderDeps): Promise<BuildResultOutcome>;
|
|
40
|
+
export declare const toTerminalEvent: (result: ConversationResult) => ConversationEvent;
|
|
41
|
+
//# sourceMappingURL=conversation-result-builder.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAA;CAAE,GACjG;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,uBAAuB,CAAC;IACtC,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,kBAAkB,CAAC,CAqF7B;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,kBAAkB,KAAG,iBAqB5D,CAAC"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { extractUsage } from '../utils/token-usage.js';
|
|
2
|
+
import { extractCommandMessages } from '../utils/extract-command-messages.js';
|
|
3
|
+
import { asRecord, getCallIdFromObject, getString, getToolInfoFromInterruption } from './interruption-info.js';
|
|
4
|
+
export async function buildConversationResult(input, deps) {
|
|
5
|
+
const { result, finalOutputOverride, reasoningOutputOverride, emittedCommandIds, usage, toolCallArgumentsById } = input;
|
|
6
|
+
const { approvalFlow, shellAutoApproval, logger, sessionId } = deps;
|
|
7
|
+
if (result.interruptions && result.interruptions.length > 0) {
|
|
8
|
+
const interruption = result.interruptions[0];
|
|
9
|
+
const interruptionRecord = asRecord(interruption);
|
|
10
|
+
approvalFlow.recordPending({
|
|
11
|
+
state: result.state,
|
|
12
|
+
interruption,
|
|
13
|
+
emittedCommandIds: emittedCommandIds ?? new Set(),
|
|
14
|
+
toolCallArgumentsById: new Map(toolCallArgumentsById),
|
|
15
|
+
});
|
|
16
|
+
const agent = asRecord(interruptionRecord?.agent);
|
|
17
|
+
const callId = getCallIdFromObject(interruption);
|
|
18
|
+
const { toolName, argumentsText } = getToolInfoFromInterruption(interruption);
|
|
19
|
+
let llmAdvisory;
|
|
20
|
+
if (toolName === 'shell' || toolName === 'bash') {
|
|
21
|
+
llmAdvisory = await shellAutoApproval.resolveAdvisoryForInterruption({
|
|
22
|
+
interruption,
|
|
23
|
+
siblings: result.interruptions || [],
|
|
24
|
+
});
|
|
25
|
+
if (shellAutoApproval.shouldAutoApprove(llmAdvisory)) {
|
|
26
|
+
logger.debug('Shell command auto-approved by LLM', {
|
|
27
|
+
eventType: 'approval.auto_approved',
|
|
28
|
+
category: 'approval',
|
|
29
|
+
phase: 'approval',
|
|
30
|
+
sessionId,
|
|
31
|
+
callId,
|
|
32
|
+
command: argumentsText,
|
|
33
|
+
model: llmAdvisory.model,
|
|
34
|
+
reasoning: llmAdvisory.reasoning,
|
|
35
|
+
});
|
|
36
|
+
return {
|
|
37
|
+
kind: 'auto_approve',
|
|
38
|
+
advisory: llmAdvisory,
|
|
39
|
+
callId,
|
|
40
|
+
argumentsText,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return {
|
|
45
|
+
kind: 'approval_required',
|
|
46
|
+
result: {
|
|
47
|
+
type: 'approval_required',
|
|
48
|
+
approval: {
|
|
49
|
+
agentName: getString(agent, 'name') ?? 'Agent',
|
|
50
|
+
toolName: toolName ?? 'Unknown Tool',
|
|
51
|
+
argumentsText,
|
|
52
|
+
rawInterruption: interruption,
|
|
53
|
+
...(callId ? { callId: String(callId) } : {}),
|
|
54
|
+
llmAdvisory,
|
|
55
|
+
},
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
approvalFlow.clearPending();
|
|
60
|
+
shellAutoApproval.clearCache();
|
|
61
|
+
const allCommandMessages = extractCommandMessages(result.newItems || result.history || []);
|
|
62
|
+
const commandMessages = emittedCommandIds
|
|
63
|
+
? allCommandMessages.filter((msg) => !emittedCommandIds.has(msg.id))
|
|
64
|
+
: allCommandMessages;
|
|
65
|
+
const visibleCommandMessages = commandMessages.filter((msg) => !msg.isApprovalRejection);
|
|
66
|
+
return {
|
|
67
|
+
kind: 'response',
|
|
68
|
+
result: {
|
|
69
|
+
type: 'response',
|
|
70
|
+
commandMessages: visibleCommandMessages,
|
|
71
|
+
finalText: finalOutputOverride ?? result.finalOutput ?? 'Done.',
|
|
72
|
+
reasoningText: reasoningOutputOverride,
|
|
73
|
+
usage: usage ?? extractUsage(result),
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
export const toTerminalEvent = (result) => {
|
|
78
|
+
if (result.type === 'approval_required') {
|
|
79
|
+
return {
|
|
80
|
+
type: 'approval_required',
|
|
81
|
+
approval: {
|
|
82
|
+
agentName: result.approval.agentName,
|
|
83
|
+
toolName: result.approval.toolName,
|
|
84
|
+
argumentsText: result.approval.argumentsText,
|
|
85
|
+
...(result.approval.callId ? { callId: result.approval.callId } : {}),
|
|
86
|
+
...(result.approval.llmAdvisory ? { llmAdvisory: result.approval.llmAdvisory } : {}),
|
|
87
|
+
},
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
return {
|
|
91
|
+
type: 'final',
|
|
92
|
+
finalText: result.finalText,
|
|
93
|
+
...(result.reasoningText ? { reasoningText: result.reasoningText } : {}),
|
|
94
|
+
...(result.commandMessages?.length ? { commandMessages: result.commandMessages } : {}),
|
|
95
|
+
...(result.usage ? { usage: result.usage } : {}),
|
|
96
|
+
};
|
|
97
|
+
};
|
|
98
|
+
//# sourceMappingURL=conversation-result-builder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-result-builder.js","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-result-builder.test.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { buildConversationResult, toTerminalEvent } from './conversation-result-builder.js';
|
|
3
|
+
import { ApprovalFlowCoordinator } from './approval-flow-coordinator.js';
|
|
4
|
+
import { ApprovalState } from './approval-state.js';
|
|
5
|
+
import { ShellAutoApprovalResolver } from './shell-auto-approval-resolver.js';
|
|
6
|
+
import { ConversationStore } from './conversation-store.js';
|
|
7
|
+
import { LoggingService } from './logging-service.js';
|
|
8
|
+
const logger = new LoggingService({ disableLogging: true });
|
|
9
|
+
const makeStream = (extras = {}) => ({
|
|
10
|
+
[Symbol.asyncIterator]: async function* () { },
|
|
11
|
+
completed: Promise.resolve(null),
|
|
12
|
+
...extras,
|
|
13
|
+
});
|
|
14
|
+
const makeDeps = (mode = 'off') => {
|
|
15
|
+
const conversationStore = new ConversationStore();
|
|
16
|
+
const agentClient = { chat: async () => '{"results":[]}' };
|
|
17
|
+
const settingsService = {
|
|
18
|
+
get: (key) => (key === 'shell.autoApproveMode' ? mode : undefined),
|
|
19
|
+
};
|
|
20
|
+
const shellAutoApproval = new ShellAutoApprovalResolver({
|
|
21
|
+
conversationStore,
|
|
22
|
+
agentClient,
|
|
23
|
+
logger,
|
|
24
|
+
settingsService,
|
|
25
|
+
});
|
|
26
|
+
const approvalFlow = new ApprovalFlowCoordinator({
|
|
27
|
+
agentClient,
|
|
28
|
+
approvalState: new ApprovalState(),
|
|
29
|
+
logger,
|
|
30
|
+
sessionId: 's1',
|
|
31
|
+
});
|
|
32
|
+
return { approvalFlow, shellAutoApproval, logger, sessionId: 's1' };
|
|
33
|
+
};
|
|
34
|
+
test('response outcome when stream has no interruptions', async (t) => {
|
|
35
|
+
const stream = makeStream({
|
|
36
|
+
finalOutput: 'Done.',
|
|
37
|
+
history: [],
|
|
38
|
+
newItems: [],
|
|
39
|
+
});
|
|
40
|
+
const outcome = await buildConversationResult({
|
|
41
|
+
result: stream,
|
|
42
|
+
finalOutputOverride: 'Hello',
|
|
43
|
+
toolCallArgumentsById: new Map(),
|
|
44
|
+
emittedCommandIds: new Set(),
|
|
45
|
+
}, makeDeps());
|
|
46
|
+
t.is(outcome.kind, 'response');
|
|
47
|
+
if (outcome.kind === 'response') {
|
|
48
|
+
t.is(outcome.result.finalText, 'Hello');
|
|
49
|
+
t.deepEqual(outcome.result.commandMessages, []);
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
test('approval_required outcome when stream has interruptions', async (t) => {
|
|
53
|
+
const stream = makeStream({
|
|
54
|
+
interruptions: [
|
|
55
|
+
{
|
|
56
|
+
name: 'shell',
|
|
57
|
+
callId: 'c1',
|
|
58
|
+
arguments: { command: 'ls' },
|
|
59
|
+
agent: { name: 'TestAgent' },
|
|
60
|
+
},
|
|
61
|
+
],
|
|
62
|
+
state: { id: 'state-1' },
|
|
63
|
+
});
|
|
64
|
+
const outcome = await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, makeDeps('off'));
|
|
65
|
+
t.is(outcome.kind, 'approval_required');
|
|
66
|
+
if (outcome.kind === 'approval_required') {
|
|
67
|
+
t.is(outcome.result.approval.toolName, 'shell');
|
|
68
|
+
t.is(outcome.result.approval.callId, 'c1');
|
|
69
|
+
t.is(outcome.result.approval.agentName, 'TestAgent');
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
test('auto_approve outcome when LLM advises approval and mode=auto', async (t) => {
|
|
73
|
+
const stream = makeStream({
|
|
74
|
+
interruptions: [
|
|
75
|
+
{
|
|
76
|
+
name: 'shell',
|
|
77
|
+
callId: 'c1',
|
|
78
|
+
arguments: { command: 'ls' },
|
|
79
|
+
},
|
|
80
|
+
],
|
|
81
|
+
state: {},
|
|
82
|
+
});
|
|
83
|
+
const conversationStore = new ConversationStore();
|
|
84
|
+
const agentClient = {
|
|
85
|
+
chat: async () => '{"results":[{"id":"c1","reasoning":"safe","approved":true}]}',
|
|
86
|
+
};
|
|
87
|
+
const settingsService = {
|
|
88
|
+
get: (key) => (key === 'shell.autoApproveMode' ? 'auto' : undefined),
|
|
89
|
+
};
|
|
90
|
+
const shellAutoApproval = new ShellAutoApprovalResolver({
|
|
91
|
+
conversationStore,
|
|
92
|
+
agentClient,
|
|
93
|
+
logger,
|
|
94
|
+
settingsService,
|
|
95
|
+
});
|
|
96
|
+
const approvalFlow = new ApprovalFlowCoordinator({
|
|
97
|
+
agentClient,
|
|
98
|
+
approvalState: new ApprovalState(),
|
|
99
|
+
logger,
|
|
100
|
+
sessionId: 's1',
|
|
101
|
+
});
|
|
102
|
+
const outcome = await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, { approvalFlow, shellAutoApproval, logger, sessionId: 's1' });
|
|
103
|
+
t.is(outcome.kind, 'auto_approve');
|
|
104
|
+
if (outcome.kind === 'auto_approve') {
|
|
105
|
+
t.is(outcome.callId, 'c1');
|
|
106
|
+
t.is(outcome.argumentsText, 'ls');
|
|
107
|
+
t.is(outcome.advisory.approved, true);
|
|
108
|
+
}
|
|
109
|
+
});
|
|
110
|
+
test('command messages dedup against emittedCommandIds', async (t) => {
|
|
111
|
+
const stream = makeStream({
|
|
112
|
+
history: [
|
|
113
|
+
{ type: 'function_call_output', call_id: 'a', output: '{"text":"x","metadata":{"messageId":"m-a"}}' },
|
|
114
|
+
{ type: 'function_call_output', call_id: 'b', output: '{"text":"y","metadata":{"messageId":"m-b"}}' },
|
|
115
|
+
],
|
|
116
|
+
});
|
|
117
|
+
const outcome = await buildConversationResult({
|
|
118
|
+
result: stream,
|
|
119
|
+
emittedCommandIds: new Set(['m-a']),
|
|
120
|
+
toolCallArgumentsById: new Map(),
|
|
121
|
+
}, makeDeps());
|
|
122
|
+
t.is(outcome.kind, 'response');
|
|
123
|
+
if (outcome.kind === 'response') {
|
|
124
|
+
const ids = (outcome.result.commandMessages ?? []).map((m) => m.id);
|
|
125
|
+
t.false(ids.includes('m-a'));
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
test('toTerminalEvent shapes response into final event', (t) => {
|
|
129
|
+
const event = toTerminalEvent({
|
|
130
|
+
type: 'response',
|
|
131
|
+
commandMessages: [],
|
|
132
|
+
finalText: 'Done',
|
|
133
|
+
});
|
|
134
|
+
t.is(event.type, 'final');
|
|
135
|
+
if (event.type === 'final') {
|
|
136
|
+
t.is(event.finalText, 'Done');
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
test('toTerminalEvent shapes approval_required with optional fields', (t) => {
|
|
140
|
+
const event = toTerminalEvent({
|
|
141
|
+
type: 'approval_required',
|
|
142
|
+
approval: {
|
|
143
|
+
agentName: 'A',
|
|
144
|
+
toolName: 'shell',
|
|
145
|
+
argumentsText: 'ls',
|
|
146
|
+
callId: 'c1',
|
|
147
|
+
rawInterruption: { name: 'shell' },
|
|
148
|
+
},
|
|
149
|
+
});
|
|
150
|
+
t.is(event.type, 'approval_required');
|
|
151
|
+
if (event.type === 'approval_required') {
|
|
152
|
+
t.is(event.approval.callId, 'c1');
|
|
153
|
+
t.is(event.approval.toolName, 'shell');
|
|
154
|
+
}
|
|
155
|
+
});
|
|
156
|
+
//# sourceMappingURL=conversation-result-builder.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-result-builder.test.js","sourceRoot":"","sources":["../../source/services/conversation-result-builder.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export declare const MAX_HALLUCINATION_RETRIES = 2;
|
|
2
|
+
export declare const isRecoverableModelError: (error: unknown) => boolean;
|
|
3
|
+
export type RetryType = 'hallucination' | 'parsing_error' | 'behavior';
|
|
4
|
+
export interface RetryEventPayload {
|
|
5
|
+
type: 'retry';
|
|
6
|
+
toolName: string;
|
|
7
|
+
attempt: number;
|
|
8
|
+
maxRetries: number;
|
|
9
|
+
errorMessage: string;
|
|
10
|
+
}
|
|
11
|
+
export interface RetryLogPayload {
|
|
12
|
+
toolName: string;
|
|
13
|
+
retryType: RetryType;
|
|
14
|
+
attempt: number;
|
|
15
|
+
maxRetries: number;
|
|
16
|
+
errorMessage: string;
|
|
17
|
+
}
|
|
18
|
+
export type RetryDecision = {
|
|
19
|
+
kind: 'no_retry';
|
|
20
|
+
} | {
|
|
21
|
+
kind: 'retry';
|
|
22
|
+
message: string;
|
|
23
|
+
retryEvent: RetryEventPayload;
|
|
24
|
+
logPayload: RetryLogPayload;
|
|
25
|
+
attempt: number;
|
|
26
|
+
/** If true, caller should update conversation store from the existing stream and may inject error context. */
|
|
27
|
+
hadStream: boolean;
|
|
28
|
+
/** True when stream produced no usable history; caller should inject error-context message. */
|
|
29
|
+
shouldInjectErrorContext: boolean;
|
|
30
|
+
errorContextMessage: string;
|
|
31
|
+
nextRunOptions: {
|
|
32
|
+
hallucinationRetryCount: number;
|
|
33
|
+
skipUserMessage: boolean;
|
|
34
|
+
};
|
|
35
|
+
};
|
|
36
|
+
export declare const decideRetry: (error: unknown, attemptCount: number, hadStream: boolean, streamHistoryLength: number) => RetryDecision;
|
|
37
|
+
//# sourceMappingURL=conversation-retry-policy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-retry-policy.d.ts","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,eAAO,MAAM,uBAAuB,GAAI,OAAO,OAAO,KAAG,OAYxD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,eAAe,GAAG,UAAU,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,8GAA8G;IAC9G,SAAS,EAAE,OAAO,CAAC;IACnB,+FAA+F;IAC/F,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE;QAAE,uBAAuB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,OAAO,CAAA;KAAE,CAAC;CAC/E,CAAC;AAEN,eAAO,MAAM,WAAW,GACtB,OAAO,OAAO,EACd,cAAc,MAAM,EACpB,WAAW,OAAO,EAClB,qBAAqB,MAAM,KAC1B,aAuCF,CAAC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { ModelBehaviorError } from '@openai/agents';
|
|
2
|
+
export const MAX_HALLUCINATION_RETRIES = 2;
|
|
3
|
+
export const isRecoverableModelError = (error) => {
|
|
4
|
+
if (!(error instanceof ModelBehaviorError)) {
|
|
5
|
+
return false;
|
|
6
|
+
}
|
|
7
|
+
const message = error.message.toLowerCase();
|
|
8
|
+
return ((message.includes('tool') && message.includes('not found')) ||
|
|
9
|
+
message.includes('model did not produce a final response') ||
|
|
10
|
+
message.includes('parsing tool arguments') ||
|
|
11
|
+
message.includes('valid json'));
|
|
12
|
+
};
|
|
13
|
+
export const decideRetry = (error, attemptCount, hadStream, streamHistoryLength) => {
|
|
14
|
+
if (!isRecoverableModelError(error) || attemptCount >= MAX_HALLUCINATION_RETRIES) {
|
|
15
|
+
return { kind: 'no_retry' };
|
|
16
|
+
}
|
|
17
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
18
|
+
const lower = message.toLowerCase();
|
|
19
|
+
const isHallucination = lower.includes('not found');
|
|
20
|
+
const isParsingError = lower.includes('parsing tool arguments') || lower.includes('valid json');
|
|
21
|
+
const toolName = isHallucination ? message.match(/Tool (\S+) not found/)?.[1] || 'unknown' : 'unknown';
|
|
22
|
+
const retryType = isHallucination ? 'hallucination' : isParsingError ? 'parsing_error' : 'behavior';
|
|
23
|
+
const attempt = attemptCount + 1;
|
|
24
|
+
return {
|
|
25
|
+
kind: 'retry',
|
|
26
|
+
message,
|
|
27
|
+
retryEvent: {
|
|
28
|
+
type: 'retry',
|
|
29
|
+
toolName: isHallucination ? toolName : 'model',
|
|
30
|
+
attempt,
|
|
31
|
+
maxRetries: MAX_HALLUCINATION_RETRIES,
|
|
32
|
+
errorMessage: message,
|
|
33
|
+
},
|
|
34
|
+
logPayload: {
|
|
35
|
+
toolName,
|
|
36
|
+
retryType,
|
|
37
|
+
attempt,
|
|
38
|
+
maxRetries: MAX_HALLUCINATION_RETRIES,
|
|
39
|
+
errorMessage: message,
|
|
40
|
+
},
|
|
41
|
+
attempt,
|
|
42
|
+
hadStream,
|
|
43
|
+
shouldInjectErrorContext: hadStream && streamHistoryLength === 0,
|
|
44
|
+
errorContextMessage: `[System: Previous attempt failed with error: ${message}. Please retry with corrected output.]`,
|
|
45
|
+
nextRunOptions: {
|
|
46
|
+
hallucinationRetryCount: attempt,
|
|
47
|
+
skipUserMessage: hadStream,
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=conversation-retry-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-retry-policy.js","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAE3C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAW,EAAE;IACjE,IAAI,CAAC,CAAC,KAAK,YAAY,kBAAkB,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,CACL,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC3D,OAAO,CAAC,QAAQ,CAAC,wCAAwC,CAAC;QAC1D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC;QAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC/B,CAAC;AACJ,CAAC,CAAC;AAoCF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,KAAc,EACd,YAAoB,EACpB,SAAkB,EAClB,mBAA2B,EACZ,EAAE;IACjB,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,yBAAyB,EAAE,CAAC;QACjF,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC,wBAAwB,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChG,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,MAAM,SAAS,GAAc,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC;IAC/G,MAAM,OAAO,GAAG,YAAY,GAAG,CAAC,CAAC;IAEjC,OAAO;QACL,IAAI,EAAE,OAAO;QACb,OAAO;QACP,UAAU,EAAE;YACV,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO;YAC9C,OAAO;YACP,UAAU,EAAE,yBAAyB;YACrC,YAAY,EAAE,OAAO;SACtB;QACD,UAAU,EAAE;YACV,QAAQ;YACR,SAAS;YACT,OAAO;YACP,UAAU,EAAE,yBAAyB;YACrC,YAAY,EAAE,OAAO;SACtB;QACD,OAAO;QACP,SAAS;QACT,wBAAwB,EAAE,SAAS,IAAI,mBAAmB,KAAK,CAAC;QAChE,mBAAmB,EAAE,gDAAgD,OAAO,wCAAwC;QACpH,cAAc,EAAE;YACd,uBAAuB,EAAE,OAAO;YAChC,eAAe,EAAE,SAAS;SAC3B;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-retry-policy.test.d.ts","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { ModelBehaviorError } from '@openai/agents';
|
|
3
|
+
import { decideRetry, isRecoverableModelError, MAX_HALLUCINATION_RETRIES } from './conversation-retry-policy.js';
|
|
4
|
+
test('isRecoverableModelError: non-ModelBehaviorError returns false', (t) => {
|
|
5
|
+
t.false(isRecoverableModelError(new Error('boom')));
|
|
6
|
+
t.false(isRecoverableModelError('boom'));
|
|
7
|
+
t.false(isRecoverableModelError(null));
|
|
8
|
+
});
|
|
9
|
+
test('isRecoverableModelError: hallucination message returns true', (t) => {
|
|
10
|
+
t.true(isRecoverableModelError(new ModelBehaviorError('Tool fake_tool not found')));
|
|
11
|
+
});
|
|
12
|
+
test('isRecoverableModelError: parsing tool arguments returns true', (t) => {
|
|
13
|
+
t.true(isRecoverableModelError(new ModelBehaviorError('Error parsing tool arguments')));
|
|
14
|
+
});
|
|
15
|
+
test('isRecoverableModelError: valid json returns true', (t) => {
|
|
16
|
+
t.true(isRecoverableModelError(new ModelBehaviorError('arguments must be valid json')));
|
|
17
|
+
});
|
|
18
|
+
test('isRecoverableModelError: model did not produce a final response returns true', (t) => {
|
|
19
|
+
t.true(isRecoverableModelError(new ModelBehaviorError('Model did not produce a final response')));
|
|
20
|
+
});
|
|
21
|
+
test('isRecoverableModelError: unrelated ModelBehaviorError returns false', (t) => {
|
|
22
|
+
t.false(isRecoverableModelError(new ModelBehaviorError('something else')));
|
|
23
|
+
});
|
|
24
|
+
test('decideRetry: non-recoverable error returns no_retry', (t) => {
|
|
25
|
+
const decision = decideRetry(new Error('boom'), 0, true, 0);
|
|
26
|
+
t.is(decision.kind, 'no_retry');
|
|
27
|
+
});
|
|
28
|
+
test('decideRetry: at MAX attempts returns no_retry', (t) => {
|
|
29
|
+
const decision = decideRetry(new ModelBehaviorError('Tool x not found'), MAX_HALLUCINATION_RETRIES, true, 0);
|
|
30
|
+
t.is(decision.kind, 'no_retry');
|
|
31
|
+
});
|
|
32
|
+
test('decideRetry: hallucination at attempt 0 returns retry with tool name extracted', (t) => {
|
|
33
|
+
const decision = decideRetry(new ModelBehaviorError('Tool fake_tool not found'), 0, true, 5);
|
|
34
|
+
t.is(decision.kind, 'retry');
|
|
35
|
+
if (decision.kind !== 'retry')
|
|
36
|
+
return;
|
|
37
|
+
t.is(decision.retryEvent.toolName, 'fake_tool');
|
|
38
|
+
t.is(decision.retryEvent.attempt, 1);
|
|
39
|
+
t.is(decision.logPayload.retryType, 'hallucination');
|
|
40
|
+
t.is(decision.logPayload.toolName, 'fake_tool');
|
|
41
|
+
t.true(decision.hadStream);
|
|
42
|
+
t.false(decision.shouldInjectErrorContext);
|
|
43
|
+
t.deepEqual(decision.nextRunOptions, { hallucinationRetryCount: 1, skipUserMessage: true });
|
|
44
|
+
});
|
|
45
|
+
test('decideRetry: parsing error returns retry with toolName=model and parsing_error type', (t) => {
|
|
46
|
+
const decision = decideRetry(new ModelBehaviorError('Error parsing tool arguments'), 0, true, 0);
|
|
47
|
+
t.is(decision.kind, 'retry');
|
|
48
|
+
if (decision.kind !== 'retry')
|
|
49
|
+
return;
|
|
50
|
+
t.is(decision.retryEvent.toolName, 'model');
|
|
51
|
+
t.is(decision.logPayload.retryType, 'parsing_error');
|
|
52
|
+
t.is(decision.logPayload.toolName, 'unknown');
|
|
53
|
+
});
|
|
54
|
+
test('decideRetry: behavior (model did not produce) returns retry with behavior type', (t) => {
|
|
55
|
+
const decision = decideRetry(new ModelBehaviorError('Model did not produce a final response'), 1, true, 3);
|
|
56
|
+
t.is(decision.kind, 'retry');
|
|
57
|
+
if (decision.kind !== 'retry')
|
|
58
|
+
return;
|
|
59
|
+
t.is(decision.logPayload.retryType, 'behavior');
|
|
60
|
+
t.is(decision.attempt, 2);
|
|
61
|
+
});
|
|
62
|
+
test('decideRetry: with stream and empty history sets shouldInjectErrorContext', (t) => {
|
|
63
|
+
const decision = decideRetry(new ModelBehaviorError('Tool x not found'), 0, true, 0);
|
|
64
|
+
t.is(decision.kind, 'retry');
|
|
65
|
+
if (decision.kind !== 'retry')
|
|
66
|
+
return;
|
|
67
|
+
t.true(decision.shouldInjectErrorContext);
|
|
68
|
+
t.true(decision.errorContextMessage.includes('Previous attempt failed'));
|
|
69
|
+
});
|
|
70
|
+
test('decideRetry: without stream returns retry with skipUserMessage=false', (t) => {
|
|
71
|
+
const decision = decideRetry(new ModelBehaviorError('Tool x not found'), 0, false, 0);
|
|
72
|
+
t.is(decision.kind, 'retry');
|
|
73
|
+
if (decision.kind !== 'retry')
|
|
74
|
+
return;
|
|
75
|
+
t.false(decision.hadStream);
|
|
76
|
+
t.false(decision.shouldInjectErrorContext);
|
|
77
|
+
t.deepEqual(decision.nextRunOptions, { hallucinationRetryCount: 1, skipUserMessage: false });
|
|
78
|
+
});
|
|
79
|
+
//# sourceMappingURL=conversation-retry-policy.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-retry-policy.test.js","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { OpenAIAgentClient } from '../lib/openai-agent-client.js';
|
|
2
|
-
import type { ILoggingService } from './service-interfaces.js';
|
|
2
|
+
import type { ILoggingService, ISettingsService } from './service-interfaces.js';
|
|
3
3
|
import { ConversationSession } from './conversation-session.js';
|
|
4
|
-
|
|
4
|
+
import type { ConversationTerminal, ReasoningEffortSetting } from '../contracts/conversation.js';
|
|
5
|
+
export type { ConversationTerminal, ApprovalDescriptor, PendingApproval } from '../contracts/conversation.js';
|
|
6
|
+
export type { CommandMessage } from './conversation-session.js';
|
|
5
7
|
/**
|
|
6
8
|
* Backward-compatible facade for the CLI.
|
|
7
9
|
*
|
|
@@ -13,19 +15,20 @@ export declare class ConversationService {
|
|
|
13
15
|
agentClient: OpenAIAgentClient;
|
|
14
16
|
deps: {
|
|
15
17
|
logger: ILoggingService;
|
|
18
|
+
settingsService?: ISettingsService;
|
|
16
19
|
};
|
|
17
20
|
sessionId?: string;
|
|
18
21
|
});
|
|
19
22
|
get sessionId(): string;
|
|
20
23
|
reset(): void;
|
|
21
24
|
setModel(model: string): void;
|
|
22
|
-
setReasoningEffort(effort:
|
|
23
|
-
setTemperature(temperature
|
|
25
|
+
setReasoningEffort(effort: ReasoningEffortSetting): void;
|
|
26
|
+
setTemperature(temperature?: number): void;
|
|
24
27
|
setProvider(provider: string): void;
|
|
25
28
|
setRetryCallback(callback: () => void): void;
|
|
26
29
|
addShellContext(historyText: string): void;
|
|
27
30
|
abort(): void;
|
|
28
|
-
sendMessage(...args: Parameters<ConversationSession['sendMessage']>): Promise<
|
|
29
|
-
handleApprovalDecision(...args: Parameters<ConversationSession['handleApprovalDecision']>): Promise<
|
|
31
|
+
sendMessage(...args: Parameters<ConversationSession['sendMessage']>): Promise<ConversationTerminal>;
|
|
32
|
+
handleApprovalDecision(...args: Parameters<ConversationSession['handleApprovalDecision']>): Promise<ConversationTerminal | null>;
|
|
30
33
|
}
|
|
31
34
|
//# sourceMappingURL=conversation-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjG,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC9G,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;GAIG;AACH,qBAAa,mBAAmB;;gBAGlB,EACV,WAAW,EACX,IAAI,EACJ,SAAqB,GACtB,EAAE;QACD,WAAW,EAAE,iBAAiB,CAAC;QAC/B,IAAI,EAAE;YAAE,MAAM,EAAE,eAAe,CAAC;YAAC,eAAe,CAAC,EAAE,gBAAgB,CAAA;SAAE,CAAC;QACtE,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IAID,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,KAAK,IAAI,IAAI;IAIb,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAIxD,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAI1C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI1C,KAAK,IAAI,IAAI;IAIb,WAAW,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAInG,sBAAsB,CACpB,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC,GACjE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAGxC"}
|
|
@@ -22,7 +22,7 @@ export class ConversationService {
|
|
|
22
22
|
this.#session.setReasoningEffort(effort);
|
|
23
23
|
}
|
|
24
24
|
setTemperature(temperature) {
|
|
25
|
-
this.#session.setTemperature
|
|
25
|
+
this.#session.setTemperature(temperature);
|
|
26
26
|
}
|
|
27
27
|
setProvider(provider) {
|
|
28
28
|
this.#session.setProvider(provider);
|