@jingyi0605/codingns4dsh 0.2.0-beta.2 → 0.2.0-rc.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.en.md +4 -4
- package/README.md +7 -5
- package/assets/provider-icons/minimax-code.svg +4 -0
- package/assets/provider-icons/zcode.svg +14 -0
- package/data/build/dist/client/account-bar.d.ts +2 -1
- package/data/build/dist/client/account-bar.d.ts.map +1 -1
- package/data/build/dist/client/account-bar.js +21 -16
- package/data/build/dist/client/account-bar.js.map +1 -1
- package/data/build/dist/client/bundle.js +4172 -1540
- package/data/build/dist/client/bundle.js.map +1 -1
- package/data/build/dist/client/cli-slots.d.ts.map +1 -1
- package/data/build/dist/client/cli-slots.js +20 -12
- package/data/build/dist/client/cli-slots.js.map +1 -1
- package/data/build/dist/client/debug/ui.d.ts +2 -1
- package/data/build/dist/client/debug/ui.d.ts.map +1 -1
- package/data/build/dist/client/debug/ui.js +39 -33
- package/data/build/dist/client/debug/ui.js.map +1 -1
- package/data/build/dist/client/delegate-command.d.ts +16 -0
- package/data/build/dist/client/delegate-command.d.ts.map +1 -0
- package/data/build/dist/client/delegate-command.js +138 -0
- package/data/build/dist/client/delegate-command.js.map +1 -0
- package/data/build/dist/client/delegate-plan.d.ts +31 -0
- package/data/build/dist/client/delegate-plan.d.ts.map +1 -0
- package/data/build/dist/client/delegate-plan.js +59 -0
- package/data/build/dist/client/delegate-plan.js.map +1 -0
- package/data/build/dist/client/delegate-ui-dom.d.ts +40 -0
- package/data/build/dist/client/delegate-ui-dom.d.ts.map +1 -0
- package/data/build/dist/client/delegate-ui-dom.js +363 -0
- package/data/build/dist/client/delegate-ui-dom.js.map +1 -0
- package/data/build/dist/client/external-tool-stream.d.ts.map +1 -1
- package/data/build/dist/client/external-tool-stream.js +44 -36
- package/data/build/dist/client/external-tool-stream.js.map +1 -1
- package/data/build/dist/client/features/cli-adapters.d.ts +7 -2
- package/data/build/dist/client/features/cli-adapters.d.ts.map +1 -1
- package/data/build/dist/client/features/cli-adapters.js +52 -103
- package/data/build/dist/client/features/cli-adapters.js.map +1 -1
- package/data/build/dist/client/features/debug.d.ts.map +1 -1
- package/data/build/dist/client/features/debug.js +5 -3
- package/data/build/dist/client/features/debug.js.map +1 -1
- package/data/build/dist/client/features/file-management.d.ts.map +1 -1
- package/data/build/dist/client/features/file-management.js +7 -4
- package/data/build/dist/client/features/file-management.js.map +1 -1
- package/data/build/dist/client/features/lan-access-panel.js +10 -10
- package/data/build/dist/client/features/lan-access-panel.js.map +1 -1
- package/data/build/dist/client/features/lan-access.d.ts.map +1 -1
- package/data/build/dist/client/features/lan-access.js +8 -3
- package/data/build/dist/client/features/lan-access.js.map +1 -1
- package/data/build/dist/client/features/login-protection-panel.d.ts.map +1 -1
- package/data/build/dist/client/features/login-protection-panel.js +9 -7
- package/data/build/dist/client/features/login-protection-panel.js.map +1 -1
- package/data/build/dist/client/features/login-protection.js +2 -2
- package/data/build/dist/client/features/login-protection.js.map +1 -1
- package/data/build/dist/client/features/mobile-access.d.ts.map +1 -1
- package/data/build/dist/client/features/mobile-access.js +6 -2
- package/data/build/dist/client/features/mobile-access.js.map +1 -1
- package/data/build/dist/client/features/peer-host.d.ts.map +1 -1
- package/data/build/dist/client/features/peer-host.js +115 -11
- package/data/build/dist/client/features/peer-host.js.map +1 -1
- package/data/build/dist/client/features/reverse-proxy.js +2 -2
- package/data/build/dist/client/features/reverse-proxy.js.map +1 -1
- package/data/build/dist/client/features/terminal-enhancement.js +2 -2
- package/data/build/dist/client/features/terminal-enhancement.js.map +1 -1
- package/data/build/dist/client/features/workspace-session-enhancement-panel.js +1 -1
- package/data/build/dist/client/features/workspace-session-enhancement-panel.js.map +1 -1
- package/data/build/dist/client/features/workspace-session-enhancement.d.ts.map +1 -1
- package/data/build/dist/client/features/workspace-session-enhancement.js +8 -3
- package/data/build/dist/client/features/workspace-session-enhancement.js.map +1 -1
- package/data/build/dist/client/file-management-dom.d.ts +3 -0
- package/data/build/dist/client/file-management-dom.d.ts.map +1 -1
- package/data/build/dist/client/file-management-dom.js +41 -30
- package/data/build/dist/client/file-management-dom.js.map +1 -1
- package/data/build/dist/client/git-management.d.ts +2 -0
- package/data/build/dist/client/git-management.d.ts.map +1 -1
- package/data/build/dist/client/git-management.js +82 -74
- package/data/build/dist/client/git-management.js.map +1 -1
- package/data/build/dist/client/git-workspace-events.d.ts +7 -0
- package/data/build/dist/client/git-workspace-events.d.ts.map +1 -0
- package/data/build/dist/client/git-workspace-events.js +32 -0
- package/data/build/dist/client/git-workspace-events.js.map +1 -0
- package/data/build/dist/client/index.d.ts +2 -0
- package/data/build/dist/client/index.d.ts.map +1 -1
- package/data/build/dist/client/index.js +6 -5
- package/data/build/dist/client/index.js.map +1 -1
- package/data/build/dist/client/locale.d.ts +7 -0
- package/data/build/dist/client/locale.d.ts.map +1 -1
- package/data/build/dist/client/locale.js +80 -36
- package/data/build/dist/client/locale.js.map +1 -1
- package/data/build/dist/client/locales/debug.d.ts +9 -0
- package/data/build/dist/client/locales/debug.d.ts.map +1 -0
- package/data/build/dist/client/locales/debug.js +163 -0
- package/data/build/dist/client/locales/debug.js.map +1 -0
- package/data/build/dist/client/locales/fileWorkspace.d.ts +9 -0
- package/data/build/dist/client/locales/fileWorkspace.d.ts.map +1 -0
- package/data/build/dist/client/locales/fileWorkspace.js +139 -0
- package/data/build/dist/client/locales/fileWorkspace.js.map +1 -0
- package/data/build/dist/client/locales/git.d.ts +9 -0
- package/data/build/dist/client/locales/git.d.ts.map +1 -0
- package/data/build/dist/client/locales/git.js +223 -0
- package/data/build/dist/client/locales/git.js.map +1 -0
- package/data/build/dist/client/locales/panels.d.ts +9 -0
- package/data/build/dist/client/locales/panels.d.ts.map +1 -0
- package/data/build/dist/client/locales/panels.js +33 -0
- package/data/build/dist/client/locales/panels.js.map +1 -0
- package/data/build/dist/client/locales/peerHost.d.ts +9 -0
- package/data/build/dist/client/locales/peerHost.d.ts.map +1 -0
- package/data/build/dist/client/locales/peerHost.js +153 -0
- package/data/build/dist/client/locales/peerHost.js.map +1 -0
- package/data/build/dist/client/locales/peerHostWorkspace.d.ts +9 -0
- package/data/build/dist/client/locales/peerHostWorkspace.d.ts.map +1 -0
- package/data/build/dist/client/locales/peerHostWorkspace.js +69 -0
- package/data/build/dist/client/locales/peerHostWorkspace.js.map +1 -0
- package/data/build/dist/client/locales/terminalAuth.d.ts +9 -0
- package/data/build/dist/client/locales/terminalAuth.d.ts.map +1 -0
- package/data/build/dist/client/locales/terminalAuth.js +67 -0
- package/data/build/dist/client/locales/terminalAuth.js.map +1 -0
- package/data/build/dist/client/locales/usage.d.ts +9 -0
- package/data/build/dist/client/locales/usage.d.ts.map +1 -0
- package/data/build/dist/client/locales/usage.js +195 -0
- package/data/build/dist/client/locales/usage.js.map +1 -0
- package/data/build/dist/client/mobile-session-interaction.d.ts +44 -0
- package/data/build/dist/client/mobile-session-interaction.d.ts.map +1 -0
- package/data/build/dist/client/mobile-session-interaction.js +291 -0
- package/data/build/dist/client/mobile-session-interaction.js.map +1 -0
- package/data/build/dist/client/mobile-sidebar-rail-dom.d.ts +10 -2
- package/data/build/dist/client/mobile-sidebar-rail-dom.d.ts.map +1 -1
- package/data/build/dist/client/mobile-sidebar-rail-dom.js +14 -6
- package/data/build/dist/client/mobile-sidebar-rail-dom.js.map +1 -1
- package/data/build/dist/client/peer-host-connection-button.d.ts +14 -1
- package/data/build/dist/client/peer-host-connection-button.d.ts.map +1 -1
- package/data/build/dist/client/peer-host-connection-button.js +12 -4
- package/data/build/dist/client/peer-host-connection-button.js.map +1 -1
- package/data/build/dist/client/peer-host-management-panel.d.ts +3 -0
- package/data/build/dist/client/peer-host-management-panel.d.ts.map +1 -1
- package/data/build/dist/client/peer-host-management-panel.js +83 -79
- package/data/build/dist/client/peer-host-management-panel.js.map +1 -1
- package/data/build/dist/client/peer-host-native-projection.d.ts +1 -0
- package/data/build/dist/client/peer-host-native-projection.d.ts.map +1 -1
- package/data/build/dist/client/peer-host-native-projection.js +5 -0
- package/data/build/dist/client/peer-host-native-projection.js.map +1 -1
- package/data/build/dist/client/peer-host-scoped-client.js +5 -5
- package/data/build/dist/client/peer-host-scoped-client.js.map +1 -1
- package/data/build/dist/client/peer-host-workspace-tab.d.ts +8 -0
- package/data/build/dist/client/peer-host-workspace-tab.d.ts.map +1 -1
- package/data/build/dist/client/peer-host-workspace-tab.js +48 -28
- package/data/build/dist/client/peer-host-workspace-tab.js.map +1 -1
- package/data/build/dist/client/provider-icon-assets.js +4 -0
- package/data/build/dist/client/provider-icon-assets.js.map +1 -1
- package/data/build/dist/client/provider-icons.d.ts +8 -2
- package/data/build/dist/client/provider-icons.d.ts.map +1 -1
- package/data/build/dist/client/provider-icons.js +13 -4
- package/data/build/dist/client/provider-icons.js.map +1 -1
- package/data/build/dist/client/pwa-install-prompt.d.ts +4 -1
- package/data/build/dist/client/pwa-install-prompt.d.ts.map +1 -1
- package/data/build/dist/client/pwa-install-prompt.js +8 -7
- package/data/build/dist/client/pwa-install-prompt.js.map +1 -1
- package/data/build/dist/client/quick-phrase-layout.d.ts +11 -0
- package/data/build/dist/client/quick-phrase-layout.d.ts.map +1 -1
- package/data/build/dist/client/quick-phrase-layout.js +20 -0
- package/data/build/dist/client/quick-phrase-layout.js.map +1 -1
- package/data/build/dist/client/quick-phrase-slot.d.ts.map +1 -1
- package/data/build/dist/client/quick-phrase-slot.js +20 -8
- package/data/build/dist/client/quick-phrase-slot.js.map +1 -1
- package/data/build/dist/client/session-changed-files-view.d.ts +8 -1
- package/data/build/dist/client/session-changed-files-view.d.ts.map +1 -1
- package/data/build/dist/client/session-changed-files-view.js +71 -28
- package/data/build/dist/client/session-changed-files-view.js.map +1 -1
- package/data/build/dist/client/settings-anchor.d.ts +9 -3
- package/data/build/dist/client/settings-anchor.d.ts.map +1 -1
- package/data/build/dist/client/settings-anchor.js +8 -2
- package/data/build/dist/client/settings-anchor.js.map +1 -1
- package/data/build/dist/client/settings-section.js +3 -3
- package/data/build/dist/client/settings-section.js.map +1 -1
- package/data/build/dist/client/subscription-slot.d.ts +4 -1
- package/data/build/dist/client/subscription-slot.d.ts.map +1 -1
- package/data/build/dist/client/subscription-slot.js +327 -51
- package/data/build/dist/client/subscription-slot.js.map +1 -1
- package/data/build/dist/client/terminal/model.d.ts +13 -2
- package/data/build/dist/client/terminal/model.d.ts.map +1 -1
- package/data/build/dist/client/terminal/model.js +27 -7
- package/data/build/dist/client/terminal/model.js.map +1 -1
- package/data/build/dist/client/terminal/ui.d.ts.map +1 -1
- package/data/build/dist/client/terminal/ui.js +3 -1
- package/data/build/dist/client/terminal/ui.js.map +1 -1
- package/data/build/dist/client/terminal/xterm-view.d.ts +4 -1
- package/data/build/dist/client/terminal/xterm-view.d.ts.map +1 -1
- package/data/build/dist/client/terminal/xterm-view.js +19 -17
- package/data/build/dist/client/terminal/xterm-view.js.map +1 -1
- package/data/build/dist/client/workspace-session-archive-dom.d.ts +3 -0
- package/data/build/dist/client/workspace-session-archive-dom.d.ts.map +1 -1
- package/data/build/dist/client/workspace-session-archive-dom.js +131 -45
- package/data/build/dist/client/workspace-session-archive-dom.js.map +1 -1
- package/data/build/dist/client/workspace-session-logo-dom.d.ts +3 -0
- package/data/build/dist/client/workspace-session-logo-dom.d.ts.map +1 -1
- package/data/build/dist/client/workspace-session-logo-dom.js +3 -1
- package/data/build/dist/client/workspace-session-logo-dom.js.map +1 -1
- package/data/build/dist/client/workspace-session-visibility-dom.d.ts +3 -0
- package/data/build/dist/client/workspace-session-visibility-dom.d.ts.map +1 -1
- package/data/build/dist/client/workspace-session-visibility-dom.js +46 -17
- package/data/build/dist/client/workspace-session-visibility-dom.js.map +1 -1
- package/data/build/dist/dsh-capabilities/client/primitives-adapter.d.ts +10 -0
- package/data/build/dist/dsh-capabilities/client/primitives-adapter.d.ts.map +1 -1
- package/data/build/dist/dsh-capabilities/client/primitives-adapter.js +20 -0
- package/data/build/dist/dsh-capabilities/client/primitives-adapter.js.map +1 -1
- package/data/build/dist/host/browser-text.d.ts +30 -0
- package/data/build/dist/host/browser-text.d.ts.map +1 -0
- package/data/build/dist/host/browser-text.js +105 -0
- package/data/build/dist/host/browser-text.js.map +1 -0
- package/data/build/dist/host/cli-adapters/claude-driver.d.ts +28 -2
- package/data/build/dist/host/cli-adapters/claude-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/claude-driver.js +73 -3
- package/data/build/dist/host/cli-adapters/claude-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/claude-model-options.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/claude-model-options.js +22 -9
- package/data/build/dist/host/cli-adapters/claude-model-options.js.map +1 -1
- package/data/build/dist/host/cli-adapters/codex-driver.d.ts +10 -0
- package/data/build/dist/host/cli-adapters/codex-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/codex-driver.js +105 -5
- package/data/build/dist/host/cli-adapters/codex-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/command-code-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/command-code-driver.js +49 -7
- package/data/build/dist/host/cli-adapters/command-code-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/delegate-dispatch.d.ts +47 -0
- package/data/build/dist/host/cli-adapters/delegate-dispatch.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/delegate-dispatch.js +158 -0
- package/data/build/dist/host/cli-adapters/delegate-dispatch.js.map +1 -0
- package/data/build/dist/host/cli-adapters/desktop-app-runtime.d.ts +32 -0
- package/data/build/dist/host/cli-adapters/desktop-app-runtime.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/desktop-app-runtime.js +121 -0
- package/data/build/dist/host/cli-adapters/desktop-app-runtime.js.map +1 -0
- package/data/build/dist/host/cli-adapters/dsh-message-projector.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/dsh-message-projector.js +5 -4
- package/data/build/dist/host/cli-adapters/dsh-message-projector.js.map +1 -1
- package/data/build/dist/host/cli-adapters/dsh-virtual-providers.d.ts +16 -0
- package/data/build/dist/host/cli-adapters/dsh-virtual-providers.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/dsh-virtual-providers.js +73 -0
- package/data/build/dist/host/cli-adapters/dsh-virtual-providers.js.map +1 -0
- package/data/build/dist/host/cli-adapters/feature.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/feature.js +196 -14
- package/data/build/dist/host/cli-adapters/feature.js.map +1 -1
- package/data/build/dist/host/cli-adapters/gemini-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/gemini-driver.js +21 -5
- package/data/build/dist/host/cli-adapters/gemini-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/grok-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/grok-driver.js +24 -7
- package/data/build/dist/host/cli-adapters/grok-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/json-rpc-process.d.ts +22 -6
- package/data/build/dist/host/cli-adapters/json-rpc-process.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/json-rpc-process.js +118 -21
- package/data/build/dist/host/cli-adapters/json-rpc-process.js.map +1 -1
- package/data/build/dist/host/cli-adapters/kimi-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/kimi-driver.js +25 -4
- package/data/build/dist/host/cli-adapters/kimi-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/legacy-session-adapter.d.ts +11 -2
- package/data/build/dist/host/cli-adapters/legacy-session-adapter.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/legacy-session-adapter.js +15 -6
- package/data/build/dist/host/cli-adapters/legacy-session-adapter.js.map +1 -1
- package/data/build/dist/host/cli-adapters/mcode-catalog.d.ts +23 -0
- package/data/build/dist/host/cli-adapters/mcode-catalog.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/mcode-catalog.js +120 -0
- package/data/build/dist/host/cli-adapters/mcode-catalog.js.map +1 -0
- package/data/build/dist/host/cli-adapters/mcode-driver.d.ts +56 -0
- package/data/build/dist/host/cli-adapters/mcode-driver.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/mcode-driver.js +544 -0
- package/data/build/dist/host/cli-adapters/mcode-driver.js.map +1 -0
- package/data/build/dist/host/cli-adapters/model-catalog.d.ts +30 -5
- package/data/build/dist/host/cli-adapters/model-catalog.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/model-catalog.js +83 -8
- package/data/build/dist/host/cli-adapters/model-catalog.js.map +1 -1
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.d.ts +51 -0
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.js +193 -0
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.js.map +1 -0
- package/data/build/dist/host/cli-adapters/native-subagent-holder.d.ts +4 -0
- package/data/build/dist/host/cli-adapters/native-subagent-holder.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/native-subagent-holder.js +4 -0
- package/data/build/dist/host/cli-adapters/native-subagent-holder.js.map +1 -0
- package/data/build/dist/host/cli-adapters/native-team-proxy.js +18 -15
- package/data/build/dist/host/cli-adapters/native-team-proxy.js.map +1 -1
- package/data/build/dist/host/cli-adapters/native-team-subagent.d.ts +45 -0
- package/data/build/dist/host/cli-adapters/native-team-subagent.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/native-team-subagent.js +107 -0
- package/data/build/dist/host/cli-adapters/native-team-subagent.js.map +1 -0
- package/data/build/dist/host/cli-adapters/opencode-driver.js +13 -3
- package/data/build/dist/host/cli-adapters/opencode-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/pi-driver.js +24 -7
- package/data/build/dist/host/cli-adapters/pi-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/provider-subscription.d.ts +8 -1
- package/data/build/dist/host/cli-adapters/provider-subscription.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/provider-subscription.js +98 -2
- package/data/build/dist/host/cli-adapters/provider-subscription.js.map +1 -1
- package/data/build/dist/host/cli-adapters/registry-holder.d.ts +4 -0
- package/data/build/dist/host/cli-adapters/registry-holder.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/registry-holder.js +9 -0
- package/data/build/dist/host/cli-adapters/registry-holder.js.map +1 -0
- package/data/build/dist/host/cli-adapters/registry.d.ts +13 -0
- package/data/build/dist/host/cli-adapters/registry.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/registry.js +37 -0
- package/data/build/dist/host/cli-adapters/registry.js.map +1 -1
- package/data/build/dist/host/cli-adapters/session-store.d.ts +6 -1
- package/data/build/dist/host/cli-adapters/session-store.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/session-store.js +42 -4
- package/data/build/dist/host/cli-adapters/session-store.js.map +1 -1
- package/data/build/dist/host/cli-adapters/standard-stream-driver.d.ts +2 -0
- package/data/build/dist/host/cli-adapters/standard-stream-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/standard-stream-driver.js +30 -4
- package/data/build/dist/host/cli-adapters/standard-stream-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/subagent-tool.d.ts +5 -0
- package/data/build/dist/host/cli-adapters/subagent-tool.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/subagent-tool.js +66 -0
- package/data/build/dist/host/cli-adapters/subagent-tool.js.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-driver.d.ts +57 -0
- package/data/build/dist/host/cli-adapters/zcode-driver.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-driver.js +843 -0
- package/data/build/dist/host/cli-adapters/zcode-driver.js.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-subscription.d.ts +28 -0
- package/data/build/dist/host/cli-adapters/zcode-subscription.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-subscription.js +212 -0
- package/data/build/dist/host/cli-adapters/zcode-subscription.js.map +1 -0
- package/data/build/dist/host/cli-bridge/bridge-holder.d.ts +27 -0
- package/data/build/dist/host/cli-bridge/bridge-holder.d.ts.map +1 -0
- package/data/build/dist/host/cli-bridge/bridge-holder.js +51 -0
- package/data/build/dist/host/cli-bridge/bridge-holder.js.map +1 -0
- package/data/build/dist/host/cli-bridge/bridge-server.d.ts +34 -0
- package/data/build/dist/host/cli-bridge/bridge-server.d.ts.map +1 -0
- package/data/build/dist/host/cli-bridge/bridge-server.js +135 -0
- package/data/build/dist/host/cli-bridge/bridge-server.js.map +1 -0
- package/data/build/dist/host/cli-bridge/command-code-mod.d.ts +25 -0
- package/data/build/dist/host/cli-bridge/command-code-mod.d.ts.map +1 -0
- package/data/build/dist/host/cli-bridge/command-code-mod.js +60 -0
- package/data/build/dist/host/cli-bridge/command-code-mod.js.map +1 -0
- package/data/build/dist/host/cli-bridge/dispatch.d.ts +19 -0
- package/data/build/dist/host/cli-bridge/dispatch.d.ts.map +1 -0
- package/data/build/dist/host/cli-bridge/dispatch.js +90 -0
- package/data/build/dist/host/cli-bridge/dispatch.js.map +1 -0
- package/data/build/dist/host/cli-bridge/injections.d.ts +28 -0
- package/data/build/dist/host/cli-bridge/injections.d.ts.map +1 -0
- package/data/build/dist/host/cli-bridge/injections.js +131 -0
- package/data/build/dist/host/cli-bridge/injections.js.map +1 -0
- package/data/build/dist/host/cli-bridge/mcp-stdio-entry.d.ts +8 -0
- package/data/build/dist/host/cli-bridge/mcp-stdio-entry.d.ts.map +1 -0
- package/data/build/dist/host/cli-bridge/mcp-stdio-entry.js +151 -0
- package/data/build/dist/host/cli-bridge/mcp-stdio-entry.js.map +1 -0
- package/data/build/dist/host/features/lan-access-dsh.d.ts.map +1 -1
- package/data/build/dist/host/features/lan-access-dsh.js +6 -2
- package/data/build/dist/host/features/lan-access-dsh.js.map +1 -1
- package/data/build/dist/host/features/peer-host.d.ts.map +1 -1
- package/data/build/dist/host/features/peer-host.js +2 -1
- package/data/build/dist/host/features/peer-host.js.map +1 -1
- package/data/build/dist/host/index.d.ts +4 -0
- package/data/build/dist/host/index.d.ts.map +1 -1
- package/data/build/dist/host/index.js +36 -0
- package/data/build/dist/host/index.js.map +1 -1
- package/data/build/dist/host/lan-access-dsh.d.ts +7 -1
- package/data/build/dist/host/lan-access-dsh.d.ts.map +1 -1
- package/data/build/dist/host/lan-access-dsh.js +95 -19
- package/data/build/dist/host/lan-access-dsh.js.map +1 -1
- package/data/build/dist/host/login-attempt-guard.d.ts +55 -0
- package/data/build/dist/host/login-attempt-guard.d.ts.map +1 -0
- package/data/build/dist/host/login-attempt-guard.js +201 -0
- package/data/build/dist/host/login-attempt-guard.js.map +1 -0
- package/data/build/dist/host/modules/peer-host/host-api-proxy-service.d.ts +3 -0
- package/data/build/dist/host/modules/peer-host/host-api-proxy-service.d.ts.map +1 -1
- package/data/build/dist/host/modules/peer-host/host-api-proxy-service.js +2 -0
- package/data/build/dist/host/modules/peer-host/host-api-proxy-service.js.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-aggregate-service.d.ts +1 -0
- package/data/build/dist/host/modules/peer-host/peer-host-aggregate-service.d.ts.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-aggregate-service.js +1 -0
- package/data/build/dist/host/modules/peer-host/peer-host-aggregate-service.js.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.d.ts +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.d.ts.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.js +3 -0
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.js.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-native-transport.d.ts +8 -0
- package/data/build/dist/host/modules/peer-host/peer-host-native-transport.d.ts.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-native-transport.js +9 -0
- package/data/build/dist/host/modules/peer-host/peer-host-native-transport.js.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-remote-summary-source.d.ts +7 -0
- package/data/build/dist/host/modules/peer-host/peer-host-remote-summary-source.d.ts.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-remote-summary-source.js +31 -3
- package/data/build/dist/host/modules/peer-host/peer-host-remote-summary-source.js.map +1 -1
- package/data/build/dist/host/modules/pwa/pwa-assets.d.ts +6 -4
- package/data/build/dist/host/modules/pwa/pwa-assets.d.ts.map +1 -1
- package/data/build/dist/host/modules/pwa/pwa-assets.js +11 -9
- package/data/build/dist/host/modules/pwa/pwa-assets.js.map +1 -1
- package/data/build/dist/host/modules/pwa/pwa-session-notifications.d.ts +3 -0
- package/data/build/dist/host/modules/pwa/pwa-session-notifications.d.ts.map +1 -1
- package/data/build/dist/host/modules/pwa/pwa-session-notifications.js +6 -4
- package/data/build/dist/host/modules/pwa/pwa-session-notifications.js.map +1 -1
- package/data/build/dist/host/native-session-bridge.d.ts.map +1 -1
- package/data/build/dist/host/native-session-bridge.js +70 -52
- package/data/build/dist/host/native-session-bridge.js.map +1 -1
- package/data/build/dist/host/rpc.js +4 -1
- package/data/build/dist/host/rpc.js.map +1 -1
- package/data/build/dist/host/settings.d.ts.map +1 -1
- package/data/build/dist/host/settings.js +3 -0
- package/data/build/dist/host/settings.js.map +1 -1
- package/data/build/dist/shared/contracts/cli-adapter.d.ts +5 -0
- package/data/build/dist/shared/contracts/cli-adapter.d.ts.map +1 -1
- package/data/build/dist/shared/contracts/config.d.ts +10 -0
- package/data/build/dist/shared/contracts/config.d.ts.map +1 -1
- package/data/build/dist/shared/contracts/config.js +8 -0
- package/data/build/dist/shared/contracts/config.js.map +1 -1
- package/data/build/dist/shared/contracts/peer-host.d.ts +2 -0
- package/data/build/dist/shared/contracts/peer-host.d.ts.map +1 -1
- package/data/build/dist/shared/contracts/peer-host.js.map +1 -1
- package/data/build/dist/shared/contracts/subscription.d.ts +15 -0
- package/data/build/dist/shared/contracts/subscription.d.ts.map +1 -1
- package/data/build/dist/shared/contracts/subscription.js.map +1 -1
- package/data/build/dist/shared/contracts/version.d.ts +1 -1
- package/data/build/dist/shared/contracts/version.d.ts.map +1 -1
- package/data/build/dist/shared/contracts/version.js +1 -1
- package/data/build/dist/shared/contracts/version.js.map +1 -1
- package/data/build/dist/shared/index.d.ts +1 -1
- package/data/build/dist/shared/index.d.ts.map +1 -1
- package/data/build/dist/shared/index.js.map +1 -1
- package/package.json +3 -1
- package/profile/README.md +2 -2
- package/profile/package.json +2 -2
- package/profile/version.json +1 -1
- package/version.json +1 -1
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Command Code 托管 mod:把内建 `agent` 工具调用转投给 DSH 原生子代理。
|
|
3
|
+
*
|
|
4
|
+
* 由驱动以 `--mod <path>` 每次运行加载;桥接配置(地址/令牌/会话)从进程环境
|
|
5
|
+
* 读取。转投失败(桥接不可达、未启用)时返回 undefined,让内建子代理继续工作。
|
|
6
|
+
*
|
|
7
|
+
* 该文件被外部 CLI 通过 jiti 直接加载,因此必须自包含:零导入、零依赖。
|
|
8
|
+
*/
|
|
9
|
+
interface ToolCallHookContext {
|
|
10
|
+
readonly toolCallId?: string;
|
|
11
|
+
readonly toolName?: string;
|
|
12
|
+
readonly input?: Record<string, unknown>;
|
|
13
|
+
}
|
|
14
|
+
interface ToolCallHookResult {
|
|
15
|
+
readonly block?: boolean;
|
|
16
|
+
readonly additionalContext?: string;
|
|
17
|
+
}
|
|
18
|
+
interface ModApiLike {
|
|
19
|
+
readonly hooks: (hooks: {
|
|
20
|
+
readonly beforeToolCall?: (context: ToolCallHookContext) => Promise<ToolCallHookResult | undefined> | ToolCallHookResult | undefined;
|
|
21
|
+
}) => unknown;
|
|
22
|
+
}
|
|
23
|
+
export default function codingNsSubagentMod(cmd: ModApiLike): void;
|
|
24
|
+
export {};
|
|
25
|
+
//# sourceMappingURL=command-code-mod.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-code-mod.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/command-code-mod.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACzC;AAED,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CACpC;AAED,UAAU,UAAU;IAClB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;QACtB,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,GAAG,kBAAkB,GAAG,SAAS,CAAA;KACrI,KAAK,OAAO,CAAA;CACd;AAID,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,CAiBjE"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Command Code 托管 mod:把内建 `agent` 工具调用转投给 DSH 原生子代理。
|
|
3
|
+
*
|
|
4
|
+
* 由驱动以 `--mod <path>` 每次运行加载;桥接配置(地址/令牌/会话)从进程环境
|
|
5
|
+
* 读取。转投失败(桥接不可达、未启用)时返回 undefined,让内建子代理继续工作。
|
|
6
|
+
*
|
|
7
|
+
* 该文件被外部 CLI 通过 jiti 直接加载,因此必须自包含:零导入、零依赖。
|
|
8
|
+
*/
|
|
9
|
+
const DISPATCH_TIMEOUT_MS = 16 * 60_000;
|
|
10
|
+
export default function codingNsSubagentMod(cmd) {
|
|
11
|
+
const baseUrl = (process.env.CODINGNS_BRIDGE_URL ?? '').replace(/\/+$/u, '');
|
|
12
|
+
const token = process.env.CODINGNS_BRIDGE_TOKEN ?? '';
|
|
13
|
+
const sessionId = process.env.CODINGNS_DSH_SESSION_ID ?? '';
|
|
14
|
+
if (baseUrl === '' || token === '' || sessionId === '')
|
|
15
|
+
return;
|
|
16
|
+
cmd.hooks({
|
|
17
|
+
beforeToolCall: async (context) => {
|
|
18
|
+
// 只接管内建子代理入口;agent_output / agent_stop 等控制工具保持原样。
|
|
19
|
+
if (context.toolName !== 'agent')
|
|
20
|
+
return undefined;
|
|
21
|
+
const input = context.input ?? {};
|
|
22
|
+
const prompt = typeof input.prompt === 'string' ? input.prompt : '';
|
|
23
|
+
if (prompt.trim() === '')
|
|
24
|
+
return undefined;
|
|
25
|
+
const text = await dispatchToBridge(baseUrl, token, sessionId, context.toolCallId, prompt, input);
|
|
26
|
+
if (text === undefined)
|
|
27
|
+
return undefined;
|
|
28
|
+
return { block: true, additionalContext: text };
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
async function dispatchToBridge(baseUrl, token, sessionId, toolCallId, prompt, input) {
|
|
33
|
+
try {
|
|
34
|
+
const response = await fetch(`${baseUrl}/v1/dispatch`, {
|
|
35
|
+
method: 'POST',
|
|
36
|
+
headers: { authorization: `Bearer ${token}`, 'content-type': 'application/json' },
|
|
37
|
+
body: JSON.stringify({
|
|
38
|
+
sessionId,
|
|
39
|
+
prompt,
|
|
40
|
+
...(toolCallId === undefined || toolCallId === '' ? {} : { toolCallId }),
|
|
41
|
+
...(typeof input.description === 'string' && input.description.trim() !== '' ? { description: input.description.trim() } : {}),
|
|
42
|
+
...(typeof input.subagent_type === 'string' && input.subagent_type.trim() !== '' ? { subagentType: input.subagent_type.trim() } : {}),
|
|
43
|
+
...(typeof input.model === 'string' && input.model.trim() !== '' ? { model: input.model.trim() } : {}),
|
|
44
|
+
}),
|
|
45
|
+
signal: AbortSignal.timeout(DISPATCH_TIMEOUT_MS),
|
|
46
|
+
});
|
|
47
|
+
if (!response.ok)
|
|
48
|
+
return undefined;
|
|
49
|
+
const payload = await response.json();
|
|
50
|
+
if (payload.ok !== true)
|
|
51
|
+
return undefined;
|
|
52
|
+
const text = typeof payload.text === 'string' ? payload.text : '';
|
|
53
|
+
return text.trim() === '' ? '(子代理没有文本输出)' : text;
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// 桥接故障时交给内建子代理;错误不写 stdout,避免污染 CLI 的协议流。
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=command-code-mod.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-code-mod.js","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/command-code-mod.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { CodingNsNativeSessionBridge } from '../native-session-bridge.js';
|
|
2
|
+
import type { SubagentBridgeDispatchRequest, SubagentBridgeDispatchResult } from './bridge-server.js';
|
|
3
|
+
/** DSH Agent 注册表的最小结构;测试可注入替身。 */
|
|
4
|
+
export interface BridgeAgentRegistry {
|
|
5
|
+
readonly get?: ((id: string) => unknown) | undefined;
|
|
6
|
+
readonly list?: (() => readonly unknown[]) | undefined;
|
|
7
|
+
}
|
|
8
|
+
export interface SubagentBridgeDispatchDeps {
|
|
9
|
+
readonly agents?: BridgeAgentRegistry | undefined;
|
|
10
|
+
readonly nativeSessions?: CodingNsNativeSessionBridge | undefined;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* 把一次外部 CLI 的子代理请求落地为 DSH 原生可续子会话。
|
|
14
|
+
*
|
|
15
|
+
* 适配器缺省取当前会话绑定;显式 agent 参数允许子代理换用其他外部 Agent。
|
|
16
|
+
* 创建阶段使用排队守卫,保证并行批次按顺序创建而不是互相拒绝。
|
|
17
|
+
*/
|
|
18
|
+
export declare function dispatchBridgeSubagent(request: SubagentBridgeDispatchRequest, deps: SubagentBridgeDispatchDeps): Promise<SubagentBridgeDispatchResult>;
|
|
19
|
+
//# sourceMappingURL=dispatch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AAK9E,OAAO,KAAK,EAAE,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAA;AAErG,kCAAkC;AAClC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,SAAS,OAAO,EAAE,CAAC,GAAG,SAAS,CAAA;CACvD;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAA;IACjD,QAAQ,CAAC,cAAc,CAAC,EAAE,2BAA2B,GAAG,SAAS,CAAA;CAClE;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,EACtC,IAAI,EAAE,0BAA0B,GAC/B,OAAO,CAAC,4BAA4B,CAAC,CA+CvC"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { dispatchNativeSubagent } from '../cli-adapters/native-subagent-dispatch.js';
|
|
2
|
+
import { getNativeSubagents } from '../cli-adapters/native-subagent-holder.js';
|
|
3
|
+
import { enqueueTeamSubagentSelection, EXTERNAL_SUBAGENT_IDS } from '../cli-adapters/native-team-subagent.js';
|
|
4
|
+
import { getAdapterRegistry } from '../cli-adapters/registry-holder.js';
|
|
5
|
+
/**
|
|
6
|
+
* 把一次外部 CLI 的子代理请求落地为 DSH 原生可续子会话。
|
|
7
|
+
*
|
|
8
|
+
* 适配器缺省取当前会话绑定;显式 agent 参数允许子代理换用其他外部 Agent。
|
|
9
|
+
* 创建阶段使用排队守卫,保证并行批次按顺序创建而不是互相拒绝。
|
|
10
|
+
*/
|
|
11
|
+
export async function dispatchBridgeSubagent(request, deps) {
|
|
12
|
+
const native = getNativeSubagents();
|
|
13
|
+
if (native?.startContinuable === undefined) {
|
|
14
|
+
return bridgeFailure('DSH 原生 Subagent 能力不可用,当前 Host 未提供可续子会话');
|
|
15
|
+
}
|
|
16
|
+
if (deps.nativeSessions === undefined) {
|
|
17
|
+
return bridgeFailure('DSH 原生会话桥接不可用');
|
|
18
|
+
}
|
|
19
|
+
const parentAgent = findAgentBySession(deps.agents, request.sessionId);
|
|
20
|
+
if (parentAgent === undefined) {
|
|
21
|
+
return bridgeFailure(`找不到会话对应的 DSH Agent: ${request.sessionId}`);
|
|
22
|
+
}
|
|
23
|
+
const parentId = parentAgent.session?.header?.id ?? parentAgent.id ?? request.sessionId;
|
|
24
|
+
const adapterId = (request.agent ?? resolveSessionAdapter(request.sessionId) ?? '').trim();
|
|
25
|
+
if (!EXTERNAL_SUBAGENT_IDS.includes(adapterId)) {
|
|
26
|
+
return bridgeFailure(`不支持的外部 Agent: ${adapterId === '' ? '(未指定)' : adapterId}`);
|
|
27
|
+
}
|
|
28
|
+
const registry = getAdapterRegistry();
|
|
29
|
+
if (registry !== undefined) {
|
|
30
|
+
const adapter = (await registry.catalog()).find((item) => item.id === adapterId);
|
|
31
|
+
if (adapter === undefined || !adapter.installed || !adapter.enabled) {
|
|
32
|
+
return bridgeFailure(`${adapterId} 未安装或未启用`);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
const modelId = request.model?.trim() === '' ? undefined : request.model?.trim();
|
|
36
|
+
try {
|
|
37
|
+
const result = await dispatchNativeSubagent(native, deps.nativeSessions, {
|
|
38
|
+
adapterId,
|
|
39
|
+
prompt: request.prompt,
|
|
40
|
+
parentAgent,
|
|
41
|
+
parentId,
|
|
42
|
+
modelId,
|
|
43
|
+
background: false,
|
|
44
|
+
select: (action) => enqueueTeamSubagentSelection(parentId, adapterId, modelId, action),
|
|
45
|
+
});
|
|
46
|
+
return {
|
|
47
|
+
ok: result.ok,
|
|
48
|
+
completed: result.completed,
|
|
49
|
+
text: result.text,
|
|
50
|
+
childSessionId: result.childSessionId,
|
|
51
|
+
toolCalls: result.toolCalls,
|
|
52
|
+
...(result.error === undefined ? {} : { error: result.error }),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
57
|
+
return bridgeFailure(message || '子代理派发失败,且未返回具体错误。');
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
function bridgeFailure(error) {
|
|
61
|
+
const message = error.trim() || '子代理派发失败,且未返回具体错误。';
|
|
62
|
+
return { ok: false, completed: false, text: message, error: message };
|
|
63
|
+
}
|
|
64
|
+
function resolveSessionAdapter(sessionId) {
|
|
65
|
+
try {
|
|
66
|
+
return getAdapterRegistry()?.getSession(sessionId).adapterId;
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return undefined;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
function findAgentBySession(agents, sessionId) {
|
|
73
|
+
if (agents === undefined)
|
|
74
|
+
return undefined;
|
|
75
|
+
if (sessionId !== '' && typeof agents.get === 'function') {
|
|
76
|
+
const direct = agents.get(sessionId);
|
|
77
|
+
if (direct !== undefined)
|
|
78
|
+
return direct;
|
|
79
|
+
}
|
|
80
|
+
for (const candidate of agents.list?.() ?? []) {
|
|
81
|
+
const session = readUnknown(candidate, 'session');
|
|
82
|
+
if (readUnknown(session, 'id') === sessionId || readUnknown(candidate, 'id') === sessionId)
|
|
83
|
+
return candidate;
|
|
84
|
+
}
|
|
85
|
+
return undefined;
|
|
86
|
+
}
|
|
87
|
+
function readUnknown(value, key) {
|
|
88
|
+
return typeof value === 'object' && value !== null ? Reflect.get(value, key) : undefined;
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=dispatch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export declare function bridgeMcpEntryPath(): string;
|
|
2
|
+
export declare function bridgeCommandCodeModPath(): string;
|
|
3
|
+
/** 桥接是否应当介入该会话;子代理会话一律排除。 */
|
|
4
|
+
export declare function subagentBridgeActive(sessionId: string): boolean;
|
|
5
|
+
/** command-code:`--mod` 每次运行加载托管 mod。 */
|
|
6
|
+
export declare function commandCodeBridgeArgs(sessionId: string): readonly string[];
|
|
7
|
+
/** command-code:mod 从进程环境读取桥接配置。 */
|
|
8
|
+
export declare function commandCodeBridgeEnvironment(sessionId: string, adapterId: string): Record<string, string>;
|
|
9
|
+
/** claude-code:`--mcp-config` 注入替身工具,并指示模型优先使用。 */
|
|
10
|
+
export declare function claudeBridgeArgs(sessionId: string, adapterId: string): readonly string[];
|
|
11
|
+
/**
|
|
12
|
+
* codex:`thread/start`、`thread/resume` 的 developerInstructions 是线程级指令面;
|
|
13
|
+
* Codex 不会自发使用注入的 MCP 工具,必须显式告诉它何时改走 DSH 子代理会话。
|
|
14
|
+
*/
|
|
15
|
+
export declare function codexBridgeDeveloperInstructions(sessionId: string): string | undefined;
|
|
16
|
+
/**
|
|
17
|
+
* ACP 适配器(gemini/grok/mcode):session/new 与 session/load 都带上 MCP server。
|
|
18
|
+
* 这些 CLI 没有可靠的“禁用内建子代理”开关,靠工具描述与模型选择。
|
|
19
|
+
*/
|
|
20
|
+
export declare function acpBridgeMcpServers(sessionId: string, adapterId: string): readonly Record<string, unknown>[];
|
|
21
|
+
/** codex:`-c` 每次启动覆盖配置,注入 MCP server。 */
|
|
22
|
+
export declare function codexBridgeArgs(sessionId: string, adapterId: string): readonly string[];
|
|
23
|
+
/**
|
|
24
|
+
* 引导文本:不同 CLI 对 MCP 工具的命名不同(claude-code 用 `mcp__server__tool`,
|
|
25
|
+
* codex 用 `server.tool`),因此按工具名生成同一套语义的指令。
|
|
26
|
+
*/
|
|
27
|
+
export declare function bridgeSubagentGuidance(toolName: string): string;
|
|
28
|
+
//# sourceMappingURL=injections.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"injections.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/injections.ts"],"names":[],"mappings":"AAiBA,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAgB,wBAAwB,IAAI,MAAM,CAEjD;AAED,6BAA6B;AAC7B,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAG/D;AAED,yCAAyC;AACzC,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAG1E;AAED,oCAAoC;AACpC,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAEzG;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CASxF;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGtF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAS5G;AAED,yCAAyC;AACzC,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAavF;AAoBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAO/D"}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import { fileURLToPath } from 'node:url';
|
|
2
|
+
import { getAdapterRegistry } from '../cli-adapters/registry-holder.js';
|
|
3
|
+
import { getSubagentBridge } from './bridge-holder.js';
|
|
4
|
+
/**
|
|
5
|
+
* 注入构造器:把桥接端点、令牌与会话身份翻译成各外部 CLI 的原生扩展面。
|
|
6
|
+
*
|
|
7
|
+
* 所有注入都只在桥接开启、且目标会话不是子代理会话时生效。子代理会话运行
|
|
8
|
+
* 同一个外部 Agent 时不再注入,避免嵌套托管无限递归。
|
|
9
|
+
*/
|
|
10
|
+
const MCP_ENTRY_PATH = fileURLToPath(new URL('./mcp-stdio-entry.js', import.meta.url));
|
|
11
|
+
const COMMAND_CODE_MOD_PATH = fileURLToPath(new URL('./command-code-mod.js', import.meta.url));
|
|
12
|
+
/** 外部 CLI 侧认为这是一次由 Codingns4DSH 托管的会话。 */
|
|
13
|
+
const BRIDGE_MARKER = 'CODINGNS_SUBAGENT_BRIDGE';
|
|
14
|
+
export function bridgeMcpEntryPath() {
|
|
15
|
+
return MCP_ENTRY_PATH;
|
|
16
|
+
}
|
|
17
|
+
export function bridgeCommandCodeModPath() {
|
|
18
|
+
return COMMAND_CODE_MOD_PATH;
|
|
19
|
+
}
|
|
20
|
+
/** 桥接是否应当介入该会话;子代理会话一律排除。 */
|
|
21
|
+
export function subagentBridgeActive(sessionId) {
|
|
22
|
+
if (getSubagentBridge() === undefined)
|
|
23
|
+
return false;
|
|
24
|
+
return !isSubagentChildSession(sessionId);
|
|
25
|
+
}
|
|
26
|
+
/** command-code:`--mod` 每次运行加载托管 mod。 */
|
|
27
|
+
export function commandCodeBridgeArgs(sessionId) {
|
|
28
|
+
if (!subagentBridgeActive(sessionId))
|
|
29
|
+
return [];
|
|
30
|
+
return ['--mod', COMMAND_CODE_MOD_PATH];
|
|
31
|
+
}
|
|
32
|
+
/** command-code:mod 从进程环境读取桥接配置。 */
|
|
33
|
+
export function commandCodeBridgeEnvironment(sessionId, adapterId) {
|
|
34
|
+
return bridgeEnvironment(sessionId, adapterId) ?? {};
|
|
35
|
+
}
|
|
36
|
+
/** claude-code:`--mcp-config` 注入替身工具,并指示模型优先使用。 */
|
|
37
|
+
export function claudeBridgeArgs(sessionId, adapterId) {
|
|
38
|
+
const env = bridgeEnvironment(sessionId, adapterId);
|
|
39
|
+
if (env === undefined)
|
|
40
|
+
return [];
|
|
41
|
+
const config = JSON.stringify({ mcpServers: { codingns: mcpServerConfig(env) } });
|
|
42
|
+
return [
|
|
43
|
+
'--mcp-config', config,
|
|
44
|
+
'--append-system-prompt', bridgeSubagentGuidance('mcp__codingns__agent_subagent'),
|
|
45
|
+
'--disallowedTools', 'Task',
|
|
46
|
+
];
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* codex:`thread/start`、`thread/resume` 的 developerInstructions 是线程级指令面;
|
|
50
|
+
* Codex 不会自发使用注入的 MCP 工具,必须显式告诉它何时改走 DSH 子代理会话。
|
|
51
|
+
*/
|
|
52
|
+
export function codexBridgeDeveloperInstructions(sessionId) {
|
|
53
|
+
if (!subagentBridgeActive(sessionId))
|
|
54
|
+
return undefined;
|
|
55
|
+
return bridgeSubagentGuidance('codingns.agent_subagent');
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* ACP 适配器(gemini/grok/mcode):session/new 与 session/load 都带上 MCP server。
|
|
59
|
+
* 这些 CLI 没有可靠的“禁用内建子代理”开关,靠工具描述与模型选择。
|
|
60
|
+
*/
|
|
61
|
+
export function acpBridgeMcpServers(sessionId, adapterId) {
|
|
62
|
+
const env = bridgeEnvironment(sessionId, adapterId);
|
|
63
|
+
if (env === undefined)
|
|
64
|
+
return [];
|
|
65
|
+
return [{
|
|
66
|
+
name: 'codingns',
|
|
67
|
+
command: process.execPath,
|
|
68
|
+
args: [MCP_ENTRY_PATH],
|
|
69
|
+
env: Object.entries(env).map(([name, value]) => ({ name, value })),
|
|
70
|
+
}];
|
|
71
|
+
}
|
|
72
|
+
/** codex:`-c` 每次启动覆盖配置,注入 MCP server。 */
|
|
73
|
+
export function codexBridgeArgs(sessionId, adapterId) {
|
|
74
|
+
const env = bridgeEnvironment(sessionId, adapterId);
|
|
75
|
+
if (env === undefined)
|
|
76
|
+
return [];
|
|
77
|
+
const envToml = `{${Object.entries(env).map(([key, value]) => `${key}=${tomlString(value)}`).join(',')}}`;
|
|
78
|
+
return [
|
|
79
|
+
'-c', `mcp_servers.codingns.command=${tomlString(process.execPath)}`,
|
|
80
|
+
'-c', `mcp_servers.codingns.args=${JSON.stringify([MCP_ENTRY_PATH])}`,
|
|
81
|
+
'-c', `mcp_servers.codingns.env=${envToml}`,
|
|
82
|
+
// Codex 对 MCP 工具调用强制审批:approvalPolicy=never 的会话会直接失败
|
|
83
|
+
// ("MCP tool call requires approval, but approval policy is never")。
|
|
84
|
+
// 托管工具属于基础设施级委派,固定为自动批准,避免把 DSH 权限模型外包给 Codex。
|
|
85
|
+
'-c', 'mcp_servers.codingns.default_tools_approval_mode="approve"',
|
|
86
|
+
];
|
|
87
|
+
}
|
|
88
|
+
function bridgeEnvironment(sessionId, adapterId) {
|
|
89
|
+
const runtime = getSubagentBridge();
|
|
90
|
+
if (runtime === undefined || isSubagentChildSession(sessionId))
|
|
91
|
+
return undefined;
|
|
92
|
+
return {
|
|
93
|
+
[BRIDGE_MARKER]: '1',
|
|
94
|
+
CODINGNS_BRIDGE_URL: runtime.baseUrl,
|
|
95
|
+
CODINGNS_BRIDGE_TOKEN: runtime.token,
|
|
96
|
+
CODINGNS_DSH_SESSION_ID: sessionId,
|
|
97
|
+
CODINGNS_ADAPTER_ID: adapterId,
|
|
98
|
+
// 桌面版 DSH 的 process.execPath 是 Electron 二进制;该变量让它以 Node 运行 MCP 入口。
|
|
99
|
+
ELECTRON_RUN_AS_NODE: '1',
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
function mcpServerConfig(env) {
|
|
103
|
+
return { command: process.execPath, args: [MCP_ENTRY_PATH], env };
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* 引导文本:不同 CLI 对 MCP 工具的命名不同(claude-code 用 `mcp__server__tool`,
|
|
107
|
+
* codex 用 `server.tool`),因此按工具名生成同一套语义的指令。
|
|
108
|
+
*/
|
|
109
|
+
export function bridgeSubagentGuidance(toolName) {
|
|
110
|
+
return [
|
|
111
|
+
`When the user asks to use parallel sessions, parallel agents, subagents, or to delegate/offload work, call the MCP tool \`${toolName}\``,
|
|
112
|
+
'— do not complete the whole task inline. Each call runs one self-contained subtask as a DSH-native subagent session,',
|
|
113
|
+
'and multiple calls in the same batch run in parallel; the tool returns the subtask result.',
|
|
114
|
+
'Provide a complete, self-contained `prompt` for every call; optionally pass `agent` (external coding agent id) and `model`.',
|
|
115
|
+
].join(' ');
|
|
116
|
+
}
|
|
117
|
+
function isSubagentChildSession(sessionId) {
|
|
118
|
+
if (sessionId === '')
|
|
119
|
+
return false;
|
|
120
|
+
try {
|
|
121
|
+
return getAdapterRegistry()?.sessionRecords?.get(sessionId)?.origin === 'subagent';
|
|
122
|
+
}
|
|
123
|
+
catch {
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
/** TOML 基本字符串与 JSON 字符串在转义规则上兼容(路径与令牌都是 ASCII)。 */
|
|
128
|
+
function tomlString(value) {
|
|
129
|
+
return JSON.stringify(value);
|
|
130
|
+
}
|
|
131
|
+
//# sourceMappingURL=injections.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"injections.js","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/injections.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-stdio-entry.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/mcp-stdio-entry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 最小 MCP stdio server:把外部 CLI 的子代理调用转发到 Host 桥接端点。
|
|
3
|
+
*
|
|
4
|
+
* 只依赖 Node 内置能力,由外部 CLI 以 `node <entry.js>` 直接启动;桥接地址、
|
|
5
|
+
* 令牌和 DSH 会话身份全部来自进程环境,不读取磁盘上的任何配置。
|
|
6
|
+
*/
|
|
7
|
+
const BRIDGE_URL = (process.env.CODINGNS_BRIDGE_URL ?? '').replace(/\/+$/u, '');
|
|
8
|
+
const BRIDGE_TOKEN = process.env.CODINGNS_BRIDGE_TOKEN ?? '';
|
|
9
|
+
const SESSION_ID = process.env.CODINGNS_DSH_SESSION_ID ?? '';
|
|
10
|
+
const ADAPTER_ID = process.env.CODINGNS_ADAPTER_ID ?? '';
|
|
11
|
+
const DISPATCH_TIMEOUT_MS = 16 * 60_000;
|
|
12
|
+
const TOOL_DEFINITION = {
|
|
13
|
+
name: 'agent_subagent',
|
|
14
|
+
description: 'Delegate a self-contained subtask to a DSH-native subagent session and return its result; multiple calls in one batch run in parallel. Use it whenever the user asks for parallel sessions/agents, subagents, or to delegate/offload parts of the work. Provide a complete, self-contained `prompt` for every call.',
|
|
15
|
+
inputSchema: {
|
|
16
|
+
type: 'object',
|
|
17
|
+
properties: {
|
|
18
|
+
prompt: { type: 'string', description: '完整、自包含的子任务说明。' },
|
|
19
|
+
agent: { type: 'string', description: '外部编码 Agent id;缺省沿用当前会话的 Agent。' },
|
|
20
|
+
model: { type: 'string', description: '可选模型覆盖。' },
|
|
21
|
+
description: { type: 'string', description: '给子代理的简短标题。' },
|
|
22
|
+
subagent_type: { type: 'string', description: '子代理类型提示(explore/plan/general)。' },
|
|
23
|
+
},
|
|
24
|
+
required: ['prompt'],
|
|
25
|
+
additionalProperties: false,
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
let buffer = '';
|
|
29
|
+
process.stdin.setEncoding('utf8');
|
|
30
|
+
process.stdin.on('data', (chunk) => {
|
|
31
|
+
buffer += chunk;
|
|
32
|
+
let index = buffer.indexOf('\n');
|
|
33
|
+
while (index >= 0) {
|
|
34
|
+
const line = buffer.slice(0, index).trim();
|
|
35
|
+
buffer = buffer.slice(index + 1);
|
|
36
|
+
if (line !== '')
|
|
37
|
+
void handleLine(line);
|
|
38
|
+
index = buffer.indexOf('\n');
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
process.stdin.on('end', () => process.exit(0));
|
|
42
|
+
async function handleLine(line) {
|
|
43
|
+
let message;
|
|
44
|
+
try {
|
|
45
|
+
message = JSON.parse(line);
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
if (typeof message !== 'object' || message === null)
|
|
51
|
+
return;
|
|
52
|
+
const request = message;
|
|
53
|
+
const id = request.id;
|
|
54
|
+
// 通知没有 id,不需要响应。
|
|
55
|
+
if (id === undefined || id === null)
|
|
56
|
+
return;
|
|
57
|
+
const method = typeof request.method === 'string' ? request.method : '';
|
|
58
|
+
try {
|
|
59
|
+
if (method === 'initialize') {
|
|
60
|
+
respond(id, {
|
|
61
|
+
protocolVersion: readProtocolVersion(request.params),
|
|
62
|
+
capabilities: { tools: {} },
|
|
63
|
+
serverInfo: { name: 'codingns-subagent-bridge', version: '0.2.0' },
|
|
64
|
+
});
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (method === 'ping') {
|
|
68
|
+
respond(id, {});
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
if (method === 'tools/list') {
|
|
72
|
+
respond(id, { tools: [TOOL_DEFINITION] });
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
if (method === 'tools/call') {
|
|
76
|
+
respond(id, await callTool(request.params));
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
respondError(id, -32601, `Method not found: ${method}`);
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
respondError(id, -32603, error instanceof Error ? error.message : String(error));
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
async function callTool(params) {
|
|
86
|
+
const record = asRecord(params);
|
|
87
|
+
const name = typeof record?.name === 'string' ? record.name : '';
|
|
88
|
+
if (name !== TOOL_DEFINITION.name)
|
|
89
|
+
return textResult(`未知工具: ${name}`, true);
|
|
90
|
+
const args = asRecord(record?.arguments) ?? {};
|
|
91
|
+
const prompt = typeof args.prompt === 'string' ? args.prompt : '';
|
|
92
|
+
if (prompt.trim() === '')
|
|
93
|
+
return textResult('prompt 不能为空', true);
|
|
94
|
+
if (BRIDGE_URL === '' || BRIDGE_TOKEN === '' || SESSION_ID === '')
|
|
95
|
+
return textResult('Codingns4DSH 子代理桥接未配置', true);
|
|
96
|
+
try {
|
|
97
|
+
const response = await fetch(`${BRIDGE_URL}/v1/dispatch`, {
|
|
98
|
+
method: 'POST',
|
|
99
|
+
headers: { authorization: `Bearer ${BRIDGE_TOKEN}`, 'content-type': 'application/json' },
|
|
100
|
+
body: JSON.stringify({
|
|
101
|
+
sessionId: SESSION_ID,
|
|
102
|
+
prompt,
|
|
103
|
+
...(typeof args.agent === 'string' && args.agent.trim() !== '' ? { agent: args.agent.trim() } : { agent: ADAPTER_ID }),
|
|
104
|
+
...(typeof args.model === 'string' && args.model.trim() !== '' ? { model: args.model.trim() } : {}),
|
|
105
|
+
...(typeof args.description === 'string' && args.description.trim() !== '' ? { description: args.description.trim() } : {}),
|
|
106
|
+
...(typeof args.subagent_type === 'string' && args.subagent_type.trim() !== '' ? { subagentType: args.subagent_type.trim() } : {}),
|
|
107
|
+
}),
|
|
108
|
+
signal: AbortSignal.timeout(DISPATCH_TIMEOUT_MS),
|
|
109
|
+
});
|
|
110
|
+
const payload = await readJsonRecord(response);
|
|
111
|
+
if (!response.ok) {
|
|
112
|
+
const detail = typeof payload?.error === 'string' && payload.error.trim() !== '' ? payload.error.trim() : `HTTP ${String(response.status)}`;
|
|
113
|
+
return textResult(`子代理桥接请求失败:${detail}`, true);
|
|
114
|
+
}
|
|
115
|
+
if (payload?.ok !== true) {
|
|
116
|
+
const detail = typeof payload?.error === 'string' && payload.error.trim() !== '' ? payload.error.trim() : '桥接端未返回具体错误。';
|
|
117
|
+
return textResult(`子代理执行失败:${detail}`, true);
|
|
118
|
+
}
|
|
119
|
+
const text = typeof payload.text === 'string' && payload.text.trim() !== '' ? payload.text : '子代理已完成,但没有文本输出。';
|
|
120
|
+
return textResult(text, false);
|
|
121
|
+
}
|
|
122
|
+
catch (error) {
|
|
123
|
+
return textResult(`子代理桥接不可达:${error instanceof Error ? error.message : String(error)}`, true);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
function textResult(text, isError) {
|
|
127
|
+
return { content: [{ type: 'text', text }], ...(isError ? { isError: true } : {}) };
|
|
128
|
+
}
|
|
129
|
+
async function readJsonRecord(response) {
|
|
130
|
+
try {
|
|
131
|
+
return asRecord(await response.json());
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
return undefined;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
function readProtocolVersion(params) {
|
|
138
|
+
const record = asRecord(params);
|
|
139
|
+
return typeof record?.protocolVersion === 'string' && record.protocolVersion !== '' ? record.protocolVersion : '2024-11-05';
|
|
140
|
+
}
|
|
141
|
+
function respond(id, result) {
|
|
142
|
+
process.stdout.write(`${JSON.stringify({ jsonrpc: '2.0', id, result })}\n`);
|
|
143
|
+
}
|
|
144
|
+
function respondError(id, code, message) {
|
|
145
|
+
process.stdout.write(`${JSON.stringify({ jsonrpc: '2.0', id, error: { code, message } })}\n`);
|
|
146
|
+
}
|
|
147
|
+
function asRecord(value) {
|
|
148
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : undefined;
|
|
149
|
+
}
|
|
150
|
+
export {};
|
|
151
|
+
//# sourceMappingURL=mcp-stdio-entry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-stdio-entry.js","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/mcp-stdio-entry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lan-access-dsh.d.ts","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAEtE,OAAO,EAA8G,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"lan-access-dsh.d.ts","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAEtE,OAAO,EAA8G,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAI3K,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,8CAA8C;AAC9C,wBAAgB,yBAAyB,CAAC,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAAO,GAAG,aAAa,CAAC,oBAAoB,CAAC,CA2D9H"}
|
|
@@ -2,6 +2,7 @@ import { DEFAULT_LAN_ACCESS_DSH_PWA_SETTINGS } from '../../shared/contracts/conf
|
|
|
2
2
|
import { createLanAccessDshRpcHandler, createNodeLanAccessDshRuntime, FileLanAccessDshLoginStore, LanAccessDshProxy } from '../lan-access-dsh.js';
|
|
3
3
|
import { createLanAccessDshPwaProvider, PwaPushService } from '../modules/pwa/index.js';
|
|
4
4
|
import { createPwaSessionNotification } from '../modules/pwa/pwa-session-notifications.js';
|
|
5
|
+
import { resolveHostPushLocale } from '../browser-text.js';
|
|
5
6
|
/** Host 侧“局域网访问 DSH”模块,只管理一条 DSH Web 监听映射。 */
|
|
6
7
|
export function createLanAccessDshFeature(options = {}) {
|
|
7
8
|
return {
|
|
@@ -25,7 +26,10 @@ export function createLanAccessDshFeature(options = {}) {
|
|
|
25
26
|
proxy.setLoginConfig(loginConfig);
|
|
26
27
|
// 推送只保存订阅与 VAPID 私钥;是否真的订阅由浏览器侧在用户开启时决定。
|
|
27
28
|
const push = new PwaPushService();
|
|
28
|
-
context.resources.add(context.services.rpc.register('lanAccessDsh', createLanAccessDshRpcHandler(proxy, settings, loginStore, {
|
|
29
|
+
context.resources.add(context.services.rpc.register('lanAccessDsh', createLanAccessDshRpcHandler(proxy, settings, loginStore, {
|
|
30
|
+
push,
|
|
31
|
+
resolveLocale: () => resolveHostPushLocale(context.services.settingsProvider),
|
|
32
|
+
})));
|
|
29
33
|
// 推送订阅由浏览器显式开启;开启后把原生会话完成/等待输入事件转成通知。
|
|
30
34
|
// 事件监听属于局域网功能生命周期,停用模块时随资源一起释放。
|
|
31
35
|
const nativeSessions = context.services.nativeSessions;
|
|
@@ -35,7 +39,7 @@ export function createLanAccessDshFeature(options = {}) {
|
|
|
35
39
|
const pwa = settings?.get().lanAccessDsh.pwa;
|
|
36
40
|
if (pwa?.enabled !== true || pwa.notifications !== 'push')
|
|
37
41
|
return;
|
|
38
|
-
const payload = createPwaSessionNotification({ session, event });
|
|
42
|
+
const payload = createPwaSessionNotification({ session, event, locale: resolveHostPushLocale(context.services.settingsProvider) });
|
|
39
43
|
if (payload === null)
|
|
40
44
|
return;
|
|
41
45
|
void push.sendToAll(payload).catch((error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lan-access-dsh.js","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mCAAmC,EAAoD,MAAM,kCAAkC,CAAA;AACxI,OAAO,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,iBAAiB,EAA4B,MAAM,sBAAsB,CAAA;AAC3K,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACvF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAA;
|
|
1
|
+
{"version":3,"file":"lan-access-dsh.js","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"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"}
|