@seawork/server 1.0.22 → 2.0.2
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 +4 -0
- package/dist/scripts/supervisor-entrypoint.js +48 -8
- package/dist/scripts/supervisor-entrypoint.js.map +1 -1
- package/dist/scripts/supervisor-native-classifier.js +77 -5
- package/dist/scripts/supervisor-native-classifier.js.map +1 -1
- package/dist/scripts/supervisor-stdio-tail.js +27 -0
- package/dist/scripts/supervisor-stdio-tail.js.map +1 -0
- package/dist/scripts/supervisor.js +12 -0
- package/dist/scripts/supervisor.js.map +1 -1
- package/dist/server/client/daemon-client.d.ts +142 -2
- package/dist/server/client/daemon-client.d.ts.map +1 -1
- package/dist/server/client/daemon-client.js +384 -3
- package/dist/server/client/daemon-client.js.map +1 -1
- package/dist/server/server/agent/agent-manager.d.ts +55 -3
- package/dist/server/server/agent/agent-manager.d.ts.map +1 -1
- package/dist/server/server/agent/agent-manager.js +325 -45
- package/dist/server/server/agent/agent-manager.js.map +1 -1
- package/dist/server/server/agent/agent-metadata-generator.d.ts +1 -0
- package/dist/server/server/agent/agent-metadata-generator.d.ts.map +1 -1
- package/dist/server/server/agent/agent-metadata-generator.js +8 -0
- package/dist/server/server/agent/agent-metadata-generator.js.map +1 -1
- package/dist/server/server/agent/agent-projections.js +7 -2
- package/dist/server/server/agent/agent-projections.js.map +1 -1
- package/dist/server/server/agent/agent-response-loop.d.ts +3 -1
- package/dist/server/server/agent/agent-response-loop.d.ts.map +1 -1
- package/dist/server/server/agent/agent-response-loop.js +33 -6
- package/dist/server/server/agent/agent-response-loop.js.map +1 -1
- package/dist/server/server/agent/agent-sdk-types.d.ts +43 -1
- package/dist/server/server/agent/agent-sdk-types.d.ts.map +1 -1
- package/dist/server/server/agent/agent-storage.d.ts +48 -48
- package/dist/server/server/agent/claude-memory.d.ts +4 -0
- package/dist/server/server/agent/claude-memory.d.ts.map +1 -0
- package/dist/server/server/agent/claude-memory.js +97 -0
- package/dist/server/server/agent/claude-memory.js.map +1 -0
- package/dist/server/server/agent/gateway-auth-env.d.ts +4 -0
- package/dist/server/server/agent/gateway-auth-env.d.ts.map +1 -0
- package/dist/server/server/agent/gateway-auth-env.js +31 -0
- package/dist/server/server/agent/gateway-auth-env.js.map +1 -0
- package/dist/server/server/agent/mcp-server.d.ts.map +1 -1
- package/dist/server/server/agent/mcp-server.js +247 -0
- package/dist/server/server/agent/mcp-server.js.map +1 -1
- package/dist/server/server/agent/mcp-shared.d.ts +25 -23
- package/dist/server/server/agent/mcp-shared.d.ts.map +1 -1
- package/dist/server/server/agent/orchestrator.d.ts +1 -1
- package/dist/server/server/agent/orchestrator.d.ts.map +1 -1
- package/dist/server/server/agent/orchestrator.js +1 -1
- package/dist/server/server/agent/orchestrator.js.map +1 -1
- package/dist/server/server/agent/provider-launch-config.d.ts +6 -139
- package/dist/server/server/agent/provider-launch-config.d.ts.map +1 -1
- package/dist/server/server/agent/provider-launch-config.js +65 -33
- package/dist/server/server/agent/provider-launch-config.js.map +1 -1
- package/dist/server/server/agent/provider-manifest.d.ts +1 -0
- package/dist/server/server/agent/provider-manifest.d.ts.map +1 -1
- package/dist/server/server/agent/provider-manifest.js +36 -0
- package/dist/server/server/agent/provider-manifest.js.map +1 -1
- package/dist/server/server/agent/provider-registry.d.ts.map +1 -1
- package/dist/server/server/agent/provider-registry.js +4 -0
- package/dist/server/server/agent/provider-registry.js.map +1 -1
- package/dist/server/server/agent/provider-snapshot-manager.d.ts +3 -1
- package/dist/server/server/agent/provider-snapshot-manager.d.ts.map +1 -1
- package/dist/server/server/agent/provider-snapshot-manager.js +13 -0
- package/dist/server/server/agent/provider-snapshot-manager.js.map +1 -1
- package/dist/server/server/agent/providers/claude/sidechain-tracker.d.ts.map +1 -1
- package/dist/server/server/agent/providers/claude/sidechain-tracker.js.map +1 -1
- package/dist/server/server/agent/providers/claude/task-notification-tool-call.d.ts +2 -2
- package/dist/server/server/agent/providers/claude-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/claude-agent.js +141 -27
- package/dist/server/server/agent/providers/claude-agent.js.map +1 -1
- package/dist/server/server/agent/providers/codex/tool-call-mapper.d.ts.map +1 -1
- package/dist/server/server/agent/providers/codex/tool-call-mapper.js +14 -1
- package/dist/server/server/agent/providers/codex/tool-call-mapper.js.map +1 -1
- package/dist/server/server/agent/providers/codex-app-server-agent.d.ts +132 -4
- package/dist/server/server/agent/providers/codex-app-server-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/codex-app-server-agent.js +2294 -163
- package/dist/server/server/agent/providers/codex-app-server-agent.js.map +1 -1
- package/dist/server/server/agent/providers/codex-binary-resolver.d.ts +9 -0
- package/dist/server/server/agent/providers/codex-binary-resolver.d.ts.map +1 -1
- package/dist/server/server/agent/providers/codex-binary-resolver.js +35 -14
- package/dist/server/server/agent/providers/codex-binary-resolver.js.map +1 -1
- package/dist/server/server/agent/providers/codex-health-probe.js +1 -1
- package/dist/server/server/agent/providers/codex-health-probe.js.map +1 -1
- package/dist/server/server/agent/providers/deepseek/constants.d.ts +4 -0
- package/dist/server/server/agent/providers/deepseek/constants.d.ts.map +1 -0
- package/dist/server/server/agent/providers/deepseek/constants.js +11 -0
- package/dist/server/server/agent/providers/deepseek/constants.js.map +1 -0
- package/dist/server/server/agent/providers/deepseek/event-mapper.d.ts +21 -0
- package/dist/server/server/agent/providers/deepseek/event-mapper.d.ts.map +1 -0
- package/dist/server/server/agent/providers/deepseek/event-mapper.js +286 -0
- package/dist/server/server/agent/providers/deepseek/event-mapper.js.map +1 -0
- package/dist/server/server/agent/providers/deepseek/serve-client.d.ts +94 -0
- package/dist/server/server/agent/providers/deepseek/serve-client.d.ts.map +1 -0
- package/dist/server/server/agent/providers/deepseek/serve-client.js +142 -0
- package/dist/server/server/agent/providers/deepseek/serve-client.js.map +1 -0
- package/dist/server/server/agent/providers/deepseek/serve-process.d.ts +18 -0
- package/dist/server/server/agent/providers/deepseek/serve-process.d.ts.map +1 -0
- package/dist/server/server/agent/providers/deepseek/serve-process.js +93 -0
- package/dist/server/server/agent/providers/deepseek/serve-process.js.map +1 -0
- package/dist/server/server/agent/providers/deepseek-agent.d.ts +94 -0
- package/dist/server/server/agent/providers/deepseek-agent.d.ts.map +1 -0
- package/dist/server/server/agent/providers/deepseek-agent.js +813 -0
- package/dist/server/server/agent/providers/deepseek-agent.js.map +1 -0
- package/dist/server/server/agent/providers/gateway-telemetry.d.ts +9 -0
- package/dist/server/server/agent/providers/gateway-telemetry.d.ts.map +1 -0
- package/dist/server/server/agent/providers/gateway-telemetry.js +36 -0
- package/dist/server/server/agent/providers/gateway-telemetry.js.map +1 -0
- package/dist/server/server/agent/providers/seaagent/constants.d.ts +3 -0
- package/dist/server/server/agent/providers/seaagent/constants.d.ts.map +1 -0
- package/dist/server/server/agent/providers/seaagent/constants.js +3 -0
- package/dist/server/server/agent/providers/seaagent/constants.js.map +1 -0
- package/dist/server/server/agent/providers/seaagent/event-mapper.d.ts +3 -0
- package/dist/server/server/agent/providers/seaagent/event-mapper.d.ts.map +1 -0
- package/dist/server/server/agent/providers/seaagent/event-mapper.js +69 -0
- package/dist/server/server/agent/providers/seaagent/event-mapper.js.map +1 -0
- package/dist/server/server/agent/providers/seaagent/rpc-client.d.ts +23 -0
- package/dist/server/server/agent/providers/seaagent/rpc-client.d.ts.map +1 -0
- package/dist/server/server/agent/providers/seaagent/rpc-client.js +139 -0
- package/dist/server/server/agent/providers/seaagent/rpc-client.js.map +1 -0
- package/dist/server/server/agent/providers/seaagent/tool-call-mapper.d.ts +3 -0
- package/dist/server/server/agent/providers/seaagent/tool-call-mapper.d.ts.map +1 -0
- package/dist/server/server/agent/providers/seaagent/tool-call-mapper.js +38 -0
- package/dist/server/server/agent/providers/seaagent/tool-call-mapper.js.map +1 -0
- package/dist/server/server/agent/providers/seaagent-agent.d.ts +81 -0
- package/dist/server/server/agent/providers/seaagent-agent.d.ts.map +1 -0
- package/dist/server/server/agent/providers/seaagent-agent.js +502 -0
- package/dist/server/server/agent/providers/seaagent-agent.js.map +1 -0
- package/dist/server/server/agent/providers/seaagent-binary-resolver.d.ts +18 -0
- package/dist/server/server/agent/providers/seaagent-binary-resolver.d.ts.map +1 -0
- package/dist/server/server/agent/providers/seaagent-binary-resolver.js +46 -0
- package/dist/server/server/agent/providers/seaagent-binary-resolver.js.map +1 -0
- package/dist/server/server/agent/providers/seaagent-health-probe.d.ts +11 -0
- package/dist/server/server/agent/providers/seaagent-health-probe.d.ts.map +1 -0
- package/dist/server/server/agent/providers/seaagent-health-probe.js +49 -0
- package/dist/server/server/agent/providers/seaagent-health-probe.js.map +1 -0
- package/dist/server/server/agent/providers/seawork-models.d.ts +8 -0
- package/dist/server/server/agent/providers/seawork-models.d.ts.map +1 -1
- package/dist/server/server/agent/providers/seawork-models.js +118 -74
- package/dist/server/server/agent/providers/seawork-models.js.map +1 -1
- package/dist/server/server/agent/providers/tool-call-detail-primitives.d.ts +16 -16
- package/dist/server/server/agent/timeline-projection.d.ts +5 -1
- package/dist/server/server/agent/timeline-projection.d.ts.map +1 -1
- package/dist/server/server/agent/timeline-projection.js +20 -4
- package/dist/server/server/agent/timeline-projection.js.map +1 -1
- package/dist/server/server/agent-attention-policy.d.ts +1 -0
- package/dist/server/server/agent-attention-policy.d.ts.map +1 -1
- package/dist/server/server/agent-attention-policy.js +6 -0
- package/dist/server/server/agent-attention-policy.js.map +1 -1
- package/dist/server/server/allowed-hosts.d.ts +13 -0
- package/dist/server/server/allowed-hosts.d.ts.map +1 -1
- package/dist/server/server/allowed-hosts.js +33 -0
- package/dist/server/server/allowed-hosts.js.map +1 -1
- package/dist/server/server/bootstrap.d.ts +2 -0
- package/dist/server/server/bootstrap.d.ts.map +1 -1
- package/dist/server/server/bootstrap.js +200 -14
- package/dist/server/server/bootstrap.js.map +1 -1
- package/dist/server/server/browser-extension-token.d.ts +23 -0
- package/dist/server/server/browser-extension-token.d.ts.map +1 -0
- package/dist/server/server/browser-extension-token.js +114 -0
- package/dist/server/server/browser-extension-token.js.map +1 -0
- package/dist/server/server/bug-report-handler.d.ts +7 -1
- package/dist/server/server/bug-report-handler.d.ts.map +1 -1
- package/dist/server/server/bug-report-handler.js +73 -5
- package/dist/server/server/bug-report-handler.js.map +1 -1
- package/dist/server/server/bug-report-redact.d.ts +25 -1
- package/dist/server/server/bug-report-redact.d.ts.map +1 -1
- package/dist/server/server/bug-report-redact.js +42 -5
- package/dist/server/server/bug-report-redact.js.map +1 -1
- package/dist/server/server/chat/chat-rpc-schemas.d.ts +50 -50
- package/dist/server/server/chat/chat-types.d.ts +6 -6
- package/dist/server/server/config.d.ts +1 -0
- package/dist/server/server/config.d.ts.map +1 -1
- package/dist/server/server/config.js +51 -1
- package/dist/server/server/config.js.map +1 -1
- package/dist/server/server/crash-report.d.ts.map +1 -1
- package/dist/server/server/crash-report.js +18 -0
- package/dist/server/server/crash-report.js.map +1 -1
- package/dist/server/server/daemon-config-store.d.ts.map +1 -1
- package/dist/server/server/daemon-config-store.js +94 -3
- package/dist/server/server/daemon-config-store.js.map +1 -1
- package/dist/server/server/disk-full.d.ts +4 -0
- package/dist/server/server/disk-full.d.ts.map +1 -0
- package/dist/server/server/disk-full.js +46 -0
- package/dist/server/server/disk-full.js.map +1 -0
- package/dist/server/server/exports.d.ts +4 -3
- package/dist/server/server/exports.d.ts.map +1 -1
- package/dist/server/server/exports.js +3 -2
- package/dist/server/server/exports.js.map +1 -1
- package/dist/server/server/git-forge/github-client.d.ts +18 -0
- package/dist/server/server/git-forge/github-client.d.ts.map +1 -1
- package/dist/server/server/git-forge/github-client.js +88 -0
- package/dist/server/server/git-forge/github-client.js.map +1 -1
- package/dist/server/server/git-forge/parse-remote.d.ts +2 -0
- package/dist/server/server/git-forge/parse-remote.d.ts.map +1 -1
- package/dist/server/server/git-forge/parse-remote.js +71 -6
- package/dist/server/server/git-forge/parse-remote.js.map +1 -1
- package/dist/server/server/git-forge/service.d.ts +87 -0
- package/dist/server/server/git-forge/service.d.ts.map +1 -1
- package/dist/server/server/git-forge/service.js +198 -4
- package/dist/server/server/git-forge/service.js.map +1 -1
- package/dist/server/server/index.js +77 -0
- package/dist/server/server/index.js.map +1 -1
- package/dist/server/server/integrations/wecom-openclaw/bridge.d.ts +88 -0
- package/dist/server/server/integrations/wecom-openclaw/bridge.d.ts.map +1 -0
- package/dist/server/server/integrations/wecom-openclaw/bridge.js +1229 -0
- package/dist/server/server/integrations/wecom-openclaw/bridge.js.map +1 -0
- package/dist/server/server/integrations/wecom-openclaw/qr.d.ts +38 -0
- package/dist/server/server/integrations/wecom-openclaw/qr.d.ts.map +1 -0
- package/dist/server/server/integrations/wecom-openclaw/qr.js +101 -0
- package/dist/server/server/integrations/wecom-openclaw/qr.js.map +1 -0
- package/dist/server/server/integrations/wecom-openclaw/workspace.d.ts +5 -0
- package/dist/server/server/integrations/wecom-openclaw/workspace.d.ts.map +1 -0
- package/dist/server/server/integrations/wecom-openclaw/workspace.js +40 -0
- package/dist/server/server/integrations/wecom-openclaw/workspace.js.map +1 -0
- package/dist/server/server/latency-proxy.d.ts.map +1 -1
- package/dist/server/server/latency-proxy.js +45 -5
- package/dist/server/server/latency-proxy.js.map +1 -1
- package/dist/server/server/library/codex-skill-discovery.d.ts +9 -0
- package/dist/server/server/library/codex-skill-discovery.d.ts.map +1 -0
- package/dist/server/server/library/codex-skill-discovery.js +49 -0
- package/dist/server/server/library/codex-skill-discovery.js.map +1 -0
- package/dist/server/server/library/hub-install.d.ts +79 -0
- package/dist/server/server/library/hub-install.d.ts.map +1 -0
- package/dist/server/server/library/hub-install.js +263 -0
- package/dist/server/server/library/hub-install.js.map +1 -0
- package/dist/server/server/library/hub-test-run.d.ts +81 -0
- package/dist/server/server/library/hub-test-run.d.ts.map +1 -0
- package/dist/server/server/library/hub-test-run.js +237 -0
- package/dist/server/server/library/hub-test-run.js.map +1 -0
- package/dist/server/server/library/library-import.d.ts +27 -0
- package/dist/server/server/library/library-import.d.ts.map +1 -0
- package/dist/server/server/library/library-import.js +227 -0
- package/dist/server/server/library/library-import.js.map +1 -0
- package/dist/server/server/library/library-injection.d.ts +16 -0
- package/dist/server/server/library/library-injection.d.ts.map +1 -0
- package/dist/server/server/library/library-injection.js +49 -0
- package/dist/server/server/library/library-injection.js.map +1 -0
- package/dist/server/server/library/library-rpc.d.ts +73 -0
- package/dist/server/server/library/library-rpc.d.ts.map +1 -0
- package/dist/server/server/library/library-rpc.js +239 -0
- package/dist/server/server/library/library-rpc.js.map +1 -0
- package/dist/server/server/library/library-store.d.ts +35 -0
- package/dist/server/server/library/library-store.d.ts.map +1 -0
- package/dist/server/server/library/library-store.js +169 -0
- package/dist/server/server/library/library-store.js.map +1 -0
- package/dist/server/server/library/library-sync.d.ts +46 -0
- package/dist/server/server/library/library-sync.d.ts.map +1 -0
- package/dist/server/server/library/library-sync.js +235 -0
- package/dist/server/server/library/library-sync.js.map +1 -0
- package/dist/server/server/library/library-types.d.ts +756 -0
- package/dist/server/server/library/library-types.d.ts.map +1 -0
- package/dist/server/server/library/library-types.js +99 -0
- package/dist/server/server/library/library-types.js.map +1 -0
- package/dist/server/server/library/worktree-dev.d.ts +14 -0
- package/dist/server/server/library/worktree-dev.d.ts.map +1 -0
- package/dist/server/server/library/worktree-dev.js +24 -0
- package/dist/server/server/library/worktree-dev.js.map +1 -0
- package/dist/server/server/log-stream-error.d.ts +2 -0
- package/dist/server/server/log-stream-error.d.ts.map +1 -0
- package/dist/server/server/log-stream-error.js +33 -0
- package/dist/server/server/log-stream-error.js.map +1 -0
- package/dist/server/server/logger.d.ts +1 -0
- package/dist/server/server/logger.d.ts.map +1 -1
- package/dist/server/server/logger.js +32 -0
- package/dist/server/server/logger.js.map +1 -1
- package/dist/server/server/loop/rpc-schemas.d.ts +833 -833
- package/dist/server/server/loop-service.d.ts +119 -119
- package/dist/server/server/messages.d.ts +4 -1
- package/dist/server/server/messages.d.ts.map +1 -1
- package/dist/server/server/messages.js +40 -2
- package/dist/server/server/messages.js.map +1 -1
- package/dist/server/server/node-pty-error.d.ts +2 -0
- package/dist/server/server/node-pty-error.d.ts.map +1 -0
- package/dist/server/server/node-pty-error.js +19 -0
- package/dist/server/server/node-pty-error.js.map +1 -0
- package/dist/server/server/persisted-config.d.ts +296 -212
- package/dist/server/server/persisted-config.d.ts.map +1 -1
- package/dist/server/server/persisted-config.js +35 -1
- package/dist/server/server/persisted-config.js.map +1 -1
- package/dist/server/server/port-in-use.d.ts +4 -0
- package/dist/server/server/port-in-use.d.ts.map +1 -0
- package/dist/server/server/port-in-use.js +35 -0
- package/dist/server/server/port-in-use.js.map +1 -0
- package/dist/server/server/provider-runtime-settings-mask.d.ts +7 -0
- package/dist/server/server/provider-runtime-settings-mask.d.ts.map +1 -0
- package/dist/server/server/provider-runtime-settings-mask.js +65 -0
- package/dist/server/server/provider-runtime-settings-mask.js.map +1 -0
- package/dist/server/server/sac/auth.d.ts +13 -0
- package/dist/server/server/sac/auth.d.ts.map +1 -1
- package/dist/server/server/sac/auth.js +20 -1
- package/dist/server/server/sac/auth.js.map +1 -1
- package/dist/server/server/sac/index.d.ts +2 -2
- package/dist/server/server/sac/index.d.ts.map +1 -1
- package/dist/server/server/sac/index.js +2 -2
- package/dist/server/server/sac/index.js.map +1 -1
- package/dist/server/server/sac/poll.d.ts +2 -0
- package/dist/server/server/sac/poll.d.ts.map +1 -1
- package/dist/server/server/sac/poll.js +7 -2
- package/dist/server/server/sac/poll.js.map +1 -1
- package/dist/server/server/schedule/cron.d.ts.map +1 -1
- package/dist/server/server/schedule/cron.js +6 -6
- package/dist/server/server/schedule/cron.js.map +1 -1
- package/dist/server/server/schedule/rpc-schemas.d.ts +1219 -324
- package/dist/server/server/schedule/rpc-schemas.d.ts.map +1 -1
- package/dist/server/server/schedule/rpc-schemas.js +34 -0
- package/dist/server/server/schedule/rpc-schemas.js.map +1 -1
- package/dist/server/server/schedule/service.d.ts +5 -1
- package/dist/server/server/schedule/service.d.ts.map +1 -1
- package/dist/server/server/schedule/service.js +97 -14
- package/dist/server/server/schedule/service.js.map +1 -1
- package/dist/server/server/schedule/types.d.ts +111 -92
- package/dist/server/server/schedule/types.d.ts.map +1 -1
- package/dist/server/server/schedule/types.js +1 -0
- package/dist/server/server/schedule/types.js.map +1 -1
- package/dist/server/server/session.d.ts +83 -2
- package/dist/server/server/session.d.ts.map +1 -1
- package/dist/server/server/session.js +896 -83
- package/dist/server/server/session.js.map +1 -1
- package/dist/server/server/speech/native-runtime-guard.d.ts +1 -0
- package/dist/server/server/speech/native-runtime-guard.d.ts.map +1 -1
- package/dist/server/server/speech/native-runtime-guard.js +10 -4
- package/dist/server/server/speech/native-runtime-guard.js.map +1 -1
- package/dist/server/server/speech/native-runtime-probe.js.map +1 -1
- package/dist/server/server/speech/providers/openai/proxy.d.ts +4 -0
- package/dist/server/server/speech/providers/openai/proxy.d.ts.map +1 -0
- package/dist/server/server/speech/providers/openai/proxy.js +34 -0
- package/dist/server/server/speech/providers/openai/proxy.js.map +1 -0
- package/dist/server/server/speech/providers/openai/stt.d.ts.map +1 -1
- package/dist/server/server/speech/providers/openai/stt.js +3 -0
- package/dist/server/server/speech/providers/openai/stt.js.map +1 -1
- package/dist/server/server/speech/providers/openai/tts.d.ts.map +1 -1
- package/dist/server/server/speech/providers/openai/tts.js +5 -1
- package/dist/server/server/speech/providers/openai/tts.js.map +1 -1
- package/dist/server/server/websocket-server.d.ts +6 -1
- package/dist/server/server/websocket-server.d.ts.map +1 -1
- package/dist/server/server/websocket-server.js +79 -7
- package/dist/server/server/websocket-server.js.map +1 -1
- package/dist/server/server/workspace-git-service.d.ts +2 -1
- package/dist/server/server/workspace-git-service.d.ts.map +1 -1
- package/dist/server/server/workspace-git-service.js +7 -3
- package/dist/server/server/workspace-git-service.js.map +1 -1
- package/dist/server/server/workspace-registry-model.d.ts +1 -0
- package/dist/server/server/workspace-registry-model.d.ts.map +1 -1
- package/dist/server/server/workspace-registry-model.js +18 -0
- package/dist/server/server/workspace-registry-model.js.map +1 -1
- package/dist/server/server/workspace-registry.d.ts +10 -10
- package/dist/server/server/worktree-session.d.ts +3 -3
- package/dist/server/server/worktree-session.d.ts.map +1 -1
- package/dist/server/server/worktree-session.js +1 -3
- package/dist/server/server/worktree-session.js.map +1 -1
- package/dist/server/shared/messages.d.ts +110060 -72329
- package/dist/server/shared/messages.d.ts.map +1 -1
- package/dist/server/shared/messages.js +531 -3
- package/dist/server/shared/messages.js.map +1 -1
- package/dist/server/shared/provider-runtime-settings.d.ts +87 -0
- package/dist/server/shared/provider-runtime-settings.d.ts.map +1 -0
- package/dist/server/shared/provider-runtime-settings.js +33 -0
- package/dist/server/shared/provider-runtime-settings.js.map +1 -0
- package/dist/server/terminal/terminal.d.ts +9 -0
- package/dist/server/terminal/terminal.d.ts.map +1 -1
- package/dist/server/terminal/terminal.js +100 -3
- package/dist/server/terminal/terminal.js.map +1 -1
- package/dist/server/utils/checkout-git.d.ts +23 -1
- package/dist/server/utils/checkout-git.d.ts.map +1 -1
- package/dist/server/utils/checkout-git.js +182 -21
- package/dist/server/utils/checkout-git.js.map +1 -1
- package/dist/server/utils/directory-suggestions.d.ts.map +1 -1
- package/dist/server/utils/directory-suggestions.js +57 -9
- package/dist/server/utils/directory-suggestions.js.map +1 -1
- package/dist/server/utils/worktree-metadata.d.ts +4 -4
- package/dist/src/server/bug-report-redact.js +42 -5
- package/dist/src/server/bug-report-redact.js.map +1 -1
- package/dist/src/server/crash-report.js +18 -0
- package/dist/src/server/crash-report.js.map +1 -1
- package/dist/src/server/speech/native-runtime-guard.js +177 -0
- package/dist/src/server/speech/native-runtime-guard.js.map +1 -0
- package/dist/src/server/speech/speech-types.js +8 -0
- package/dist/src/server/speech/speech-types.js.map +1 -0
- package/package.json +24 -11
|
@@ -28,6 +28,7 @@ interface CreateGuardParams {
|
|
|
28
28
|
logger: Logger;
|
|
29
29
|
env?: NodeJS.ProcessEnv;
|
|
30
30
|
}
|
|
31
|
+
export declare function isQuarantinedPlatform(platform?: NodeJS.Platform): boolean;
|
|
31
32
|
export declare function createSpeechNativeGuard(params: CreateGuardParams): SpeechNativeGuard;
|
|
32
33
|
export {};
|
|
33
34
|
//# sourceMappingURL=native-runtime-guard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-runtime-guard.d.ts","sourceRoot":"","sources":["../../../../src/server/speech/native-runtime-guard.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"native-runtime-guard.d.ts","sourceRoot":"","sources":["../../../../src/server/speech/native-runtime-guard.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AA4BlE,MAAM,MAAM,uBAAuB,GAC/B;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,GACpB;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC,MAAM,WAAW,iBAAiB;IAChC,2BAA2B,CAAC,SAAS,EAAE,wBAAwB,GAAG,OAAO,CAAC;IAC1E,MAAM,IAAI,uBAAuB,CAAC;IAOlC,sBAAsB,CACpB,SAAS,EAAE,wBAAwB,EACnC,OAAO,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;KAAE,GACxC,IAAI,CAAC;CACT;AAED,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AA2BD,wBAAgB,qBAAqB,CAAC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,OAAO,CAE3F;AAQD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAoKpF"}
|
|
@@ -20,6 +20,12 @@ function localSpeechRequested(providers) {
|
|
|
20
20
|
(providers.voiceStt.enabled !== false && providers.voiceStt.provider === "local") ||
|
|
21
21
|
(providers.voiceTts.enabled !== false && providers.voiceTts.provider === "local"));
|
|
22
22
|
}
|
|
23
|
+
// Platforms where loading the local speech native runtime in the main
|
|
24
|
+
// daemon process is known to hard-crash the worker. Quarantine is a no-op
|
|
25
|
+
// on every other platform (e.g. Linux), so they keep loading native locally.
|
|
26
|
+
export function isQuarantinedPlatform(platform = process.platform) {
|
|
27
|
+
return platform === "win32" || platform === "darwin";
|
|
28
|
+
}
|
|
23
29
|
function isTruthyEnvFlag(value) {
|
|
24
30
|
if (!value)
|
|
25
31
|
return false;
|
|
@@ -71,7 +77,7 @@ export function createSpeechNativeGuard(params) {
|
|
|
71
77
|
// don't fork a probe that loads native modules on configurations that
|
|
72
78
|
// weren't going to load them anyway).
|
|
73
79
|
const isQuarantined = (providers) => {
|
|
74
|
-
if (
|
|
80
|
+
if (!isQuarantinedPlatform())
|
|
75
81
|
return false;
|
|
76
82
|
if (!localSpeechRequested(providers))
|
|
77
83
|
return false;
|
|
@@ -83,7 +89,7 @@ export function createSpeechNativeGuard(params) {
|
|
|
83
89
|
shouldQuarantineLocalSpeech(providers) {
|
|
84
90
|
const quarantined = isQuarantined(providers);
|
|
85
91
|
if (!quarantined &&
|
|
86
|
-
|
|
92
|
+
isQuarantinedPlatform() &&
|
|
87
93
|
localSpeechRequested(providers) &&
|
|
88
94
|
isTruthyEnvFlag(env.SEAWORK_LOCAL_SPEECH_NATIVE_FORCE)) {
|
|
89
95
|
logger.info("SEAWORK_LOCAL_SPEECH_NATIVE_FORCE=1 — loading local speech native in main process");
|
|
@@ -101,8 +107,8 @@ export function createSpeechNativeGuard(params) {
|
|
|
101
107
|
// load native locally anyway, or where local speech isn't requested
|
|
102
108
|
// at all. Probing in those cases would either duplicate work or add
|
|
103
109
|
// pointless native-load noise on machines that never asked for it.
|
|
104
|
-
if (
|
|
105
|
-
setStatus({ state: "skipped", reason: "non-
|
|
110
|
+
if (!isQuarantinedPlatform()) {
|
|
111
|
+
setStatus({ state: "skipped", reason: "non-quarantined-platform" }, options?.onStatusChange);
|
|
106
112
|
return;
|
|
107
113
|
}
|
|
108
114
|
if (!localSpeechRequested(providers)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-runtime-guard.js","sourceRoot":"","sources":["../../../../src/server/speech/native-runtime-guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAqB,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"native-runtime-guard.js","sourceRoot":"","sources":["../../../../src/server/speech/native-runtime-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-runtime-probe.js","sourceRoot":"","sources":["../../../../src/server/speech/native-runtime-probe.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,wEAAwE;AACxE,2EAA2E;AAC3E,qEAAqE;AACrE,kDAAkD;AAClD,EAAE;AACF,4EAA4E;AAC5E,4EAA4E;AAE5E,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAChC,IAAI,KAAK,GAAkB,IAAI,CAAC;AAEhC,SAAS,OAAO;IACd,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,IAAI,CAAC;QACH,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,KAA+B;IAC9D,MAAM,IAAI,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,GACvD,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EACxC,IAAI,CAAC;IACL,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACP,cAAc;QAChB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,QAAQ;IACf,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,SAAS,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;AACH,CAAC;AAED,KAAK,UAAU,KAAK;IAClB,OAAO,EAAE,CAAC;IACV,QAAQ,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAE3F,uEAAuE;IACvE,uEAAuE;IACvE,iEAAiE;IACjE,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IACjC,MAAM,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"native-runtime-probe.js","sourceRoot":"","sources":["../../../../src/server/speech/native-runtime-probe.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,wEAAwE;AACxE,2EAA2E;AAC3E,qEAAqE;AACrE,kDAAkD;AAClD,EAAE;AACF,4EAA4E;AAC5E,4EAA4E;AAE5E,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAChC,IAAI,KAAK,GAAkB,IAAI,CAAC;AAEhC,SAAS,OAAO;IACd,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,IAAI,CAAC;QACH,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,KAA+B;IAC9D,MAAM,IAAI,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,GACvD,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EACxC,IAAI,CAAC;IACL,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACP,cAAc;QAChB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,QAAQ;IACf,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,SAAS,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;AACH,CAAC;AAED,KAAK,UAAU,KAAK;IAClB,OAAO,EAAE,CAAC;IACV,QAAQ,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAE3F,uEAAuE;IACvE,uEAAuE;IACvE,iEAAiE;IACjE,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IACjC,MAAM,EAAE,kBAAkB,EAAE,GAC1B,MAAM,MAAM,CAAC,qDAAqD,CAAC,CAAC;IACtE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE9B,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAC9B,kBAAkB,EAAE,CAAC;IACrB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAE3B,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjB,QAAQ,EAAE,CAAC;IACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE;IACtC,QAAQ,CAAC,mBAAmB,EAAE;QAC5B,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QACzD,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;KACpD,CAAC,CAAC;IACH,QAAQ,EAAE,CAAC;IACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,EAAE;IAC1C,QAAQ,CAAC,oBAAoB,EAAE;QAC7B,MAAM,EAAE,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;KAClE,CAAC,CAAC;IACH,QAAQ,EAAE,CAAC;IACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACpB,QAAQ,CAAC,gBAAgB,EAAE;QACzB,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;KAC1D,CAAC,CAAC;IACH,QAAQ,EAAE,CAAC;IACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/proxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAa5C,wBAAgB,uBAAuB,CACrC,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,GACnB,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,CAoBpC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { ProxyAgent } from "undici";
|
|
2
|
+
// 代理 URL 常带 user:pass 凭据,日志只保留 scheme://host:port,无法解析时整体打码
|
|
3
|
+
function redactProxyUrl(proxyUrl) {
|
|
4
|
+
try {
|
|
5
|
+
const u = new URL(proxyUrl);
|
|
6
|
+
return `${u.protocol}//${u.host}`;
|
|
7
|
+
}
|
|
8
|
+
catch {
|
|
9
|
+
return "<redacted>";
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
// undici(OpenAI SDK 底层 fetch)不读 HTTPS_PROXY;有代理时注入 ProxyAgent dispatcher
|
|
13
|
+
export function resolveOpenAIProxyFetch(env = process.env, logger) {
|
|
14
|
+
const proxyUrl = env.HTTPS_PROXY ?? env.https_proxy;
|
|
15
|
+
if (!proxyUrl)
|
|
16
|
+
return undefined;
|
|
17
|
+
let dispatcher;
|
|
18
|
+
try {
|
|
19
|
+
dispatcher = new ProxyAgent(proxyUrl);
|
|
20
|
+
}
|
|
21
|
+
catch (err) {
|
|
22
|
+
// 代理 URL 非法(缺 scheme、非 http 协议等)时降级为无代理,避免连带崩掉 STT/TTS 初始化
|
|
23
|
+
const redacted = redactProxyUrl(proxyUrl);
|
|
24
|
+
const warn = `Invalid HTTPS_PROXY (${redacted}), falling back to direct connection`;
|
|
25
|
+
if (logger)
|
|
26
|
+
logger.warn({ err, proxyUrl: redacted }, warn);
|
|
27
|
+
else
|
|
28
|
+
console.warn(warn, err);
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
// biome-ignore lint/suspicious/noExplicitAny: openai shims RequestInfo differs from global RequestInfo
|
|
32
|
+
return ((url, init) => fetch(url, { ...init, dispatcher }));
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAIpC,4DAA4D;AAC5D,SAAS,cAAc,CAAC,QAAgB;IACtC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5B,OAAO,GAAG,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,YAAY,CAAC;IACtB,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,uBAAuB,CACrC,MAAyB,OAAO,CAAC,GAAG,EACpC,MAAoB;IAEpB,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,CAAC;IACpD,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,IAAI,UAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,UAAU,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,2DAA2D;QAC3D,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,wBAAwB,QAAQ,sCAAsC,CAAC;QACpF,IAAI,MAAM;YAAE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;;YACtD,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,uGAAuG;IACvG,OAAO,CAAC,CAAC,GAAQ,EAAE,IAAU,EAAE,EAAE,CAC/B,KAAK,CACH,GAAa,EACb,EAAE,GAAG,IAAI,EAAE,UAAU,EAA4B,CAClD,CAAsC,CAAC;AAC5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stt.d.ts","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/stt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"stt.d.ts","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/stt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAQ7B,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAElC,YAAY,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAElD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,WAAW,GAAG,mBAAmB,GAAG,wBAAwB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACrF,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AA0BD,qBAAa,SAAU,YAAW,oBAAoB;IACpD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,SAAgB,EAAE,EAAG,QAAQ,CAAU;gBAE3B,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM;IAepD,aAAa,CAAC,MAAM,EAAE;QAC3B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,6BAA6B;YA6GnB,uBAAuB;CAmFtC"}
|
|
@@ -5,6 +5,7 @@ import { join } from "path";
|
|
|
5
5
|
import { tmpdir } from "os";
|
|
6
6
|
import { v4 } from "uuid";
|
|
7
7
|
import { inferAudioExtension } from "../../../agent/audio-utils.js";
|
|
8
|
+
import { resolveOpenAIProxyFetch } from "./proxy.js";
|
|
8
9
|
function isObject(value) {
|
|
9
10
|
return typeof value === "object" && value !== null;
|
|
10
11
|
}
|
|
@@ -31,9 +32,11 @@ export class OpenAISTT {
|
|
|
31
32
|
this.id = "openai";
|
|
32
33
|
this.config = sttConfig;
|
|
33
34
|
this.logger = parentLogger.child({ module: "agent", provider: "openai", component: "stt" });
|
|
35
|
+
const proxyFetch = resolveOpenAIProxyFetch(process.env, this.logger);
|
|
34
36
|
this.openaiClient = new OpenAI({
|
|
35
37
|
apiKey: sttConfig.apiKey,
|
|
36
38
|
...(sttConfig.baseURL ? { baseURL: sttConfig.baseURL } : {}),
|
|
39
|
+
...(proxyFetch ? { fetch: proxyFetch } : {}),
|
|
37
40
|
});
|
|
38
41
|
this.logger.info({ model: sttConfig.model || "whisper-1", baseURL: sttConfig.baseURL ?? "default" }, "STT (OpenAI Whisper) initialized");
|
|
39
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stt.js","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/stt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"stt.js","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/stt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tts.d.ts","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/tts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"tts.d.ts","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/tts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGzF,YAAY,EAAE,kBAAkB,EAAE,CAAC;AAEnC,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACjE,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;CAClE;AAED,qBAAa,SAAU,YAAW,oBAAoB;IACpD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;gBAEzB,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM;IAoBpD,SAAS,IAAI,SAAS;IAIhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA0CzE"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import OpenAI from "openai";
|
|
2
|
+
import { Readable } from "node:stream";
|
|
3
|
+
import { resolveOpenAIProxyFetch } from "./proxy.js";
|
|
2
4
|
export class OpenAITTS {
|
|
3
5
|
constructor(ttsConfig, parentLogger) {
|
|
4
6
|
this.config = {
|
|
@@ -8,8 +10,10 @@ export class OpenAITTS {
|
|
|
8
10
|
...ttsConfig,
|
|
9
11
|
};
|
|
10
12
|
this.logger = parentLogger.child({ module: "agent", provider: "openai", component: "tts" });
|
|
13
|
+
const proxyFetch = resolveOpenAIProxyFetch(process.env, this.logger);
|
|
11
14
|
this.openaiClient = new OpenAI({
|
|
12
15
|
apiKey: ttsConfig.apiKey,
|
|
16
|
+
...(proxyFetch ? { fetch: proxyFetch } : {}),
|
|
13
17
|
});
|
|
14
18
|
this.logger.info({ voice: this.config.voice, model: this.config.model, format: this.config.responseFormat }, "TTS (OpenAI) initialized");
|
|
15
19
|
}
|
|
@@ -29,7 +33,7 @@ export class OpenAITTS {
|
|
|
29
33
|
input: text,
|
|
30
34
|
response_format: this.config.responseFormat,
|
|
31
35
|
});
|
|
32
|
-
const audioStream = response.body;
|
|
36
|
+
const audioStream = Readable.fromWeb(response.body);
|
|
33
37
|
const duration = Date.now() - startTime;
|
|
34
38
|
this.logger.debug({ duration }, "Speech synthesis stream ready");
|
|
35
39
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tts.js","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/tts.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"tts.js","sourceRoot":"","sources":["../../../../../../src/server/speech/providers/openai/tts.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAWrD,MAAM,OAAO,SAAS;IAKpB,YAAY,SAAoB,EAAE,YAAyB;QACzD,IAAI,CAAC,MAAM,GAAG;YACZ,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,OAAO;YACd,cAAc,EAAE,KAAK;YACrB,GAAG,SAAS;SACb,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5F,MAAM,UAAU,GAAG,uBAAuB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,GAAG,IAAI,MAAM,CAAC;YAC7B,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAC1F,0BAA0B,CAC3B,CAAC;IACJ,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACxC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE7B,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAC3D,qBAAqB,CACtB,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;gBAC3D,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAM;gBACzB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAM;gBACzB,KAAK,EAAE,IAAI;gBACX,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,cAMpB;aACV,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAClC,QAAQ,CAAC,IAA4D,CACtE,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,EAAE,+BAA+B,CAAC,CAAC;YAEjE,OAAO;gBACL,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,KAAK;aAC5C,CAAC;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,wBAAwB,CAAC,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;CACF"}
|
|
@@ -57,7 +57,9 @@ export declare class VoiceAssistantWebSocketServer {
|
|
|
57
57
|
private readonly workspaceGitService;
|
|
58
58
|
private readonly downloadTokenStore;
|
|
59
59
|
private readonly seaworkHome;
|
|
60
|
+
private browserExtensionToken;
|
|
60
61
|
private readonly daemonConfigStore;
|
|
62
|
+
private library;
|
|
61
63
|
private readonly pushTokenStore;
|
|
62
64
|
private readonly pushService;
|
|
63
65
|
private readonly mcpBaseUrl;
|
|
@@ -66,7 +68,7 @@ export declare class VoiceAssistantWebSocketServer {
|
|
|
66
68
|
private readonly dictation;
|
|
67
69
|
private readonly voiceSpeakHandlers;
|
|
68
70
|
private readonly voiceCallerContexts;
|
|
69
|
-
private
|
|
71
|
+
private agentProviderRuntimeSettings;
|
|
70
72
|
private readonly providerSnapshotManager;
|
|
71
73
|
private readonly onLifecycleIntent;
|
|
72
74
|
private serverCapabilities;
|
|
@@ -78,9 +80,11 @@ export declare class VoiceAssistantWebSocketServer {
|
|
|
78
80
|
private runtimeMetricsInterval;
|
|
79
81
|
private unsubscribeSpeechReadiness;
|
|
80
82
|
private unsubscribeDaemonConfigChange;
|
|
83
|
+
private unsubscribeAgentProvidersChange;
|
|
81
84
|
constructor(server: HTTPServer, logger: pino.Logger, serverId: string, agentManager: AgentManager, agentStorage: AgentStorage, downloadTokenStore: DownloadTokenStore, seaworkHome: string, daemonConfigStore: DaemonConfigStore, mcpBaseUrl: string | null, wsConfig: WebSocketServerConfig, speech?: SpeechService | null, terminalManager?: TerminalManager | null, dictation?: {
|
|
82
85
|
finalTimeoutMs?: number;
|
|
83
86
|
}, agentProviderRuntimeSettings?: AgentProviderRuntimeSettingsMap, daemonVersion?: string, onLifecycleIntent?: (intent: SessionLifecycleIntent) => void, projectRegistry?: ProjectRegistry, workspaceRegistry?: WorkspaceRegistry, chatService?: FileBackedChatService, loopService?: LoopService, scheduleService?: ScheduleService, checkoutDiffManager?: CheckoutDiffManager);
|
|
87
|
+
setLibrary(library: import("./library/library-store.js").LibraryStore | null): void;
|
|
84
88
|
broadcast(message: WSOutboundMessage): void;
|
|
85
89
|
publishSpeechReadiness(readiness: SpeechReadinessSnapshot | null): void;
|
|
86
90
|
updateServerCapabilities(capabilities: ServerCapabilities | null | undefined): void;
|
|
@@ -93,6 +97,7 @@ export declare class VoiceAssistantWebSocketServer {
|
|
|
93
97
|
private attachSocket;
|
|
94
98
|
private createSessionConnection;
|
|
95
99
|
private clearPendingConnection;
|
|
100
|
+
private getBrowserExtensionToken;
|
|
96
101
|
private handleHello;
|
|
97
102
|
private buildServerInfoStatusPayload;
|
|
98
103
|
private createServerInfoMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../../src/server/websocket-server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAC;AAGjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,4BAA4B,CAAC;AAC3F,OAAO,KAAK,EAAE,iBAAiB,EAAuB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../../src/server/websocket-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,16 @@ import { WebSocketServer } from "ws";
|
|
|
2
2
|
import { join } from "path";
|
|
3
3
|
import { hostname as getHostname } from "node:os";
|
|
4
4
|
import { redactGitForgeTokens } from "./git-forge/token-mask.js";
|
|
5
|
+
import { redactProviderEnv } from "./provider-runtime-settings-mask.js";
|
|
5
6
|
import { WSInboundMessageSchema, wrapSessionMessage, } from "./messages.js";
|
|
6
7
|
import { asUint8Array, decodeTerminalStreamFrame } from "../shared/terminal-stream-protocol.js";
|
|
7
|
-
import { isHostAllowed } from "./allowed-hosts.js";
|
|
8
|
+
import { isHostAllowed, isLoopbackOrigin } from "./allowed-hosts.js";
|
|
9
|
+
import { CHROME_EXTENSION_ORIGIN } from "./config.js";
|
|
10
|
+
import { getOrCreateBrowserExtensionToken } from "./browser-extension-token.js";
|
|
8
11
|
import { Session } from "./session.js";
|
|
9
12
|
import { ProviderSnapshotManager } from "./agent/provider-snapshot-manager.js";
|
|
10
13
|
import { buildProviderRegistry } from "./agent/provider-registry.js";
|
|
14
|
+
import { createAllClients } from "./agent/provider-registry.js";
|
|
11
15
|
import { WorkspaceGitServiceImpl } from "./workspace-git-service.js";
|
|
12
16
|
import { PushTokenStore } from "./push/token-store.js";
|
|
13
17
|
import { PushService } from "./push/push-service.js";
|
|
@@ -95,10 +99,12 @@ function bufferFromWsData(data) {
|
|
|
95
99
|
}
|
|
96
100
|
const SLOW_REQUEST_THRESHOLD_MS = 500;
|
|
97
101
|
const EXTERNAL_SESSION_DISCONNECT_GRACE_MS = 90000;
|
|
102
|
+
const CLI_SESSION_DISCONNECT_GRACE_MS = 5000;
|
|
98
103
|
const HELLO_TIMEOUT_MS = 15000;
|
|
99
104
|
const WS_CLOSE_HELLO_TIMEOUT = 4001;
|
|
100
105
|
const WS_CLOSE_INVALID_HELLO = 4002;
|
|
101
106
|
const WS_CLOSE_INCOMPATIBLE_PROTOCOL = 4003;
|
|
107
|
+
const WS_CLOSE_INVALID_AUTH = 4004;
|
|
102
108
|
const WS_PROTOCOL_VERSION = 1;
|
|
103
109
|
const WS_RUNTIME_METRICS_FLUSH_MS = 30000;
|
|
104
110
|
export class MissingDaemonVersionError extends Error {
|
|
@@ -115,6 +121,8 @@ export class VoiceAssistantWebSocketServer {
|
|
|
115
121
|
this.pendingConnections = new Map();
|
|
116
122
|
this.sessions = new Map();
|
|
117
123
|
this.externalSessionsByKey = new Map();
|
|
124
|
+
this.browserExtensionToken = null;
|
|
125
|
+
this.library = null;
|
|
118
126
|
this.voiceSpeakHandlers = new Map();
|
|
119
127
|
this.voiceCallerContexts = new Map();
|
|
120
128
|
this.runtimeWindowStartedAt = Date.now();
|
|
@@ -141,6 +149,7 @@ export class VoiceAssistantWebSocketServer {
|
|
|
141
149
|
this.runtimeMetricsInterval = null;
|
|
142
150
|
this.unsubscribeSpeechReadiness = null;
|
|
143
151
|
this.unsubscribeDaemonConfigChange = null;
|
|
152
|
+
this.unsubscribeAgentProvidersChange = null;
|
|
144
153
|
this.ACTIVITY_THRESHOLD_MS = 120000;
|
|
145
154
|
this.logger = logger.child({ module: "websocket-server" });
|
|
146
155
|
this.serverId = serverId;
|
|
@@ -195,6 +204,16 @@ export class VoiceAssistantWebSocketServer {
|
|
|
195
204
|
this.unsubscribeDaemonConfigChange = this.daemonConfigStore.onChange((config) => {
|
|
196
205
|
this.broadcastDaemonConfigChanged(config);
|
|
197
206
|
});
|
|
207
|
+
this.unsubscribeAgentProvidersChange = this.daemonConfigStore.onFieldChange("agents.providers", (value) => {
|
|
208
|
+
const runtimeSettings = value;
|
|
209
|
+
this.agentProviderRuntimeSettings = runtimeSettings;
|
|
210
|
+
for (const [provider, client] of Object.entries(createAllClients(this.logger, { runtimeSettings }))) {
|
|
211
|
+
if (client) {
|
|
212
|
+
this.agentManager.replaceClient(provider, client);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
this.providerSnapshotManager.replaceRegistry(buildProviderRegistry(providerSnapshotLogger, { runtimeSettings }));
|
|
216
|
+
});
|
|
198
217
|
const pushLogger = this.logger.child({ module: "push" });
|
|
199
218
|
this.pushTokenStore = new PushTokenStore(pushLogger, join(seaworkHome, "push-tokens.json"));
|
|
200
219
|
this.pushService = new PushService(pushLogger, this.pushTokenStore);
|
|
@@ -218,7 +237,11 @@ export class VoiceAssistantWebSocketServer {
|
|
|
218
237
|
const sameOrigin = !!origin &&
|
|
219
238
|
!!requestHost &&
|
|
220
239
|
(origin === `http://${requestHost}` || origin === `https://${requestHost}`);
|
|
221
|
-
if (!origin ||
|
|
240
|
+
if (!origin ||
|
|
241
|
+
allowedOrigins.has("*") ||
|
|
242
|
+
allowedOrigins.has(origin) ||
|
|
243
|
+
sameOrigin ||
|
|
244
|
+
isLoopbackOrigin(origin)) {
|
|
222
245
|
callback(true);
|
|
223
246
|
}
|
|
224
247
|
else {
|
|
@@ -238,6 +261,9 @@ export class VoiceAssistantWebSocketServer {
|
|
|
238
261
|
runtimeMetricsInterval.unref?.();
|
|
239
262
|
this.logger.info("WebSocket server initialized on /ws");
|
|
240
263
|
}
|
|
264
|
+
setLibrary(library) {
|
|
265
|
+
this.library = library;
|
|
266
|
+
}
|
|
241
267
|
broadcast(message) {
|
|
242
268
|
const payload = JSON.stringify(message);
|
|
243
269
|
for (const ws of this.sessions.keys()) {
|
|
@@ -315,6 +341,8 @@ export class VoiceAssistantWebSocketServer {
|
|
|
315
341
|
}));
|
|
316
342
|
}
|
|
317
343
|
await Promise.all(cleanupPromises);
|
|
344
|
+
this.unsubscribeAgentProvidersChange?.();
|
|
345
|
+
this.unsubscribeAgentProvidersChange = null;
|
|
318
346
|
this.providerSnapshotManager.destroy();
|
|
319
347
|
this.workspaceGitService.dispose();
|
|
320
348
|
this.checkoutDiffManager.dispose();
|
|
@@ -366,6 +394,7 @@ export class VoiceAssistantWebSocketServer {
|
|
|
366
394
|
const pending = {
|
|
367
395
|
connectionLogger,
|
|
368
396
|
helloTimeout: null,
|
|
397
|
+
origin: requestMetadata.origin ?? null,
|
|
369
398
|
};
|
|
370
399
|
const timeout = setTimeout(() => {
|
|
371
400
|
if (this.pendingConnections.get(ws) !== pending) {
|
|
@@ -391,7 +420,7 @@ export class VoiceAssistantWebSocketServer {
|
|
|
391
420
|
}, "Client connected; awaiting hello");
|
|
392
421
|
}
|
|
393
422
|
createSessionConnection(params) {
|
|
394
|
-
const { ws, clientId, appVersion, connectionLogger } = params;
|
|
423
|
+
const { ws, clientId, clientType, appVersion, connectionLogger } = params;
|
|
395
424
|
let connection = null;
|
|
396
425
|
const session = new Session({
|
|
397
426
|
clientId,
|
|
@@ -455,10 +484,15 @@ export class VoiceAssistantWebSocketServer {
|
|
|
455
484
|
}
|
|
456
485
|
: undefined,
|
|
457
486
|
agentProviderRuntimeSettings: this.agentProviderRuntimeSettings,
|
|
487
|
+
library: this.library,
|
|
488
|
+
broadcastLibraryUpdate: (snapshot) => {
|
|
489
|
+
this.broadcast(wrapSessionMessage({ type: "library_updated", snapshot }));
|
|
490
|
+
},
|
|
458
491
|
});
|
|
459
492
|
connection = {
|
|
460
493
|
session,
|
|
461
494
|
clientId,
|
|
495
|
+
clientType,
|
|
462
496
|
appVersion,
|
|
463
497
|
connectionLogger,
|
|
464
498
|
sockets: new Set([ws]),
|
|
@@ -478,6 +512,14 @@ export class VoiceAssistantWebSocketServer {
|
|
|
478
512
|
this.pendingConnections.delete(ws);
|
|
479
513
|
return pending;
|
|
480
514
|
}
|
|
515
|
+
getBrowserExtensionToken() {
|
|
516
|
+
if (this.browserExtensionToken === null) {
|
|
517
|
+
this.browserExtensionToken = getOrCreateBrowserExtensionToken(this.seaworkHome, {
|
|
518
|
+
logger: this.logger,
|
|
519
|
+
});
|
|
520
|
+
}
|
|
521
|
+
return this.browserExtensionToken;
|
|
522
|
+
}
|
|
481
523
|
handleHello(params) {
|
|
482
524
|
const { ws, message, pending } = params;
|
|
483
525
|
if (message.protocolVersion !== WS_PROTOCOL_VERSION) {
|
|
@@ -506,6 +548,24 @@ export class VoiceAssistantWebSocketServer {
|
|
|
506
548
|
}
|
|
507
549
|
return;
|
|
508
550
|
}
|
|
551
|
+
// The browser extension's Origin is admitted by CORS, but its id derives
|
|
552
|
+
// from a public manifest key — so a side-loaded clone shares it. Require the
|
|
553
|
+
// per-daemon pairing token for that Origin specifically; every other client
|
|
554
|
+
// (mobile/cli/desktop, all loopback/same-origin) is unaffected.
|
|
555
|
+
if (pending.origin === CHROME_EXTENSION_ORIGIN) {
|
|
556
|
+
const expected = this.getBrowserExtensionToken();
|
|
557
|
+
if (!message.clientAuthToken || message.clientAuthToken !== expected) {
|
|
558
|
+
this.clearPendingConnection(ws);
|
|
559
|
+
pending.connectionLogger.warn("Rejected browser extension hello with invalid pairing token");
|
|
560
|
+
try {
|
|
561
|
+
ws.close(WS_CLOSE_INVALID_AUTH, "Invalid pairing token");
|
|
562
|
+
}
|
|
563
|
+
catch {
|
|
564
|
+
// ignore close errors
|
|
565
|
+
}
|
|
566
|
+
return;
|
|
567
|
+
}
|
|
568
|
+
}
|
|
509
569
|
this.clearPendingConnection(ws);
|
|
510
570
|
const existing = this.externalSessionsByKey.get(clientId);
|
|
511
571
|
if (existing) {
|
|
@@ -534,6 +594,7 @@ export class VoiceAssistantWebSocketServer {
|
|
|
534
594
|
const connection = this.createSessionConnection({
|
|
535
595
|
ws,
|
|
536
596
|
clientId,
|
|
597
|
+
clientType: message.clientType,
|
|
537
598
|
appVersion: message.appVersion ?? null,
|
|
538
599
|
connectionLogger,
|
|
539
600
|
});
|
|
@@ -573,7 +634,7 @@ export class VoiceAssistantWebSocketServer {
|
|
|
573
634
|
type: "status",
|
|
574
635
|
payload: {
|
|
575
636
|
status: "daemon_config_changed",
|
|
576
|
-
config: redactGitForgeTokens(config),
|
|
637
|
+
config: redactProviderEnv(redactGitForgeTokens(config)),
|
|
577
638
|
},
|
|
578
639
|
});
|
|
579
640
|
}
|
|
@@ -629,19 +690,23 @@ export class VoiceAssistantWebSocketServer {
|
|
|
629
690
|
if (connection.externalDisconnectCleanupTimeout) {
|
|
630
691
|
clearTimeout(connection.externalDisconnectCleanupTimeout);
|
|
631
692
|
}
|
|
693
|
+
const reconnectGraceMs = connection.clientType === "cli"
|
|
694
|
+
? CLI_SESSION_DISCONNECT_GRACE_MS
|
|
695
|
+
: EXTERNAL_SESSION_DISCONNECT_GRACE_MS;
|
|
632
696
|
const timeout = setTimeout(() => {
|
|
633
697
|
if (connection.externalDisconnectCleanupTimeout !== timeout) {
|
|
634
698
|
return;
|
|
635
699
|
}
|
|
636
700
|
connection.externalDisconnectCleanupTimeout = null;
|
|
637
701
|
void this.cleanupConnection(connection, "Client disconnected (grace timeout)");
|
|
638
|
-
},
|
|
702
|
+
}, reconnectGraceMs);
|
|
639
703
|
connection.externalDisconnectCleanupTimeout = timeout;
|
|
640
704
|
connection.connectionLogger.trace({
|
|
641
705
|
clientId: connection.clientId,
|
|
706
|
+
clientType: connection.clientType,
|
|
642
707
|
code: details.code,
|
|
643
708
|
reason: stringifyCloseReason(details.reason),
|
|
644
|
-
reconnectGraceMs
|
|
709
|
+
reconnectGraceMs,
|
|
645
710
|
}, "Client disconnected; waiting for reconnect");
|
|
646
711
|
return;
|
|
647
712
|
}
|
|
@@ -969,7 +1034,13 @@ export class VoiceAssistantWebSocketServer {
|
|
|
969
1034
|
getClientActivityState(session) {
|
|
970
1035
|
const activity = session.getClientActivity();
|
|
971
1036
|
if (!activity) {
|
|
972
|
-
return {
|
|
1037
|
+
return {
|
|
1038
|
+
deviceType: null,
|
|
1039
|
+
focusedAgentId: null,
|
|
1040
|
+
isStale: true,
|
|
1041
|
+
appVisible: false,
|
|
1042
|
+
desktopRuntime: null,
|
|
1043
|
+
};
|
|
973
1044
|
}
|
|
974
1045
|
const now = Date.now();
|
|
975
1046
|
const ageMs = now - activity.lastActivityAt.getTime();
|
|
@@ -979,6 +1050,7 @@ export class VoiceAssistantWebSocketServer {
|
|
|
979
1050
|
focusedAgentId: activity.focusedAgentId,
|
|
980
1051
|
isStale,
|
|
981
1052
|
appVisible: activity.appVisible,
|
|
1053
|
+
desktopRuntime: activity.desktopRuntime,
|
|
982
1054
|
};
|
|
983
1055
|
}
|
|
984
1056
|
broadcastAgentAttention(params) {
|