@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
|
@@ -28,11 +28,19 @@ export const createStaticRoutesRuntime = (dependencies) => {
|
|
|
28
28
|
|
|
29
29
|
if (fs.existsSync(distPath)) {
|
|
30
30
|
console.log(`Serving static files from ${distPath}`);
|
|
31
|
+
const hashedAssetsPrefix = path.join(distPath, 'assets') + path.sep;
|
|
31
32
|
app.use(express.static(distPath, {
|
|
32
33
|
setHeaders(res, filePath) {
|
|
33
34
|
// Service workers should never be long-cached; iOS is especially sensitive.
|
|
34
|
-
if (
|
|
35
|
+
if (filePath.endsWith(`${path.sep}sw.js`)) {
|
|
35
36
|
res.setHeader('Cache-Control', 'no-store');
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
// Vite names every file under assets/ by its content hash, so a name
|
|
40
|
+
// never changes meaning. Without this each lazy chunk costs a
|
|
41
|
+
// revalidation round trip, which is felt on remote connections.
|
|
42
|
+
if (filePath.startsWith(hashedAssetsPrefix)) {
|
|
43
|
+
res.setHeader('Cache-Control', 'public, max-age=31536000, immutable');
|
|
36
44
|
}
|
|
37
45
|
},
|
|
38
46
|
}));
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import { describe, expect, it } from 'bun:test';
|
|
1
|
+
import { afterAll, beforeAll, describe, expect, it } from 'bun:test';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
2
5
|
import express from 'express';
|
|
3
6
|
import request from 'supertest';
|
|
4
7
|
import { createStaticRoutesRuntime } from './static-routes-runtime.js';
|
|
@@ -17,6 +20,60 @@ const createRuntime = () => createStaticRoutesRuntime({
|
|
|
17
20
|
normalizePwaOrientation: (value) => value,
|
|
18
21
|
});
|
|
19
22
|
|
|
23
|
+
const createServingRuntime = (distPath) => createStaticRoutesRuntime({
|
|
24
|
+
fs,
|
|
25
|
+
path,
|
|
26
|
+
process: { env: { OPENCHAMBER_DIST_DIR: distPath } },
|
|
27
|
+
__dirname: '/server',
|
|
28
|
+
express,
|
|
29
|
+
resolveProjectDirectory: () => '',
|
|
30
|
+
buildOpenCodeUrl: () => '',
|
|
31
|
+
getOpenCodeAuthHeaders: () => ({}),
|
|
32
|
+
readSettingsFromDiskMigrated: async () => ({}),
|
|
33
|
+
normalizePwaAppName: (value) => value,
|
|
34
|
+
normalizePwaOrientation: (value) => value,
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
describe('static file caching', () => {
|
|
38
|
+
let distPath;
|
|
39
|
+
|
|
40
|
+
beforeAll(() => {
|
|
41
|
+
distPath = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-static-routes-'));
|
|
42
|
+
fs.mkdirSync(path.join(distPath, 'assets'));
|
|
43
|
+
fs.writeFileSync(path.join(distPath, 'index.html'), '<!doctype html>');
|
|
44
|
+
fs.writeFileSync(path.join(distPath, 'sw.js'), '');
|
|
45
|
+
fs.writeFileSync(path.join(distPath, 'favicon.png'), '');
|
|
46
|
+
fs.writeFileSync(path.join(distPath, 'assets', 'SettingsView-DkrERrCE.js'), 'export {}');
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
afterAll(() => {
|
|
50
|
+
fs.rmSync(distPath, { recursive: true, force: true });
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
const serve = () => {
|
|
54
|
+
const app = express();
|
|
55
|
+
createServingRuntime(distPath).registerStaticRoutes(app);
|
|
56
|
+
return app;
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
it('caches content-hashed assets as immutable', async () => {
|
|
60
|
+
const response = await request(serve()).get('/assets/SettingsView-DkrERrCE.js');
|
|
61
|
+
|
|
62
|
+
expect(response.status).toBe(200);
|
|
63
|
+
expect(response.headers['cache-control']).toBe('public, max-age=31536000, immutable');
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
it('keeps unhashed files revalidated and the service worker uncached', async () => {
|
|
67
|
+
const app = serve();
|
|
68
|
+
|
|
69
|
+
const favicon = await request(app).get('/favicon.png');
|
|
70
|
+
const serviceWorker = await request(app).get('/sw.js');
|
|
71
|
+
|
|
72
|
+
expect(favicon.headers['cache-control']).toBe('public, max-age=0');
|
|
73
|
+
expect(serviceWorker.headers['cache-control']).toBe('no-store');
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
|
|
20
77
|
describe('static routes runtime', () => {
|
|
21
78
|
it('returns API-only HTML fallback for browser UI routes', async () => {
|
|
22
79
|
const app = express();
|
|
@@ -5,6 +5,7 @@ import os from 'os';
|
|
|
5
5
|
import path from 'path';
|
|
6
6
|
import { fileURLToPath } from 'url';
|
|
7
7
|
import { fetchUpdateNotes } from './changelog/update-notes.js';
|
|
8
|
+
import { isEnterpriseMode } from './enterprise-mode.js';
|
|
8
9
|
|
|
9
10
|
const __filename = fileURLToPath(import.meta.url);
|
|
10
11
|
const __dirname = path.dirname(__filename);
|
|
@@ -128,7 +129,9 @@ async function checkForUpdatesFromApi(currentVersion, options = {}) {
|
|
|
128
129
|
const shouldTrustClientPlatform = appType === 'desktop-electron' || appType === 'vscode' || appType === 'mobile-capacitor';
|
|
129
130
|
const platform = shouldTrustClientPlatform ? normalizePlatform(options.platform) : hostPlatform;
|
|
130
131
|
const arch = shouldTrustClientPlatform ? normalizeArch(options.arch) : hostArch;
|
|
131
|
-
|
|
132
|
+
// Enterprise mode keeps the update check (security fixes must reach the
|
|
133
|
+
// company) but never reports usage, whatever the client asked for.
|
|
134
|
+
const reportUsage = options.reportUsage !== false && !isEnterpriseMode();
|
|
132
135
|
const payload = {
|
|
133
136
|
appType,
|
|
134
137
|
deviceClass: normalizeDeviceClass(options.deviceClass),
|
|
@@ -149,6 +149,30 @@ describe('checkForUpdates', () => {
|
|
|
149
149
|
});
|
|
150
150
|
});
|
|
151
151
|
|
|
152
|
+
it('still checks for updates in enterprise mode but reports no usage', async () => {
|
|
153
|
+
fetchMock
|
|
154
|
+
.when('api.openchamber.dev', {
|
|
155
|
+
ok: true,
|
|
156
|
+
json: async () => ({ latestVersion: '1.10.0', updateAvailable: true, releaseNotes: '' }),
|
|
157
|
+
});
|
|
158
|
+
process.env.OPENCHAMBER_ENTERPRISE_MODE = '1';
|
|
159
|
+
try {
|
|
160
|
+
const result = await checkForUpdates({
|
|
161
|
+
appType: 'desktop-electron',
|
|
162
|
+
currentVersion: '1.9.10',
|
|
163
|
+
installId: '4f4dfead-9688-4c4f-97d7-4607fbbfc3ab',
|
|
164
|
+
platform: 'windows',
|
|
165
|
+
arch: 'arm64',
|
|
166
|
+
});
|
|
167
|
+
expect(result.available).toBe(true);
|
|
168
|
+
const sent = JSON.parse(fetchMock.mock.calls[0][1].body);
|
|
169
|
+
expect(sent.reportUsage).toBe(false);
|
|
170
|
+
expect(sent.installId).toBeUndefined();
|
|
171
|
+
} finally {
|
|
172
|
+
delete process.env.OPENCHAMBER_ENTERPRISE_MODE;
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
|
|
152
176
|
it('resolves an Android APK asset when the update API returns an AAB', async () => {
|
|
153
177
|
fetchMock
|
|
154
178
|
.when('api.openchamber.dev', {
|
|
@@ -2,41 +2,49 @@
|
|
|
2
2
|
|
|
3
3
|
## Purpose
|
|
4
4
|
|
|
5
|
-
This module owns the authoritative permission
|
|
5
|
+
This module owns the authoritative per-session permission policy for web, desktop, and mobile runtimes. Policy is persisted in OpenChamber settings so permission handling survives UI disconnects and server restarts.
|
|
6
6
|
|
|
7
7
|
## Policy
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
Each session has a mode (`modes.js`):
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
- `ask`: every request waits for the user.
|
|
12
|
+
- `safety`: a request is accepted when the safety net (Jev, `../routing/DOCUMENTATION.md`) says the user need not decide; otherwise it waits. Without a usable classification provider, or when Jev fails, it waits.
|
|
13
|
+
- `auto`: every request is accepted.
|
|
14
|
+
|
|
15
|
+
`permissionAutoAccept.sessions` maps session ids to modes. Inheritance uses the nearest explicit session value, so a child `ask` overrides a parent `auto`; descendants without an explicit value inherit from their nearest configured ancestor.
|
|
16
|
+
|
|
17
|
+
Policies written before the modes stored booleans. The first read converts them and persists the result once: `false` becomes `ask`, `true` becomes `safety` when the old global safety-net switch in the routing config was on and `auto` otherwise (`resolveLegacyEnabledMode`). The settings sanitizer accepts both shapes so the converting write and older files pass.
|
|
18
|
+
|
|
19
|
+
## Default mode
|
|
20
|
+
|
|
21
|
+
`permissionDefaultMode` (Settings → Sessions) is written onto each new top-level session when `session.created` arrives, and only when no policy exists for it yet: a mode the creating flow already set wins, and changing the default never reaches back into older sessions. Subagents inherit instead. `ask` writes nothing. Mode resolution waits for pending writes, so a session's first permission request sees its default.
|
|
12
22
|
|
|
13
23
|
## Runtime
|
|
14
24
|
|
|
15
|
-
`createPermissionAutoAcceptRuntime` loads and serializes policy writes, subscribes to the global OpenCode event hub, caches session lineage, retries transient replies, and reconciles pending permissions after startup, reconnect, and
|
|
25
|
+
`createPermissionAutoAcceptRuntime` loads and serializes policy writes, subscribes to the global OpenCode event hub, caches session lineage, retries transient replies, and reconciles pending permissions after startup, reconnect, and when a session moves to `safety` or `auto`. It keeps handling requests without a connected UI.
|
|
16
26
|
|
|
17
|
-
Unknown lineage and failed policy loads fail closed. A failed pending-permission fetch is distinct from an empty successful response and never clears policy state.
|
|
27
|
+
Unknown lineage and failed policy loads fail closed (`ask`). A failed pending-permission fetch is distinct from an empty successful response and never clears policy state.
|
|
18
28
|
|
|
19
29
|
## Safety net
|
|
20
30
|
|
|
21
|
-
`evaluatePermission` (the routing runtime,
|
|
22
|
-
|
|
23
|
-
request
|
|
24
|
-
before. A `permission.replied` event is passed to `onPermissionReplied` so the
|
|
25
|
-
routing runtime forgets its cached decision.
|
|
31
|
+
`evaluatePermission` (the routing runtime) is consulted in `safety` sessions only, before the reply. Only `accept` replies; anything else counts the request as handled without replying, so it stays on screen. A `permission.replied` event is passed to `onPermissionReplied` so the routing runtime forgets its cached decision.
|
|
32
|
+
|
|
33
|
+
Each request's outcome (`replied`, `held`, `ignored`, `failed`) is kept for a bounded while. `isPermissionAutoAnswered` lets notifications skip only a request that was actually answered: a held one still notifies.
|
|
26
34
|
|
|
27
35
|
## Routes
|
|
28
36
|
|
|
29
|
-
- `GET /api/permission-auto-accept`
|
|
30
|
-
- `PUT /api/permission-auto-accept/sessions/:sessionId`
|
|
37
|
+
- `GET /api/permission-auto-accept` answers `{ sessions, modes, revision }`. `modes` is the policy; `sessions` is its on/off view (`ask` is off) for clients from before the modes.
|
|
38
|
+
- `PUT /api/permission-auto-accept/sessions/:sessionId` takes `{ mode, directory }`; a body with only `enabled` (older clients, VS Code's bridge shape) means `auto` or `ask`.
|
|
31
39
|
|
|
32
40
|
These are normal authenticated OpenChamber runtime routes. They must not be added to browser URL-token allowlists.
|
|
33
41
|
|
|
34
42
|
## UI ownership
|
|
35
43
|
|
|
36
|
-
`packages/ui/src/stores/permissionStore.ts` is a projection of server policy and does not persist an independent policy. The server is the sole responder and the UI renders pending requests until the authoritative `permission.replied` event arrives.
|
|
44
|
+
`packages/ui/src/stores/permissionStore.ts` is a projection of server policy and does not persist an independent policy. The server is the sole responder and the UI renders pending requests until the authoritative `permission.replied` event arrives. The composer's shield button cycles ask → safety → auto, skipping `safety` while no classification provider can run it (a `safety` session then shows as `ask`).
|
|
37
45
|
|
|
38
|
-
VS Code retains its foreground-only responder because it does not run the web server runtime. Its extension host persists and broadcasts
|
|
46
|
+
VS Code retains its foreground-only responder because it does not run the web server runtime. Its extension host persists and broadcasts an on/off policy across webviews, so VS Code has only `ask` and `auto` and no default mode. The active UI handles live events plus startup, reconnect, and enablement reconciliation. With all OpenChamber webviews closed or suspended, permissions are not auto-accepted; this is an intentional VS Code limitation.
|
|
39
47
|
|
|
40
48
|
## Tests
|
|
41
49
|
|
|
42
|
-
`runtime.test.js` covers restart persistence, nearest explicit subagent inheritance, missing-lineage lookup, retry/deduplication, and
|
|
50
|
+
`runtime.test.js` covers restart persistence, on/off requests, the one-time conversion of pre-modes policies, the default mode on new sessions, nearest explicit subagent inheritance, missing-lineage lookup, retry/deduplication, reconnect reconciliation, the safety net's hold and accept, and which outcomes notifications may skip.
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* How a session answers tool permissions:
|
|
3
|
+
*
|
|
4
|
+
* - `ask`: every request waits for the user.
|
|
5
|
+
* - `safety`: requests are accepted unless the safety net (Jev) says the user
|
|
6
|
+
* should decide; without an answer from Jev the request waits.
|
|
7
|
+
* - `auto`: every request is accepted.
|
|
8
|
+
*
|
|
9
|
+
* Policy files written before the modes existed store booleans: `false` is
|
|
10
|
+
* `ask`, and `true` meant auto-accept, which the old global safety-net switch
|
|
11
|
+
* turned into `safety`. The caller supplies that answer as `legacyEnabledMode`.
|
|
12
|
+
*/
|
|
13
|
+
export const PERMISSION_MODES = ['ask', 'safety', 'auto'];
|
|
14
|
+
|
|
15
|
+
export const isPermissionMode = (value) => PERMISSION_MODES.includes(value);
|
|
16
|
+
|
|
17
|
+
/** A stored or requested value as a mode, or null when it is neither a mode nor a legacy boolean. */
|
|
18
|
+
export const toPermissionMode = (value, legacyEnabledMode = 'auto') => {
|
|
19
|
+
if (isPermissionMode(value)) return value;
|
|
20
|
+
if (value === true) return legacyEnabledMode;
|
|
21
|
+
if (value === false) return 'ask';
|
|
22
|
+
return null;
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
/** What clients that only know on/off see: anything but `ask` answers requests by itself. */
|
|
26
|
+
export const isAutoAnsweringMode = (mode) => mode === 'safety' || mode === 'auto';
|
|
@@ -1,19 +1,39 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { PERMISSION_MODES, isAutoAnsweringMode, isPermissionMode, toPermissionMode } from './modes.js';
|
|
3
|
+
|
|
1
4
|
const SETTINGS_KEY = 'permissionAutoAccept';
|
|
5
|
+
const DEFAULT_MODE_SETTINGS_KEY = 'permissionDefaultMode';
|
|
2
6
|
const RETRY_DELAYS_MS = [0, 250, 1000];
|
|
3
7
|
const REQUEST_TIMEOUT_MS = 5000;
|
|
4
8
|
const SESSION_CACHE_LIMIT = 10000;
|
|
9
|
+
const OUTCOME_CACHE_LIMIT = 1000;
|
|
10
|
+
|
|
11
|
+
// A stored entry is a mode, or a boolean from before the modes existed; an
|
|
12
|
+
// entry that is neither is dropped rather than failing the whole policy.
|
|
13
|
+
const storedEntrySchema = z.union([z.boolean(), z.enum(PERMISSION_MODES)]).nullable().catch(null);
|
|
14
|
+
const storedPolicySchema = z.object({
|
|
15
|
+
sessions: z.record(z.string().min(1), storedEntrySchema).catch({}).default({}),
|
|
16
|
+
revision: z.number().int().nonnegative().catch(0).default(0),
|
|
17
|
+
}).catch({ sessions: {}, revision: 0 });
|
|
18
|
+
|
|
19
|
+
const readStoredPolicy = (value) => storedPolicySchema.parse(value ?? {});
|
|
5
20
|
|
|
6
|
-
const
|
|
7
|
-
|
|
21
|
+
const createdSessionSchema = z.object({ id: z.string().min(1), parentID: z.string().nullish() });
|
|
22
|
+
|
|
23
|
+
const hasLegacyEntries = (stored) => Object.values(stored.sessions).some((entry) => entry === true || entry === false);
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* `sessions` maps a session id to its mode. Returns whether any entry was a
|
|
27
|
+
* pre-modes boolean, so the caller can persist the converted policy once.
|
|
28
|
+
*/
|
|
29
|
+
const normalizePolicy = (value, legacyEnabledMode = 'auto') => {
|
|
30
|
+
const stored = readStoredPolicy(value);
|
|
8
31
|
const sessions = {};
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
for (const [sessionId, enabled] of entries) {
|
|
13
|
-
if (sessionId && typeof enabled === 'boolean') sessions[sessionId] = enabled;
|
|
32
|
+
for (const [sessionId, entry] of Object.entries(stored.sessions)) {
|
|
33
|
+
const mode = toPermissionMode(entry, legacyEnabledMode);
|
|
34
|
+
if (mode) sessions[sessionId] = mode;
|
|
14
35
|
}
|
|
15
|
-
|
|
16
|
-
return { sessions, revision };
|
|
36
|
+
return { policy: { sessions, revision: stored.revision }, hadLegacy: hasLegacyEntries(stored) };
|
|
17
37
|
};
|
|
18
38
|
|
|
19
39
|
const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -25,33 +45,55 @@ export function createPermissionAutoAcceptRuntime({
|
|
|
25
45
|
readSettingsFromDiskMigrated,
|
|
26
46
|
persistSettings,
|
|
27
47
|
broadcastGlobalUiEvent,
|
|
28
|
-
// The routing safety net
|
|
29
|
-
// `
|
|
48
|
+
// The routing safety net, asked once per request in a `safety` session.
|
|
49
|
+
// `accept` replies; anything else leaves the request for the user. Absent
|
|
50
|
+
// means `safety` sessions wait for the user on every request.
|
|
30
51
|
evaluatePermission = null,
|
|
31
52
|
onPermissionReplied = null,
|
|
53
|
+
// What a pre-modes `true` becomes: `safety` when the old global safety-net
|
|
54
|
+
// switch was on, else `auto`. Asked only while converting such a policy.
|
|
55
|
+
resolveLegacyEnabledMode = async () => 'auto',
|
|
32
56
|
fetchImpl = fetch,
|
|
33
57
|
retryDelaysMs = RETRY_DELAYS_MS,
|
|
34
58
|
requestTimeoutMs = REQUEST_TIMEOUT_MS,
|
|
35
59
|
}) {
|
|
36
|
-
let policy = normalizePolicy();
|
|
60
|
+
let policy = normalizePolicy().policy;
|
|
37
61
|
let loaded = false;
|
|
38
62
|
let loadPromise = null;
|
|
39
63
|
let writePromise = Promise.resolve();
|
|
40
64
|
const sessions = new Map();
|
|
41
65
|
const inFlight = new Map();
|
|
42
66
|
const reconcilePromises = new Map();
|
|
67
|
+
// What the runtime did with each recent request, so notifications can tell a
|
|
68
|
+
// request the safety net held (the user must hear about it) from one it
|
|
69
|
+
// accepted.
|
|
70
|
+
const outcomes = new Map();
|
|
43
71
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
72
|
+
// `sessions` keeps the on/off shape clients from before the modes read;
|
|
73
|
+
// `modes` is the policy itself.
|
|
74
|
+
const snapshot = () => {
|
|
75
|
+
const legacySessions = {};
|
|
76
|
+
for (const [sessionId, mode] of Object.entries(policy.sessions)) legacySessions[sessionId] = isAutoAnsweringMode(mode);
|
|
77
|
+
return { sessions: legacySessions, modes: { ...policy.sessions }, revision: policy.revision };
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
const readPolicy = async () => {
|
|
81
|
+
const settings = await readSettingsFromDiskMigrated();
|
|
82
|
+
const stored = settings?.[SETTINGS_KEY];
|
|
83
|
+
const legacyEnabledMode = hasLegacyEntries(readStoredPolicy(stored)) ? await resolveLegacyEnabledMode() : 'auto';
|
|
84
|
+
const { policy: next, hadLegacy } = normalizePolicy(stored, legacyEnabledMode);
|
|
85
|
+
// Converted once: the answer to "was the safety net on" is gone after the
|
|
86
|
+
// routing config is next saved.
|
|
87
|
+
if (hadLegacy) await persistSettings({ [SETTINGS_KEY]: next });
|
|
88
|
+
return next;
|
|
89
|
+
};
|
|
48
90
|
|
|
49
91
|
const load = async () => {
|
|
50
92
|
if (loaded) return snapshot();
|
|
51
93
|
if (!loadPromise) {
|
|
52
|
-
loadPromise =
|
|
53
|
-
.then((
|
|
54
|
-
policy =
|
|
94
|
+
loadPromise = readPolicy()
|
|
95
|
+
.then((next) => {
|
|
96
|
+
policy = next;
|
|
55
97
|
loaded = true;
|
|
56
98
|
return snapshot();
|
|
57
99
|
})
|
|
@@ -75,19 +117,44 @@ export function createPermissionAutoAcceptRuntime({
|
|
|
75
117
|
return writePromise;
|
|
76
118
|
};
|
|
77
119
|
|
|
78
|
-
|
|
120
|
+
/**
|
|
121
|
+
* `mode` is a permission mode; a boolean is accepted from callers that only
|
|
122
|
+
* know on/off (clients from before the modes, scheduled tasks) and means
|
|
123
|
+
* `auto` or `ask`.
|
|
124
|
+
*/
|
|
125
|
+
const setSessionPolicy = async (sessionId, mode, directory) => {
|
|
79
126
|
if (typeof sessionId !== 'string' || !sessionId.trim()) throw new TypeError('sessionId is required');
|
|
80
|
-
|
|
127
|
+
const next = toPermissionMode(mode);
|
|
128
|
+
if (!next) throw new TypeError('mode must be ask, safety or auto');
|
|
81
129
|
await load();
|
|
82
130
|
const result = await persistUpdate((current) => ({
|
|
83
131
|
...current,
|
|
84
|
-
sessions: { ...current.sessions, [sessionId.trim()]:
|
|
132
|
+
sessions: { ...current.sessions, [sessionId.trim()]: next },
|
|
85
133
|
revision: current.revision + 1,
|
|
86
134
|
}));
|
|
87
|
-
if (
|
|
135
|
+
if (isAutoAnsweringMode(next)) await reconcilePending({ directories: [directory] });
|
|
88
136
|
return result;
|
|
89
137
|
};
|
|
90
138
|
|
|
139
|
+
/**
|
|
140
|
+
* A new top-level session starts in the default mode from Settings. Written
|
|
141
|
+
* once, at creation, so changing the default never reaches back into older
|
|
142
|
+
* sessions; a policy the creating flow already set wins. Subagents inherit
|
|
143
|
+
* from their parent instead.
|
|
144
|
+
*/
|
|
145
|
+
const applyDefaultMode = async (sessionId) => {
|
|
146
|
+
await load();
|
|
147
|
+
if (Object.hasOwn(policy.sessions, sessionId)) return;
|
|
148
|
+
const settings = await readSettingsFromDiskMigrated();
|
|
149
|
+
const mode = settings?.[DEFAULT_MODE_SETTINGS_KEY];
|
|
150
|
+
if (!isPermissionMode(mode) || mode === 'ask') return;
|
|
151
|
+
await persistUpdate((current) => (Object.hasOwn(current.sessions, sessionId) ? current : {
|
|
152
|
+
...current,
|
|
153
|
+
sessions: { ...current.sessions, [sessionId]: mode },
|
|
154
|
+
revision: current.revision + 1,
|
|
155
|
+
}));
|
|
156
|
+
};
|
|
157
|
+
|
|
91
158
|
const rememberSession = (info, directoryHint) => {
|
|
92
159
|
if (!info || typeof info.id !== 'string' || !info.id) return;
|
|
93
160
|
// v2 session updates are partial (a rename carries only the title), so a
|
|
@@ -138,33 +205,40 @@ export function createPermissionAutoAcceptRuntime({
|
|
|
138
205
|
return sessions.get(sessionId) ?? null;
|
|
139
206
|
};
|
|
140
207
|
|
|
141
|
-
|
|
208
|
+
/** The nearest explicit mode up the session's lineage; unknown lineage fails closed to `ask`. */
|
|
209
|
+
const resolveSessionMode = async (sessionId, directory) => {
|
|
142
210
|
await load();
|
|
211
|
+
// A default being written for a just-created session must be visible to
|
|
212
|
+
// its first permission request.
|
|
213
|
+
await writePromise.catch(() => undefined);
|
|
143
214
|
const seen = new Set();
|
|
144
215
|
let current = sessionId;
|
|
145
216
|
let currentDirectory = directory;
|
|
146
217
|
while (current && !seen.has(current)) {
|
|
147
|
-
if (Object.hasOwn(policy.sessions, current)) return policy.sessions[current]
|
|
218
|
+
if (Object.hasOwn(policy.sessions, current)) return policy.sessions[current];
|
|
148
219
|
seen.add(current);
|
|
149
220
|
let info;
|
|
150
221
|
try {
|
|
151
222
|
info = await getSession(current, currentDirectory);
|
|
152
223
|
} catch {
|
|
153
|
-
return
|
|
224
|
+
return 'ask';
|
|
154
225
|
}
|
|
155
226
|
current = info?.parentID ?? null;
|
|
156
227
|
currentDirectory = info?.directory ?? currentDirectory;
|
|
157
228
|
}
|
|
158
|
-
return
|
|
229
|
+
return 'ask';
|
|
159
230
|
};
|
|
160
231
|
|
|
232
|
+
const isSessionAutoAccepting = async (sessionId, directory) => isAutoAnsweringMode(await resolveSessionMode(sessionId, directory));
|
|
233
|
+
|
|
234
|
+
/** `replied`, `held` (left for the user by the safety net), or `ignored` (an `ask` session). */
|
|
161
235
|
const replyOnce = async (permission, directory) => {
|
|
162
|
-
if (!permission?.id || !permission?.sessionID) return
|
|
163
|
-
await
|
|
164
|
-
if (
|
|
165
|
-
if (
|
|
166
|
-
const verdict = await evaluatePermission(permission, directory);
|
|
167
|
-
if (verdict?.action
|
|
236
|
+
if (!permission?.id || !permission?.sessionID) return 'ignored';
|
|
237
|
+
const mode = await resolveSessionMode(permission.sessionID, directory);
|
|
238
|
+
if (mode === 'ask') return 'ignored';
|
|
239
|
+
if (mode === 'safety') {
|
|
240
|
+
const verdict = evaluatePermission ? await evaluatePermission(permission, directory) : null;
|
|
241
|
+
if (verdict?.action !== 'accept') return 'held';
|
|
168
242
|
}
|
|
169
243
|
// v2 scopes a permission reply under its session.
|
|
170
244
|
await request(`/api/session/${encodeURIComponent(permission.sessionID)}/permission/${encodeURIComponent(permission.id)}/reply`, {
|
|
@@ -173,29 +247,50 @@ export function createPermissionAutoAcceptRuntime({
|
|
|
173
247
|
// OpenCode 2.0.8 renamed the reply body field `reply` to `decision`.
|
|
174
248
|
body: { decision: 'once' },
|
|
175
249
|
});
|
|
176
|
-
return
|
|
250
|
+
return 'replied';
|
|
177
251
|
};
|
|
178
252
|
|
|
253
|
+
const rememberOutcome = (permissionId, outcome) => {
|
|
254
|
+
outcomes.delete(permissionId);
|
|
255
|
+
outcomes.set(permissionId, outcome);
|
|
256
|
+
if (outcomes.size > OUTCOME_CACHE_LIMIT) outcomes.delete(outcomes.keys().next().value);
|
|
257
|
+
};
|
|
258
|
+
|
|
259
|
+
/** Resolves to whether the request was handled here (replied to, or deliberately held). */
|
|
179
260
|
const processPermission = (permission, directory) => {
|
|
180
261
|
if (!permission?.id) return Promise.resolve(false);
|
|
181
262
|
const key = permission.id;
|
|
182
263
|
const existing = inFlight.get(key);
|
|
183
264
|
if (existing) return existing;
|
|
184
|
-
const
|
|
265
|
+
const outcome = (async () => {
|
|
185
266
|
for (const delay of retryDelaysMs) {
|
|
186
267
|
if (delay > 0) await wait(delay);
|
|
187
268
|
try {
|
|
188
269
|
return await replyOnce(permission, directory);
|
|
189
270
|
} catch (error) {
|
|
190
|
-
if (error?.status === 404) return
|
|
271
|
+
if (error?.status === 404) return 'replied';
|
|
191
272
|
}
|
|
192
273
|
}
|
|
193
|
-
return
|
|
194
|
-
})()
|
|
274
|
+
return 'failed';
|
|
275
|
+
})();
|
|
276
|
+
rememberOutcome(key, outcome);
|
|
277
|
+
const task = outcome.then((result) => result !== 'ignored' && result !== 'failed').finally(() => inFlight.delete(key));
|
|
195
278
|
inFlight.set(key, task);
|
|
196
279
|
return task;
|
|
197
280
|
};
|
|
198
281
|
|
|
282
|
+
/**
|
|
283
|
+
* Whether the user can skip hearing about this request: it was, or is being,
|
|
284
|
+
* answered automatically. A held or unanswered request is not.
|
|
285
|
+
*/
|
|
286
|
+
const isPermissionAutoAnswered = async (sessionId, directory, permissionId) => {
|
|
287
|
+
const mode = await resolveSessionMode(sessionId, directory);
|
|
288
|
+
if (mode === 'auto') return true;
|
|
289
|
+
if (mode === 'ask') return false;
|
|
290
|
+
const outcome = permissionId ? outcomes.get(permissionId) : undefined;
|
|
291
|
+
return outcome ? (await outcome) === 'replied' : false;
|
|
292
|
+
};
|
|
293
|
+
|
|
199
294
|
async function reconcilePending({ directories = [] } = {}) {
|
|
200
295
|
const normalizedDirectories = Array.from(new Set(
|
|
201
296
|
directories.filter((directory) => typeof directory === 'string' && directory.trim()).map((directory) => directory.trim()),
|
|
@@ -232,7 +327,14 @@ export function createPermissionAutoAcceptRuntime({
|
|
|
232
327
|
const directory = typeof event?.directory === 'string' && event.directory !== 'global' ? event.directory : undefined;
|
|
233
328
|
for (const payload of event?.translated?.() ?? []) {
|
|
234
329
|
if (payload.type === 'session.created' || payload.type === 'session.updated') {
|
|
235
|
-
|
|
330
|
+
const info = payload.properties?.info;
|
|
331
|
+
rememberSession(info, directory ?? payload.properties?.directory);
|
|
332
|
+
const created = payload.type === 'session.created' ? createdSessionSchema.safeParse(info) : null;
|
|
333
|
+
if (created?.success && !created.data.parentID) {
|
|
334
|
+
void applyDefaultMode(created.data.id).catch((error) => {
|
|
335
|
+
console.warn('[permission-auto-accept] failed to apply the default mode:', error?.message ?? error);
|
|
336
|
+
});
|
|
337
|
+
}
|
|
236
338
|
continue;
|
|
237
339
|
}
|
|
238
340
|
// A v2 permission request is `{ id, sessionID, action, resources, ... }`;
|
|
@@ -268,7 +370,9 @@ export function createPermissionAutoAcceptRuntime({
|
|
|
268
370
|
snapshot,
|
|
269
371
|
load,
|
|
270
372
|
setSessionPolicy,
|
|
373
|
+
resolveSessionMode,
|
|
271
374
|
isSessionAutoAccepting,
|
|
375
|
+
isPermissionAutoAnswered,
|
|
272
376
|
processPermission,
|
|
273
377
|
reconcilePending,
|
|
274
378
|
start,
|
|
@@ -287,7 +391,9 @@ export function registerPermissionAutoAcceptRoutes(app, runtime) {
|
|
|
287
391
|
app.put('/api/permission-auto-accept/sessions/:sessionId', async (req, res) => {
|
|
288
392
|
try {
|
|
289
393
|
const directory = typeof req.body?.directory === 'string' ? req.body.directory : undefined;
|
|
290
|
-
|
|
394
|
+
// Clients from before the modes send only `enabled`.
|
|
395
|
+
const mode = req.body?.mode ?? req.body?.enabled;
|
|
396
|
+
res.json(await runtime.setSessionPolicy(req.params.sessionId, mode, directory));
|
|
291
397
|
} catch (error) {
|
|
292
398
|
res.status(error instanceof TypeError ? 400 : 500).json({ error: error?.message });
|
|
293
399
|
}
|