@yuriai/web 0.2.25 → 0.2.27-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +21 -1
- package/dist/assets/AgentAvatar-kIN4sZMz.js +1 -0
- package/dist/assets/AssistantView-C2KQZ6a4.js +3 -0
- package/dist/assets/{DiagramView-DN_rHdr9.js → DiagramView-DK0iXm9b.js} +1 -1
- package/dist/assets/{FadeInOnReveal-555z1y1N.js → FadeInOnReveal-BJA9Za3T.js} +1 -1
- package/dist/assets/{GuiPluginSurface-BPMATuPa.js → GuiPluginSurface-Dz2CdSUA.js} +1 -1
- package/dist/assets/{GuiPluginWindow-CAmfr79x.js → GuiPluginWindow-l4FYY6S-.js} +1 -1
- package/dist/assets/Icon-BP1sfnHn.js +1 -0
- package/dist/assets/{ImageLoadingPlaceholder-BMsQLN_b.js → ImageLoadingPlaceholder-DCWssLJG.js} +1 -1
- package/dist/assets/{LoadingImage-DI7sb_H_.js → LoadingImage-C_Hryaqe.js} +1 -1
- package/dist/assets/MarkdownRenderer-Y6uQXIFH.js +2 -0
- package/dist/assets/{MarkdownRendererImpl-B9K5q0Lc.js → MarkdownRendererImpl-qKp1tQrP.js} +1 -1
- package/dist/assets/{MarkstreamRendererImpl-9gUEVQck.js → MarkstreamRendererImpl-B_JTod0h.js} +1 -1
- package/dist/assets/MobileDetailNavigation-B3rUx5Ve.js +1 -0
- package/dist/assets/{MobileResizableSheet-_6OvPSMI.js → MobileResizableSheet-F1zSUD1S.js} +1 -1
- package/dist/assets/{MobileShareBridge-BrdOiu_r.js → MobileShareBridge-F70fkIfS.js} +3 -3
- package/dist/assets/MobileTabPageHeader-0esgB2TO.js +2 -0
- package/dist/assets/MultiRunWindow-D8m6R_4x.js +1 -0
- package/dist/assets/{OnboardingScreen-g8PDztN3.js → OnboardingScreen-BAsPVV_W.js} +1 -1
- package/dist/assets/{OverlayScrollbar-COv8rH_z.js → OverlayScrollbar-wiRM4AGj.js} +1 -1
- package/dist/assets/SettingsView-izzjIckv.js +29 -0
- package/dist/assets/SettingsWindow-CSuHDq_c.js +1 -0
- package/dist/assets/{TerminalView-BLer-ZhM.js → TerminalView-BtM5-BVx.js} +1 -1
- package/dist/assets/{ToolOutputDialog-DI-s2TBb.js → ToolOutputDialog-DJs9w1_J.js} +2 -2
- package/dist/assets/{YuriLogo-BP4j1iqV.js → YuriLogo-aBS6wlYU.js} +1 -1
- package/dist/assets/appThemeRegistry-BY5rY9-W.js +1 -0
- package/dist/assets/{assistant-attachment-cache-Cis9yYGt.js → assistant-attachment-cache-B9iHLlm2.js} +1 -1
- package/dist/assets/{button-Be1cqulG.js → button-Dt6Ygbc7.js} +1 -1
- package/dist/assets/{capgoAdapter-B31jIkD8.js → capgoAdapter-MQ1qpf60.js} +1 -1
- package/dist/assets/collapsible-Dm7OHk7m.js +1 -0
- package/dist/assets/{device-hj359GjJ.js → device-BjRYYXNT.js} +1 -1
- package/dist/assets/{diagram-hEIRiKol.js → diagram-DWZaG3_v.js} +1 -1
- package/dist/assets/dialog-CTYD3Sbr.css +1 -0
- package/dist/assets/dialog-CjQeHVOc.js +1 -0
- package/dist/assets/{dropdown-menu.styles-xxM2ofOp.js → dropdown-menu.styles-PdxueXzN.js} +1 -1
- package/dist/assets/{es-Clj7CS2r.js → es-BjI1GHJ5.js} +3 -3
- package/dist/assets/{fileMentionTouchSelection-CTh0Mc2g.js → fileMentionTouchSelection-D7QtVxjI.js} +2 -2
- package/dist/assets/{fileQueries-COS23nLq.js → fileQueries-5a1jkme2.js} +1 -1
- package/dist/assets/{fileReferenceActions-Cus9oSW7.js → fileReferenceActions-BAoEu4z8.js} +1 -1
- package/dist/assets/{fr-dmrFQLCO.js → fr-Bs7ndHkb.js} +4 -4
- package/dist/assets/{gitApi-deADOzlN.js → gitApi-BxQmH8Wg.js} +1 -1
- package/dist/assets/{gitApiHttp-BBRKl9WX.js → gitApiHttp-DHrRqnYh.js} +3 -3
- package/dist/assets/{gui-BHEKelUx.js → gui-9enrif_1.js} +1 -1
- package/dist/assets/{host-DrqLUbqt.js → host-D1EpSUMR.js} +1 -1
- package/dist/assets/image-loading-Dq1g_wpm.js +1 -0
- package/dist/assets/{input-DTdHYZ6r.js → input-Dq4usRDa.js} +1 -1
- package/dist/assets/insertionBoundaries-CKQL85zy.js +1 -0
- package/dist/assets/{ja-Co0dxiN_.js → ja-DkdV26EW.js} +4 -4
- package/dist/assets/{ko-BltElAGq.js → ko-B0qoC5da.js} +4 -4
- package/dist/assets/main-CNwFqQQd.js +2 -0
- package/dist/assets/main-DPhcXanT.js +169 -0
- package/dist/assets/{markdownHeightCache-DnR01ECa.js → markdownHeightCache-C1u0bWDL.js} +1 -1
- package/dist/assets/{markdownTheme-DHoKvD6O.js → markdownTheme-hpURsgju.js} +1 -1
- package/dist/assets/{mcpQueries-Cpb22_60.js → mcpQueries-D2IxTr4k.js} +1 -1
- package/dist/assets/miniChat-CF2vb25D.js +2 -0
- package/dist/assets/mobile-C24qSj44.js +2 -0
- package/dist/assets/{mobileBackNavigation-BibkyIeB.js → mobileBackNavigation-vpCg1S7j.js} +1 -1
- package/dist/assets/{multirun-CPvUnP91.js → multirun-DT-dFXud.js} +2 -2
- package/dist/assets/{native-BMAEg2E6.js → native-De1DIkLZ.js} +1 -1
- package/dist/assets/{native-config-DA8S8EqV.js → native-config-ncdoz9Wl.js} +1 -1
- package/dist/assets/{persistence-CBL0OOdj.js → persistence-JyLTFv27.js} +1 -1
- package/dist/assets/{pl-qd6Wnl7H.js → pl-D27Y_GBs.js} +4 -4
- package/dist/assets/projectMeta-CG8NLahh.js +1 -0
- package/dist/assets/{pt-BR-CsOFfQXS.js → pt-BR-DbocEu4b.js} +3 -3
- package/dist/assets/{react-BYRXYlGz.js → react-CURmDhtB.js} +1 -1
- package/dist/assets/{readiness-RiznV1AX.js → readiness-DSJs_3v4.js} +1 -1
- package/dist/assets/{renderElectronMiniChatApp-DdGqTh4X.js → renderElectronMiniChatApp-ChZCxxH6.js} +2 -2
- package/dist/assets/renderMobileApp-CRv3Il6P.js +28 -0
- package/dist/assets/{runtime-file-download-B_c7JBoS.js → runtime-file-download-CcNIVp7u.js} +1 -1
- package/dist/assets/{runtime-file-resource-DpTxBCsp.js → runtime-file-resource-6np6lzoV.js} +1 -1
- package/dist/assets/runtimeConfig-CZrflo-r.js +2 -0
- package/dist/assets/runtimeEndpointReset-BL9hV6J1.css +1 -0
- package/dist/assets/runtimeEndpointReset-Cx3RE97b.js +149 -0
- package/dist/assets/scheduledTaskNavigation-rhgnZaaj.js +1 -0
- package/dist/assets/sessionChangeSummary-8C8nv-EP.css +1 -0
- package/dist/assets/sessionChangeSummary-CVUA1AFw.js +1 -0
- package/dist/assets/{sessionLookup-B7kUOIpO.js → sessionLookup-C3_vQwLe.js} +1 -1
- package/dist/assets/{sortable-tabs-strip-CQZ16rbO.js → sortable-tabs-strip-C1QmKFdb.js} +1 -1
- package/dist/assets/speechSettingsQueries-BSQ-2JTv.js +4 -0
- package/dist/assets/src-NKCZI3Lg.css +2 -0
- package/dist/assets/{store-7wItZZ7_.js → store-DvN2L3vf.js} +4 -4
- package/dist/assets/{terminalApi-C0_GUlPR.js → terminalApi-B5o8UqWA.js} +1 -1
- package/dist/assets/{textarea-BU8JtaSQ.js → textarea-vtIQM2iP.js} +1 -1
- package/dist/assets/{tooltip-C8DhNU1d.js → tooltip-BpG2mxrT.js} +1 -1
- package/dist/assets/{touch-gestures-zegXCZEP.js → touch-gestures-K2_ZOkKW.js} +1 -1
- package/dist/assets/types-CNTgeeM1.js +2 -0
- package/dist/assets/{uk-BNrdZFvK.js → uk-B_JwElWz.js} +3 -3
- package/dist/assets/{useAppFontEffects-Bs6kVjrE.js → useAppFontEffects-BguV1Hfa.js} +55 -51
- package/dist/assets/useAppFontEffects-RpgNbjA4.css +1 -0
- package/dist/assets/{useAssistantUIStore-NlYBroMc.js → useAssistantUIStore-C9FPlYQz.js} +1 -1
- package/dist/assets/{useDesktopWindowControlsLayout-COBTly74.js → useDesktopWindowControlsLayout-CwgkVw9f.js} +1 -1
- package/dist/assets/useEffectiveDirectory-Ci6Z13kj.js +1 -0
- package/dist/assets/{useFontPreferences-DQAS94Z4.js → useFontPreferences-DMiP_Yy-.js} +1 -1
- package/dist/assets/useMobileNavigationStore-TCj7ZnhV.js +418 -0
- package/dist/assets/{useThemeSystem-8jhE4Zyk.js → useThemeSystem-CGF5jnIh.js} +1 -1
- package/dist/assets/{useUIStore-96W41KFb.js → useUIStore-DI7va1HH.js} +1 -1
- package/dist/assets/{useWorkerHighlightedLines-BZUO0Si5.js → useWorkerHighlightedLines-HKhuYGSj.js} +1 -1
- package/dist/assets/{vendor-base-ui-CdzJ6My_.js → vendor-base-ui-BQjbsJ43.js} +1 -1
- package/dist/assets/{vendor-cmdk-RDxC-9Iz.js → vendor-cmdk-C3oBVL9X.js} +1 -1
- package/dist/assets/{vendor-dnd-kit-accessibility-COSwgjFs.js → vendor-dnd-kit-accessibility-DxpFzZhi.js} +1 -1
- package/dist/assets/{vendor-dnd-kit-core-5pNnzVdw.js → vendor-dnd-kit-core-B3g3zWQd.js} +1 -1
- package/dist/assets/{vendor-dnd-kit-sortable-Dm50I0m7.js → vendor-dnd-kit-sortable-BKewx0Py.js} +1 -1
- package/dist/assets/{vendor-framer-motion-BQ3-sJMO.js → vendor-framer-motion-C1twy-GF.js} +1 -1
- package/dist/assets/{vendor-markstream-react-Bm0cO70Z.js → vendor-markstream-react-BlbOg72y.js} +3 -3
- package/dist/assets/vendor-motion-BmLx2V78.js +1 -0
- package/dist/assets/{vendor-opencode-client-fxfj4IA_.js → vendor-opencode-client-UL_TecvQ.js} +1 -1
- package/dist/assets/{vendor-opencode-plugin-CQ5ogY33.js → vendor-opencode-plugin-Bw7Q6Nv9.js} +1 -1
- package/dist/assets/{vendor-pierre-diffs-DPBtNDJ5.js → vendor-pierre-diffs-Bj9Nqn6w.js} +1 -1
- package/dist/assets/{vendor-react-BP2cRVqX.js → vendor-react-D5d-V1vN.js} +1 -1
- package/dist/assets/{vendor-react-drawio-Ck9ZKdNN.js → vendor-react-drawio-C-iPmmED.js} +1 -1
- package/dist/assets/{vendor-reactuses-core-BJ-jJ4YM.js → vendor-reactuses-core-BcebBLwF.js} +1 -1
- package/dist/assets/{vendor-solid-js-Dmt4_-Zk.js → vendor-solid-js-0T254UHG.js} +1 -1
- package/dist/assets/{vendor-sonner-ZS8XIOVl.js → vendor-sonner-r2EJnfoo.js} +1 -1
- package/dist/assets/{vendor-stream-diffs-TgIdH4lX.js → vendor-stream-diffs-BnLmeqg2.js} +2 -2
- package/dist/assets/{vendor-tanstack-react-query-CdqCAt40.js → vendor-tanstack-react-query-C4SG3JZB.js} +1 -1
- package/dist/assets/vendor-tanstack-react-virtual-BeZn51tF.js +1 -0
- package/dist/assets/{vendor-zustand-o69pgTEK.js → vendor-zustand-B43HCgwC.js} +1 -1
- package/dist/assets/{zh-CN-DMvJXS23.js → zh-CN-DhFFdHQu.js} +4 -4
- package/dist/assets/{zh-TW-D0wsKLs1.js → zh-TW-BvehppXO.js} +4 -4
- package/dist/index.html +18 -18
- package/dist/mini-chat.html +18 -18
- package/dist/mobile.html +18 -18
- package/package.json +1 -1
- package/server/lib/assistants/DOCUMENTATION.md +68 -37
- package/server/lib/assistants/cards.js +4 -0
- package/server/lib/assistants/cards.test.js +11 -1
- package/server/lib/assistants/contact-attachments.http.test.js +31 -7
- package/server/lib/assistants/contact-store.js +70 -27
- package/server/lib/assistants/contact-store.test.js +88 -8
- package/server/lib/assistants/contact-tools.js +68 -84
- package/server/lib/assistants/contact-tools.test.js +85 -42
- package/server/lib/assistants/harness.js +6 -3
- package/server/lib/assistants/harness.test.js +25 -10
- package/server/lib/assistants/routes.js +25 -3
- package/server/lib/assistants/service.js +283 -146
- package/server/lib/assistants/service.test.js +954 -54
- package/server/lib/assistants/weixin/DOCUMENTATION.md +142 -0
- package/server/lib/assistants/weixin/api.js +113 -0
- package/server/lib/assistants/weixin/api.test.js +80 -0
- package/server/lib/assistants/weixin/routes.js +23 -0
- package/server/lib/assistants/weixin/routes.test.js +41 -0
- package/server/lib/assistants/weixin/runtime.js +357 -0
- package/server/lib/assistants/weixin/runtime.test.js +286 -0
- package/server/lib/assistants/weixin/store.js +103 -0
- package/server/lib/assistants/weixin/typing.js +88 -0
- package/server/lib/assistants/weixin/typing.test.js +185 -0
- package/server/lib/assistants/yuri-project.http.test.js +47 -0
- package/server/lib/assistants/yuri-tools.js +1 -1
- package/server/lib/assistants/yuri-tools.test.js +3 -2
- package/server/lib/git/DOCUMENTATION.md +6 -0
- package/server/lib/git/branches.test.js +18 -0
- package/server/lib/git/service.js +6 -3
- package/server/lib/llm/DOCUMENTATION.md +15 -7
- package/server/lib/llm/bridge-client.js +58 -34
- package/server/lib/llm/bridge-client.test.js +123 -16
- package/server/lib/notifications/APNS.md +7 -4
- package/server/lib/notifications/DOCUMENTATION.md +3 -1
- package/server/lib/notifications/apns-runtime.js +14 -8
- package/server/lib/notifications/apns-runtime.test.js +28 -0
- package/server/lib/notifications/family-completion-gate.js +37 -31
- package/server/lib/notifications/family-completion-gate.test.js +32 -0
- package/server/lib/opencode/DOCUMENTATION.md +6 -0
- package/server/lib/opencode/hmr-isolation.test.js +56 -0
- package/server/lib/opencode/lifecycle.js +23 -27
- package/server/lib/opencode/network-runtime.js +8 -14
- package/server/lib/opencode/network-runtime.test.js +4 -4
- package/server/lib/opencode/proxy.js +2 -1
- package/server/lib/opencode/proxy.test.js +1 -0
- package/server/lib/opencode/shutdown-runtime.js +1 -1
- package/server/lib/opencode/shutdown-runtime.test.js +12 -0
- package/server/lib/relay/DOCUMENTATION.md +8 -1
- package/server/lib/relay/relay-server.e2e.test.ts +102 -1
- package/server/lib/relay/service.js +1 -1
- package/server/lib/relay/service.test.js +14 -1
- package/server/lib/request-cors.js +1 -1
- package/server/lib/request-cors.test.js +13 -1
- package/server/lib/session-goal/DOCUMENTATION.md +3 -0
- package/server/lib/session-goal/runtime.js +0 -4
- package/server/lib/session-index/DOCUMENTATION.md +18 -4
- package/server/lib/session-index/event-ingest.js +6 -0
- package/server/lib/session-index/event-ingest.test.js +10 -0
- package/server/lib/session-index/service.js +89 -13
- package/server/lib/session-index/service.test.js +144 -1
- package/server/lib/session-metadata/routes.test.js +44 -0
- package/server/lib/tts/DOCUMENTATION.md +24 -2
- package/server/lib/tts/direct-speech.test.js +28 -3
- package/server/opencode-proxy.test.js +5 -5
- package/dist/assets/AgentAvatar--wjVXk3I.js +0 -1
- package/dist/assets/AssistantView-CSpW-4g6.js +0 -3
- package/dist/assets/Icon-Bn4Eec3Y.js +0 -1
- package/dist/assets/MarkdownRenderer-DP2a0lfG.js +0 -2
- package/dist/assets/MobileDetailNavigation-C9NHt08G.js +0 -1
- package/dist/assets/MobileTabPageHeader-qe23xT2-.js +0 -2
- package/dist/assets/MultiRunWindow-CvHADKf9.js +0 -1
- package/dist/assets/SettingsView-DK8Jkkhd.js +0 -29
- package/dist/assets/SettingsWindow-EP8KZok8.js +0 -1
- package/dist/assets/appThemeRegistry-BnQF2GlY.js +0 -1
- package/dist/assets/collapsible-DqfguRMp.js +0 -1
- package/dist/assets/dialog-BS-KgM5J.js +0 -1
- package/dist/assets/image-loading-DJZLvhMd.js +0 -1
- package/dist/assets/insertionBoundaries-h2be7xbf.js +0 -1
- package/dist/assets/main-BpBrYqtJ.js +0 -169
- package/dist/assets/main-C2QklNP4.js +0 -2
- package/dist/assets/miniChat-C-9deNrt.js +0 -2
- package/dist/assets/mobile-DW7tEL-k.js +0 -2
- package/dist/assets/projectMeta-BwAS96mf.js +0 -1
- package/dist/assets/renderMobileApp-Bipi0hKv.js +0 -28
- package/dist/assets/runtimeConfig-Dx7Y6Yvp.js +0 -2
- package/dist/assets/runtimeEndpointReset-0buInzjw.js +0 -149
- package/dist/assets/runtimeEndpointReset-HYSytKO-.css +0 -1
- package/dist/assets/scheduledTaskNavigation-CYozx15H.js +0 -1
- package/dist/assets/sessionChangeSummary-BGisROOB.js +0 -1
- package/dist/assets/sessionChangeSummary-CRYRvpy7.css +0 -1
- package/dist/assets/speechSettingsQueries-CWXTghOr.js +0 -4
- package/dist/assets/src-BFsc_2gs.css +0 -2
- package/dist/assets/types-C9aO7yfx.js +0 -2
- package/dist/assets/useEffectiveDirectory-Bg0LmEqP.js +0 -1
- package/dist/assets/useMobileNavigationStore-hhiMBg5n.js +0 -418
- package/dist/assets/vendor-motion-B4xmxmaP.js +0 -1
- package/dist/assets/vendor-tanstack-react-virtual-B_EO--9t.js +0 -1
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { createRequire } from 'node:module';
|
|
4
|
+
import { randomUUID } from 'node:crypto';
|
|
5
|
+
|
|
6
|
+
const require = createRequire(import.meta.url);
|
|
7
|
+
|
|
8
|
+
export function createWeixinStore(directory) {
|
|
9
|
+
fs.mkdirSync(directory, { recursive: true, mode: 0o700 });
|
|
10
|
+
fs.chmodSync(directory, 0o700);
|
|
11
|
+
const filename = path.join(directory, 'channel.sqlite');
|
|
12
|
+
// Private directory protects the journal too. Do not use the shared settings
|
|
13
|
+
// response, contact transcript or model context as a credential store.
|
|
14
|
+
const db = new (require('better-sqlite3'))(filename);
|
|
15
|
+
fs.chmodSync(filename, 0o600);
|
|
16
|
+
db.pragma('busy_timeout = 5000');
|
|
17
|
+
db.pragma('secure_delete = ON');
|
|
18
|
+
db.exec(`
|
|
19
|
+
CREATE TABLE IF NOT EXISTS binding (
|
|
20
|
+
assistant_id TEXT PRIMARY KEY, epoch TEXT NOT NULL, account_id TEXT NOT NULL UNIQUE,
|
|
21
|
+
peer_id TEXT NOT NULL, token TEXT NOT NULL, base_url TEXT NOT NULL,
|
|
22
|
+
language TEXT NOT NULL, cursor TEXT NOT NULL DEFAULT '', context_token TEXT NOT NULL DEFAULT '',
|
|
23
|
+
generation INTEGER NOT NULL, ordinal INTEGER NOT NULL, status TEXT NOT NULL DEFAULT 'connected',
|
|
24
|
+
error TEXT, updated_at INTEGER NOT NULL
|
|
25
|
+
);
|
|
26
|
+
CREATE TABLE IF NOT EXISTS inbox (
|
|
27
|
+
id TEXT PRIMARY KEY, epoch TEXT NOT NULL, text TEXT NOT NULL, state TEXT NOT NULL DEFAULT 'pending'
|
|
28
|
+
);
|
|
29
|
+
CREATE INDEX IF NOT EXISTS inbox_pending ON inbox(epoch, state);
|
|
30
|
+
CREATE TABLE IF NOT EXISTS outbox (
|
|
31
|
+
id TEXT NOT NULL UNIQUE, epoch TEXT NOT NULL, text TEXT NOT NULL, state TEXT NOT NULL DEFAULT 'pending',
|
|
32
|
+
sequence INTEGER PRIMARY KEY AUTOINCREMENT
|
|
33
|
+
);
|
|
34
|
+
`);
|
|
35
|
+
db.exec(`CREATE INDEX IF NOT EXISTS outbox_pending ON outbox(epoch, state, sequence);
|
|
36
|
+
CREATE TABLE IF NOT EXISTS lease (id INTEGER PRIMARY KEY CHECK(id=1), owner TEXT NOT NULL, expires_at INTEGER NOT NULL);`);
|
|
37
|
+
const get = (assistantID) => db.prepare('SELECT * FROM binding WHERE assistant_id=?').get(assistantID) ?? null;
|
|
38
|
+
const patch = (epoch, values) => {
|
|
39
|
+
const allowed = new Set(['cursor', 'context_token', 'generation', 'ordinal', 'status', 'error', 'updated_at']);
|
|
40
|
+
const keys = Object.keys(values).filter((key) => allowed.has(key));
|
|
41
|
+
if (!keys.length) return;
|
|
42
|
+
db.prepare(`UPDATE binding SET ${keys.map((key) => `${key}=?`).join(',')} WHERE epoch=?`).run(...keys.map((key) => values[key]), epoch);
|
|
43
|
+
};
|
|
44
|
+
const enqueue = (epoch, id, text) => db.prepare('INSERT OR IGNORE INTO outbox(id,epoch,text) VALUES (?,?,?)').run(id, epoch, text);
|
|
45
|
+
const unlink = db.transaction((assistantID) => {
|
|
46
|
+
const binding = get(assistantID);
|
|
47
|
+
if (!binding) return;
|
|
48
|
+
db.prepare('DELETE FROM inbox WHERE epoch=?').run(binding.epoch);
|
|
49
|
+
db.prepare('DELETE FROM outbox WHERE epoch=?').run(binding.epoch);
|
|
50
|
+
db.prepare('DELETE FROM binding WHERE assistant_id=?').run(assistantID);
|
|
51
|
+
});
|
|
52
|
+
return {
|
|
53
|
+
get, patch, enqueue, unlink,
|
|
54
|
+
list: () => db.prepare('SELECT * FROM binding ORDER BY assistant_id').all(),
|
|
55
|
+
bind: db.transaction((value) => {
|
|
56
|
+
const existing = db.prepare('SELECT assistant_id FROM binding WHERE account_id=?').get(value.account_id);
|
|
57
|
+
if (existing && existing.assistant_id !== value.assistant_id) { const error = new Error('account_in_use'); error.code = 'account_in_use'; throw error; }
|
|
58
|
+
unlink(value.assistant_id);
|
|
59
|
+
db.prepare(`INSERT INTO binding(assistant_id,epoch,account_id,peer_id,token,base_url,language,generation,ordinal,updated_at)
|
|
60
|
+
VALUES (@assistant_id,@epoch,@account_id,@peer_id,@token,@base_url,@language,@generation,@ordinal,@updated_at)`)
|
|
61
|
+
.run({ ...value, epoch: randomUUID() });
|
|
62
|
+
return get(value.assistant_id);
|
|
63
|
+
}),
|
|
64
|
+
accept: db.transaction((binding, cursor, messages) => {
|
|
65
|
+
if (get(binding.assistant_id)?.epoch !== binding.epoch) return;
|
|
66
|
+
for (const message of messages) {
|
|
67
|
+
db.prepare('INSERT OR IGNORE INTO inbox(id,epoch,text) VALUES (?,?,?)').run(message.id, binding.epoch, message.text);
|
|
68
|
+
if (message.context) patch(binding.epoch, { context_token: message.context });
|
|
69
|
+
}
|
|
70
|
+
patch(binding.epoch, { cursor });
|
|
71
|
+
}),
|
|
72
|
+
pending: (epoch) => db.prepare("SELECT * FROM inbox WHERE epoch=? AND state='pending' ORDER BY rowid LIMIT 20").all(epoch),
|
|
73
|
+
backlog: (epoch) => db.prepare("SELECT COUNT(*) AS count FROM inbox WHERE epoch=? AND state IN ('pending','admitted')").get(epoch).count,
|
|
74
|
+
markInbox: (id, state) => db.prepare('UPDATE inbox SET state=? WHERE id=?').run(state, id),
|
|
75
|
+
finishTurn: (id) => db.prepare("UPDATE inbox SET state='done',text='' WHERE id=?").run(id),
|
|
76
|
+
recover: db.transaction((epoch, text) => {
|
|
77
|
+
for (const row of db.prepare("SELECT id FROM inbox WHERE epoch=? AND state='admitted'").all(epoch)) {
|
|
78
|
+
enqueue(epoch, `${row.id}:interrupted`, text);
|
|
79
|
+
db.prepare("UPDATE inbox SET state='done',text='' WHERE id=?").run(row.id);
|
|
80
|
+
}
|
|
81
|
+
// A process exit during HTTP send cannot prove whether Weixin accepted it.
|
|
82
|
+
db.prepare("UPDATE outbox SET state='unknown' WHERE epoch=? AND state='sending'").run(epoch);
|
|
83
|
+
}),
|
|
84
|
+
collect: db.transaction((binding, page, deliveries) => {
|
|
85
|
+
if (get(binding.assistant_id)?.epoch !== binding.epoch) return;
|
|
86
|
+
if (binding.generation !== page.generation) db.prepare('DELETE FROM outbox WHERE epoch=?').run(binding.epoch);
|
|
87
|
+
for (const delivery of deliveries) enqueue(binding.epoch, delivery.id, delivery.text);
|
|
88
|
+
patch(binding.epoch, { generation: page.generation, ordinal: page.ordinal });
|
|
89
|
+
}),
|
|
90
|
+
nextDelivery: (epoch) => db.prepare("SELECT * FROM outbox WHERE epoch=? AND state!='sent' ORDER BY sequence LIMIT 1").get(epoch),
|
|
91
|
+
markDelivery: (id, state) => db.prepare('UPDATE outbox SET state=? WHERE id=?').run(state, id),
|
|
92
|
+
sent: (id) => db.prepare("UPDATE outbox SET state='sent',text='' WHERE id=?").run(id),
|
|
93
|
+
retry: (epoch) => db.prepare("UPDATE outbox SET state='pending' WHERE epoch=? AND state IN ('unknown','blocked')").run(epoch),
|
|
94
|
+
unblock: (epoch) => db.prepare("UPDATE outbox SET state='pending' WHERE epoch=? AND state='blocked'").run(epoch),
|
|
95
|
+
hasUnknown: (epoch) => Boolean(db.prepare("SELECT 1 FROM outbox WHERE epoch=? AND state='unknown' LIMIT 1").get(epoch)),
|
|
96
|
+
acquire: (owner, now) => Boolean(db.prepare(`INSERT INTO lease(id,owner,expires_at) VALUES (1,?,?)
|
|
97
|
+
ON CONFLICT(id) DO UPDATE SET owner=excluded.owner,expires_at=excluded.expires_at
|
|
98
|
+
WHERE lease.owner=excluded.owner OR lease.expires_at<=?`).run(owner, now + 60_000, now).changes),
|
|
99
|
+
owns: (owner, now) => Boolean(db.prepare('SELECT 1 FROM lease WHERE id=1 AND owner=? AND expires_at>?').get(owner, now)),
|
|
100
|
+
release: (owner) => db.prepare('DELETE FROM lease WHERE owner=?').run(owner),
|
|
101
|
+
close: () => db.close(),
|
|
102
|
+
};
|
|
103
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
2
|
+
|
|
3
|
+
const REFRESH_MS = 8000;
|
|
4
|
+
const TICKET_TTL_MS = 24 * 60 * 60 * 1000;
|
|
5
|
+
|
|
6
|
+
/** Optional, live-only presence. Never gate contact admission or message delivery. */
|
|
7
|
+
export function createWeixinTyping({ api, getBinding, isCurrent, canCancel, clock = Date.now }) {
|
|
8
|
+
const entries = new Map();
|
|
9
|
+
let closed = false;
|
|
10
|
+
const pause = (ms, signal) => delay(ms, undefined, { signal }).catch(() => {});
|
|
11
|
+
const launch = (entry) => {
|
|
12
|
+
if (entry.running || entry.disposed || closed) return;
|
|
13
|
+
const controller = new AbortController();
|
|
14
|
+
entry.controller = controller;
|
|
15
|
+
entry.running = (async () => {
|
|
16
|
+
let lastTicket = '';
|
|
17
|
+
let retryMs = 2000;
|
|
18
|
+
try {
|
|
19
|
+
while (!controller.signal.aborted && entry.turns.size && isCurrent(entry.binding)) {
|
|
20
|
+
const binding = getBinding(entry.binding.assistant_id);
|
|
21
|
+
try {
|
|
22
|
+
if (!entry.ticket || clock() >= entry.ticketExpiresAt) {
|
|
23
|
+
const config = await api.getConfig(binding, controller.signal);
|
|
24
|
+
if (config.ret !== 0 || typeof config.typing_ticket !== 'string'
|
|
25
|
+
|| !config.typing_ticket || config.typing_ticket.length > 65_536) throw new Error('typing_unavailable');
|
|
26
|
+
entry.ticket = config.typing_ticket;
|
|
27
|
+
entry.ticketExpiresAt = clock() + TICKET_TTL_MS;
|
|
28
|
+
}
|
|
29
|
+
if (controller.signal.aborted || !entry.turns.size || !isCurrent(entry.binding)) break;
|
|
30
|
+
// Record attempts too: a failed HTTP response may still have set presence.
|
|
31
|
+
lastTicket = entry.ticket;
|
|
32
|
+
await api.sendTyping(binding, entry.ticket, 1, controller.signal);
|
|
33
|
+
retryMs = 2000;
|
|
34
|
+
await pause(REFRESH_MS, controller.signal);
|
|
35
|
+
} catch {
|
|
36
|
+
if (controller.signal.aborted) break;
|
|
37
|
+
entry.ticket = '';
|
|
38
|
+
await pause(retryMs, controller.signal);
|
|
39
|
+
retryMs = Math.min(60_000, retryMs * 2);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
} finally {
|
|
43
|
+
if (lastTicket && canCancel(entry.binding)) {
|
|
44
|
+
// Do not reuse the aborted start signal. Serialize cancellation before a
|
|
45
|
+
// newer turn can publish typing, including during disconnect/shutdown.
|
|
46
|
+
try { await api.sendTyping(entry.binding, lastTicket, 2); } catch { /* Presence is best-effort. */ }
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
})().finally(() => {
|
|
50
|
+
entry.running = null;
|
|
51
|
+
if (!entry.disposed && !closed && entry.turns.size && isCurrent(entry.binding)) launch(entry);
|
|
52
|
+
});
|
|
53
|
+
};
|
|
54
|
+
const forget = async (assistantID) => {
|
|
55
|
+
const entry = entries.get(assistantID);
|
|
56
|
+
if (!entry) return;
|
|
57
|
+
entry.disposed = true;
|
|
58
|
+
entry.turns.clear();
|
|
59
|
+
entry.controller?.abort();
|
|
60
|
+
await entry.running;
|
|
61
|
+
if (entries.get(assistantID) === entry) entries.delete(assistantID);
|
|
62
|
+
};
|
|
63
|
+
const clear = () => Promise.allSettled([...entries.keys()].map(forget));
|
|
64
|
+
return {
|
|
65
|
+
onTurnEvent: (event) => {
|
|
66
|
+
if (closed || !['yuri:contact-turn-start', 'yuri:contact-turn-end'].includes(event.type)) return;
|
|
67
|
+
const { assistantID, turnID } = event.properties ?? {};
|
|
68
|
+
if (typeof assistantID !== 'string' || typeof turnID !== 'string' || !turnID) return;
|
|
69
|
+
const binding = getBinding(assistantID);
|
|
70
|
+
if (!binding || binding.status === 'expired' || !isCurrent(binding)) return;
|
|
71
|
+
let entry = entries.get(assistantID);
|
|
72
|
+
if (event.type === 'yuri:contact-turn-start') {
|
|
73
|
+
if (!entry) {
|
|
74
|
+
entry = { binding, turns: new Set(), ticket: '', ticketExpiresAt: 0, running: null, disposed: false };
|
|
75
|
+
entries.set(assistantID, entry);
|
|
76
|
+
}
|
|
77
|
+
if (entry.disposed || entry.binding.epoch !== binding.epoch) return;
|
|
78
|
+
entry.turns.add(turnID);
|
|
79
|
+
launch(entry);
|
|
80
|
+
} else if (entry?.binding.epoch === binding.epoch) {
|
|
81
|
+
entry.turns.delete(turnID);
|
|
82
|
+
if (!entry.turns.size) entry.controller?.abort();
|
|
83
|
+
}
|
|
84
|
+
},
|
|
85
|
+
forget, clear,
|
|
86
|
+
close: () => { closed = true; return clear(); },
|
|
87
|
+
};
|
|
88
|
+
}
|
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
|
|
3
|
+
// Node's promise timers capture native timers before Vitest's fake clock installs.
|
|
4
|
+
vi.mock('node:timers/promises', () => ({
|
|
5
|
+
setTimeout: (ms, value, { signal }) => new Promise((resolve, reject) => {
|
|
6
|
+
const abort = () => { clearTimeout(timer); reject(new Error('cancelled')); };
|
|
7
|
+
const timer = setTimeout(() => { signal.removeEventListener('abort', abort); resolve(value); }, ms);
|
|
8
|
+
if (signal.aborted) abort();
|
|
9
|
+
else signal.addEventListener('abort', abort, { once: true });
|
|
10
|
+
}),
|
|
11
|
+
}));
|
|
12
|
+
import { createWeixinTyping } from './typing.js';
|
|
13
|
+
|
|
14
|
+
let typing;
|
|
15
|
+
beforeEach(() => vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }));
|
|
16
|
+
afterEach(async () => { await typing?.close(); typing = null; vi.useRealTimers(); });
|
|
17
|
+
const turn = (assistantID, turnID, phase = 'start') => ({
|
|
18
|
+
type: `yuri:contact-turn-${phase}`, properties: { assistantID, turnID },
|
|
19
|
+
});
|
|
20
|
+
const flush = async () => { await vi.advanceTimersByTimeAsync(0); };
|
|
21
|
+
const deferred = () => {
|
|
22
|
+
let resolve;
|
|
23
|
+
const promise = new Promise((done) => { resolve = done; });
|
|
24
|
+
return { promise, resolve };
|
|
25
|
+
};
|
|
26
|
+
const fixture = () => {
|
|
27
|
+
const bindings = new Map(['a', 'b'].map((id) => [id, {
|
|
28
|
+
assistant_id: id, epoch: `epoch-${id}`, peer_id: `owner-${id}`, context_token: `context-${id}`, status: 'connected',
|
|
29
|
+
}]));
|
|
30
|
+
const api = {
|
|
31
|
+
getConfig: vi.fn(async (binding) => ({ ret: 0, typing_ticket: `ticket-${binding.assistant_id}` })),
|
|
32
|
+
sendTyping: vi.fn(async () => ({})),
|
|
33
|
+
};
|
|
34
|
+
const current = (binding) => bindings.get(binding.assistant_id)?.epoch === binding.epoch;
|
|
35
|
+
typing = createWeixinTyping({ api, getBinding: (id) => bindings.get(id), isCurrent: current, canCancel: current });
|
|
36
|
+
return { api, bindings };
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
describe('live WeChat typing lifecycle', () => {
|
|
40
|
+
it('stays idle without a live start and coalesces duplicate starts and streaming deltas', async () => {
|
|
41
|
+
const { api } = fixture();
|
|
42
|
+
for (let index = 0; index < 50; index++) {
|
|
43
|
+
typing.onTurnEvent({ type: 'yuri:contact-bubble-delta', properties: { assistantID: 'a', turnID: 'old', delta: 'text' } });
|
|
44
|
+
typing.onTurnEvent(turn('a', 'old', 'end'));
|
|
45
|
+
}
|
|
46
|
+
await flush();
|
|
47
|
+
expect(api.getConfig).not.toHaveBeenCalled();
|
|
48
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
49
|
+
await flush();
|
|
50
|
+
for (let index = 0; index < 50; index++) typing.onTurnEvent(turn('a', 'one'));
|
|
51
|
+
await flush();
|
|
52
|
+
expect(api.getConfig).toHaveBeenCalledTimes(1);
|
|
53
|
+
expect(api.sendTyping.mock.calls.map((call) => call[2])).toEqual([1]);
|
|
54
|
+
typing.onTurnEvent(turn('a', 'one', 'end'));
|
|
55
|
+
await flush();
|
|
56
|
+
expect(api.sendTyping.mock.calls.map((call) => call[2])).toEqual([1, 2]);
|
|
57
|
+
await vi.advanceTimersByTimeAsync(60_000);
|
|
58
|
+
expect(api.sendTyping).toHaveBeenCalledTimes(2);
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
it('refreshes at a bounded cadence, keeps overlapping turns active, and reuses an idle ticket', async () => {
|
|
62
|
+
const { api } = fixture();
|
|
63
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
64
|
+
typing.onTurnEvent(turn('a', 'two'));
|
|
65
|
+
await flush();
|
|
66
|
+
await vi.advanceTimersByTimeAsync(7999);
|
|
67
|
+
expect(api.sendTyping).toHaveBeenCalledTimes(1);
|
|
68
|
+
await vi.advanceTimersByTimeAsync(1);
|
|
69
|
+
expect(api.sendTyping).toHaveBeenCalledTimes(2);
|
|
70
|
+
typing.onTurnEvent(turn('a', 'one', 'end'));
|
|
71
|
+
await flush();
|
|
72
|
+
expect(api.sendTyping.mock.calls.map((call) => call[2])).toEqual([1, 1]);
|
|
73
|
+
typing.onTurnEvent(turn('a', 'two', 'end'));
|
|
74
|
+
await flush();
|
|
75
|
+
typing.onTurnEvent(turn('a', 'three'));
|
|
76
|
+
await flush();
|
|
77
|
+
expect(api.sendTyping.mock.calls.map((call) => call[2])).toEqual([1, 1, 2, 1]);
|
|
78
|
+
expect(api.getConfig).toHaveBeenCalledTimes(1);
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
it('never starts typing from a ticket that arrives after completion or disconnect', async () => {
|
|
82
|
+
const { api } = fixture();
|
|
83
|
+
const ticket = deferred();
|
|
84
|
+
api.getConfig.mockImplementation(() => ticket.promise);
|
|
85
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
86
|
+
typing.onTurnEvent(turn('a', 'one', 'end'));
|
|
87
|
+
ticket.resolve({ ret: 0, typing_ticket: 'late' });
|
|
88
|
+
await flush();
|
|
89
|
+
expect(api.sendTyping).not.toHaveBeenCalled();
|
|
90
|
+
|
|
91
|
+
const other = deferred();
|
|
92
|
+
api.getConfig.mockImplementation(() => other.promise);
|
|
93
|
+
typing.onTurnEvent(turn('b', 'two'));
|
|
94
|
+
const disconnected = typing.forget('b');
|
|
95
|
+
other.resolve({ ret: 0, typing_ticket: 'late-b' });
|
|
96
|
+
await disconnected;
|
|
97
|
+
expect(api.sendTyping).not.toHaveBeenCalled();
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it('serializes late start completion, cancellation and the next live turn', async () => {
|
|
101
|
+
const { api } = fixture();
|
|
102
|
+
const start = deferred();
|
|
103
|
+
api.sendTyping.mockImplementationOnce(() => start.promise);
|
|
104
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
105
|
+
await flush();
|
|
106
|
+
typing.onTurnEvent(turn('a', 'one', 'end'));
|
|
107
|
+
typing.onTurnEvent(turn('a', 'two'));
|
|
108
|
+
await flush();
|
|
109
|
+
expect(api.sendTyping).toHaveBeenCalledTimes(1);
|
|
110
|
+
start.resolve({});
|
|
111
|
+
await flush();
|
|
112
|
+
expect(api.sendTyping.mock.calls.map((call) => call[2])).toEqual([1, 2, 1]);
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
it('isolates accounts and backs off missing/failed tickets without aborting other typing', async () => {
|
|
116
|
+
const { api } = fixture();
|
|
117
|
+
api.getConfig.mockImplementation(async (binding) => binding.assistant_id === 'a'
|
|
118
|
+
? { ret: 0 } : { ret: 0, typing_ticket: 'ticket-b' });
|
|
119
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
120
|
+
typing.onTurnEvent(turn('b', 'two'));
|
|
121
|
+
await flush();
|
|
122
|
+
expect(api.sendTyping.mock.calls.map((call) => [call[0].assistant_id, call[2]])).toEqual([['b', 1]]);
|
|
123
|
+
await vi.advanceTimersByTimeAsync(1999);
|
|
124
|
+
expect(api.getConfig).toHaveBeenCalledTimes(2);
|
|
125
|
+
await vi.advanceTimersByTimeAsync(1);
|
|
126
|
+
expect(api.getConfig).toHaveBeenCalledTimes(3);
|
|
127
|
+
await vi.advanceTimersByTimeAsync(4000);
|
|
128
|
+
expect(api.getConfig).toHaveBeenCalledTimes(4);
|
|
129
|
+
typing.onTurnEvent(turn('a', 'one', 'end'));
|
|
130
|
+
await flush();
|
|
131
|
+
expect(api.sendTyping).toHaveBeenCalledTimes(1);
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
it('cancels on forget/shutdown with a fresh signal and drops the per-binding ticket cache', async () => {
|
|
135
|
+
const { api, bindings } = fixture();
|
|
136
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
137
|
+
await flush();
|
|
138
|
+
const signal = api.sendTyping.mock.calls[0][3];
|
|
139
|
+
await typing.forget('a');
|
|
140
|
+
expect(signal.aborted).toBe(true);
|
|
141
|
+
expect(api.sendTyping.mock.calls.at(-1).slice(1, 3)).toEqual(['ticket-a', 2]);
|
|
142
|
+
expect(api.sendTyping.mock.calls.at(-1)[3]).toBeUndefined();
|
|
143
|
+
bindings.set('a', { ...bindings.get('a'), epoch: 'new-epoch' });
|
|
144
|
+
typing.onTurnEvent(turn('a', 'two'));
|
|
145
|
+
await flush();
|
|
146
|
+
expect(api.getConfig).toHaveBeenCalledTimes(2);
|
|
147
|
+
await typing.close();
|
|
148
|
+
expect(api.sendTyping.mock.calls.map((call) => call[2])).toEqual([1, 2, 1, 2]);
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
it('fences a ticket completion after lease/epoch changes without cancelling another owner', async () => {
|
|
152
|
+
const { api, bindings } = fixture();
|
|
153
|
+
const ticket = deferred();
|
|
154
|
+
api.getConfig.mockImplementationOnce(() => ticket.promise);
|
|
155
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
156
|
+
bindings.set('a', { ...bindings.get('a'), epoch: 'rebound' });
|
|
157
|
+
ticket.resolve({ ret: 0, typing_ticket: 'old-ticket' });
|
|
158
|
+
await flush();
|
|
159
|
+
expect(api.sendTyping).not.toHaveBeenCalled();
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
it('refreshes an expired ticket using the latest conversation context', async () => {
|
|
163
|
+
const { api, bindings } = fixture();
|
|
164
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
165
|
+
await flush();
|
|
166
|
+
typing.onTurnEvent(turn('a', 'one', 'end'));
|
|
167
|
+
await flush();
|
|
168
|
+
vi.setSystemTime(Date.now() + 24 * 60 * 60 * 1000);
|
|
169
|
+
bindings.set('a', { ...bindings.get('a'), context_token: 'new-context' });
|
|
170
|
+
typing.onTurnEvent(turn('a', 'two'));
|
|
171
|
+
await flush();
|
|
172
|
+
expect(api.getConfig).toHaveBeenCalledTimes(2);
|
|
173
|
+
expect(api.getConfig.mock.calls[1][0].context_token).toBe('new-context');
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
it('stops refreshing on ownership loss and does not cancel the replacement owner', async () => {
|
|
177
|
+
const { api, bindings } = fixture();
|
|
178
|
+
typing.onTurnEvent(turn('a', 'one'));
|
|
179
|
+
await flush();
|
|
180
|
+
bindings.set('a', { ...bindings.get('a'), epoch: 'replacement-owner' });
|
|
181
|
+
await vi.advanceTimersByTimeAsync(8000);
|
|
182
|
+
await typing.clear();
|
|
183
|
+
expect(api.sendTyping.mock.calls.map((call) => call[2])).toEqual([1]);
|
|
184
|
+
});
|
|
185
|
+
});
|
|
@@ -21,6 +21,53 @@ import { createProjectRegistry } from '../projects/registry.js';
|
|
|
21
21
|
const call = (name, args) => ({ completion: { choices: [{ message: { content: '', tool_calls: [{ id: `call_${name}`, type: 'function', function: { name, arguments: JSON.stringify(args) } }] } }] } });
|
|
22
22
|
|
|
23
23
|
describe('HTTP → real contact Agent → project registry → worker admission', () => {
|
|
24
|
+
it('delivers a sourced peer message over HTTP and wakes only the recipient without worker or relay tools', async () => {
|
|
25
|
+
const directory = await fs.mkdtemp(path.join(os.tmpdir(), 'yuri-peer-http-'));
|
|
26
|
+
const createWorker = vi.fn();
|
|
27
|
+
const promptWorker = vi.fn();
|
|
28
|
+
external.client = { session: { create: createWorker, prompt: promptWorker } };
|
|
29
|
+
const complete = vi.fn(async ({ body }) => {
|
|
30
|
+
expect(body.tools.map((tool) => tool.function.name)).not.toContain('message_assistant');
|
|
31
|
+
expect(body.tools.map((tool) => tool.function.name)).not.toContain('assign_session');
|
|
32
|
+
expect(JSON.stringify(body.messages)).toContain('老大你好');
|
|
33
|
+
return { completion: { choices: [{ message: { content: '小小白你好,收到了。' } }] } };
|
|
34
|
+
});
|
|
35
|
+
external.complete = complete;
|
|
36
|
+
const app = express(); app.use(express.json());
|
|
37
|
+
const runtime = registerAssistantRoutes(app, {
|
|
38
|
+
dbPath: path.join(directory, 'assistants.sqlite'), yuriDataDir: directory,
|
|
39
|
+
buildOpenCodeUrl: (pathname) => `http://upstream.invalid${pathname}`, getOpenCodeAuthHeaders: () => ({}),
|
|
40
|
+
});
|
|
41
|
+
const server = http.createServer(app);
|
|
42
|
+
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve));
|
|
43
|
+
const base = `http://127.0.0.1:${server.address().port}`;
|
|
44
|
+
const post = (route, body) => fetch(`${base}${route}`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(body) });
|
|
45
|
+
try {
|
|
46
|
+
const sender = await (await post('/api/yuri/assistants', { name: '小小白', providerID: 'p', modelID: 'm' })).json();
|
|
47
|
+
const recipient = await (await post('/api/yuri/assistants', { name: '大白', providerID: 'p', modelID: 'm' })).json();
|
|
48
|
+
const input = { messageID: 'http_peer_hello', toAssistantID: recipient.id, text: '老大你好' };
|
|
49
|
+
const response = await post(`/api/yuri/assistants/${sender.id}/contact/dm`, input);
|
|
50
|
+
expect(response.status).toBe(201);
|
|
51
|
+
const admitted = await response.json();
|
|
52
|
+
expect(admitted).toMatchObject({ admitted: true, fromAssistantID: sender.id, toAssistantID: recipient.id });
|
|
53
|
+
expect(await runtime.service.whenContactTurnSettled(admitted.messageID)).toMatchObject({ status: 'complete' });
|
|
54
|
+
const page = await (await fetch(`${base}/api/yuri/assistants/${recipient.id}/contact/messages`)).json();
|
|
55
|
+
expect(page.messages.map((message) => message.role)).toEqual(['assistant', 'peer', 'assistant']);
|
|
56
|
+
expect(page.messages[1]).toMatchObject({ fromAssistantName: '小小白', text: '老大你好' });
|
|
57
|
+
expect(page.messages[2].text).toBe('小小白你好,收到了。');
|
|
58
|
+
expect((await (await post(`/api/yuri/assistants/${sender.id}/contact/dm`, input)).json()).replayed).toBe(true);
|
|
59
|
+
expect((await post(`/api/yuri/assistants/${sender.id}/contact/dm`, { ...input, text: 'changed' })).status).toBe(409);
|
|
60
|
+
expect(complete).toHaveBeenCalledTimes(1);
|
|
61
|
+
expect(createWorker).not.toHaveBeenCalled();
|
|
62
|
+
expect(promptWorker).not.toHaveBeenCalled();
|
|
63
|
+
} finally {
|
|
64
|
+
runtime.close(); server.closeAllConnections();
|
|
65
|
+
await new Promise((resolve) => server.close(resolve));
|
|
66
|
+
external.complete = null; external.client = null;
|
|
67
|
+
await fs.rm(directory, { recursive: true, force: true });
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
|
|
24
71
|
it('registers a cloned directory, sends hello and persists a real session card without manual Settings', async () => {
|
|
25
72
|
const directory = await fs.mkdtemp(path.join(os.tmpdir(), 'yuri-project-http-'));
|
|
26
73
|
const workspace = path.join(directory, 'cloned-app');
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export function createYuriContactToolGroups(tools) {
|
|
2
2
|
return [
|
|
3
3
|
{ id: 'yuri.projects', description: 'Register an existing workspace before opening a coding session.', names: ['register_project'] },
|
|
4
|
-
{ id: 'yuri.assistants', description: 'Create
|
|
4
|
+
{ id: 'yuri.assistants', description: 'Create another Bot.', names: ['create_assistant'] },
|
|
5
5
|
{ id: 'yuri.tasks', description: 'Create or update scheduled tasks (including pause/resume).', names: ['schedule_task', 'update_scheduled_task'] },
|
|
6
6
|
].map(({ id, description, names }) => ({ id, description, tools: tools.filter((tool) => names.includes(tool.name)) }))
|
|
7
7
|
.filter((group) => group.tools.length > 0);
|
|
@@ -67,7 +67,8 @@ describe('assistant-only progressive business tools', () => {
|
|
|
67
67
|
if (round === 1) {
|
|
68
68
|
expect(names(body)).toContain('assign_session');
|
|
69
69
|
expect(names(body)).toContain('load_tools');
|
|
70
|
-
for (const name of ['register_project', 'create_assistant', '
|
|
70
|
+
for (const name of ['register_project', 'create_assistant', 'schedule_task', 'update_scheduled_task']) expect(names(body)).not.toContain(name);
|
|
71
|
+
expect(names(body)).toContain('update_assistant_settings');
|
|
71
72
|
expect(JSON.stringify(body)).not.toContain('register_project');
|
|
72
73
|
return call('load_tools', { domain: 'yuri.projects' });
|
|
73
74
|
}
|
|
@@ -143,7 +144,7 @@ describe('assistant-only progressive business tools', () => {
|
|
|
143
144
|
const tools = [...createContactTools({}), ...createYuriContactTools({ registerProject })];
|
|
144
145
|
await turn(tools, async ({ body }) => {
|
|
145
146
|
expect(names(body)).toContain('list_scheduled_tasks');
|
|
146
|
-
for (const name of ['load_tools', 'register_project', 'create_assistant', 'schedule_task', '
|
|
147
|
+
for (const name of ['load_tools', 'register_project', 'create_assistant', 'schedule_task', 'update_assistant_settings']) expect(names(body)).not.toContain(name);
|
|
147
148
|
return { text: 'Reviewed.' };
|
|
148
149
|
}, { readOnly: true });
|
|
149
150
|
expect(registerProject).not.toHaveBeenCalled();
|
|
@@ -43,6 +43,12 @@ The following functions are exported and used by the web server:
|
|
|
43
43
|
|
|
44
44
|
### Branch Operations
|
|
45
45
|
- `getBranches(directory)`: Read local branches and locally known remote-tracking refs, excluding remote HEAD aliases from `all`. This is an offline read: it never runs `ls-remote` or waits for remote authentication/network. Explicit Fetch updates remote-tracking refs; pruning is controlled by that operation. The returned `current` and `branches` metadata retain the Git snapshot shape.
|
|
46
|
+
`current` is empty for detached HEAD, not simple-git's pseudo branch label.
|
|
47
|
+
Unborn repositories resolve their actual symbolic HEAD name (no assumed
|
|
48
|
+
`main`/`master`). A confirmed non-repository returns an empty snapshot;
|
|
49
|
+
permission, unavailable-directory and other failures still reject so Query
|
|
50
|
+
refreshes retain their last valid data. Shared Web/Electron/mobile callers use
|
|
51
|
+
this contract; VS Code owns the equivalent native/raw Git projection.
|
|
46
52
|
- `createBranch(directory, branchName, options)`: Create and checkout a new branch.
|
|
47
53
|
- `checkoutBranch(directory, branchName)`: Checkout an existing branch.
|
|
48
54
|
- `deleteBranch(directory, branch, options)`: Delete a branch (supports force flag).
|
|
@@ -37,3 +37,21 @@ test('branch failures remain errors instead of an authoritative empty list', asy
|
|
|
37
37
|
git.branch.mockRejectedValue(new Error('repository unavailable'));
|
|
38
38
|
await expect(getBranches('/repo')).rejects.toThrow('repository unavailable');
|
|
39
39
|
});
|
|
40
|
+
|
|
41
|
+
test('detached HEAD has no current branch even when simple-git returns a pseudo label', async () => {
|
|
42
|
+
git.raw.mockResolvedValue('/repo\n');
|
|
43
|
+
git.branch.mockResolvedValue({ all: ['main'], current: 'HEAD detached at abc123', detached: true, branches: {} });
|
|
44
|
+
expect(await getBranches('/repo')).toEqual({ all: ['main'], current: '', branches: {} });
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
test('a confirmed non-repository returns an empty snapshot, not a transport failure', async () => {
|
|
48
|
+
git.raw.mockRejectedValue(new Error('fatal: not a git repository (or any of the parent directories): .git'));
|
|
49
|
+
git.branch.mockRejectedValue(new Error('fatal: not a git repository'));
|
|
50
|
+
expect(await getBranches('/plain')).toEqual({ all: [], current: '', branches: {} });
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
test('an unborn branch uses its real symbolic HEAD name without inventing a default', async () => {
|
|
54
|
+
git.raw.mockImplementation(async (args) => args[0] === 'symbolic-ref' ? 'trunk\n' : '/repo\n');
|
|
55
|
+
git.branch.mockResolvedValue({ all: [], current: '', detached: false, branches: {} });
|
|
56
|
+
expect(await getBranches('/repo')).toEqual({ all: [], current: 'trunk', branches: {} });
|
|
57
|
+
});
|
|
@@ -3232,10 +3232,10 @@ export async function commit(directory, message, options = {}) {
|
|
|
3232
3232
|
}
|
|
3233
3233
|
|
|
3234
3234
|
export async function getBranches(directory) {
|
|
3235
|
-
const { git } = await createRepositoryGitContext(directory);
|
|
3236
|
-
|
|
3237
3235
|
try {
|
|
3236
|
+
const { git } = await createRepositoryGitContext(directory);
|
|
3238
3237
|
const result = await git.branch();
|
|
3238
|
+
const current = result.detached ? '' : result.current || (await git.raw(['symbolic-ref', '--quiet', '--short', 'HEAD'])).trim();
|
|
3239
3239
|
|
|
3240
3240
|
// Listing branches is a local read. Explicit fetch updates remote-tracking
|
|
3241
3241
|
// refs; startup must not wait on ls-remote or hide refs when a remote is offline.
|
|
@@ -3243,10 +3243,13 @@ export async function getBranches(directory) {
|
|
|
3243
3243
|
|
|
3244
3244
|
return {
|
|
3245
3245
|
all: filteredAll,
|
|
3246
|
-
current
|
|
3246
|
+
current,
|
|
3247
3247
|
branches: result.branches
|
|
3248
3248
|
};
|
|
3249
3249
|
} catch (error) {
|
|
3250
|
+
if (isNotGitRepositoryError(error)) {
|
|
3251
|
+
return { all: [], current: '', branches: {} };
|
|
3252
|
+
}
|
|
3250
3253
|
console.error('Failed to get branches:', error);
|
|
3251
3254
|
throw error;
|
|
3252
3255
|
}
|
|
@@ -15,14 +15,21 @@ start or replace OpenCode to provide inference.
|
|
|
15
15
|
restarts and concurrent hosts running the same bundle reuse one directory and
|
|
16
16
|
one Location instead of adding one per process. The plugin file is replaced
|
|
17
17
|
atomically only when its content differs. Shutdown never deletes this shared
|
|
18
|
-
directory.
|
|
19
|
-
directories
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
directory. The Host never automatically deletes other `yuri-inference-*`
|
|
19
|
+
directories: one service's `debug.location.list` cannot establish that another
|
|
20
|
+
service is not using them. Older bundles remain for OS/operator cleanup.
|
|
21
|
+
Each use checks that the staged plugin still exists; a missing file is
|
|
22
|
+
restaged through one shared preparation flight without rereading bundles on
|
|
23
|
+
the normal warm path.
|
|
22
24
|
- Calls use the official authenticated `client.rpc(LlmBridge)` transport, scoped
|
|
23
25
|
to that directory. `ready` verifies protocol version 2 and runtime service availability; only RPC-not-ready
|
|
24
|
-
startup errors receive a bounded readiness retry.
|
|
25
|
-
|
|
26
|
+
startup errors receive a bounded readiness retry. Persistent `rpc.unavailable`
|
|
27
|
+
restages the plugin and evicts/reloads only that isolated Location once, then
|
|
28
|
+
repeats the bounded readiness check. Concurrent callers on one upstream share
|
|
29
|
+
that reload; cancelling one caller does not cancel another caller's repair.
|
|
30
|
+
Other Locations, user sessions and global configuration are untouched.
|
|
31
|
+
Generation is never replayed by this recovery, including ambiguous transport
|
|
32
|
+
failures, because a response may already have been produced.
|
|
26
33
|
- `bridge-plugin.js` runs **inside external OpenCode**. It reads that Location's
|
|
27
34
|
live `ModelResolver.Service` through the RPC caller's Location context. The
|
|
28
35
|
external service itself resolves the selected model/variant, active integration
|
|
@@ -79,7 +86,8 @@ files. Web build, prepack and development API scripts build it. At runtime the
|
|
|
79
86
|
Host copies its bytes into the temporary directory, including when the Host
|
|
80
87
|
source lives in Electron ASAR; external OpenCode needs no access to ASAR or
|
|
81
88
|
Yuri's node_modules. The bundle has no machine-specific source directory.
|
|
82
|
-
Shutdown
|
|
89
|
+
Shutdown forgets the cached directory without deleting it; failed staging only
|
|
90
|
+
removes its own incomplete temporary file.
|
|
83
91
|
|
|
84
92
|
## Completion contract
|
|
85
93
|
|