@openchamber/web 2.0.2 → 2.0.4
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/bin/lib/DOCUMENTATION.md +1 -1
- package/bin/lib/commands-connect-url.js +6 -5
- package/bin/lib/commands-tunnel.js +24 -5
- package/dist/assets/{CodeMirrorCommentWidgets-CmKmyb9T.js → CodeMirrorCommentWidgets-C_zL-eri.js} +1 -1
- package/dist/assets/{DiffView-8-PFpZ2p.js → DiffView-BeN2_YYF.js} +3 -3
- package/dist/assets/FilesView-CN34wm_N.js +17 -0
- package/dist/assets/{GitView-DNUSu00w.js → GitView-DLDazOo1.js} +4 -4
- package/dist/assets/{GuestAttachDialog-Cv6QzjHC.js → GuestAttachDialog-C0xe_Lyy.js} +1 -1
- package/dist/assets/{GuestSurfacePane-Bt3jB_Ye.js → GuestSurfacePane-BdaurnDr.js} +1 -1
- package/dist/assets/{JsonTreeView-BlyHTRhM.js → JsonTreeView-B1Xq-k2t.js} +1 -1
- package/dist/assets/LinearIssuesView-BryoAHow.js +1 -0
- package/dist/assets/{MarkdownImageGallery-2UXJF-5B.js → MarkdownImageGallery-DfuEoaGq.js} +1 -1
- package/dist/assets/MarkdownRendererImpl-B_ZcWOvX.js +12 -0
- package/dist/assets/OnboardingScreen-C22bGmnP.js +1 -0
- package/dist/assets/{PatchDiff-ByvnbG5T.js → PatchDiff-0xd6UeFB.js} +1 -1
- package/dist/assets/{PierreDiffViewer-BXieg0mH.js → PierreDiffViewer-BC950e3F.js} +3 -3
- package/dist/assets/PlanView-B7Xgihqk.js +5 -0
- package/dist/assets/PluginPane-2C71F8uF.js +3 -0
- package/dist/assets/SettingsView-m_zoFiaT.js +30 -0
- package/dist/assets/{SettingsWindow-BIz224xs.js → SettingsWindow-CofS020b.js} +1 -1
- package/dist/assets/{SubmoduleDiffSummary-CXKmlps9.js → SubmoduleDiffSummary-BSA9gnIO.js} +1 -1
- package/dist/assets/{ToolOutputDialog-BsgAK8xu.js → ToolOutputDialog-DprkVKcj.js} +7 -7
- package/dist/assets/{ToolPartDiffPreview-vdPObXOf.js → ToolPartDiffPreview-Dq0go_fX.js} +2 -2
- package/dist/assets/{VirtualizedFileDiff-BkFNKWS5.js → VirtualizedFileDiff-Kp8hKJdT.js} +1 -1
- package/dist/assets/WalkthroughView-DGnTzqIU.js +4 -0
- package/dist/assets/{appThemeRegistry-aHUNHoqP.js → appThemeRegistry-BdEHBA4s.js} +1 -1
- package/dist/assets/{commitAndPush-Bon9r94r.js → commitAndPush-LwtVa2Oc.js} +1 -1
- package/dist/assets/{computeVirtualFileMetrics-DKqr_1AQ.js → computeVirtualFileMetrics-6V1xNpO9.js} +2 -2
- package/dist/assets/de-DlgBHUAI.js +10 -0
- package/dist/assets/es-BC8G41U8.js +16 -0
- package/dist/assets/fr-I0z3vVjy.js +14 -0
- package/dist/assets/index-CgR5rJq_.js +41 -0
- package/dist/assets/{index-DpFttslC.js → index-CmNPYddV.js} +1 -1
- package/dist/assets/index-adyy_sEk.css +1 -0
- package/dist/assets/{isDiffPlainText-kzAgpIgi.js → isDiffPlainText-1bXcWCrw.js} +1 -1
- package/dist/assets/{isFilePlainText-Uj6y-jzz.js → isFilePlainText-CBAppvy1.js} +1 -1
- package/dist/assets/ja-BIElEsY8.js +16 -0
- package/dist/assets/ko-DRnnHetA.js +16 -0
- package/dist/assets/{main-CbfMxn-I.js → main-CzjTMTfW.js} +2 -2
- package/dist/assets/main-DVX34beR.js +886 -0
- package/dist/assets/markdownCore-Cxbkn5NR.js +7 -0
- package/dist/assets/{miniChat-CiAKBC10.js → miniChat-CP68IL8Q.js} +2 -2
- package/dist/assets/{mobile-CsT4sJwC.js → mobile-BrlBrNfZ.js} +2 -2
- package/dist/assets/nl-DzUV-kwp.js +16 -0
- package/dist/assets/{patchFileDiff-DeaE08W0.js → patchFileDiff-pqRSHLHI.js} +2 -2
- package/dist/assets/pl-Bb-cb7k7.js +16 -0
- package/dist/assets/pt-BR-CyIWrTcE.js +16 -0
- package/dist/assets/renderElectronMiniChatApp-DKIilR7N.js +2 -0
- package/dist/assets/renderMobileApp-B0z6-x58.js +25 -0
- package/dist/assets/runtimeEndpointReset-uu1DBwLL.js +52 -0
- package/dist/assets/{scheduledTasksApi-BZCNJ588.js → scheduledTasksApi-BuzWT445.js} +1 -1
- package/dist/assets/{shikiHighlight-BSUEa3yF.js → shikiHighlight-BWGrY5YU.js} +1 -1
- package/dist/assets/{textMateThemeFromAppTheme-CsATFZIV.js → textMateThemeFromAppTheme-BSUFChBY.js} +1 -1
- package/dist/assets/tr-DXEDSoYO.js +7 -0
- package/dist/assets/uk-C8hN--q_.js +16 -0
- package/dist/assets/useAppFontEffects-Dsl_sLrj.js +7366 -0
- package/dist/assets/useInlineCommentController-d5vntsQ_.js +2 -0
- package/dist/assets/{useRootScrollLock-Cp1eFoM2.js → useRootScrollLock-2rd5Y6gR.js} +2 -2
- package/dist/assets/{vendor-base-ui-CsXYnR5c.js → vendor-base-ui-DnNniUWp.js} +1 -1
- package/dist/assets/{vendor-codemirror-language-data-BwwommM0.js → vendor-codemirror-language-data-B1EetJur.js} +2 -2
- package/dist/assets/vendor-opencode-client-DSZl7jSi.js +12 -0
- package/dist/assets/{vendor-tanstack-react-virtual-ClYN8CzB.js → vendor-tanstack-react-virtual--0sBrLRh.js} +1 -1
- package/dist/assets/{vendor-tanstack-virtual-core-BewVQryB.js → vendor-tanstack-virtual-core-BoA4iGMw.js} +1 -1
- package/dist/assets/{vendor-zod-BSoePkpP.js → vendor-zod-CxRSdNoV.js} +4 -4
- package/dist/assets/{web-components-D3Yjr4Zx.js → web-components-ngpHPEDU.js} +1 -1
- package/dist/assets/zh-CN-CtzXdjMZ.js +16 -0
- package/dist/assets/zh-TW-Ds0CADSz.js +16 -0
- package/dist/index.html +5 -5
- package/dist/mini-chat.html +5 -5
- package/dist/mobile.html +5 -5
- package/package.json +5 -5
- package/server/index.js +82 -4
- package/server/lib/agent-tool/DOCUMENTATION.md +8 -1
- package/server/lib/agent-tool/runtime.js +13 -4
- package/server/lib/agent-tool/runtime.test.js +15 -0
- package/server/lib/context-obligatory/DOCUMENTATION.md +10 -7
- package/server/lib/context-obligatory/runtime.js +2 -1
- package/server/lib/context-obligatory/runtime.test.js +76 -30
- package/server/lib/dictation/DOCUMENTATION.md +4 -1
- package/server/lib/dictation/openai-compatible-session.js +7 -0
- package/server/lib/enterprise-mode.d.ts +30 -0
- package/server/lib/enterprise-mode.js +253 -0
- package/server/lib/enterprise-mode.test.js +247 -0
- package/server/lib/event-stream/translate-v2.js +6 -0
- package/server/lib/event-stream/translate-v2.test.js +6 -0
- package/server/lib/git/DOCUMENTATION.md +2 -1
- package/server/lib/git/routes.js +44 -1
- package/server/lib/git/routes.test.js +98 -1
- package/server/lib/git/service.js +146 -11
- package/server/lib/git/service.test.js +195 -0
- package/server/lib/github/routes.js +9 -19
- package/server/lib/github/routes.test.js +112 -0
- package/server/lib/guests/DOCUMENTATION.md +4 -2
- package/server/lib/guests/background.test.js +1 -1
- package/server/lib/guests/catalog.js +56 -2
- package/server/lib/guests/catalog.test.js +24 -1
- package/server/lib/guests/clone-network.test.js +52 -0
- package/server/lib/guests/clone.js +30 -4
- package/server/lib/guests/enterprise.js +68 -0
- package/server/lib/guests/enterprise.test.js +106 -0
- package/server/lib/guests/grant-scope.js +8 -2
- package/server/lib/guests/grant-scope.test.js +9 -0
- package/server/lib/guests/html-styles.js +16 -2
- package/server/lib/guests/html-styles.test.js +53 -4
- package/server/lib/guests/install.js +10 -0
- package/server/lib/guests/persist.js +1 -0
- package/server/lib/guests/routes.js +40 -5
- package/server/lib/guests/updates.js +9 -2
- package/server/lib/notifications/DOCUMENTATION.md +1 -1
- package/server/lib/notifications/runtime.js +22 -8
- package/server/lib/notifications/trigger-runtime.test.js +45 -0
- package/server/lib/openchamber-sessions/session-metadata-store.js +27 -0
- package/server/lib/openchamber-sessions/session-metadata-store.test.js +18 -0
- package/server/lib/opencode/DOCUMENTATION.md +13 -9
- package/server/lib/opencode/auth-state-runtime.js +2 -2
- package/server/lib/opencode/config-paths.test.js +1 -0
- package/server/lib/opencode/env-runtime.js +26 -3
- package/server/lib/opencode/env-runtime.test.js +57 -0
- package/server/lib/opencode/feature-routes-runtime.js +2 -0
- package/server/lib/opencode/hmr-state-runtime.js +4 -3
- package/server/lib/opencode/lifecycle.js +10 -5
- package/server/lib/opencode/lifecycle.test.js +6 -2
- package/server/lib/opencode/managed-config-file.js +2 -1
- package/server/lib/opencode/managed-config-file.test.js +18 -0
- package/server/lib/opencode/npm-registry-config.d.ts +1 -0
- package/server/lib/opencode/npm-registry-config.js +123 -0
- package/server/lib/opencode/npm-registry-config.test.js +167 -0
- package/server/lib/opencode/npm-registry.js +5 -6
- package/server/lib/opencode/npm-registry.test.js +30 -0
- package/server/lib/opencode/openchamber-routes.js +8 -0
- package/server/lib/opencode/project-icon-routes.js +2 -2
- package/server/lib/opencode/project-icon-routes.test.js +44 -0
- package/server/lib/opencode/provider-source-route.test.js +32 -0
- package/server/lib/opencode/routes.js +17 -2
- package/server/lib/opencode/settings-helpers.js +26 -3
- package/server/lib/opencode/settings-helpers.test.js +12 -5
- package/server/lib/opencode/settings-registry.json +35 -1
- package/server/lib/opencode/settings-runtime.js +1 -0
- package/server/lib/opencode/shutdown-runtime.js +2 -0
- package/server/lib/opencode/static-routes-runtime.js +9 -1
- package/server/lib/opencode/static-routes-runtime.test.js +58 -1
- package/server/lib/package-manager.js +4 -1
- package/server/lib/package-manager.test.js +24 -0
- package/server/lib/permission-auto-accept/DOCUMENTATION.md +23 -15
- package/server/lib/permission-auto-accept/modes.js +26 -0
- package/server/lib/permission-auto-accept/runtime.js +146 -40
- package/server/lib/permission-auto-accept/runtime.test.js +93 -9
- package/server/lib/quota/DOCUMENTATION.md +6 -0
- package/server/lib/quota/providers/zhipuai-coding-plan.js +74 -30
- package/server/lib/quota/providers/zhipuai-coding-plan.test.js +124 -0
- package/server/lib/relay/DOCUMENTATION.md +1 -1
- package/server/lib/relay/service.js +32 -12
- package/server/lib/relay/service.test.js +30 -0
- package/server/lib/routing/DOCUMENTATION.md +150 -41
- package/server/lib/routing/classifier.js +156 -0
- package/server/lib/routing/defaults.js +27 -0
- package/server/lib/routing/jev.js +5 -17
- package/server/lib/routing/routes.http.test.js +9 -0
- package/server/lib/routing/routes.js +27 -1
- package/server/lib/routing/runtime.js +199 -33
- package/server/lib/routing/runtime.test.js +299 -15
- package/server/lib/routing/store.js +57 -0
- package/server/lib/routing/store.test.js +37 -0
- package/server/lib/session-assist/DOCUMENTATION.md +17 -7
- package/server/lib/session-assist/context.js +42 -2
- package/server/lib/session-assist/context.test.js +38 -1
- package/server/lib/session-assist/runtime.js +57 -13
- package/server/lib/session-assist/runtime.test.js +45 -0
- package/server/lib/session-goal/DOCUMENTATION.md +47 -22
- package/server/lib/session-goal/audit.js +112 -0
- package/server/lib/session-goal/audit.test.js +58 -0
- package/server/lib/session-goal/runtime.js +113 -134
- package/server/lib/session-goal/runtime.test.js +146 -13
- package/server/lib/session-lineage.js +52 -0
- package/server/lib/session-lineage.test.js +45 -0
- package/server/lib/session-work/DOCUMENTATION.md +108 -0
- package/server/lib/session-work/questions.js +126 -0
- package/server/lib/session-work/runtime.js +278 -0
- package/server/lib/session-work/runtime.test.js +255 -0
- package/server/lib/session-work/state.js +48 -0
- package/server/lib/session-work/state.test.js +34 -0
- package/server/lib/small-model/DOCUMENTATION.md +14 -7
- package/server/lib/small-model/client.js +7 -4
- package/server/lib/small-model/index.js +11 -21
- package/server/lib/small-model/index.test.js +13 -26
- package/server/lib/spaces/DOCUMENTATION.md +79 -25
- package/server/lib/spaces/gatekeeper-channel.js +63 -11
- package/server/lib/spaces/gatekeeper-channel.test.js +34 -4
- package/server/lib/spaces/gatekeeper-program.cjs +64 -13
- package/server/lib/spaces/gatekeeper-program.test.js +115 -3
- package/server/lib/spaces/host.js +58 -13
- package/server/lib/spaces/host.test.js +34 -1
- package/server/lib/spaces/idle-stop.js +98 -0
- package/server/lib/spaces/idle-stop.test.js +130 -0
- package/server/lib/spaces/journey.js +427 -17
- package/server/lib/spaces/journey.test.js +592 -5
- package/server/lib/spaces/layout.js +27 -6
- package/server/lib/spaces/manager.test.js +1 -1
- package/server/lib/spaces/places/contract-suite.js +4 -2
- package/server/lib/spaces/places/docker-live-support.js +27 -4
- package/server/lib/spaces/places/docker.js +32 -5
- package/server/lib/spaces/places/docker.test.js +38 -8
- package/server/lib/spaces/places/escape-suite.js +32 -0
- package/server/lib/spaces/places/fake-docker.js +3 -1
- package/server/lib/spaces/places/grants.docker.live.test.js +197 -0
- package/server/lib/spaces/places/memory-place.js +3 -3
- package/server/lib/spaces/places/sessions.docker.live.test.js +4 -2
- package/server/lib/spaces/routes.js +49 -1
- package/server/lib/spaces/routes.test.js +31 -3
- package/server/lib/spaces/space-opencode.js +52 -0
- package/server/lib/spaces/space-opencode.test.js +41 -0
- package/server/lib/spaces/space-records.js +90 -2
- package/server/lib/spaces/space-records.test.js +58 -1
- package/server/lib/spaces/space-server.js +13 -1
- package/server/lib/spaces/space-server.test.js +13 -0
- package/server/lib/spaces/space-setup.js +173 -0
- package/server/lib/spaces/space-setup.test.js +174 -0
- package/server/lib/tts/DOCUMENTATION.md +3 -0
- package/server/lib/tts/base-url.js +8 -0
- package/server/lib/tts/routes.js +13 -1
- package/server/lib/tts/routes.test.js +26 -0
- package/server/lib/tunnels/DOCUMENTATION.md +2 -0
- package/server/lib/tunnels/routes.js +14 -0
- package/server/lib/tunnels/routes.test.js +26 -0
- package/server/lib/walkthrough/index.js +11 -7
- package/server/lib/walkthrough/jobs.test.js +8 -0
- package/server/lib/walkthrough/languages.js +1 -0
- package/server/lib/walkthrough/routes.js +7 -1
- package/dist/assets/FilesView-0Ie20mEk.js +0 -17
- package/dist/assets/LinearIssuesView-CSl2MUfA.js +0 -1
- package/dist/assets/MarkdownRendererImpl-DVHqZoug.js +0 -12
- package/dist/assets/OnboardingScreen-CIdXJpfc.js +0 -1
- package/dist/assets/PlanView-DEIi3Q7M.js +0 -5
- package/dist/assets/PluginPane-BEPUWVho.js +0 -3
- package/dist/assets/SettingsView-CiNh-RbW.js +0 -30
- package/dist/assets/WalkthroughView-6oE-MuDL.js +0 -4
- package/dist/assets/de-CgAJ51z7.js +0 -10
- package/dist/assets/es-zGi_ravM.js +0 -16
- package/dist/assets/fr-CPfogrWx.js +0 -14
- package/dist/assets/index-CHfphYL3.js +0 -41
- package/dist/assets/index-DvMJ3w6V.css +0 -1
- package/dist/assets/ja-DMk6wd-U.js +0 -16
- package/dist/assets/ko-BFpzJ8jc.js +0 -16
- package/dist/assets/main-anyZFMIs.js +0 -896
- package/dist/assets/markdownCore-CmM47cAE.js +0 -7
- package/dist/assets/pl-VdRPcZrB.js +0 -16
- package/dist/assets/pt-BR-BRys_lOW.js +0 -16
- package/dist/assets/renderElectronMiniChatApp-C5677jy0.js +0 -2
- package/dist/assets/renderMobileApp-D4dBBAqQ.js +0 -25
- package/dist/assets/runtimeEndpointReset-5r0hkd-2.js +0 -27
- package/dist/assets/tr-CA9ckNnm.js +0 -7
- package/dist/assets/uk-byjR-y8D.js +0 -16
- package/dist/assets/useAppFontEffects-BWQZ5DeI.js +0 -7341
- package/dist/assets/useInlineCommentController-DlFyVfBu.js +0 -2
- package/dist/assets/vendor-opencode-client-DYdsLbCM.js +0 -12
- package/dist/assets/zh-CN-DRabgxdG.js +0 -16
- package/dist/assets/zh-TW-rbY5c9UK.js +0 -16
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Owns Jev routing at runtime:
|
|
3
|
-
* send that selected `openchamber/auto`
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
2
|
+
* Owns Jev routing at runtime: which classification provider answers, whether
|
|
3
|
+
* Auto is ready, which model and agent a send that selected `openchamber/auto`
|
|
4
|
+
* runs on, and the safety net consulted in a `safety` permission session.
|
|
5
|
+
* Failure paths fall back to the user's own behaviour for routing (the
|
|
6
|
+
* fallback model) and to the user's own decision for the safety net: a request
|
|
7
|
+
* Jev could not check waits for the user, and the UI is told why.
|
|
7
8
|
*
|
|
8
9
|
* OpenCode 2.x holds the model and the agent on the session, switched by their
|
|
9
10
|
* own calls, and a prompt body carries only the user's text. So Auto is a
|
|
@@ -13,10 +14,20 @@
|
|
|
13
14
|
*/
|
|
14
15
|
import { OpenCode } from '@opencode/client';
|
|
15
16
|
import { z } from 'zod';
|
|
16
|
-
import { AUTO_MODEL_REF, BUILTIN_CATEGORIES, isAutoModel } from './defaults.js';
|
|
17
|
+
import { AUTO_MODEL_REF, BUILTIN_CATEGORIES, ZEN_JEV_PROMOTION_ACTIVE, isAutoModel } from './defaults.js';
|
|
17
18
|
import { createRoutingStore, parseEffectiveConfig } from './store.js';
|
|
18
|
-
import { buildPermissionRequest, buildRoutingRequest, createJevClient, decidePermission, decideRouting
|
|
19
|
+
import { buildPermissionRequest, buildRoutingRequest, createJevClient, decidePermission, decideRouting } from './jev.js';
|
|
20
|
+
import {
|
|
21
|
+
CLASSIFIER_SOURCES,
|
|
22
|
+
classifierEndpoint,
|
|
23
|
+
legacyClassifier,
|
|
24
|
+
normalizeCustomEndpointUrl,
|
|
25
|
+
readPinnedCustomEndpoint,
|
|
26
|
+
resolveClassifier,
|
|
27
|
+
} from './classifier.js';
|
|
19
28
|
import { loadRoutingHistory } from './history.js';
|
|
29
|
+
import { readAuthFile } from '../opencode/auth.js';
|
|
30
|
+
import { ENTERPRISE_MODE_ERROR, isEnterpriseMode } from '../enterprise-mode.js';
|
|
20
31
|
|
|
21
32
|
const HISTORY_TIMEOUT_MS = 2500;
|
|
22
33
|
/** A held permission is remembered so reconnect reconciliation does not re-ask Jev. */
|
|
@@ -44,6 +55,12 @@ export const requestTextOf = (body) => {
|
|
|
44
55
|
|
|
45
56
|
const agentBodySchema = z.object({ agent: z.string().trim().min(1) });
|
|
46
57
|
|
|
58
|
+
const customEndpointInputSchema = z.object({
|
|
59
|
+
url: z.string().trim().min(1).max(2000),
|
|
60
|
+
model: z.string().trim().min(1).max(200),
|
|
61
|
+
key: z.string().trim().max(4000).nullable().optional(),
|
|
62
|
+
});
|
|
63
|
+
|
|
47
64
|
/** OpenChamber stores a model as `{ providerID, modelID }`; v2 wants a `Model.Ref`. */
|
|
48
65
|
const toModelRef = (model, variant) => {
|
|
49
66
|
const ref = { providerID: model.providerID, id: model.modelID };
|
|
@@ -51,6 +68,38 @@ const toModelRef = (model, variant) => {
|
|
|
51
68
|
return ref;
|
|
52
69
|
};
|
|
53
70
|
|
|
71
|
+
/**
|
|
72
|
+
* The API keys the user saved in OpenCode for the providers that serve Jev. An
|
|
73
|
+
* OpenCode account sign-in is an OAuth credential, which Zen rejects as a key,
|
|
74
|
+
* so only `api` entries count.
|
|
75
|
+
*/
|
|
76
|
+
const apiKeySchema = z.object({ type: z.literal('api'), key: z.string().min(1) });
|
|
77
|
+
const envKeySchema = z.string().trim().min(1);
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* OpenCode also connects OpenRouter and AI Gateway from these variables, read
|
|
81
|
+
* live and never stored in its database. A managed OpenCode inherits this
|
|
82
|
+
* server's environment, so the same variable is the same key. A saved key
|
|
83
|
+
* wins over the variable; Zen has no variable.
|
|
84
|
+
*/
|
|
85
|
+
const PROVIDER_ENV_KEYS = { openrouter: 'OPENROUTER_API_KEY', vercel: 'AI_GATEWAY_API_KEY' };
|
|
86
|
+
|
|
87
|
+
export const readOpenCodeKeys = ({ readAuth = readAuthFile, env = process.env } = {}) => {
|
|
88
|
+
let auth = {};
|
|
89
|
+
try {
|
|
90
|
+
auth = readAuth();
|
|
91
|
+
} catch {
|
|
92
|
+
// An unreadable credential store still leaves the environment.
|
|
93
|
+
}
|
|
94
|
+
const saved = (providerId) => apiKeySchema.safeParse(auth[providerId]).data?.key ?? null;
|
|
95
|
+
const fromEnv = (providerId) => envKeySchema.safeParse(env[PROVIDER_ENV_KEYS[providerId]]).data ?? null;
|
|
96
|
+
return {
|
|
97
|
+
zenKey: saved('opencode'),
|
|
98
|
+
openrouterKey: saved('openrouter') ?? fromEnv('openrouter'),
|
|
99
|
+
vercelKey: saved('vercel') ?? fromEnv('vercel'),
|
|
100
|
+
};
|
|
101
|
+
};
|
|
102
|
+
|
|
54
103
|
export function createRoutingRuntime({
|
|
55
104
|
dataDir,
|
|
56
105
|
buildOpenCodeUrl,
|
|
@@ -59,6 +108,10 @@ export function createRoutingRuntime({
|
|
|
59
108
|
fetchImpl = fetch,
|
|
60
109
|
store = createRoutingStore({ dataDir }),
|
|
61
110
|
jev = createJevClient({ fetchImpl }),
|
|
111
|
+
readProviderKeys = () => readOpenCodeKeys(),
|
|
112
|
+
zenPromotionActive = ZEN_JEV_PROMOTION_ACTIVE,
|
|
113
|
+
enterpriseMode = isEnterpriseMode,
|
|
114
|
+
readPinnedEndpoint = readPinnedCustomEndpoint,
|
|
62
115
|
now = Date.now,
|
|
63
116
|
}) {
|
|
64
117
|
const permissionDecisions = new Map();
|
|
@@ -81,23 +134,70 @@ export function createRoutingRuntime({
|
|
|
81
134
|
|
|
82
135
|
const enabledCategories = (config) => config.categories.filter((category) => category.enabled);
|
|
83
136
|
|
|
84
|
-
/**
|
|
137
|
+
/** Which classification provider answers now, and where its requests go (null endpoint: no Jev). */
|
|
138
|
+
const resolveAccess = async () => {
|
|
139
|
+
const [typesafeKey, stored, savedEndpoint] = await Promise.all([
|
|
140
|
+
store.readToken(),
|
|
141
|
+
store.readClassifierSource(),
|
|
142
|
+
store.readCustomEndpoint(),
|
|
143
|
+
]);
|
|
144
|
+
// An endpoint the administrator pinned replaces the one saved in Settings.
|
|
145
|
+
const pinned = readPinnedEndpoint();
|
|
146
|
+
const customEndpoint = pinned ?? savedEndpoint;
|
|
147
|
+
const keys = { typesafeKey, customEndpoint, ...readProviderKeys() };
|
|
148
|
+
// Enterprise mode overrides whatever was picked; the pick itself is kept.
|
|
149
|
+
// The pinned endpoint is the administrator's own, so there it is the
|
|
150
|
+
// default and Off the only other choice.
|
|
151
|
+
const selected = !enterpriseMode() ? stored : pinned && stored !== 'off' ? 'custom' : 'off';
|
|
152
|
+
const classifier = resolveClassifier({ selected, ...keys, zenPromotionActive });
|
|
153
|
+
const endpoint = classifier.effective ? classifierEndpoint(classifier.effective, keys) : null;
|
|
154
|
+
return { classifier, endpoint, tokenPresent: Boolean(typesafeKey), customEndpoint, pinned: pinned !== null };
|
|
155
|
+
};
|
|
156
|
+
|
|
157
|
+
// What Settings shows of the custom endpoint: never the key itself.
|
|
158
|
+
const describeCustomEndpoint = (endpoint, pinned) => (endpoint
|
|
159
|
+
? { url: endpoint.url, model: endpoint.model, keyPresent: Boolean(endpoint.key), pinned }
|
|
160
|
+
: null);
|
|
161
|
+
|
|
162
|
+
const pinnedEndpointError = () => Object.assign(
|
|
163
|
+
new Error('The custom endpoint is set by your administrator and cannot be changed here'),
|
|
164
|
+
{ status: 409 },
|
|
165
|
+
);
|
|
166
|
+
|
|
167
|
+
/** What the client needs to decide whether to offer Auto and the safety net, and what Settings shows. */
|
|
85
168
|
const describe = async () => {
|
|
86
|
-
const [config,
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
// model zen serves, so Auto only needs a fallback and two categories.
|
|
90
|
-
const autoReady = config.enabled && Boolean(config.fallback) && enabledCategories(config).length >= 2;
|
|
169
|
+
const [config, access] = await Promise.all([store.readConfig(), resolveAccess()]);
|
|
170
|
+
const jevAvailable = access.endpoint !== null;
|
|
171
|
+
const autoReady = jevAvailable && config.enabled && Boolean(config.fallback) && enabledCategories(config).length >= 2;
|
|
91
172
|
// Built-in text travels with the config so "Reset" in Settings restores the shipped wording.
|
|
92
173
|
// `available` stays in the payload for the client: a runtime without an
|
|
93
174
|
// OpenChamber server (VS Code) answers 404 and reads it as false.
|
|
94
|
-
|
|
175
|
+
// `jevSource` is the two-value field clients from before the classifier
|
|
176
|
+
// pick parse, `classifier` what v2.0.2 clients parse, and `classification`
|
|
177
|
+
// the full picture.
|
|
178
|
+
return {
|
|
179
|
+
available: true,
|
|
180
|
+
autoReady,
|
|
181
|
+
jevAvailable,
|
|
182
|
+
tokenPresent: access.tokenPresent,
|
|
183
|
+
customEndpoint: describeCustomEndpoint(access.customEndpoint, access.pinned),
|
|
184
|
+
enterpriseMode: enterpriseMode(),
|
|
185
|
+
jevSource: access.classifier.effective === 'typesafe' ? 'typesafe' : 'zen-free',
|
|
186
|
+
classifier: legacyClassifier(access.classifier),
|
|
187
|
+
classification: access.classifier,
|
|
188
|
+
config,
|
|
189
|
+
builtins: BUILTIN_CATEGORIES,
|
|
190
|
+
};
|
|
95
191
|
};
|
|
96
192
|
|
|
97
193
|
const publishUpdated = async () => {
|
|
98
194
|
const state = await describe();
|
|
99
195
|
broadcast('openchamber:routing.updated', {
|
|
100
|
-
available: state.available,
|
|
196
|
+
available: state.available,
|
|
197
|
+
autoReady: state.autoReady,
|
|
198
|
+
jevAvailable: state.jevAvailable,
|
|
199
|
+
tokenPresent: state.tokenPresent,
|
|
200
|
+
jevSource: state.jevSource,
|
|
101
201
|
});
|
|
102
202
|
return state;
|
|
103
203
|
};
|
|
@@ -166,9 +266,10 @@ export function createRoutingRuntime({
|
|
|
166
266
|
console.warn('[routing] history unavailable, routing on the request alone:', errorMessage(error));
|
|
167
267
|
}
|
|
168
268
|
try {
|
|
169
|
-
const
|
|
269
|
+
const { endpoint } = await resolveAccess();
|
|
270
|
+
if (!endpoint) throw new Error('No classification provider is available');
|
|
170
271
|
const request = (requestText ?? '').trim();
|
|
171
|
-
const { answers, ms } = await jev.ask(buildRoutingRequest({ categories: enabledCategories(config), history, request }),
|
|
272
|
+
const { answers, ms } = await jev.ask(buildRoutingRequest({ categories: enabledCategories(config), history, request }), endpoint);
|
|
172
273
|
const result = decideRouting(answers.category, { categories: enabledCategories(config), minConfidence: config.minConfidence });
|
|
173
274
|
decision.category = result.category?.id ?? null;
|
|
174
275
|
decision.confidence = result.confidence;
|
|
@@ -233,39 +334,55 @@ export function createRoutingRuntime({
|
|
|
233
334
|
};
|
|
234
335
|
|
|
235
336
|
/**
|
|
236
|
-
* Consulted by permission auto-accept
|
|
237
|
-
*
|
|
238
|
-
*
|
|
337
|
+
* Consulted by permission auto-accept in a `safety` session before it
|
|
338
|
+
* replies. `accept` replies; `hold` leaves the request for the user. Only a
|
|
339
|
+
* verdict from Jev accepts: with no classification provider the request
|
|
340
|
+
* waits quietly, the way an `ask` session's would; when Jev fails it waits
|
|
341
|
+
* too, and the UI is told why (`skipped`).
|
|
239
342
|
*/
|
|
240
343
|
const evaluatePermission = async (permission, directory) => {
|
|
241
|
-
if (!permission?.id) return { action: '
|
|
344
|
+
if (!permission?.id) return { action: 'hold' };
|
|
242
345
|
const cached = permissionDecisions.get(permission.id);
|
|
243
346
|
if (cached && now() - cached.at < PERMISSION_DECISION_TTL_MS) return cached.result;
|
|
244
|
-
const
|
|
245
|
-
if (!
|
|
347
|
+
const [config, access] = await Promise.all([store.readConfig(), resolveAccess()]);
|
|
348
|
+
if (!access.endpoint) return { action: 'hold', unavailable: true };
|
|
246
349
|
let result;
|
|
247
350
|
try {
|
|
248
|
-
const
|
|
249
|
-
const
|
|
250
|
-
const verdict = decidePermission(answers, { threshold: state.config.safetyNet.threshold });
|
|
351
|
+
const { answers } = await jev.ask(buildPermissionRequest(permission), access.endpoint);
|
|
352
|
+
const verdict = decidePermission(answers, { threshold: config.safetyNet.threshold });
|
|
251
353
|
result = verdict.hold
|
|
252
354
|
? { action: 'hold', score: verdict.score, kind: verdict.kind }
|
|
253
355
|
: { action: 'accept', score: verdict.score, kind: verdict.kind };
|
|
254
|
-
if (verdict.hold) {
|
|
255
|
-
broadcast('openchamber:routing.permission-held', {
|
|
256
|
-
permissionId: permission.id, sessionId: permission.sessionID, directory: directory ?? null, score: verdict.score, kind: verdict.kind,
|
|
257
|
-
});
|
|
258
|
-
}
|
|
259
356
|
} catch (error) {
|
|
260
|
-
|
|
357
|
+
// Not remembered: reconnect reconciliation asks Jev again, and may accept.
|
|
358
|
+
const skipped = errorMessage(error);
|
|
261
359
|
broadcast('openchamber:routing.safety-skipped', {
|
|
262
|
-
permissionId: permission.id, sessionId: permission.sessionID, directory: directory ?? null, error:
|
|
360
|
+
permissionId: permission.id, sessionId: permission.sessionID, directory: directory ?? null, error: skipped,
|
|
361
|
+
});
|
|
362
|
+
return { action: 'hold', skipped };
|
|
363
|
+
}
|
|
364
|
+
if (result.action === 'hold') {
|
|
365
|
+
broadcast('openchamber:routing.permission-held', {
|
|
366
|
+
permissionId: permission.id, sessionId: permission.sessionID, directory: directory ?? null, score: result.score, kind: result.kind,
|
|
263
367
|
});
|
|
264
368
|
}
|
|
265
369
|
permissionDecisions.set(permission.id, { at: now(), result });
|
|
266
370
|
return result;
|
|
267
371
|
};
|
|
268
372
|
|
|
373
|
+
/**
|
|
374
|
+
* Whether the old global safety-net switch was on. Asked once, when the
|
|
375
|
+
* permission policy converts its pre-modes `true` entries: those sessions
|
|
376
|
+
* were auto-accepting behind the safety net, so they become `safety`.
|
|
377
|
+
*/
|
|
378
|
+
const legacySafetyNetEnabled = async () => {
|
|
379
|
+
try {
|
|
380
|
+
return (await store.readConfig()).safetyNet.enabled === true;
|
|
381
|
+
} catch {
|
|
382
|
+
return false;
|
|
383
|
+
}
|
|
384
|
+
};
|
|
385
|
+
|
|
269
386
|
const forgetPermission = (permissionId) => {
|
|
270
387
|
permissionDecisions.delete(permissionId);
|
|
271
388
|
};
|
|
@@ -279,7 +396,10 @@ export function createRoutingRuntime({
|
|
|
279
396
|
const setToken = async (token) => {
|
|
280
397
|
const parsed = z.string().trim().min(1).max(4000).safeParse(token);
|
|
281
398
|
if (!parsed.success) throw Object.assign(new Error('A Jev API key is required'), { status: 400 });
|
|
399
|
+
if (enterpriseMode()) throw Object.assign(new Error(ENTERPRISE_MODE_ERROR), { status: 403 });
|
|
282
400
|
await store.writeToken(parsed.data);
|
|
401
|
+
// Pasting a key is choosing it.
|
|
402
|
+
await store.writeClassifierSource('typesafe');
|
|
283
403
|
return publishUpdated();
|
|
284
404
|
};
|
|
285
405
|
|
|
@@ -288,6 +408,47 @@ export function createRoutingRuntime({
|
|
|
288
408
|
return publishUpdated();
|
|
289
409
|
};
|
|
290
410
|
|
|
411
|
+
const setClassifierSource = async (source) => {
|
|
412
|
+
const parsed = z.enum(CLASSIFIER_SOURCES).safeParse(source);
|
|
413
|
+
if (!parsed.success) throw Object.assign(new Error(`Unknown classification provider: ${String(source)}`), { status: 400 });
|
|
414
|
+
const allowedInEnterprise = parsed.data === 'off' || (parsed.data === 'custom' && readPinnedEndpoint() !== null);
|
|
415
|
+
if (enterpriseMode() && !allowedInEnterprise) throw Object.assign(new Error(ENTERPRISE_MODE_ERROR), { status: 403 });
|
|
416
|
+
await store.writeClassifierSource(parsed.data);
|
|
417
|
+
return publishUpdated();
|
|
418
|
+
};
|
|
419
|
+
|
|
420
|
+
/**
|
|
421
|
+
* Saves the custom System One endpoint and picks it, the way saving a
|
|
422
|
+
* TypeSafe key does. `key`: a string replaces the saved one, null removes
|
|
423
|
+
* it, absent keeps it, so the URL or model can change without retyping it.
|
|
424
|
+
*/
|
|
425
|
+
const setCustomEndpoint = async (input) => {
|
|
426
|
+
if (readPinnedEndpoint()) throw pinnedEndpointError();
|
|
427
|
+
if (enterpriseMode()) throw Object.assign(new Error(ENTERPRISE_MODE_ERROR), { status: 403 });
|
|
428
|
+
const parsed = customEndpointInputSchema.safeParse(input);
|
|
429
|
+
if (!parsed.success) throw Object.assign(new Error('A URL and a model are required'), { status: 400 });
|
|
430
|
+
const { model, key } = parsed.data;
|
|
431
|
+
const url = normalizeCustomEndpointUrl(parsed.data.url);
|
|
432
|
+
// An empty key field is the same as leaving it out.
|
|
433
|
+
const keepKey = key === undefined || key === '';
|
|
434
|
+
const savedKey = keepKey ? (await store.readCustomEndpoint())?.key : key;
|
|
435
|
+
const endpoint = { url, model };
|
|
436
|
+
if (savedKey) endpoint.key = savedKey;
|
|
437
|
+
await store.writeCustomEndpoint(endpoint);
|
|
438
|
+
// Saving is choosing it; removing only the key is not a choice of anything.
|
|
439
|
+
if (key !== null) await store.writeClassifierSource('custom');
|
|
440
|
+
return publishUpdated();
|
|
441
|
+
};
|
|
442
|
+
|
|
443
|
+
const clearCustomEndpoint = async () => {
|
|
444
|
+
if (readPinnedEndpoint()) throw pinnedEndpointError();
|
|
445
|
+
await store.clearCustomEndpoint();
|
|
446
|
+
return publishUpdated();
|
|
447
|
+
};
|
|
448
|
+
|
|
449
|
+
/** Where a Jev request goes right now, or null when no classification provider is usable. */
|
|
450
|
+
const currentClassifierEndpoint = async () => (await resolveAccess()).endpoint;
|
|
451
|
+
|
|
291
452
|
/** Held permissions the UI can read back after a reload. */
|
|
292
453
|
const heldPermissions = () => {
|
|
293
454
|
const held = [];
|
|
@@ -299,6 +460,7 @@ export function createRoutingRuntime({
|
|
|
299
460
|
|
|
300
461
|
return {
|
|
301
462
|
describe,
|
|
463
|
+
classifierEndpoint: currentClassifierEndpoint,
|
|
302
464
|
noteModelSelection,
|
|
303
465
|
isAutoSession,
|
|
304
466
|
resolveAutoSelection,
|
|
@@ -307,8 +469,12 @@ export function createRoutingRuntime({
|
|
|
307
469
|
evaluatePermission,
|
|
308
470
|
forgetPermission,
|
|
309
471
|
heldPermissions,
|
|
472
|
+
legacySafetyNetEnabled,
|
|
310
473
|
updateConfig,
|
|
311
474
|
setToken,
|
|
312
475
|
clearToken,
|
|
476
|
+
setClassifierSource,
|
|
477
|
+
setCustomEndpoint,
|
|
478
|
+
clearCustomEndpoint,
|
|
313
479
|
};
|
|
314
480
|
}
|