@yuriai/web 0.2.40-beta.4 → 0.2.40-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/{AgentAvatar-BmT_6apW.js → AgentAvatar-XDXiFZvA.js} +1 -1
- package/dist/assets/AssistantConversationSurface-B59k-lXE.css +1 -0
- package/dist/assets/AssistantConversationSurface-CQnJaKTn.js +3 -0
- package/dist/assets/AssistantSessionCard-DXY8-wyP.js +2 -0
- package/dist/assets/{AssistantUnreadBadge-C34eOGCL.js → AssistantUnreadBadge-B-G015yE.js} +1 -1
- package/dist/assets/{AssistantView-0nXkM9VG.js → AssistantView-CasyQbii.js} +1 -1
- package/dist/assets/DiagramView-DhWnsM9v.js +1 -0
- package/dist/assets/{FadeInOnReveal-CCVdl9Vt.js → FadeInOnReveal-Ca9EVP3a.js} +1 -1
- package/dist/assets/{GuiPluginPage-BMt5AMqg.js → GuiPluginPage-DKOsUpVL.js} +1 -1
- package/dist/assets/GuiPluginSurface-BfXMBqdD.js +1 -0
- package/dist/assets/{GuiPluginWindow-BVvzrnp1.js → GuiPluginWindow-Dmg2Qui6.js} +1 -1
- package/dist/assets/{Icon-B5nBc6dO.js → Icon-ChyA050P.js} +1 -1
- package/dist/assets/{ImageLoadingPlaceholder-Bv5mmf2U.js → ImageLoadingPlaceholder-C8QUF5aV.js} +1 -1
- package/dist/assets/LoadingImage-BxRq1dMQ.js +1 -0
- package/dist/assets/MarkdownRenderer-CvWLikEO.js +2 -0
- package/dist/assets/MarkdownRendererImpl-CcNsQOEn.js +10 -0
- package/dist/assets/MarkstreamRendererImpl-D9W5XXPo.js +3 -0
- package/dist/assets/MobileDetailNavigation-CnwIZn5g.js +1 -0
- package/dist/assets/{MobileResizableSheet-D5PcZMuI.js → MobileResizableSheet-Bpp079l7.js} +1 -1
- package/dist/assets/MobileShareBridge-C-GpJfF6.js +3 -0
- package/dist/assets/MobileSurface-CrNI8cYQ.js +2 -0
- package/dist/assets/{MultiRunWindow-rMqP99ID.js → MultiRunWindow-DvywQkz9.js} +1 -1
- package/dist/assets/OnboardingScreen-BvueSxVk.js +1 -0
- package/dist/assets/{OverlayScrollbar-Byx2H3pc.js → OverlayScrollbar-CPaH_j8g.js} +1 -1
- package/dist/assets/RemoteAssistantSessionCard-CFWE00xD.js +1 -0
- package/dist/assets/SettingsView-Df6GCFPI.js +29 -0
- package/dist/assets/{SettingsWindow-U-RDDOS7.js → SettingsWindow-BpaRjeR-.js} +1 -1
- package/dist/assets/SetupTourDialog-DD_4qiTz.js +1 -0
- package/dist/assets/TerminalView-CRTtNAfA.js +8 -0
- package/dist/assets/ToolOutputDialog-omGmWntf.js +16 -0
- package/dist/assets/VoiceSettings-Du-Yd5MF.js +2 -0
- package/dist/assets/{YuriLogo-B58GIl2v.js → YuriLogo-CvyJy_R9.js} +1 -1
- package/dist/assets/YuriWordmark-B7lmpLRB.js +1 -0
- package/dist/assets/{assistant-attachment-cache-Cmzt4xXE.js → assistant-attachment-cache-D-LmCflm.js} +1 -1
- package/dist/assets/bootstrap-eLlfzqAI.js +1 -0
- package/dist/assets/{capgoAdapter-B5NImlKh.js → capgoAdapter-CqMX4zC-.js} +1 -1
- package/dist/assets/{checkbox-Bdj4n5cI.js → checkbox-KNAgqjPZ.js} +1 -1
- package/dist/assets/client-1Fk5IbQR.js +7 -0
- package/dist/assets/{collapsible-D1JZOgJZ.js → collapsible-CdiLY07j.js} +1 -1
- package/dist/assets/{context-menu-DDX0ZFhc.js → context-menu-CO_VRWeV.js} +1 -1
- package/dist/assets/{desktopHosts-DovfbQPm.js → desktopHosts-135cuRCE.js} +1 -1
- package/dist/assets/{desktopRelayRestore-D4pbpNKN.js → desktopRelayRestore-1aUztDPU.js} +1 -1
- package/dist/assets/{device-DNG0cNwQ.js → device-QL8KNSLM.js} +1 -1
- package/dist/assets/{diagram-C72TQWfh.js → diagram-9b-Aaful.js} +1 -1
- package/dist/assets/{dialog-CIKJalI5.js → dialog-8YYmYPFP.js} +1 -1
- package/dist/assets/{es-D0Q_CV0t.js → es-Ba3NUCtE.js} +3 -3
- package/dist/assets/{fileMentionTouchSelection-tnd9RDDh.js → fileMentionTouchSelection-CLQBqWR8.js} +1 -1
- package/dist/assets/fileReferenceActions-cYqdsXFz.js +1 -0
- package/dist/assets/{fr-DrO5SAKl.js → fr-CRhp3hyT.js} +3 -3
- package/dist/assets/{gitApi-BI8OG_ts.js → gitApi-uhoLUa-e.js} +11 -7
- package/dist/assets/gitApiHttp-B0FJaIhU.js +3 -0
- package/dist/assets/{gui-DN2sVP96.js → gui-BMN3-WPc.js} +1 -1
- package/dist/assets/historyImportQueries-D_9RlrLp.js +1 -0
- package/dist/assets/host-D9EDWNmx.js +1 -0
- package/dist/assets/{i18n-UaLestuf.js → i18n-RH7UieOS.js} +1 -1
- package/dist/assets/image-loading-DBqnxgDH.js +1 -0
- package/dist/assets/{input-gVHSS0EB.js → input-DK8VTvJw.js} +1 -1
- package/dist/assets/input-store-CsY-uaSj.js +1 -0
- package/dist/assets/insertionBoundaries-rYqUxuB-.js +1 -0
- package/dist/assets/{ja-BNeP9_GU.js → ja-D-UPjDY2.js} +3 -3
- package/dist/assets/{ko-DRRFD_7l.js → ko-x-z9J5z7.js} +3 -3
- package/dist/assets/main-BMx-2MjO.js +169 -0
- package/dist/assets/main-DzqojuZ1.js +2 -0
- package/dist/assets/{markdownHeightCache-B-FoaQ1U.js → markdownHeightCache-DAvnT6xF.js} +1 -1
- package/dist/assets/{markdownTheme-CHNl6tUv.js → markdownTheme-DFDWa8Gh.js} +1 -1
- package/dist/assets/mcpQueries-CpH8vPf1.js +1 -0
- package/dist/assets/miniChat-BTE_XpRk.js +2 -0
- package/dist/assets/mobile-BBZOulQ1.js +2 -0
- package/dist/assets/mobileBackNavigation-Cq08UPxZ.js +1 -0
- package/dist/assets/mobileConnections-ZehAozpe.js +2 -0
- package/dist/assets/multirun-Cll2Meol.js +3 -0
- package/dist/assets/{native-DsqzO52u.js → native-CDqNKjmz.js} +1 -1
- package/dist/assets/{native-config-DqDXViVx.js → native-config-DtUZFauV.js} +1 -1
- package/dist/assets/navigation-J3d8PQcs.js +2 -0
- package/dist/assets/openRemoteProjectSession-oJZpCDPT.js +1 -0
- package/dist/assets/{pl-BnW5wJrl.js → pl-Cqo1FJwM.js} +3 -3
- package/dist/assets/platform-wF65ZFgV.js +1 -0
- package/dist/assets/project-preview-2H-TmJkd.js +1 -0
- package/dist/assets/projectActions-50e_f9dI.js +1 -0
- package/dist/assets/projectMeta-BBpfOmij.js +1 -0
- package/dist/assets/prompt-attachment-upload-9fjmgafL.js +1 -0
- package/dist/assets/{pt-BR-fZW8CCVQ.js → pt-BR-C930XU1k.js} +3 -3
- package/dist/assets/pwa-C8B1Mf_t.js +2 -0
- package/dist/assets/queue-abort-optimistic-B1Uskf6F.js +1 -0
- package/dist/assets/{react-DeB-Vc_L.js → react-45rBMaUm.js} +1 -1
- package/dist/assets/{readiness-CIlvQ-aQ.js → readiness-CrjBrUa_.js} +2 -2
- package/dist/assets/reference-history-DqfMBWzF.js +1 -0
- package/dist/assets/relay-preview-frame-src-BPyz3nXA.js +1 -0
- package/dist/assets/remote-input-store-84i8uDyM.js +1 -0
- package/dist/assets/remoteProjectQueries-B6lrEDMq.js +1 -0
- package/dist/assets/remoteSessionReference-YiGvdabX.js +1 -0
- package/dist/assets/renderElectronMiniChatApp-BuHQB0V8.js +2 -0
- package/dist/assets/renderMobileApp-D_VswCi0.js +29 -0
- package/dist/assets/{runtime-file-download-DMY1k1af.js → runtime-file-download-D11Nnedg.js} +1 -1
- package/dist/assets/runtime-file-resource-CuLP3xp7.js +6 -0
- package/dist/assets/runtimeConfig-CMbNyYbK.js +2 -0
- package/dist/assets/{runtimeEndpointReset-BOdd_mJM.css → runtimeEndpointReset-BUGfn7y0.css} +1 -1
- package/dist/assets/runtimeEndpointReset-zo-HZQgX.js +151 -0
- package/dist/assets/safeStorage-DTOhKN0V.js +1 -0
- package/dist/assets/scheduledTaskNavigation-y5g8D2ee.js +1 -0
- package/dist/assets/{select-BwCKwnTH.js → select-VWoGVTBZ.js} +1 -1
- package/dist/assets/sessionLookup-JAf5UU7-.js +1 -0
- package/dist/assets/sortable-tabs-strip-Dbt3TTAs.js +1 -0
- package/dist/assets/{speechSettingsQueries-C5mPRWIv.js → speechSettingsQueries-Bidfcv0W.js} +1 -1
- package/dist/assets/src-BZCFf9_1.css +2 -0
- package/dist/assets/{store-CzVMz42v.js → store-DunGyOfe.js} +4 -4
- package/dist/assets/terminalApi-Cq0vjFe1.js +1 -0
- package/dist/assets/{textarea-CaTDyZrS.js → textarea-vyMsAV5p.js} +1 -1
- package/dist/assets/{tooltip-BvZzoiqg.js → tooltip-DWqHWi4N.js} +1 -1
- package/dist/assets/tour-CQMBn8gJ.js +1 -0
- package/dist/assets/{types-Bm8kDgSv.js → types-DeOkRCgE.js} +1 -1
- package/dist/assets/{uk-C4OKsNRv.js → uk-OXQSdzuT.js} +3 -3
- package/dist/assets/useAppFontEffects-K31q-1OV.css +1 -0
- package/dist/assets/{useAppFontEffects-C9IaiJgF.js → useAppFontEffects-z382Lhm_.js} +63 -58
- package/dist/assets/useAssistantUIStore-jOKVcBK8.js +1 -0
- package/dist/assets/useDesktopWindowControlsLayout-BEs7i5qj.js +1 -0
- package/dist/assets/{useDictation-Sk20Gi0T.js → useDictation-e68rFA6y.js} +1 -1
- package/dist/assets/useEffectiveDirectory-CcM3S1OQ.js +1 -0
- package/dist/assets/useFontPreferences-CO-L-Gd7.js +1 -0
- package/dist/assets/{useMobileHtmlPreviewStore-C03uVLfX.js → useMobileHtmlPreviewStore-EOAzZiAy.js} +1 -1
- package/dist/assets/useMobileNavigationStore-BA0IaUi_.js +13 -0
- package/dist/assets/usePluginsStore-BG5MW5LR.js +1 -0
- package/dist/assets/useProjectRuntimeAPIs-Be4gXG7P.js +1 -0
- package/dist/assets/{useStreamingTextThrottle-CeKHHK13.js → useStreamingTextThrottle-DylP9HFC.js} +1 -1
- package/dist/assets/{useThemeSystem-CNzUUkFn.js → useThemeSystem-C57Z9mV2.js} +1 -1
- package/dist/assets/useUIStore-Cfmg-aDQ.js +1 -0
- package/dist/assets/uuid-D-SDZijH.js +1 -0
- package/dist/assets/{vendor-base-ui-CzHs0bHY.js → vendor-base-ui-z2M4boRm.js} +1 -1
- package/dist/assets/{vendor-cmdk-C_tivUtr.js → vendor-cmdk-BgHvMv5l.js} +1 -1
- package/dist/assets/{vendor-dnd-kit-accessibility-BOtnpZt5.js → vendor-dnd-kit-accessibility-gVi9ga0x.js} +1 -1
- package/dist/assets/{vendor-dnd-kit-core-DK4OoOTr.js → vendor-dnd-kit-core-Dd5yS2-T.js} +1 -1
- package/dist/assets/{vendor-dnd-kit-sortable-Cv69eQm1.js → vendor-dnd-kit-sortable-CV-SGi8y.js} +1 -1
- package/dist/assets/{vendor-framer-motion-DDMKlXiP.js → vendor-framer-motion-CF9BQLta.js} +1 -1
- package/dist/assets/{vendor-markstream-react-6zxyQLCD.js → vendor-markstream-react-TwEpkgfP.js} +3 -3
- package/dist/assets/vendor-motion-Dv27UnOI.js +1 -0
- package/dist/assets/{vendor-opencode-client-cQ47ywrT.js → vendor-opencode-client-BM2r1f0o.js} +3 -3
- package/dist/assets/{vendor-opencode-plugin-BmdTE4Te.js → vendor-opencode-plugin-ZhpPgHCL.js} +1 -1
- package/dist/assets/{vendor-pierre-diffs-BFiZ3IhI.js → vendor-pierre-diffs-tqo4Z3TC.js} +1 -1
- package/dist/assets/{vendor-react-DlzBev0S.js → vendor-react-P8wFrkcT.js} +1 -1
- package/dist/assets/{vendor-react-drawio-Dyg1-39Q.js → vendor-react-drawio-CQW1YP2l.js} +1 -1
- package/dist/assets/vendor-reactuses-core-Dyjw5sZR.js +1 -0
- package/dist/assets/{vendor-solid-js-D98iXT7C.js → vendor-solid-js-BBVUd3Hw.js} +1 -1
- package/dist/assets/{vendor-sonner-BEHGipm5.js → vendor-sonner-B5HgJenP.js} +1 -1
- package/dist/assets/{vendor-stream-diffs-wcQxoPZk.js → vendor-stream-diffs-DCMtZcS3.js} +2 -2
- package/dist/assets/vendor-tanstack-query-core-BSjXNgF_.js +1 -0
- package/dist/assets/vendor-tanstack-react-query-B-KblYBV.js +1 -0
- package/dist/assets/{vendor-tanstack-react-virtual-DSFNK3qc.js → vendor-tanstack-react-virtual-BkuqzrEV.js} +1 -1
- package/dist/assets/{vendor-zustand-vDaAPGfl.js → vendor-zustand-Cwko4FG1.js} +1 -1
- package/dist/assets/{zh-CN-ieAs59w6.js → zh-CN-B5X8yCZV.js} +3 -3
- package/dist/assets/{zh-TW-WWTW1fkP.js → zh-TW-CF6zr1fk.js} +3 -3
- package/dist/index.html +32 -27
- package/dist/mini-chat.html +32 -27
- package/dist/mobile.html +2 -2
- package/package.json +3 -2
- package/server/index.d.ts +19 -0
- package/server/index.js +36 -5
- package/server/lib/assistants/DOCUMENTATION.md +87 -0
- package/server/lib/assistants/assign.js +10 -7
- package/server/lib/assistants/builtin-skills.js +1 -0
- package/server/lib/assistants/builtin-skills.test.js +1 -1
- package/server/lib/assistants/cards.js +6 -1
- package/server/lib/assistants/contact-store.js +22 -5
- package/server/lib/assistants/contact-tools.js +46 -26
- package/server/lib/assistants/execution-target.js +136 -0
- package/server/lib/assistants/opencode-tools.js +22 -9
- package/server/lib/assistants/remote-execution.test.js +378 -0
- package/server/lib/assistants/remote-watch-reconciler.js +43 -0
- package/server/lib/assistants/remote-watch-reconciler.test.js +88 -0
- package/server/lib/assistants/routes.js +1 -0
- package/server/lib/assistants/service.js +302 -99
- package/server/lib/assistants/yuri-project.http.test.js +2 -2
- package/server/lib/client-auth/remote-clients.js +11 -0
- package/server/lib/content-search/DOCUMENTATION.md +5 -0
- package/server/lib/content-search/routes.js +4 -0
- package/server/lib/content-search/routes.test.js +10 -0
- package/server/lib/event-stream/DOCUMENTATION.md +5 -0
- package/server/lib/event-stream/runtime.js +3 -0
- package/server/lib/event-stream/upstream-reader.js +1 -1
- package/server/lib/gui-customization/DOCUMENTATION.md +8 -2
- package/server/lib/gui-customization/projects-client.mjs +10 -8
- package/server/lib/gui-customization/projects-remote.js +101 -0
- package/server/lib/gui-customization/projects-remote.test.js +125 -0
- package/server/lib/gui-customization/projects.js +30 -6
- package/server/lib/gui-customization/projects.test.js +66 -1
- package/server/lib/gui-customization/session-skill.js +2 -2
- package/server/lib/gui-customization/session-skill.test.js +4 -0
- package/server/lib/gui-customization/skill/SKILL.md +3 -1
- package/server/lib/gui-customization/skill/references/projects.md +30 -3
- package/server/lib/gui-customization/skill/references/remote-connections.md +13 -0
- package/server/lib/message-queue/DOCUMENTATION.md +4 -0
- package/server/lib/message-queue/service.js +2 -1
- package/server/lib/message-queue/service.test.js +11 -0
- package/server/lib/notifications/emitter-runtime.js +5 -0
- package/server/lib/opencode/DOCUMENTATION.md +34 -0
- package/server/lib/opencode/core-routes.js +14 -2
- package/server/lib/opencode/core-routes.test.js +28 -0
- package/server/lib/opencode/feature-routes-runtime.js +8 -1
- package/server/lib/opencode/proxy.js +1 -0
- package/server/lib/opencode/routes.js +18 -4
- package/server/lib/opencode/routes.test.js +22 -0
- package/server/lib/opencode/settings-helpers.js +26 -0
- package/server/lib/opencode/settings-helpers.test.js +20 -0
- package/server/lib/opencode/settings-runtime.js +5 -3
- package/server/lib/opencode/settings-runtime.test.js +35 -0
- package/server/lib/opencode/v2-client.js +9 -4
- package/server/lib/preview/DOCUMENTATION.md +73 -0
- package/server/lib/preview/file-preview-path.js +37 -0
- package/server/lib/preview/file-target.js +38 -0
- package/server/lib/preview/file-target.test.js +111 -0
- package/server/lib/preview/proxy-runtime.js +110 -17
- package/server/lib/projects/DOCUMENTATION.md +6 -0
- package/server/lib/relay/tunnel-host.js +1 -0
- package/server/lib/remote-hosts/DOCUMENTATION.md +321 -0
- package/server/lib/remote-hosts/configuration.js +15 -0
- package/server/lib/remote-hosts/deadline.js +22 -0
- package/server/lib/remote-hosts/deadline.test.js +64 -0
- package/server/lib/remote-hosts/fixtures/settings-server.mjs +26 -0
- package/server/lib/remote-hosts/gateway.js +744 -0
- package/server/lib/remote-hosts/json-lifecycle.test.js +90 -0
- package/server/lib/remote-hosts/preview-scope.js +23 -0
- package/server/lib/remote-hosts/relay-client.ts +3 -0
- package/server/lib/remote-hosts/routes.js +429 -0
- package/server/lib/remote-hosts/routes.test.js +1427 -0
- package/server/lib/remote-hosts/settings-production.test.js +145 -0
- package/server/lib/remote-hosts/store.js +124 -0
- package/server/lib/remote-hosts/store.test.js +52 -0
- package/server/lib/remote-hosts/task-client.js +25 -0
- package/server/lib/remote-hosts/task-client.test.js +60 -0
- package/server/lib/remote-hosts/transport.js +118 -0
- package/server/lib/request-cors.js +1 -1
- package/server/lib/request-cors.test.js +1 -0
- package/server/lib/scheduled-tasks/session-skill.test.js +33 -2
- package/server/lib/session-folders/routes.js +1 -0
- package/server/lib/transcript-cache/DOCUMENTATION.md +4 -0
- package/server/lib/transcript-cache/routes.js +3 -0
- package/server/lib/transcript-cache/service.js +15 -0
- package/server/lib/transcript-cache/service.test.js +13 -0
- package/server/lib/ui-auth/DOCUMENTATION.md +18 -0
- package/server/lib/ui-auth/ui-auth.js +30 -2
- package/server/lib/ui-auth/ui-auth.test.js +46 -1
- package/dist/assets/AssistantConversationSurface-B-D-mLgs.js +0 -3
- package/dist/assets/AssistantConversationSurface-n9w_Av0k.css +0 -1
- package/dist/assets/DiagramView-BU6jWxKJ.js +0 -1
- package/dist/assets/GuiPluginSurface-kxAcgmf1.js +0 -1
- package/dist/assets/LoadingImage-BzBw_1lI.js +0 -1
- package/dist/assets/MarkdownRenderer-CoMohPOZ.js +0 -2
- package/dist/assets/MarkdownRendererImpl-DoZW1UKH.js +0 -10
- package/dist/assets/MarkstreamRendererImpl-B3zd5x2O.js +0 -3
- package/dist/assets/MobileDetailNavigation-bEZ_NA03.js +0 -1
- package/dist/assets/MobileShareBridge-Cjukxazk.js +0 -3
- package/dist/assets/MobileTabPageHeader-Da1maXx-.js +0 -2
- package/dist/assets/OnboardingScreen-CZhqHzAj.js +0 -1
- package/dist/assets/SettingsView-7Bea2DvF.js +0 -29
- package/dist/assets/SetupTourDialog-CKec5tUy.js +0 -1
- package/dist/assets/TerminalView-CS1oSAuY.js +0 -8
- package/dist/assets/ToolOutputDialog-BWhrFvvI.js +0 -10
- package/dist/assets/VoiceSettings-7aFmJq9Z.js +0 -2
- package/dist/assets/YuriWordmark--S-QEpRp.js +0 -1
- package/dist/assets/appThemeRegistry-LyWTE-mT.js +0 -1
- package/dist/assets/bootstrap-BhC95qVC.js +0 -1
- package/dist/assets/fileQueries-D9l0crnM.js +0 -1
- package/dist/assets/fileReferenceActions-BmquJskG.js +0 -1
- package/dist/assets/gitApiHttp-D4d-rgcR.js +0 -9
- package/dist/assets/historyImportQueries-DkB2_92i.js +0 -1
- package/dist/assets/host-kMLXU0hK.js +0 -1
- package/dist/assets/image-loading-BrDob6MW.js +0 -1
- package/dist/assets/insertionBoundaries-B-yZI6iY.js +0 -1
- package/dist/assets/main-BfAN93rT.js +0 -169
- package/dist/assets/main-DYWwmI_W.js +0 -2
- package/dist/assets/mcpQueries-CehWHIB1.js +0 -1
- package/dist/assets/miniChat-BlkcLQBr.js +0 -2
- package/dist/assets/mobile-I3Xe5NtO.js +0 -2
- package/dist/assets/mobileBackNavigation-BFUH-c-G.js +0 -1
- package/dist/assets/mobileConnections-BFvtbJXX.js +0 -2
- package/dist/assets/multirun-DdEjp77z.js +0 -3
- package/dist/assets/pathNormalization-ewtPqJWn.js +0 -1
- package/dist/assets/platform-DMsFWy1a.js +0 -1
- package/dist/assets/projectActions-C-9Z8R7y.js +0 -1
- package/dist/assets/projectMeta-BKgum5WN.js +0 -1
- package/dist/assets/pwa-BvKUY4Hk.js +0 -2
- package/dist/assets/queue-abort-optimistic-BcbiNk8t.js +0 -1
- package/dist/assets/renderElectronMiniChatApp-DIjWdFHu.js +0 -2
- package/dist/assets/renderMobileApp-CE0QyOH0.js +0 -29
- package/dist/assets/runtime-file-resource-CL7EVzOG.js +0 -2
- package/dist/assets/runtimeConfig-uhjQn4kK.js +0 -2
- package/dist/assets/runtimeEndpointReset-DezNESKT.js +0 -149
- package/dist/assets/scheduledTaskNavigation-FMDNRUnX.js +0 -1
- package/dist/assets/sessionLookup-DzKZsy-W.js +0 -1
- package/dist/assets/sortable-tabs-strip-m5JQrTx4.js +0 -1
- package/dist/assets/src-HgtAe3Q4.css +0 -2
- package/dist/assets/terminalApi-DK4KmfFn.js +0 -1
- package/dist/assets/touch-gestures-CErgaXZ7.js +0 -1
- package/dist/assets/tour-DDI0Zg7l.js +0 -1
- package/dist/assets/useAppFontEffects-RpgNbjA4.css +0 -1
- package/dist/assets/useAssistantUIStore-nNYL140o.js +0 -1
- package/dist/assets/useDesktopWindowControlsLayout-C3M12PjJ.js +0 -1
- package/dist/assets/useEffectiveDirectory-Do4UqfZR.js +0 -1
- package/dist/assets/useFontPreferences-DxzruDDQ.js +0 -1
- package/dist/assets/useMobileNavigationStore-InwdmuDX.js +0 -17
- package/dist/assets/usePluginsStore-BH4-CNcj.js +0 -1
- package/dist/assets/useUIStore-vvNwcOk3.js +0 -1
- package/dist/assets/useWorkerHighlightedLines-0XahwAbS.js +0 -7
- package/dist/assets/vendor-motion-C9oiAdx-.js +0 -1
- package/dist/assets/vendor-reactuses-core-CuTmqEMK.js +0 -1
- package/dist/assets/vendor-tanstack-query-core-Y_YoRHtC.js +0 -1
- package/dist/assets/vendor-tanstack-react-query-B-Wpqq5J.js +0 -1
- /package/dist/assets/{sessionLookup-8C8nv-EP.css → reference-history-8C8nv-EP.css} +0 -0
|
@@ -143,8 +143,8 @@ describe('HTTP → real contact Agent → project registry → worker admission'
|
|
|
143
143
|
const admitted = await request(`/api/yuri/assistants/${assistant.id}/messages`, { messageID: 'create-project-chat', text: `Add ${workspace} and open a session saying hello` });
|
|
144
144
|
expect(admitted.admitted).toBe(true);
|
|
145
145
|
expect((await runtime.service.whenContactTurnSettled(admitted.messageID)).status).toBe('complete');
|
|
146
|
-
expect(creates).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ location: { directory: canonical } }));
|
|
147
|
-
expect(prompts).toHaveBeenCalledWith(expect.objectContaining({ sessionID: 'ses_hello', text: 'hello' }));
|
|
146
|
+
expect(creates).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ location: { directory: canonical } }), expect.objectContaining({ signal: expect.any(AbortSignal) }));
|
|
147
|
+
expect(prompts).toHaveBeenCalledWith(expect.objectContaining({ sessionID: 'ses_hello', text: 'hello' }), expect.objectContaining({ signal: expect.any(AbortSignal) }));
|
|
148
148
|
expect(prompts.mock.calls[0][0]).not.toHaveProperty('skills');
|
|
149
149
|
expect(prompts.mock.calls[0][0]).not.toHaveProperty('tools');
|
|
150
150
|
expect(JSON.stringify(creates.mock.calls[0][0])).not.toContain('load_tools');
|
|
@@ -170,6 +170,7 @@ export const createRemoteClientAuthRuntime = ({ fsPromises, path, crypto, storeP
|
|
|
170
170
|
return withStoreMutation(async () => {
|
|
171
171
|
const store = await readStore();
|
|
172
172
|
const normalizedDedupeKey = normalizeOptionalString(dedupeKey);
|
|
173
|
+
const previousIds = normalizedDedupeKey ? store.clients.map((entry) => entry.id) : [];
|
|
173
174
|
const token = generateToken();
|
|
174
175
|
const client = {
|
|
175
176
|
id: generateId(),
|
|
@@ -204,6 +205,11 @@ export const createRemoteClientAuthRuntime = ({ fsPromises, path, crypto, storeP
|
|
|
204
205
|
}
|
|
205
206
|
store.clients.push(client);
|
|
206
207
|
await writeStore(store);
|
|
208
|
+
for (const id of previousIds) if (!store.clients.some((entry) => entry.id === id)) {
|
|
209
|
+
for (const listener of revocationListeners) {
|
|
210
|
+
try { listener(id); } catch { /* Replacement credentials revoke old active resources independently. */ }
|
|
211
|
+
}
|
|
212
|
+
}
|
|
207
213
|
return { client: publicClient(client), token };
|
|
208
214
|
});
|
|
209
215
|
};
|
|
@@ -222,6 +228,7 @@ export const createRemoteClientAuthRuntime = ({ fsPromises, path, crypto, storeP
|
|
|
222
228
|
});
|
|
223
229
|
};
|
|
224
230
|
|
|
231
|
+
const revocationListeners = new Set();
|
|
225
232
|
const revokeClient = async (id) => {
|
|
226
233
|
if (typeof id !== 'string' || id.trim().length === 0) {
|
|
227
234
|
return { revoked: false };
|
|
@@ -232,6 +239,9 @@ export const createRemoteClientAuthRuntime = ({ fsPromises, path, crypto, storeP
|
|
|
232
239
|
if (!client) return { revoked: false };
|
|
233
240
|
if (!client.revokedAt) client.revokedAt = nowIso();
|
|
234
241
|
await writeStore(store);
|
|
242
|
+
for (const listener of revocationListeners) {
|
|
243
|
+
try { listener(id); } catch { /* Revocation must remain durable even if a consumer has already stopped. */ }
|
|
244
|
+
}
|
|
235
245
|
return { revoked: true, client: publicClient(client) };
|
|
236
246
|
});
|
|
237
247
|
};
|
|
@@ -278,6 +288,7 @@ export const createRemoteClientAuthRuntime = ({ fsPromises, path, crypto, storeP
|
|
|
278
288
|
};
|
|
279
289
|
|
|
280
290
|
return {
|
|
291
|
+
subscribeRevocation(listener) { revocationListeners.add(listener); return () => revocationListeners.delete(listener); },
|
|
281
292
|
authenticateBearerToken,
|
|
282
293
|
createClient,
|
|
283
294
|
listClients,
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
# Global conversation content search
|
|
2
2
|
|
|
3
|
+
Remote Project searches execute on their target Host via the Gateway's read-only
|
|
4
|
+
content-search capability. Local search rejects explicit remote Host/Location
|
|
5
|
+
scopes without touching this index. Remote event fanout bypasses local ingestion;
|
|
6
|
+
the Hub never indexes remote conversation bodies.
|
|
7
|
+
|
|
3
8
|
`POST /api/yuri/content-search/resume` authenticates Host UI/client access without
|
|
4
9
|
URL/preview tokens, rejects cross-origin cookie requests, and returns 202 with the
|
|
5
10
|
current index status. It invokes the existing `sync({ resume: true })` in the
|
|
@@ -20,6 +20,10 @@ export function registerContentSearchRoutes(app, { contentSearch, uiAuthControll
|
|
|
20
20
|
});
|
|
21
21
|
app.get('/api/yuri/content-search', (req, res) => {
|
|
22
22
|
if (hasPreviewProxyCredential(req)) return res.status(403).json({ error: 'Forbidden' });
|
|
23
|
+
if (req.query.hostId || req.headers['x-yuri-remote-host']
|
|
24
|
+
|| (typeof req.query.directory === 'string' && req.query.directory.startsWith('yuri-remote-location:'))) {
|
|
25
|
+
return res.status(403).json({ code: 'remote_scope_forbidden', error: 'Use the Host-scoped content search API' });
|
|
26
|
+
}
|
|
23
27
|
if (!contentSearch) return res.status(503).json({ error: 'Global content index unavailable' });
|
|
24
28
|
const query = req.query.q ?? '';
|
|
25
29
|
const limit = req.query.limit === undefined ? 30 : Number(req.query.limit);
|
|
@@ -5,6 +5,16 @@ import { registerContentSearchRoutes } from './routes.js';
|
|
|
5
5
|
import { createContentSearchService } from './service.js';
|
|
6
6
|
import { createContentSearchRuntime } from './runtime.js';
|
|
7
7
|
|
|
8
|
+
test('rejects remote scopes without querying the local content index', async () => {
|
|
9
|
+
const app = express(); const search = vi.fn();
|
|
10
|
+
registerContentSearchRoutes(app, { contentSearch: { service: { search }, getRuntimeKey: () => 'local' } });
|
|
11
|
+
for (const query of [{ hostId: 'remote' }, { directory: 'yuri-remote-location:["hub","host","/repo"]' }]) {
|
|
12
|
+
expect((await request(app).get('/api/yuri/content-search').query(query)).status).toBe(403);
|
|
13
|
+
}
|
|
14
|
+
expect((await request(app).get('/api/yuri/content-search').set('x-yuri-remote-host', 'remote')).status).toBe(403);
|
|
15
|
+
expect(search).not.toHaveBeenCalled();
|
|
16
|
+
});
|
|
17
|
+
|
|
8
18
|
test('exposes durable initialization times through the existing status route', async () => {
|
|
9
19
|
const app = express();
|
|
10
20
|
const service = createContentSearchService({ dbPath: ':memory:' });
|
|
@@ -72,6 +72,11 @@ Native v2 `session.reasoning.*` events are filtered at the same outbound boundar
|
|
|
72
72
|
- Health checks are reserved for initial upstream connect failures and explicit upstream-unavailable responses, not for ordinary stall recovery on an already-established stream.
|
|
73
73
|
- Global synthetic events such as `yuri:session-status`, `yuri:session-activity`, `yuri:notification`, and `yuri:heartbeat` are preserved on the WS path, but heartbeat frames are emitted only while an upstream SSE stream is actively attached.
|
|
74
74
|
- Global UI broadcasts are fan-out capable across both SSE and WS clients.
|
|
75
|
+
- Remote Host envelopes (`yuri:host-*`) fail closed unless the broadcaster receives
|
|
76
|
+
a live `targetFilter`. SSE/WS sends and synthetic-event proxy subscribers apply
|
|
77
|
+
that same filter before serialization. Gateway pairing revocation/expiry clears
|
|
78
|
+
the resource grant; merely opening an unpaired local global stream never grants
|
|
79
|
+
access to remote content.
|
|
75
80
|
- The broadcaster's `subscribe` seam also feeds `/api/event` and `/api/global/event` through the authenticated proxy. Host title/metadata/notification events retain their directory envelope, use the same outbound filter and serialized writer, and can only be interleaved between complete upstream SSE blocks. Pending writes are capped at 2 MiB; overflow disconnects the slow stream. Close/error removes the subscription. Relay uses this same path.
|
|
76
81
|
- Queue event confirmation accepts native `session.inbox.enqueued` user items and `session.inbox.delivered` with exact inbox/session/runtime identity; periodic query reconciliation remains the fallback.
|
|
77
82
|
- Each global upstream connection captures a sanitized runtime fence containing the normalized runtime key plus connection generation and derived token. Queue confirmation uses that generation only to validate the connection runtime identity and read current authority by runtime key. Active and paused authorities confirm exact directory, session, and message matches through the queue service; shadow authority skips confirmation while session-index ingestion continues.
|
|
@@ -27,6 +27,7 @@ export function createGlobalUiEventBroadcaster({
|
|
|
27
27
|
}) {
|
|
28
28
|
const subscribers = new Set();
|
|
29
29
|
const broadcast = (payload, options = {}) => {
|
|
30
|
+
if (/^yuri:host-/.test(payload?.type || '') && typeof options.targetFilter !== 'function') return;
|
|
30
31
|
for (const emit of subscribers) {
|
|
31
32
|
try { emit(payload, options); } catch { /* Other streams remain independent. */ }
|
|
32
33
|
}
|
|
@@ -38,6 +39,7 @@ export function createGlobalUiEventBroadcaster({
|
|
|
38
39
|
|
|
39
40
|
if (hasSseClients) {
|
|
40
41
|
for (const res of sseClients) {
|
|
42
|
+
if (options.targetFilter && !options.targetFilter(res)) continue;
|
|
41
43
|
try {
|
|
42
44
|
writeSseEvent(res, payload);
|
|
43
45
|
} catch {
|
|
@@ -47,6 +49,7 @@ export function createGlobalUiEventBroadcaster({
|
|
|
47
49
|
|
|
48
50
|
if (hasWsClients) {
|
|
49
51
|
for (const socket of Array.from(wsClients)) {
|
|
52
|
+
if (options.targetFilter && !options.targetFilter(socket)) continue;
|
|
50
53
|
const sent = sendMessageStreamWsEvent(socket, payload, {
|
|
51
54
|
directory: typeof options.directory === 'string' && options.directory.length > 0 ? options.directory : 'global',
|
|
52
55
|
eventId: typeof options.eventId === 'string' && options.eventId.length > 0 ? options.eventId : undefined,
|
|
@@ -23,7 +23,7 @@ function waitForReconnectDelay(ms, signal) {
|
|
|
23
23
|
signal?.removeEventListener('abort', onAbort);
|
|
24
24
|
resolve();
|
|
25
25
|
};
|
|
26
|
-
const timeout = setTimeout(finish, Math.max(0, ms));
|
|
26
|
+
const timeout = setTimeout(finish, Math.max(0, typeof ms === 'function' ? ms() : ms));
|
|
27
27
|
const onAbort = () => {
|
|
28
28
|
clearTimeout(timeout);
|
|
29
29
|
finish();
|
|
@@ -29,16 +29,22 @@ their immutable staged references until a new session is admitted. Contacts use
|
|
|
29
29
|
their own granted `yuri.projects` tools, not this session binding.
|
|
30
30
|
|
|
31
31
|
`projects.js` owns `POST /api/yuri/session-skills/projects` (`describe`, `list`,
|
|
32
|
-
`add`). The global gate and route require the existing loopback service credential,
|
|
32
|
+
`add`, `remote-hosts`, `add-remote`, `remote-projects`, `sessions`, `read-session`, `create-session`, `prompt-session`). `projects-remote.js` uses the injected `remoteHostGateway` and its immutable task leases; discovery returns authenticated `{hubId,hostId,instanceId}` targets, and explicit targets never fall back to local. `remote-hosts` includes authorized machines with no associated project, reports per-machine failures and releases each probe. `add-remote` uses `gateway.registerProject`, shared with the UI: the target validates/canonicalizes and registers the directory before the Hub saves a deduplicated reference and broadcasts project-order invalidation. A Hub write failure leaves the remote project intact; retrying the same target/path completes association. Paths are never resolved on the Hub filesystem. Lease cleanup runs on every outcome. Remote SDK requests preserve generated request data through the lease; bounded message reads use the existing Host turn-page route. No remote bodies are persisted on Hub. Session creation/prompt require stable caller IDs for ambiguous-result inspection, not automatic replay. This capability neither uses nor grants the desktop SSH helper. The global gate and route require the existing loopback service credential,
|
|
33
33
|
no browser Origin, shared-service ownership and the session's admitted Host origin.
|
|
34
34
|
The bridge reuses `projects/registry.js`, just like the UI directory API and contact
|
|
35
35
|
tools: strict reads, canonical path deduplication, serialized persistence and
|
|
36
36
|
existing project-order SSE notifications remain with their owners. Registration
|
|
37
37
|
preserves an existing active selection and returns only `{project, created}` after
|
|
38
38
|
persistence, never settings/credentials. List errors remain errors. There is no
|
|
39
|
-
cloning, directory creation
|
|
39
|
+
cloning, directory creation or desktop window navigation. Remote conversation creation is explicit and separate from local registration.
|
|
40
40
|
Web/Electron/connected-mobile shared-service sessions operate on their bound Host;
|
|
41
41
|
private/external OpenCode and standalone VS Code have no session helper admission.
|
|
42
|
+
Remote SDK calls share `remote-hosts/task-client.js`, so the target proxy owns
|
|
43
|
+
execution admission even when the Hub's own OpenCode is unavailable. Reads use a
|
|
44
|
+
25-second operation budget; explicit create/prompt use 300 seconds (the bound
|
|
45
|
+
client waits five seconds longer for the result). Caller disconnect cancels and
|
|
46
|
+
releases the task lease; uncertain writes are inspected by their stable IDs before
|
|
47
|
+
any retry.
|
|
42
48
|
|
|
43
49
|
`references/plugin-styles.md` inventories existing host CSS variables for plugin-owned
|
|
44
50
|
Solid/DOM content, including colors, typography, geometry, controls and optional
|
|
@@ -8,14 +8,15 @@ async function main() {
|
|
|
8
8
|
try {
|
|
9
9
|
const [encoded, operation] = process.argv.slice(2);
|
|
10
10
|
const binding = JSON.parse(Buffer.from(encoded, 'base64url').toString());
|
|
11
|
-
|
|
11
|
+
const operations = ['list', 'add', 'remote-hosts', 'add-remote', 'remote-projects', 'sessions', 'read-session', 'create-session', 'prompt-session'];
|
|
12
|
+
if (!['describe', ...operations].includes(operation)) throw new Error();
|
|
12
13
|
const origin = new URL(binding.hostOrigin);
|
|
13
14
|
if (origin.protocol !== 'http:' || !['127.0.0.1', '[::1]'].includes(origin.hostname) || origin.username || origin.password) throw new Error();
|
|
14
15
|
const registration = JSON.parse(await readFile(binding.registrationFile, 'utf8'));
|
|
15
16
|
if (new URL(registration.url).origin !== binding.upstreamOrigin || typeof registration.password !== 'string' || !registration.password) throw new Error();
|
|
16
17
|
bound = true;
|
|
17
18
|
let input = {};
|
|
18
|
-
if (
|
|
19
|
+
if (!['describe', 'list', 'remote-hosts', 'remote-projects'].includes(operation)) {
|
|
19
20
|
let text = '';
|
|
20
21
|
for await (const chunk of process.stdin) {
|
|
21
22
|
text += chunk;
|
|
@@ -24,7 +25,7 @@ async function main() {
|
|
|
24
25
|
input = JSON.parse(text);
|
|
25
26
|
}
|
|
26
27
|
const response = await fetch(new URL('/api/yuri/session-skills/projects', origin), {
|
|
27
|
-
method: 'POST', redirect: 'error', signal: AbortSignal.timeout(30_000),
|
|
28
|
+
method: 'POST', redirect: 'error', signal: AbortSignal.timeout(['create-session', 'prompt-session'].includes(operation) ? 305_000 : 30_000),
|
|
28
29
|
headers: { 'content-type': 'application/json', authorization: `Basic ${Buffer.from(`opencode:${registration.password}`).toString('base64')}` },
|
|
29
30
|
body: JSON.stringify({ sessionID: binding.sessionID, operation, input }),
|
|
30
31
|
});
|
|
@@ -32,23 +33,24 @@ async function main() {
|
|
|
32
33
|
if (!response.ok) {
|
|
33
34
|
const terminal = [401, 403, 501].includes(response.status);
|
|
34
35
|
console.error(JSON.stringify({ error: 'Project API operation failed', status: response.status, terminal,
|
|
35
|
-
...(['invalid_input', 'validation_error', 'project_unavailable', 'project_operation_failed'].includes(result?.code) ? { code: result.code } : {}),
|
|
36
|
+
...(['invalid_input', 'validation_error', 'project_unavailable', 'project_operation_failed', 'remote_unavailable', 'remote_target_mismatch', 'remote_response_invalid'].includes(result?.code) ? { code: result.code } : {}),
|
|
36
37
|
recovery: terminal ? 'Stop this workflow; resume only with a new supported session and its bound project describe command.'
|
|
37
|
-
: 'Result not confirmed.
|
|
38
|
+
: 'Result not confirmed. Inspect the same target before retrying; retain sessionID/messageID for interrupted writes. Never switch to local or claim success from a failed request.',
|
|
38
39
|
}));
|
|
39
40
|
process.exitCode = 1;
|
|
40
41
|
return;
|
|
41
42
|
}
|
|
42
|
-
if (
|
|
43
|
+
if (['add', 'add-remote'].includes(operation) && (typeof result.project?.id !== 'string' || typeof result.project?.path !== 'string' || typeof result.created !== 'boolean')) throw new Error();
|
|
44
|
+
if (operation === 'remote-hosts' && (!Array.isArray(result.hosts) || !Array.isArray(result.failed) || typeof result.complete !== 'boolean')) throw new Error();
|
|
43
45
|
if (operation === 'list' && !Array.isArray(result.projects)) throw new Error();
|
|
44
46
|
if (operation === 'describe' && result.supported !== true) throw new Error();
|
|
45
47
|
console.log(JSON.stringify(operation === 'describe' ? { ...result,
|
|
46
|
-
commands: Object.fromEntries(['list', 'add'].map((op) => [op, sessionSkillCommand(process.execPath, process.argv[1], encoded, op)])),
|
|
48
|
+
commands: Object.fromEntries(operations.filter((op) => result.remoteSupported || ['list', 'add'].includes(op)).map((op) => [op, sessionSkillCommand(process.execPath, process.argv[1], encoded, op)])),
|
|
47
49
|
} : result));
|
|
48
50
|
} catch {
|
|
49
51
|
console.error(JSON.stringify({ error: 'Bound project helper failed; the result is unconfirmed', terminal: !bound,
|
|
50
52
|
recovery: !bound ? 'Stop this workflow; resume only with a new supported session and its bound project describe command.'
|
|
51
|
-
: 'Check the input or connection. Resume with the bound describe command; retry
|
|
53
|
+
: 'Check the input or connection. Resume with the bound describe command; retry registration with the same target and path only after recovery.' }));
|
|
52
54
|
process.exitCode = 1;
|
|
53
55
|
}
|
|
54
56
|
}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import { makeRemoteTaskOpenCodeClient } from '../remote-hosts/task-client.js';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
|
|
4
|
+
const text = (value, limit = 4096) => typeof value === 'string' && value.trim() === value && value.length > 0 && value.length <= limit && !/[\x00-\x1f]/.test(value);
|
|
5
|
+
const object = (value) => value && typeof value === 'object' && !Array.isArray(value);
|
|
6
|
+
const targetValid = (value) => object(value) && Object.keys(value).length === 3
|
|
7
|
+
&& ['hubId', 'hostId', 'instanceId'].every((key) => text(value[key], 512));
|
|
8
|
+
const fail = (code) => { throw Object.assign(new Error(code), { code }); };
|
|
9
|
+
const sessionRecord = (value) => value?.data && !value.id ? value.data : value;
|
|
10
|
+
const directoryOf = (value) => value?.location?.directory ?? value?.directory;
|
|
11
|
+
const sessionSummary = (value, target) => {
|
|
12
|
+
const session = sessionRecord(value);
|
|
13
|
+
if (!text(session?.id, 512) || !text(directoryOf(session))) fail('remote_response_invalid');
|
|
14
|
+
return { sessionID: session.id, directory: directoryOf(session), title: session.title ?? '', time: session.time, target };
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
export const remoteProjectOperations = ['remote-hosts', 'add-remote', 'remote-projects', 'sessions', 'read-session', 'create-session', 'prompt-session'];
|
|
18
|
+
|
|
19
|
+
export function validRemoteProjectInput(operation, input) {
|
|
20
|
+
if (!object(input)) return false;
|
|
21
|
+
if (operation === 'remote-projects' || operation === 'remote-hosts') return Object.keys(input).length === 0;
|
|
22
|
+
if (operation === 'add-remote') return Object.keys(input).every((key) => ['target', 'path', 'label'].includes(key))
|
|
23
|
+
&& targetValid(input.target) && text(input.path) && (path.posix.isAbsolute(input.path) || path.win32.isAbsolute(input.path))
|
|
24
|
+
&& (input.label === undefined || text(input.label, 80));
|
|
25
|
+
const extras = { sessions: ['cursor'], 'read-session': ['sessionID', 'cursor'], 'create-session': ['sessionID', 'title'], 'prompt-session': ['sessionID', 'messageID', 'text'] }[operation];
|
|
26
|
+
if (!extras || Object.keys(input).some((key) => !['target', 'directory', ...extras].includes(key))) return false;
|
|
27
|
+
if (!targetValid(input.target) || !text(input.directory)) return false;
|
|
28
|
+
if (operation !== 'sessions' && !text(input.sessionID, 512)) return false;
|
|
29
|
+
if (input.cursor !== undefined && !text(input.cursor, 4096)) return false;
|
|
30
|
+
if (input.title !== undefined && !text(input.title, 256)) return false;
|
|
31
|
+
return operation !== 'prompt-session' || (text(input.messageID, 512) && typeof input.text === 'string' && input.text.trim().length > 0 && input.text.length <= 12_000);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** Only the admitted Hub's existing connections; no desktop configuration capability. */
|
|
35
|
+
export async function runRemoteProjectOperation(gateway, operation, input, signal) {
|
|
36
|
+
signal?.throwIfAborted();
|
|
37
|
+
if (!gateway?.acquireTask) fail('remote_unavailable');
|
|
38
|
+
const catalog = await gateway.list();
|
|
39
|
+
signal?.throwIfAborted();
|
|
40
|
+
if (!catalog.supported) fail('remote_unavailable');
|
|
41
|
+
if (operation === 'remote-hosts') {
|
|
42
|
+
const hosts = [], failed = [];
|
|
43
|
+
for (const host of catalog.hosts) {
|
|
44
|
+
let lease;
|
|
45
|
+
try {
|
|
46
|
+
if (host.available === false) fail('remote_unavailable');
|
|
47
|
+
lease = await gateway.acquireTask(host.id, { signal });
|
|
48
|
+
hosts.push({ name: host.name, source: host.source, target: lease.target });
|
|
49
|
+
} catch { signal?.throwIfAborted(); failed.push({ hostId: host.id, code: 'remote_unavailable' }); }
|
|
50
|
+
finally { lease?.release(); }
|
|
51
|
+
}
|
|
52
|
+
return { hosts, failed, complete: failed.length === 0 };
|
|
53
|
+
}
|
|
54
|
+
if (operation === 'remote-projects') {
|
|
55
|
+
const projects = [], failed = [];
|
|
56
|
+
for (const hostId of new Set(catalog.projects.map((project) => project.hostId))) {
|
|
57
|
+
let lease;
|
|
58
|
+
try {
|
|
59
|
+
lease = await gateway.acquireTask(hostId, { signal });
|
|
60
|
+
for (const project of catalog.projects.filter((project) => project.hostId === hostId)) {
|
|
61
|
+
projects.push({ id: project.id, path: project.path, ...(project.label ? { label: project.label } : {}), target: lease.target });
|
|
62
|
+
}
|
|
63
|
+
} catch { signal?.throwIfAborted(); failed.push({ hostId, code: 'remote_unavailable' }); }
|
|
64
|
+
finally { lease?.release(); }
|
|
65
|
+
}
|
|
66
|
+
return { projects, failed, complete: failed.length === 0 };
|
|
67
|
+
}
|
|
68
|
+
if (input.target.hubId !== catalog.hubId) fail('remote_target_mismatch');
|
|
69
|
+
if (operation === 'add-remote') {
|
|
70
|
+
const result = await gateway.registerProject(input.target.hostId, { path: input.path, ...(input.label ? { label: input.label } : {}) },
|
|
71
|
+
{ instanceId: input.target.instanceId, signal });
|
|
72
|
+
return { ...result, target: input.target };
|
|
73
|
+
}
|
|
74
|
+
const lease = await gateway.acquireTask(input.target.hostId, { instanceId: input.target.instanceId, signal });
|
|
75
|
+
try {
|
|
76
|
+
if (['hubId', 'hostId', 'instanceId'].some((key) => lease.target[key] !== input.target[key])) fail('remote_target_mismatch');
|
|
77
|
+
gateway.assertProjectDirectory(input.target.hostId, input.directory);
|
|
78
|
+
const client = makeRemoteTaskOpenCodeClient(lease);
|
|
79
|
+
if (operation === 'sessions') {
|
|
80
|
+
const result = await client.session.list({ directory: input.directory, limit: 20, ...(input.cursor ? { cursor: input.cursor } : { order: 'desc' }) }, { signal });
|
|
81
|
+
const rows = result?.data;
|
|
82
|
+
if (!Array.isArray(rows)) fail('remote_response_invalid');
|
|
83
|
+
return { sessions: rows.map((row) => sessionSummary(row, lease.target)).filter((row) => row.directory === input.directory), nextCursor: result.cursor?.next ?? null };
|
|
84
|
+
}
|
|
85
|
+
if (operation === 'create-session') {
|
|
86
|
+
const created = await client.session.create({ id: input.sessionID, location: { directory: input.directory }, ...(input.title ? { title: input.title } : {}) }, { signal });
|
|
87
|
+
const session = sessionSummary(created, lease.target);
|
|
88
|
+
if (session.sessionID !== input.sessionID || session.directory !== input.directory) fail('remote_target_mismatch');
|
|
89
|
+
return { session, created: true };
|
|
90
|
+
}
|
|
91
|
+
const session = sessionRecord(await client.session.get({ sessionID: input.sessionID }, { signal }));
|
|
92
|
+
if (session?.id !== input.sessionID || directoryOf(session) !== input.directory) fail('remote_target_mismatch');
|
|
93
|
+
if (operation === 'read-session') {
|
|
94
|
+
const query = new URLSearchParams({ directory: input.directory, turns: '3', ...(input.cursor ? { cursor: input.cursor } : {}) });
|
|
95
|
+
const messages = await lease.json(`/api/yuri/sessions/${encodeURIComponent(input.sessionID)}/messages?${query}`, { signal });
|
|
96
|
+
return { session: sessionSummary(session, lease.target), messages };
|
|
97
|
+
}
|
|
98
|
+
await client.session.prompt({ sessionID: input.sessionID, id: input.messageID, text: input.text, delivery: 'steer' }, { signal });
|
|
99
|
+
return { session: sessionSummary(session, lease.target), messageID: input.messageID, admitted: true };
|
|
100
|
+
} finally { lease.release(); }
|
|
101
|
+
}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { configureServerOpenCodeFetchGate } from '../opencode/server-opencode-fetch.js';
|
|
3
|
+
import { runRemoteProjectOperation, validRemoteProjectInput } from './projects-remote.js';
|
|
4
|
+
|
|
5
|
+
const target = { hubId: 'hub', hostId: 'host', instanceId: 'instance' };
|
|
6
|
+
const input = { target, directory: '/repo', sessionID: 'ses_one' };
|
|
7
|
+
const session = { id: 'ses_one', location: { directory: '/repo' }, title: 'Remote', time: { created: 1, updated: 1 } };
|
|
8
|
+
const fixture = () => {
|
|
9
|
+
const request = vi.fn(async (route, init) => {
|
|
10
|
+
if (route === '/api/session/ses_one') return Response.json({ data: session });
|
|
11
|
+
const url = new URL(route, 'http://remote.invalid');
|
|
12
|
+
if (url.pathname === '/api/session' && init.method === 'GET') return Response.json({ data: [session], cursor: { next: 'next' } });
|
|
13
|
+
if (url.pathname === '/api/session' && init.method === 'POST') return Response.json({ data: session });
|
|
14
|
+
return Response.json({ data: {} });
|
|
15
|
+
});
|
|
16
|
+
const release = vi.fn(), json = vi.fn(async () => ({ messages: [], complete: true }));
|
|
17
|
+
const gateway = { supported: true, list: vi.fn(async () => ({ supported: true, hubId: 'hub', hosts: [{ id: 'host', name: 'Build machine', source: 'ssh' }], projects: [{ id: 'p', hostId: 'host', path: '/repo' }] })),
|
|
18
|
+
registerProject: vi.fn(async () => ({ project: { id: 'ref', path: '/repo', hostId: 'host' }, created: true })),
|
|
19
|
+
acquireTask: vi.fn(async () => ({ target, request, json, release })), assertProjectDirectory: vi.fn() };
|
|
20
|
+
return { gateway, request, json, release };
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
describe('bound remote project sessions', () => {
|
|
24
|
+
it('validates the complete target and operation allowlists', () => {
|
|
25
|
+
expect(validRemoteProjectInput('read-session', input)).toBe(true);
|
|
26
|
+
for (const value of [{ ...input, target: null }, { ...input, target: { ...target, instanceId: '' } }, { ...input, target: { hostId: 'host' } }, { ...input, hostOrigin: 'http://other' }]) {
|
|
27
|
+
expect(validRemoteProjectInput('read-session', value)).toBe(false);
|
|
28
|
+
}
|
|
29
|
+
expect(validRemoteProjectInput('prompt-session', { ...input, messageID: 'm', text: 'continue' })).toBe(true);
|
|
30
|
+
expect(validRemoteProjectInput('create-session', { target, directory: '/repo' })).toBe(false);
|
|
31
|
+
for (const path of ['/repo/new', 'C:\\Work\\项目 & 100%', '\\\\server\\share\\repo']) expect(validRemoteProjectInput('add-remote', { target, path, label: 'Project' })).toBe(true);
|
|
32
|
+
for (const value of [{ target, path: 'relative' }, { target, path: '/repo', label: '' }, { target, path: '/repo', label: 'x'.repeat(81) },
|
|
33
|
+
{ target, path: '/repo\n' }, { target, path: '/repo', activate: true }, { target: { ...target, instanceId: '' }, path: '/repo' }]) expect(validRemoteProjectInput('add-remote', value)).toBe(false);
|
|
34
|
+
expect(validRemoteProjectInput('remote-hosts', {})).toBe(true);
|
|
35
|
+
expect(validRemoteProjectInput('remote-hosts', { target })).toBe(false);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it('discovers authorized machines even without projects and preserves per-machine failures without credentials', async () => {
|
|
39
|
+
const f = fixture();
|
|
40
|
+
f.gateway.list.mockResolvedValue({ supported: true, hubId: 'hub', hosts: [
|
|
41
|
+
{ id: 'host', name: 'Build machine', source: 'ssh', apiUrl: 'private-url', clientToken: 'private-token' },
|
|
42
|
+
{ id: 'offline', name: 'Offline', available: false }, { id: 'denied', name: 'Denied' },
|
|
43
|
+
], projects: [] });
|
|
44
|
+
f.gateway.acquireTask.mockImplementation(async (id) => {
|
|
45
|
+
if (id === 'denied') throw new Error('private failure');
|
|
46
|
+
return { target, release: f.release };
|
|
47
|
+
});
|
|
48
|
+
const first = await runRemoteProjectOperation(f.gateway, 'remote-hosts', {});
|
|
49
|
+
expect(first).toMatchObject({ hosts: [{ name: 'Build machine', target }], failed: [{ hostId: 'offline' }, { hostId: 'denied' }], complete: false });
|
|
50
|
+
expect(JSON.stringify(first)).not.toMatch(/private/);
|
|
51
|
+
expect(f.release).toHaveBeenCalledOnce();
|
|
52
|
+
f.gateway.acquireTask.mockClear(); f.release.mockClear();
|
|
53
|
+
f.gateway.list.mockResolvedValue({ supported: true, hubId: 'hub', hosts: [{ id: 'host', name: 'Build machine', source: 'ssh' }], projects: [] });
|
|
54
|
+
expect(await runRemoteProjectOperation(f.gateway, 'remote-hosts', {})).toEqual({ hosts: [{ name: 'Build machine', source: 'ssh', target }], failed: [], complete: true });
|
|
55
|
+
expect(f.release).toHaveBeenCalledOnce();
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it('registers against the captured instance through the shared gateway without local or session mutations', async () => {
|
|
59
|
+
const f = fixture(); const signal = new AbortController().signal;
|
|
60
|
+
expect(await runRemoteProjectOperation(f.gateway, 'add-remote', { target, path: '/repo', label: 'Remote' }, signal)).toEqual({ project: { id: 'ref', path: '/repo', hostId: 'host' }, created: true, target });
|
|
61
|
+
expect(f.gateway.registerProject).toHaveBeenCalledExactlyOnceWith('host', { path: '/repo', label: 'Remote' }, { instanceId: 'instance', signal });
|
|
62
|
+
expect(f.request).not.toHaveBeenCalled();
|
|
63
|
+
expect(f.gateway.assertProjectDirectory).not.toHaveBeenCalled();
|
|
64
|
+
await expect(runRemoteProjectOperation(f.gateway, 'add-remote', { target: { ...target, hubId: 'other' }, path: '/repo' })).rejects.toMatchObject({ code: 'remote_target_mismatch' });
|
|
65
|
+
expect(f.gateway.registerProject).toHaveBeenCalledOnce();
|
|
66
|
+
f.gateway.registerProject.mockRejectedValueOnce(new Error('offline'));
|
|
67
|
+
await expect(runRemoteProjectOperation(f.gateway, 'add-remote', { target, path: '/repo' })).rejects.toThrow('offline');
|
|
68
|
+
expect(f.gateway.registerProject).toHaveBeenCalledTimes(2);
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it('stops discovery on cancellation instead of returning a false complete catalog', async () => {
|
|
72
|
+
const f = fixture(); const controller = new AbortController();
|
|
73
|
+
f.gateway.acquireTask.mockImplementationOnce(async () => { controller.abort(); throw controller.signal.reason; });
|
|
74
|
+
await expect(runRemoteProjectOperation(f.gateway, 'remote-hosts', {}, controller.signal)).rejects.toMatchObject({ name: 'AbortError' });
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('discovers authenticated targets, releases leases and preserves partial failures', async () => {
|
|
78
|
+
const f = fixture();
|
|
79
|
+
expect(await runRemoteProjectOperation(f.gateway, 'remote-projects', {})).toEqual({ projects: [{ id: 'p', path: '/repo', target }], failed: [], complete: true });
|
|
80
|
+
expect(f.release).toHaveBeenCalledTimes(1);
|
|
81
|
+
f.gateway.acquireTask.mockRejectedValueOnce(new Error('private transport details'));
|
|
82
|
+
expect(await runRemoteProjectOperation(f.gateway, 'remote-projects', {})).toEqual({ projects: [], failed: [{ hostId: 'host', code: 'remote_unavailable' }], complete: false });
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
it('rejects wrong Hub, retarget and wrong session directory before message access', async () => {
|
|
86
|
+
const f = fixture();
|
|
87
|
+
await expect(runRemoteProjectOperation(f.gateway, 'read-session', { ...input, target: { ...target, hubId: 'other' } })).rejects.toMatchObject({ code: 'remote_target_mismatch' });
|
|
88
|
+
expect(f.gateway.acquireTask).not.toHaveBeenCalled();
|
|
89
|
+
f.gateway.acquireTask.mockResolvedValueOnce({ target: { ...target, instanceId: 'replacement' }, release: f.release });
|
|
90
|
+
await expect(runRemoteProjectOperation(f.gateway, 'read-session', input)).rejects.toMatchObject({ code: 'remote_target_mismatch' });
|
|
91
|
+
await expect(runRemoteProjectOperation(f.gateway, 'read-session', { ...input, directory: '/other' })).rejects.toMatchObject({ code: 'remote_target_mismatch' });
|
|
92
|
+
expect(f.json).not.toHaveBeenCalled();
|
|
93
|
+
expect(f.release).toHaveBeenCalledTimes(2);
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
it('uses lease-backed generated SDK requests and only bounded transient message pages', async () => {
|
|
97
|
+
const f = fixture();
|
|
98
|
+
const signal = new AbortController().signal;
|
|
99
|
+
const listed = await runRemoteProjectOperation(f.gateway, 'sessions', { target, directory: '/repo' }, signal);
|
|
100
|
+
expect(listed).toMatchObject({ sessions: [{ sessionID: 'ses_one', directory: '/repo', target }], nextCursor: 'next' });
|
|
101
|
+
const [route] = f.request.mock.calls[0];
|
|
102
|
+
expect(new URL(route, 'http://remote.invalid').searchParams.get('directory')).toBe('/repo');
|
|
103
|
+
const read = await runRemoteProjectOperation(f.gateway, 'read-session', input, signal);
|
|
104
|
+
expect(read).toMatchObject({ session: { target }, messages: { complete: true } });
|
|
105
|
+
expect(f.json).toHaveBeenCalledWith('/api/yuri/sessions/ses_one/messages?directory=%2Frepo&turns=3', { signal });
|
|
106
|
+
expect(f.release).toHaveBeenCalledTimes(2);
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
it('preserves caller-owned write IDs and never retries a failed prompt', async () => {
|
|
110
|
+
configureServerOpenCodeFetchGate(() => ({ executionAllowed: false }));
|
|
111
|
+
try {
|
|
112
|
+
const f = fixture();
|
|
113
|
+
expect(await runRemoteProjectOperation(f.gateway, 'create-session', input)).toMatchObject({ session: { sessionID: 'ses_one', target } });
|
|
114
|
+
const created = JSON.parse(Buffer.from(f.request.mock.calls[0][1].body).toString());
|
|
115
|
+
expect(created).toMatchObject({ id: 'ses_one' });
|
|
116
|
+
f.request.mockClear();
|
|
117
|
+
expect(await runRemoteProjectOperation(f.gateway, 'prompt-session', { ...input, messageID: 'msg_one', text: 'continue' })).toMatchObject({ admitted: true, messageID: 'msg_one' });
|
|
118
|
+
const call = f.request.mock.calls.find(([, init]) => init.method === 'POST');
|
|
119
|
+
expect(JSON.parse(Buffer.from(call[1].body).toString())).toMatchObject({ id: 'msg_one', text: 'continue', delivery: 'steer' });
|
|
120
|
+
f.request.mockRejectedValue(new Error('network'));
|
|
121
|
+
await expect(runRemoteProjectOperation(f.gateway, 'prompt-session', { ...input, messageID: 'msg_one', text: 'continue' })).rejects.toThrow();
|
|
122
|
+
expect(f.release).toHaveBeenCalledTimes(3);
|
|
123
|
+
} finally { configureServerOpenCodeFetchGate(null); }
|
|
124
|
+
});
|
|
125
|
+
});
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { authorizeScheduledTaskSkillRequest } from '../scheduled-tasks/session-skill-contract.js';
|
|
3
|
+
import { remoteProjectOperations, validRemoteProjectInput, runRemoteProjectOperation } from './projects-remote.js';
|
|
3
4
|
|
|
4
5
|
export const PROJECTS_SKILL_PATH = '/api/yuri/session-skills/projects';
|
|
5
6
|
|
|
6
7
|
const projectResult = ({ id, path, label }) => ({ id, path, ...(label ? { label } : {}) });
|
|
7
8
|
const validInput = (operation, input) => {
|
|
9
|
+
if (remoteProjectOperations.includes(operation)) return validRemoteProjectInput(operation, input);
|
|
8
10
|
if (!input || typeof input !== 'object' || Array.isArray(input)) return false;
|
|
9
11
|
const allowed = operation === 'add' ? ['path', 'label'] : [];
|
|
10
12
|
if (Object.keys(input).some((key) => !allowed.includes(key))) return false;
|
|
@@ -14,19 +16,40 @@ const validInput = (operation, input) => {
|
|
|
14
16
|
};
|
|
15
17
|
|
|
16
18
|
/** Session-bound Host registration; the shared project registry owns persistence. */
|
|
17
|
-
export function registerProjectsSkill(app, { express, getIsSharedOpenCodeService, getOpenCodeAuthHeaders, createClient, registerProject, readSettingsFromDiskStrict, sanitizeProjects }) {
|
|
19
|
+
export function registerProjectsSkill(app, { express, getIsSharedOpenCodeService, getOpenCodeAuthHeaders, createClient, registerProject, readSettingsFromDiskStrict, sanitizeProjects, remoteHostGateway }) {
|
|
18
20
|
app.post(PROJECTS_SKILL_PATH, express.json({ limit: '16kb' }), async (req, res) => {
|
|
19
21
|
res.setHeader('Cache-Control', 'no-store');
|
|
20
22
|
if (!getIsSharedOpenCodeService() || !authorizeScheduledTaskSkillRequest(req, getOpenCodeAuthHeaders())) return res.status(403).json({ error: 'Forbidden' });
|
|
21
23
|
const { sessionID, operation, input = {} } = req.body ?? {};
|
|
22
24
|
if (typeof sessionID !== 'string' || !sessionID || sessionID.length > 256
|
|
23
|
-
|| !['describe', 'list', 'add'].includes(operation) || !validInput(operation, input)) return res.status(400).json({ code: 'invalid_input', error: 'Invalid project input' });
|
|
25
|
+
|| !['describe', 'list', 'add', ...remoteProjectOperations].includes(operation) || !validInput(operation, input)) return res.status(400).json({ code: 'invalid_input', error: 'Invalid project input' });
|
|
24
26
|
try {
|
|
25
27
|
const session = await createClient().session.get({ sessionID });
|
|
26
28
|
const hostOrigin = `http://${req.socket.localAddress === '::1' ? '[::1]' : '127.0.0.1'}:${req.socket.localPort}`;
|
|
27
29
|
if (session.metadata?.yuri?.scheduledTaskSkill?.hostOrigin !== hostOrigin) return res.status(403).json({ error: 'Session is not bound to this Host' });
|
|
28
|
-
if (operation === 'describe') return res.json({ supported: true, inputs: { add: '{path: existing absolute Host directory, label?: display name}', list: '{}'
|
|
29
|
-
|
|
30
|
+
if (operation === 'describe') return res.json({ supported: true, remoteSupported: Boolean(remoteHostGateway?.supported && remoteHostGateway?.acquireTask), inputs: { add: '{path: existing absolute Host directory, label?: display name}', list: '{}',
|
|
31
|
+
'remote-hosts': '{}', 'add-remote': '{target: {hubId,hostId,instanceId} from remote-hosts, path: existing absolute remote directory, label?}',
|
|
32
|
+
'remote-projects': '{}', sessions: '{target, directory, cursor?}', 'read-session': '{target, directory, sessionID, cursor?}',
|
|
33
|
+
'create-session': '{target, directory, sessionID: new caller-generated ID, title?}', 'prompt-session': '{target, directory, sessionID, messageID: stable caller-generated ID, text}' },
|
|
34
|
+
completion: 'add and add-remote return the persisted project and created=true/false. add-remote registers on the target Host, then saves the Hub reference. Registration does not clone/create files, open a session or change an existing active selection. Retry the same target and path safely after an interrupted response.' });
|
|
35
|
+
if (remoteProjectOperations.includes(operation)) {
|
|
36
|
+
const controller = new AbortController();
|
|
37
|
+
const abort = () => controller.abort();
|
|
38
|
+
req.once('aborted', abort);
|
|
39
|
+
res.once('close', abort);
|
|
40
|
+
if (req.aborted || res.destroyed) abort();
|
|
41
|
+
const timeout = ['create-session', 'prompt-session'].includes(operation) ? 300_000 : 25_000;
|
|
42
|
+
try {
|
|
43
|
+
const result = await runRemoteProjectOperation(remoteHostGateway, operation, input,
|
|
44
|
+
AbortSignal.any([controller.signal, AbortSignal.timeout(timeout)]));
|
|
45
|
+
if (!controller.signal.aborted) return res.json(result);
|
|
46
|
+
return;
|
|
47
|
+
} finally {
|
|
48
|
+
req.removeListener('aborted', abort);
|
|
49
|
+
res.removeListener('close', abort);
|
|
50
|
+
controller.abort();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
30
53
|
if (operation === 'list') {
|
|
31
54
|
const settings = await readSettingsFromDiskStrict();
|
|
32
55
|
if (!settings || typeof settings !== 'object' || Array.isArray(settings)
|
|
@@ -36,8 +59,9 @@ export function registerProjectsSkill(app, { express, getIsSharedOpenCodeService
|
|
|
36
59
|
const { project, created } = await registerProject(input);
|
|
37
60
|
return res.json({ project: projectResult(project), created });
|
|
38
61
|
} catch (error) {
|
|
39
|
-
|
|
40
|
-
|
|
62
|
+
if (res.destroyed) return;
|
|
63
|
+
const code = ['validation_error', 'project_unavailable', 'remote_unavailable', 'remote_target_mismatch', 'remote_response_invalid'].includes(error?.code) ? error.code : 'project_operation_failed';
|
|
64
|
+
return res.status(code === 'validation_error' ? 400 : 503).json({ code, error: 'Project operation was not confirmed; inspect the same target before retrying. Never retry against the local Host.' });
|
|
41
65
|
}
|
|
42
66
|
});
|
|
43
67
|
}
|