@xopcai/xopc 0.0.264 → 0.0.266
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser-ext/dist/assets/auth-CknJ00ae.js +5844 -0
- package/dist/browser-ext/dist/assets/sidepanel-C69P3v9u.css +113 -0
- package/dist/browser-ext/dist/background.js +200 -68
- package/dist/browser-ext/dist/sidepanel.html +14 -0
- package/dist/browser-ext/dist/sidepanel.js +18832 -0
- package/dist/browser-ext/manifest.json +20 -20
- package/dist/extensions/telegram/xopc.extension.json +1 -1
- package/dist/gateway/static/root/assets/{activity-store-BYBCpt7_.js → activity-store-Bhyy6ENz.js} +1 -1
- package/dist/gateway/static/root/assets/{agent-avatar-dicebear-D20aBHPJ.js → agent-avatar-dicebear-Qrp5ALCF.js} +1 -1
- package/dist/gateway/static/root/assets/{agent-defaults-settings-panel-BZvMqNrU.js → agent-defaults-settings-panel-DwinST48.js} +1 -1
- package/dist/gateway/static/root/assets/{agents-6foBELwt.js → agents-Dlr0YyNt.js} +1 -1
- package/dist/gateway/static/root/assets/{api-YbtjDbuG.js → api-B2y7ZjZk.js} +1 -1
- package/dist/gateway/static/root/assets/{app-management-settings-panel-4ps1RrDU.js → app-management-settings-panel-bLNvz93c.js} +1 -1
- package/dist/gateway/static/root/assets/{appearance-settings-C7nBHnkG.js → appearance-settings-D5qgIepF.js} +1 -1
- package/dist/gateway/static/root/assets/{apps-page-B_g-rL5b.js → apps-page-BQVlXhIb.js} +1 -1
- package/dist/gateway/static/root/assets/{archive-plugin-DfKK1iJO.js → archive-plugin-BEA7VAA4.js} +1 -1
- package/dist/gateway/static/root/assets/{attachment-load-BOU1pdnQ.js → attachment-load-B1RyF3uu.js} +1 -1
- package/dist/gateway/static/root/assets/{automations-page-BePzexAH.js → automations-page-BfH0FdKa.js} +1 -1
- package/dist/gateway/static/root/assets/{automations-workspace-7-m5pBEZ.js → automations-workspace-C37AlD3E.js} +1 -1
- package/dist/gateway/static/root/assets/{binary-plugins-Cly8XDyt.js → binary-plugins-EU884ZXi.js} +1 -1
- package/dist/gateway/static/root/assets/{block-editor-DzSu62js.js → block-editor-Bjr3naHb.js} +1 -1
- package/dist/gateway/static/root/assets/{browser-automation-inputs-8bHj7Fv2.js → browser-automation-inputs-s5I78Iko.js} +1 -1
- package/dist/gateway/static/root/assets/{browser-automations-page-CzL7Aj2k.js → browser-automations-page-CDrYrNGy.js} +1 -1
- package/dist/gateway/static/root/assets/{browser-settings-page-Dum3mTiz.js → browser-settings-page-DOmUkj2k.js} +1 -1
- package/dist/gateway/static/root/assets/{capabilities-settings-panel-Ci6qVS-O.js → capabilities-settings-panel-slt1o04n.js} +2 -2
- package/dist/gateway/static/root/assets/{channels-settings-BOGEZnSv.js → channels-settings-oHTTX6Jy.js} +1 -1
- package/dist/gateway/static/root/assets/{channels-status-swr-BR8oQ_eP.js → channels-status-swr-_OsWr_vS.js} +1 -1
- package/dist/gateway/static/root/assets/{chat-terminal-dock-BF9ZXa5Z.js → chat-terminal-dock-DEYQdv6n.js} +1 -1
- package/dist/gateway/static/root/assets/{connectors-page-DBvEvupa.js → connectors-page-olrbxHIT.js} +1 -1
- package/dist/gateway/static/root/assets/{cron-expression-BszT_gjK.js → cron-expression-DFrbDWpP.js} +1 -1
- package/dist/gateway/static/root/assets/{date-picker-D2MKBJ0G.js → date-picker-CYriYKpH.js} +1 -1
- package/dist/gateway/static/root/assets/{dependency-picker-DqigBx-G.js → dependency-picker-XY3qUErs.js} +1 -1
- package/dist/gateway/static/root/assets/{desktop-pet-CapspBGG.js → desktop-pet-Dsc__ynA.js} +1 -1
- package/dist/gateway/static/root/assets/{desktop-pet-settings-DMPk4CaK.js → desktop-pet-settings-EpuX3C08.js} +1 -1
- package/dist/gateway/static/root/assets/{extension-debug-page-CXLsDtrW.js → extension-debug-page-B_NeLV4K.js} +1 -1
- package/dist/gateway/static/root/assets/{extension-page-B2j87ROw.js → extension-page-D3JC6mLB.js} +1 -1
- package/dist/gateway/static/root/assets/{extension-settings-page-t1BApw-u.js → extension-settings-page-CXTQt1lp.js} +1 -1
- package/dist/gateway/static/root/assets/{files-BArWTfr7.js → files-Be5viEFY.js} +1 -1
- package/dist/gateway/static/root/assets/{gateway-config-swr-BFSesvAC.js → gateway-config-swr-OObCK8jM.js} +1 -1
- package/dist/gateway/static/root/assets/{gateway-settings-BFAecoGy.js → gateway-settings-yeYm_UPE.js} +1 -1
- package/dist/gateway/static/root/assets/{gateway-startup-retry-D1giYgI-.js → gateway-startup-retry-D_TxKN_A.js} +1 -1
- package/dist/gateway/static/root/assets/{heartbeat-settings-CyD9zDcU.js → heartbeat-settings-coh1LFsg.js} +1 -1
- package/dist/gateway/static/root/assets/{home-page-uItZMiBE.js → home-page-CAgoBZqp.js} +1 -1
- package/dist/gateway/static/root/assets/{image-generation-api-BeB-OPqO.js → image-generation-api-fPU9yGsw.js} +1 -1
- package/dist/gateway/static/root/assets/index-Cn__9Un2.js +74 -0
- package/dist/gateway/static/root/assets/{keyboard-shortcuts-settings-Q_CM-ZCs.js → keyboard-shortcuts-settings-Cu1bI3Bg.js} +1 -1
- package/dist/gateway/static/root/assets/{local-app-workbench-page-DaiBWfOt.js → local-app-workbench-page-C9s2lFaI.js} +1 -1
- package/dist/gateway/static/root/assets/{local-apps-page-BALMNCSp.js → local-apps-page-CJ03Umjr.js} +1 -1
- package/dist/gateway/static/root/assets/{locale-store-RJHYFoq9.js → locale-store-DFQX9kTl.js} +1 -1
- package/dist/gateway/static/root/assets/{logs-page-C-TS7oFg.js → logs-page-CY_DQKJ2.js} +1 -1
- package/dist/gateway/static/root/assets/{management-settings-BajkJeYl.js → management-settings-YPEemeMo.js} +1 -1
- package/dist/gateway/static/root/assets/{markdown-view-BxoQJqHx.js → markdown-view-D-5jHRWg.js} +1 -1
- package/dist/gateway/static/root/assets/{media-plugins-C_8Hl6KG.js → media-plugins-BjT6jlrA.js} +1 -1
- package/dist/gateway/static/root/assets/{messages-Cf1h5WXB.js → messages-Dj8QuS6e.js} +2 -2
- package/dist/gateway/static/root/assets/{mobile-pairing-wizard-CsWIZrZW.js → mobile-pairing-wizard-A8eLtV6v.js} +1 -1
- package/dist/gateway/static/root/assets/{note-detail-panel-CCbPg_GP.js → note-detail-panel-DHT2QksJ.js} +3 -3
- package/dist/gateway/static/root/assets/{notes-page-BdxxcUKa.js → notes-page-BRFQiivM.js} +1 -1
- package/dist/gateway/static/root/assets/{page-tabs-BMYQef5D.js → page-tabs-DNUwulnl.js} +1 -1
- package/dist/gateway/static/root/assets/{preview-open-alternatives-CKZ-H5hJ.js → preview-open-alternatives-B33KsKkJ.js} +1 -1
- package/dist/gateway/static/root/assets/{product-delivery-CV4pDOtG.js → product-delivery-CCC4FJ3Y.js} +1 -1
- package/dist/gateway/static/root/assets/{product-open-page-zXJIptXs.js → product-open-page-CIGLPFm7.js} +1 -1
- package/dist/gateway/static/root/assets/{project-detail-page-DRhhxhZB.js → project-detail-page-CItEFVt9.js} +1 -1
- package/dist/gateway/static/root/assets/{projects-page-Wt7gF3Sx.js → projects-page-Bmy-c_lL.js} +1 -1
- package/dist/gateway/static/root/assets/{registry-api-BSfFaxVN.js → registry-api-CsZLatKo.js} +1 -1
- package/dist/gateway/static/root/assets/{remote-access-hub-B6de5Zrb.js → remote-access-hub-H6B1cA2V.js} +1 -1
- package/dist/gateway/static/root/assets/{runtime-tools-settings-panel-DcUB5h1f.js → runtime-tools-settings-panel-BsCovC39.js} +1 -1
- package/dist/gateway/static/root/assets/{schema-form-CquWhe7r.js → schema-form-NsPb_Vam.js} +1 -1
- package/dist/gateway/static/root/assets/{schemas-BHS7bo06.js → schemas-BaskVM5g.js} +2 -2
- package/dist/gateway/static/root/assets/{sessions-page-BNWO2EVF.js → sessions-page-CyYLSXk_.js} +1 -1
- package/dist/gateway/static/root/assets/settings-advanced-gate-3T4rPk4A.js +1 -0
- package/dist/gateway/static/root/assets/{settings-form-section-DwswAefc.js → settings-form-section-BzPIPe1-.js} +1 -1
- package/dist/gateway/static/root/assets/{settings-page-CoAVmjjs.js → settings-page-4idpMhsw.js} +1 -1
- package/dist/gateway/static/root/assets/{setup-status-panel-C9EIcWtH.js → setup-status-panel-D2ds_TTD.js} +1 -1
- package/dist/gateway/static/root/assets/{share-preview-page-DWwy_4zh.js → share-preview-page-Djo3VTaC.js} +1 -1
- package/dist/gateway/static/root/assets/{shares-settings-CIUvq27-.js → shares-settings-fhRzNfRp.js} +1 -1
- package/dist/gateway/static/root/assets/skill-reload-api-Ct8tUju_.js +1 -0
- package/dist/gateway/static/root/assets/{skills-page-CqsgVtVh.js → skills-page-riM7FytZ.js} +1 -1
- package/dist/gateway/static/root/assets/{skills-page.utils-B-N73248.js → skills-page.utils-B3G8LBb-.js} +1 -1
- package/dist/gateway/static/root/assets/{system-settings-panel-BndjXuBZ.js → system-settings-panel-CW91jjnB.js} +1 -1
- package/dist/gateway/static/root/assets/{task-detail-page-CG6Ha9t7.js → task-detail-page-BBXKvl0k.js} +1 -1
- package/dist/gateway/static/root/assets/{theme-store-C5ssn64t.js → theme-store-zRT6vaZc.js} +1 -1
- package/dist/gateway/static/root/assets/{tunnel-api-BxZdcp3h.js → tunnel-api-DILER0Yb.js} +1 -1
- package/dist/gateway/static/root/assets/{use-autosave-mj9CUuz1.js → use-autosave-GxnP8vLO.js} +1 -1
- package/dist/gateway/static/root/assets/{user-model-page-DKeHMXI4.js → user-model-page-I1H4XRfA.js} +1 -1
- package/dist/gateway/static/root/assets/{voice-api-key-field-CzxVMYlr.js → voice-api-key-field-CI3sXyl4.js} +1 -1
- package/dist/gateway/static/root/assets/{voice-config-api-COA0V1cK.js → voice-config-api-DpJEu2RQ.js} +1 -1
- package/dist/gateway/static/root/assets/{work-discovery-overlay-DMiPK8dp.js → work-discovery-overlay-DZC9Exn3.js} +1 -1
- package/dist/gateway/static/root/assets/{workflow-run-setup-panel-C82OXCJK.js → workflow-run-setup-panel-CaBaQER2.js} +1 -1
- package/dist/gateway/static/root/assets/{workflows-page-HLCUV3rQ.js → workflows-page-C-_Dxihw.js} +1 -1
- package/dist/gateway/static/root/index.html +12 -12
- package/dist/package.js +1 -1
- package/dist/packages/browser-control-contract/src/index.js +14 -0
- package/dist/packages/endpoint-tools-protocol/src/index.js +2 -1
- package/dist/packages/gateway-contract/src/browser-page-context.js +43 -0
- package/dist/packages/gateway-contract/src/browser-tab-binding.js +29 -0
- package/dist/packages/gateway-contract/src/device-pairing.js +18 -2
- package/dist/packages/realtime-protocol/src/index.js +1 -0
- package/dist/packages/realtime-protocol/src/voice-audio.js +70 -9
- package/dist/packages/realtime-protocol/src/voice.js +65 -17
- package/dist/src/agent/agent-manager.js +4 -4
- package/dist/src/agent/background-review/run-background-review.js +1 -1
- package/dist/src/agent/embedded/model-runtime.js +1 -1
- package/dist/src/agent/embedded/run-for-session.js +1 -1
- package/dist/src/agent/image/tool-model-config.js +1 -1
- package/dist/src/agent/mcp/oauth/mcp-oauth-store.js +1 -1
- package/dist/src/agent/service.js +2 -2
- package/dist/src/agent/session/session-inspector.js +1 -1
- package/dist/src/agent/skills/hub-lock.js +1 -1
- package/dist/src/agent/source-context/browser-page.d.ts +3 -0
- package/dist/src/agent/source-context/browser-page.js +39 -0
- package/dist/src/agent/source-context/injector.js +9 -2
- package/dist/src/agent/source-context/types.d.ts +7 -1
- package/dist/src/agent/source-context/types.js +4 -1
- package/dist/src/agent/tasks/task-judge-service.js +3 -3
- package/dist/src/agent/tools/factory.js +9 -1
- package/dist/src/ai-assist/text-assist.js +1 -1
- package/dist/src/auth/credentials.js +2 -2
- package/dist/src/auth/oauth/xopc-cloud.js +1 -1
- package/dist/src/auth/profiles/store.js +1 -1
- package/dist/src/auth/sync-provider-auth.js +2 -2
- package/dist/src/browser/automations/schema.d.ts +1 -1
- package/dist/src/browser/automations/service.d.ts +1 -1
- package/dist/src/browser/native-messaging-host.d.ts +15 -0
- package/dist/src/browser/native-messaging-host.js +105 -0
- package/dist/src/browser/providers/browser-ext-install.d.ts +17 -1
- package/dist/src/browser/providers/browser-ext-install.js +82 -16
- package/dist/src/browser/providers/extension.d.ts +4 -0
- package/dist/src/browser/providers/extension.js +104 -38
- package/dist/src/browser/runtime/browser-runtime.d.ts +2 -1
- package/dist/src/browser/runtime/browser-runtime.js +6 -2
- package/dist/src/cli/commands/browser.js +13 -3
- package/dist/src/cli/commands/doctor/checks/database-schema.js +1 -1
- package/dist/src/cli/commands/doctor/checks/provider-auth.js +1 -1
- package/dist/src/cli/commands/models.js +1 -1
- package/dist/src/config/index.js +4 -4
- package/dist/src/config/loader.js +2 -2
- package/dist/src/config/models-json.js +1 -1
- package/dist/src/endpoint-tools/runtime.js +2 -0
- package/dist/src/extensions/lockfile.js +1 -1
- package/dist/src/gateway/agents-admin.js +1 -1
- package/dist/src/gateway/chat-stream/mapper.js +3 -2
- package/dist/src/gateway/file-path-classifier.js +1 -1
- package/dist/src/gateway/hono/app.js +19 -3
- package/dist/src/gateway/hono/lib/config-payload.js +1 -1
- package/dist/src/gateway/hono/middleware/auth.d.ts +4 -1
- package/dist/src/gateway/hono/middleware/auth.js +12 -1
- package/dist/src/gateway/hono/routes/browser-install.js +1 -1
- package/dist/src/gateway/hono/routes/browser.js +106 -7
- package/dist/src/gateway/hono/routes/devices.js +36 -3
- package/dist/src/gateway/hono/routes/endpoint-tools.js +15 -0
- package/dist/src/gateway/hono/routes/models.js +1 -1
- package/dist/src/gateway/hono/routes/session-input-handler.d.ts +20 -2
- package/dist/src/gateway/hono/routes/session-input-handler.js +18 -0
- package/dist/src/gateway/hono/routes/sessions.js +12 -6
- package/dist/src/gateway/hono/routes/voice.js +5 -4
- package/dist/src/gateway/security/gateway-scopes.d.ts +1 -0
- package/dist/src/gateway/security/gateway-scopes.js +10 -1
- package/dist/src/gateway/security/origin-check.d.ts +1 -0
- package/dist/src/gateway/security/origin-check.js +5 -1
- package/dist/src/gateway/service/agent-runner.js +2 -1
- package/dist/src/gateway/service/config-coordinator.js +1 -1
- package/dist/src/gateway/service/session-input-coordinator.d.ts +1 -0
- package/dist/src/gateway/service/session-input-coordinator.js +5 -4
- package/dist/src/gateway/service.js +22 -21
- package/dist/src/providers/auth-runtime/resolve-auth.js +1 -1
- package/dist/src/providers/index.js +2 -2
- package/dist/src/providers/model-registry.js +1 -1
- package/dist/src/providers/register-runtime-providers.js +1 -1
- package/dist/src/realtime/runtime.js +2 -1
- package/dist/src/session/client-history.d.ts +4 -1
- package/dist/src/session/client-history.js +6 -3
- package/dist/src/storage/sqlite/browser-tab-binding-repository.d.ts +7 -0
- package/dist/src/storage/sqlite/browser-tab-binding-repository.js +60 -0
- package/dist/src/storage/sqlite/device-access-repository.d.ts +3 -1
- package/dist/src/storage/sqlite/device-access-repository.js +4 -3
- package/dist/src/storage/sqlite/device-pairing-approval.js +6 -4
- package/dist/src/storage/sqlite/device-pairing-repository.d.ts +1 -1
- package/dist/src/storage/sqlite/index.d.ts +1 -0
- package/dist/src/storage/sqlite/index.js +2 -1
- package/dist/src/storage/sqlite/migrations/155_browser_extension.sql +120 -0
- package/dist/src/storage/sqlite/migrations/156_browser_tab_bindings.sql +14 -0
- package/dist/src/storage/sqlite/migrations/runner.d.ts +1 -1
- package/dist/src/storage/sqlite/migrations/runner.js +3 -3
- package/dist/src/storage/sqlite/migrations/runner.ts +1 -1
- package/dist/src/storage/sqlite/schema.js +1 -1
- package/dist/src/tui/tui-startup-resources.js +1 -1
- package/dist/src/tui/tui.js +1 -1
- package/dist/src/voice/realtime/agentBroker.d.ts +54 -0
- package/dist/src/voice/realtime/agentBroker.js +116 -0
- package/dist/src/voice/realtime/agentEngine.js +62 -15
- package/dist/src/voice/realtime/engine.d.ts +2 -1
- package/dist/src/voice/realtime/omniEngine.js +36 -7
- package/dist/src/voice/realtime/pcmFrameBuffer.d.ts +6 -0
- package/dist/src/voice/realtime/pcmFrameBuffer.js +29 -0
- package/dist/src/voice/realtime/runtime.js +97 -21
- package/dist/src/voice/realtime/runtime.types.d.ts +5 -21
- package/dist/src/voice/realtime/turnPolicy.d.ts +36 -0
- package/dist/src/voice/realtime/turnPolicy.js +134 -0
- package/dist/src/work-discovery/service.js +1 -1
- package/dist/src/workflows/service/workflow-run-service.js +1 -1
- package/package.json +2 -2
- package/dist/browser-ext/dist/content.js +0 -191
- package/dist/browser-ext/dist/popup.js +0 -32
- package/dist/browser-ext/popup.html +0 -37
- package/dist/gateway/static/root/assets/index-DQtjs2x3.js +0 -74
- package/dist/gateway/static/root/assets/settings-advanced-gate-DK1yTYE4.js +0 -1
- package/dist/gateway/static/root/assets/skill-reload-api-DfE3zFVw.js +0 -1
- package/dist/src/voice/realtime/conversationTurn.d.ts +0 -20
- package/dist/src/voice/realtime/conversationTurn.js +0 -83
|
@@ -14,10 +14,14 @@ var BrowserRuntime = class {
|
|
|
14
14
|
this.evictExpiredSessions();
|
|
15
15
|
if (!this.options.getConfig().enabled) return failure("DRIVER_UNAVAILABLE", "Browser Control is disabled.");
|
|
16
16
|
if (signal?.aborted) return failure("ABORTED", "Operation was aborted.");
|
|
17
|
+
const effectiveInput = input.target ? input : {
|
|
18
|
+
...input,
|
|
19
|
+
target: this.options.resolveTarget?.(taskKey)
|
|
20
|
+
};
|
|
17
21
|
let session;
|
|
18
22
|
let driver;
|
|
19
23
|
try {
|
|
20
|
-
session = await this.resolveSession(taskKey,
|
|
24
|
+
session = await this.resolveSession(taskKey, effectiveInput.sessionId);
|
|
21
25
|
if (!session) return failure("SESSION_NOT_FOUND", "The browser session does not belong to this task.");
|
|
22
26
|
driver = await this.getDriver();
|
|
23
27
|
} catch (error) {
|
|
@@ -30,7 +34,7 @@ var BrowserRuntime = class {
|
|
|
30
34
|
});
|
|
31
35
|
let result;
|
|
32
36
|
try {
|
|
33
|
-
result = await this.dispatch(driver, session,
|
|
37
|
+
result = await this.dispatch(driver, session, effectiveInput, signal);
|
|
34
38
|
result = this.constrainResult(result);
|
|
35
39
|
} catch (error) {
|
|
36
40
|
result = failure("DRIVER_UNAVAILABLE", error instanceof Error ? error.message : String(error));
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { register } from "../registry.js";
|
|
2
2
|
import { Command } from "commander";
|
|
3
3
|
//#region src/cli/commands/browser.ts
|
|
4
|
-
function createBrowserCommand(
|
|
4
|
+
function createBrowserCommand(ctx) {
|
|
5
5
|
const command = new Command("browser").description("Browser Control v2 diagnostics and extension setup");
|
|
6
6
|
command.command("doctor").description("Check the configured browser driver").action(async () => {
|
|
7
7
|
const { doctorCli } = await import("./browser-cli-helpers.js");
|
|
@@ -13,8 +13,18 @@ function createBrowserCommand(_ctx) {
|
|
|
13
13
|
console.log(JSON.stringify(await browserExtDoctor(), null, 2));
|
|
14
14
|
});
|
|
15
15
|
extension.command("install").description("Install extension artifacts").action(async () => {
|
|
16
|
-
const { ensureBrowserExtensionArtifacts } = await import("../../browser/providers/browser-ext-install.js");
|
|
17
|
-
|
|
16
|
+
const { ensureBrowserExtensionArtifacts, installBrowserNativeMessagingHost } = await import("../../browser/providers/browser-ext-install.js");
|
|
17
|
+
const artifacts = await ensureBrowserExtensionArtifacts();
|
|
18
|
+
const nativeHost = await installBrowserNativeMessagingHost({ configPath: ctx.configPath });
|
|
19
|
+
console.log(JSON.stringify({
|
|
20
|
+
...artifacts,
|
|
21
|
+
nativeHost
|
|
22
|
+
}, null, 2));
|
|
23
|
+
});
|
|
24
|
+
extension.command("native-host").description("Run the Chrome native messaging bootstrap host").action(async () => {
|
|
25
|
+
process.env.XOPC_LOG_CONSOLE = "false";
|
|
26
|
+
const { runBrowserNativeMessagingHost } = await import("../../browser/native-messaging-host.js");
|
|
27
|
+
await runBrowserNativeMessagingHost(ctx.configPath);
|
|
18
28
|
});
|
|
19
29
|
return command;
|
|
20
30
|
}
|
|
@@ -52,7 +52,7 @@ async function checkDatabaseSchema(ctx) {
|
|
|
52
52
|
id: "database-schema",
|
|
53
53
|
label: "Database schema",
|
|
54
54
|
status: "pass",
|
|
55
|
-
message: `SQLite schema v${status.dbVersion} (current release
|
|
55
|
+
message: `SQLite schema v${status.dbVersion} (current release v156).`,
|
|
56
56
|
hints: []
|
|
57
57
|
};
|
|
58
58
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getAgentDefaultModelRef, init_schema, parseModelRef } from "../../../../config/schema.js";
|
|
2
|
-
import { init_loader, loadConfig } from "../../../../config/loader.js";
|
|
3
2
|
import { PROVIDER_ENV_MAP, getApiKeyFromEnv, init_env_keys } from "../../../../providers/env-keys.js";
|
|
3
|
+
import { init_loader, loadConfig } from "../../../../config/loader.js";
|
|
4
4
|
import { existsSync } from "node:fs";
|
|
5
5
|
//#region src/cli/commands/doctor/checks/provider-auth.ts
|
|
6
6
|
init_loader();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
|
|
2
|
-
import { loadConfig, saveConfig } from "../../config/loader.js";
|
|
3
2
|
import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
|
|
3
|
+
import { loadConfig, saveConfig } from "../../config/loader.js";
|
|
4
4
|
import { getAllModels, getAvailableModels, getConfiguredProviders, getProviderAuthState, getProviderDisplayName, init_providers, isProviderConfigured, providerSupportsApiKey, providerSupportsOAuth, resolveModel } from "../../providers/index.js";
|
|
5
5
|
import { formatExamples, register } from "../registry.js";
|
|
6
6
|
import { getContextWithOpts } from "../context.js";
|
package/dist/src/config/index.js
CHANGED
|
@@ -2,15 +2,15 @@ import { ENV_VARS, XOPC_DB_FILENAME, resolveHomeDir, resolveStateDir, resolveXop
|
|
|
2
2
|
import { TelegramAccountConfigSchema, TelegramConfigSchema, TelegramGroupConfigSchema, TelegramTopicConfigSchema } from "../../extensions/telegram/src/config-schema.js";
|
|
3
3
|
import { WeixinAccountConfigSchema, WeixinConfigSchema } from "../../extensions/weixin/src/config-schema.js";
|
|
4
4
|
import { AgentImageGenerationModelSchema, AgentModelRefSchema, AgentModelsSchema, AgentsConfigSchema, BindingMatchSchema, BindingRuleSchema, BindingsConfigSchema, BrowserConfigSchema, ChannelsConfigSchema, CommandsConfigSchema, ConfigSchema, ConnectorsConfigSchema, ExperimentalConfigSchema, ExtensionSecurityConfigSchema, ExtensionSlotsConfigSchema, ExtensionsConfigSchema, GatewayAuthRateLimitSchema, GatewayAuthSchema, GatewayBindModeSchema, GatewayChannelConnectDeferModeSchema, GatewayConfigSchema, GatewayModeSchema, GatewayRemoteSchema, GatewaySecuritySchema, GatewayTailscaleConsentSchema, GatewayTailscaleSchema, GatewayTlsSchema, GatewayTrustedProxySchema, GatewayWebchatConfigSchema, HeartbeatConfigSchema, McpConfigSchema, McpOAuthConfigSchema, McpServerSchema, MediaUnderstandingCapabilitiesSchema, MediaUnderstandingModelSchema, MessagesConfigSchema, ModelCatalogConfigSchema, ModelsDevConfigSchema, ProviderAuthConfigSchema, ProviderAzureConfigSchema, ProviderRequestOverridesSchema, ProvidersConfigSchema, RuntimeToolsConfigSchema, STTConfigSchema, STTFallbackConfigSchema, STTProviderConfigSchema, SearchProviderEntrySchema, SessionConfigSchema, SessionDmScopeSchema, SessionResetByTypeSchema, SessionResetConfigSchema, SessionResetModeSchema, SessionScopeSchema, SessionStorageConfigSchema, TTSConfigSchema, TTSEdgeConfigSchema, TTSFallbackConfigSchema, TTSModelOverridesConfigSchema, TTSProviderConfigSchema, TTSSummarizationConfigSchema, ToolsConfigSchema, ToolsMediaAudioConfigSchema, ToolsMediaConfigSchema, TuiConfigSchema, TunnelConfigSchema, TunnelConsentSchema, UpdateAutoConfigSchema, UpdateConfigSchema, VoiceConfigSchema, VoiceRefinementConfigSchema, WebSearchConfigSchema, WebToolsConfigSchema, WebsiteBlocklistSchema, WorkspaceConfigSchema, WorkspaceImportConfigSchema, getAgentDefaultImageGenerationModelConfig, getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "./schema.js";
|
|
5
|
-
import {
|
|
5
|
+
import { clearConfigValueCache, getAllowedCommands, getCacheStats, init_resolve_config_value, resolveConfigValue, resolveHeaders, testApiKeyResolution } from "./resolve-config-value.js";
|
|
6
6
|
import { expandWorkspacePathString, init_workspace_path, normalizeWorkspaceDir, resolveWorkspaceRoot } from "./workspace-path.js";
|
|
7
7
|
import { resolveDefaultAgentWorkspaceDir } from "./workspace-defaults.js";
|
|
8
8
|
import { resolveAgentDir as resolveAgentDir$1, resolveAgentHomeDir as resolveAgentHomeDir$1, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
|
|
9
|
-
import { extractProfileAgentId, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "./agent-profile.js";
|
|
10
9
|
import { FILENAMES, WORKSPACE_FILES, existsSync, hasBundledExtensionManifest, init_paths, resolveAgentAuthProfilesPath, resolveAgentDir, resolveAgentHomeDir, resolveAgentProfileDir, resolveAgentProfileMarkdownPath, resolveAuthProfilesPath, resolveBinDir, resolveBundledExtensionsDir, resolveBundledSkillsDir, resolveConfigPath, resolveCredentialsDir, resolveExtensionSdkPath, resolveExtensionsDir, resolveExtensionsLockPath, resolveInboxDir, resolveInboxMessagePath, resolveInboxPendingDir, resolveInboxProcessedDir, resolveLogPath, resolveLogsDir, resolveMcpOAuthPath, resolveModelsJsonPath, resolveNodeBinDir, resolveNodeBinPath, resolveNodeToolsDir, resolveNpmBinPath, resolveOAuthPath, resolvePidPath, resolveSkillPath, resolveSkillsCachePath, resolveSkillsDir, resolveSkillsLockPath, resolveSocketPath, resolveStatusPath, resolveToolsDir, resolveWorkspaceExtensionsDir, resolveWorkspaceFile, resolveWorkspaceStateDir, resolveWorkspaceStatePath, resolveXopcBinPath } from "./paths.js";
|
|
11
|
-
import { init_loader, loadConfig, saveConfig } from "./loader.js";
|
|
12
|
-
import { clearConfigValueCache, getAllowedCommands, getCacheStats, init_resolve_config_value, resolveConfigValue, resolveHeaders, testApiKeyResolution } from "./resolve-config-value.js";
|
|
13
10
|
import { CustomModelSchema, ImageGenerationCapabilitiesSchema, ImageGenerationModelSchema, ImageGenerationProviderSchema, ModelOverrideSchema, ModelsJsonSchema, OpenAICompatSchema, OpenAICompletionsCompatSchema, OpenAIResponsesCompatSchema, OpenRouterRoutingSchema, ProviderConfigSchema, VercelGatewayRoutingSchema, getDefaultModelValues, init_models_json, loadModelsJson, modelsJsonExists, saveModelsJson, validateModelsConfig } from "./models-json.js";
|
|
11
|
+
import { init_loader, loadConfig, saveConfig } from "./loader.js";
|
|
12
|
+
import { applyConfigOverrides, getConfigOverrides, resetConfigOverrides, setConfigOverride, unsetConfigOverride } from "./runtime-overrides.js";
|
|
13
|
+
import { extractProfileAgentId, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "./agent-profile.js";
|
|
14
14
|
import { canonicalizeConfiguredMcpServer, isKnownCliMcpTypeAlias, normalizeConfiguredMcpServers, resolveXopcMcpTransportAlias } from "./mcp-config-normalize.js";
|
|
15
15
|
import { formatThinkingLevels, listThinkingLevels, normalizeElevatedMode, normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel, thinkLevelToNumber } from "../agent/transcript/thinking-types.js";
|
|
16
16
|
import { getWorkspacePath } from "./workspace-path-helpers.js";
|
|
@@ -2,10 +2,10 @@ import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
|
|
|
2
2
|
import { createLogger } from "../utils/logger/index.js";
|
|
3
3
|
import { init_logger } from "../utils/logger.js";
|
|
4
4
|
import { ConfigSchema, init_schema } from "./schema.js";
|
|
5
|
-
import { init_paths, resolveConfigPath } from "./paths.js";
|
|
6
5
|
import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
|
|
7
|
-
import {
|
|
6
|
+
import { init_paths, resolveConfigPath } from "./paths.js";
|
|
8
7
|
import { init_resolution, setActivePlatformDiscovery } from "../platform/resolution.js";
|
|
8
|
+
import { assertChannelPluginConfigs, init_validate_channel_configs } from "./validate-channel-configs.js";
|
|
9
9
|
import { dirname } from "path";
|
|
10
10
|
import { existsSync, mkdirSync, promises, readFileSync } from "fs";
|
|
11
11
|
import { config } from "dotenv";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
|
|
2
|
-
import { init_paths, resolveModelsJsonPath } from "./paths.js";
|
|
3
2
|
import { init_write_file_atomic, writeTextAtomicSync } from "../infra/write-file-atomic.js";
|
|
3
|
+
import { init_paths, resolveModelsJsonPath } from "./paths.js";
|
|
4
4
|
import { existsSync, readFileSync } from "fs";
|
|
5
5
|
import { z } from "zod";
|
|
6
6
|
//#region src/config/models-json.ts
|
|
@@ -2,6 +2,7 @@ import { resolveStateDir } from "../config/paths-state.js";
|
|
|
2
2
|
import { createLogger } from "../utils/logger/index.js";
|
|
3
3
|
import { init_logger } from "../utils/logger.js";
|
|
4
4
|
import { deleteEndpointSessionBinding, getEndpointSessionBinding, setEndpointSessionBinding } from "../storage/sqlite/endpoint-session-binding-repository.js";
|
|
5
|
+
import { deleteBrowserTabBindingsByEndpoint } from "../storage/sqlite/browser-tab-binding-repository.js";
|
|
5
6
|
import { bindEndpointPrincipal, getEndpointPrincipal, touchEndpointPrincipal } from "../storage/sqlite/endpoint-principal-repository.js";
|
|
6
7
|
import { finishEndpointToolInvocationAudit, startEndpointToolInvocationAudit } from "../storage/sqlite/endpoint-tool-invocation-repository.js";
|
|
7
8
|
import "../storage/sqlite/index.js";
|
|
@@ -75,6 +76,7 @@ var EndpointToolRuntime = class {
|
|
|
75
76
|
remove(endpointId, connectionId) {
|
|
76
77
|
if (!this.registry.remove(endpointId, connectionId)) return;
|
|
77
78
|
this.invocations.failEndpoint(endpointId);
|
|
79
|
+
deleteBrowserTabBindingsByEndpoint(endpointId);
|
|
78
80
|
log.info({
|
|
79
81
|
endpointId,
|
|
80
82
|
connectionId
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createLogger } from "../utils/logger/index.js";
|
|
2
2
|
import { init_logger } from "../utils/logger.js";
|
|
3
|
-
import { init_paths, resolveExtensionsDir, resolveExtensionsLockPath } from "../config/paths.js";
|
|
4
3
|
import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
|
|
4
|
+
import { init_paths, resolveExtensionsDir, resolveExtensionsLockPath } from "../config/paths.js";
|
|
5
5
|
import { dirname, join } from "path";
|
|
6
6
|
import { existsSync } from "fs";
|
|
7
7
|
import { mkdir, readFile } from "fs/promises";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveAgentDir, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, resolveUserPath, validateAgentIdForNewAgent } from "../agent/agent-scope.js";
|
|
2
|
-
import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
|
|
3
2
|
import { WORKSPACE_FILES, init_paths } from "../config/paths.js";
|
|
3
|
+
import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
|
|
4
4
|
import { AGENT_PROFILE_MARKDOWN_SYSTEM_FILES, REQUIRED_AGENT_PROFILE_MARKDOWN_FILE_SET } from "../agent/context/workspace.js";
|
|
5
5
|
import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.js";
|
|
6
6
|
import { seedAgentProfileMarkdownFiles } from "../agent/context/workspace-seed.js";
|
|
@@ -56,7 +56,7 @@ var ChatStreamMapper = class {
|
|
|
56
56
|
status: event.status === "error" ? "error" : "complete",
|
|
57
57
|
...typeof event.message === "string" && event.message ? { message: event.message } : {}
|
|
58
58
|
})];
|
|
59
|
-
case "user_message": return [this.make("user_message", { message: userMessageFromEvent(event) })];
|
|
59
|
+
case "user_message": return [this.make("user_message", { message: userMessageFromEvent(event, this.opts.runId) })];
|
|
60
60
|
case "user_transcript": return [this.make("user_transcript", {
|
|
61
61
|
text: String(event.text ?? ""),
|
|
62
62
|
media: event.media
|
|
@@ -427,9 +427,10 @@ var ChatStreamMapper = class {
|
|
|
427
427
|
}
|
|
428
428
|
}
|
|
429
429
|
};
|
|
430
|
-
function userMessageFromEvent(event) {
|
|
430
|
+
function userMessageFromEvent(event, turnId) {
|
|
431
431
|
return {
|
|
432
432
|
role: "user",
|
|
433
|
+
turnId,
|
|
433
434
|
content: event.content ?? [],
|
|
434
435
|
attachments: event.media,
|
|
435
436
|
metadata: userMessageDisplayMetadata(event.metadata),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { init_paths_state, resolveStateDir } from "../config/paths-state.js";
|
|
2
2
|
import { init_agent_scope, resolveAgentProfileDir } from "../agent/agent-scope.js";
|
|
3
|
-
import { extractProfileAgentId } from "../config/agent-profile.js";
|
|
4
3
|
import { init_paths, resolveConfigPath, resolveSkillsDir } from "../config/paths.js";
|
|
4
|
+
import { extractProfileAgentId } from "../config/agent-profile.js";
|
|
5
5
|
import { isBareProfileMarkdownFileName, resolveProfileMarkdownPathIfBareName } from "../agent/tools/tool-paths.js";
|
|
6
6
|
import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.js";
|
|
7
7
|
import { basename, isAbsolute, resolve } from "node:path";
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createLogger } from "../../utils/logger/index.js";
|
|
2
2
|
import { init_logger } from "../../utils/logger.js";
|
|
3
|
+
import { listDevices } from "../../storage/sqlite/device-access-repository.js";
|
|
3
4
|
import { resolveAllowedBrowserOrigins, resolveGatewayServiceListenPort } from "../host.js";
|
|
4
5
|
import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
|
|
5
6
|
import { loadTunnelState } from "../../tunnel/tunnel-state.js";
|
|
@@ -7,7 +8,7 @@ import { resolveReverseProxyPublicUrl } from "../public-url.js";
|
|
|
7
8
|
import { maxSessionInputRequestBodyBytes } from "../chat-limits.js";
|
|
8
9
|
import { isLoopbackIpAddress, isTrustedProxyAddress } from "../client-ip.js";
|
|
9
10
|
import { buildGatewayConsoleCspHeader } from "../security/csp.js";
|
|
10
|
-
import { checkBrowserOrigin } from "../security/origin-check.js";
|
|
11
|
+
import { checkBrowserOrigin, isChromeExtensionOrigin } from "../security/origin-check.js";
|
|
11
12
|
import { auth } from "./middleware/auth.js";
|
|
12
13
|
import { gatewayScopes } from "./middleware/scopes.js";
|
|
13
14
|
import { createChannelRateLimitMiddleware, createChatRateLimitMiddleware, createMediaRateLimitMiddleware, createStrictRateLimitMiddleware, createTaskRateLimitMiddleware, createXopcCloudPollRateLimitMiddleware } from "./middleware/strict-rate-limit.js";
|
|
@@ -52,6 +53,19 @@ function createHonoApp(config) {
|
|
|
52
53
|
tunnelPublicUrl: loadTunnelState()?.publicUrl,
|
|
53
54
|
reverseProxyPublicUrl: resolveReverseProxyPublicUrl(service.currentConfig)
|
|
54
55
|
});
|
|
56
|
+
let loggedUnavailableDeviceStore = false;
|
|
57
|
+
const resolvePairedBrowserExtensionOrigins = () => {
|
|
58
|
+
try {
|
|
59
|
+
return listDevices().filter((device) => device.platform === "chrome" && !device.revokedAt && device.extensionId).map((device) => `chrome-extension://${device.extensionId}`);
|
|
60
|
+
} catch (cause) {
|
|
61
|
+
if (!loggedUnavailableDeviceStore) {
|
|
62
|
+
loggedUnavailableDeviceStore = true;
|
|
63
|
+
log.warn({ err: cause }, "Browser extension origins unavailable until the device store opens");
|
|
64
|
+
}
|
|
65
|
+
return [];
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
const resolveAllBrowserOrigins = () => [...resolveBrowserOrigins(), ...resolvePairedBrowserExtensionOrigins()];
|
|
55
69
|
/**
|
|
56
70
|
* TCP source for the in-flight request, normalized for trusted-proxy checks.
|
|
57
71
|
* Returns undefined when the runtime doesn't expose conninfo (tests, mocks).
|
|
@@ -84,9 +98,10 @@ function createHonoApp(config) {
|
|
|
84
98
|
registerSiteShareMiddleware(app, service);
|
|
85
99
|
app.use(cors({
|
|
86
100
|
origin: (origin) => {
|
|
87
|
-
const allowed =
|
|
101
|
+
const allowed = resolveAllBrowserOrigins();
|
|
88
102
|
if (!origin) return allowed[0] ?? `http://127.0.0.1:${gatewayPort}`;
|
|
89
103
|
const normalized = origin.toLowerCase();
|
|
104
|
+
if (isChromeExtensionOrigin(normalized)) return origin;
|
|
90
105
|
if (allowed.find((entry) => entry.toLowerCase() === normalized)) return origin;
|
|
91
106
|
return allowed.includes("*") ? "*" : "";
|
|
92
107
|
},
|
|
@@ -123,10 +138,11 @@ function createHonoApp(config) {
|
|
|
123
138
|
if (isExtensionGatewayUiAssetPath(c.req.path)) return next();
|
|
124
139
|
const origin = c.req.header("origin");
|
|
125
140
|
if (!origin || origin.trim().toLowerCase() === "null") return next();
|
|
141
|
+
if (isChromeExtensionOrigin(origin) && (c.req.path.startsWith("/api/device-pairing/") || c.req.path === "/api/device-auth/refresh")) return next();
|
|
126
142
|
const result = checkBrowserOrigin({
|
|
127
143
|
requestHost: c.req.header("host"),
|
|
128
144
|
origin,
|
|
129
|
-
allowedOrigins:
|
|
145
|
+
allowedOrigins: resolveAllBrowserOrigins(),
|
|
130
146
|
allowHostHeaderOriginFallback,
|
|
131
147
|
autoAllowSameHostFromTrustedProxy: isRequestFromTrustedProxy(c),
|
|
132
148
|
isLocalClient: false
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { ContextPlanningConfigSchema, KnowledgeMemoryConfigSchema, UserModelConfigSchema, init_config } from "../../../user-context/config.js";
|
|
2
2
|
import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
|
|
3
3
|
import { resolveModelsJsonPath } from "../../../config/paths.js";
|
|
4
|
-
import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus, init_channel_catalog_service } from "../../../channels/catalog/channel-catalog-service.js";
|
|
5
4
|
import { init_models_json, loadModelsJson } from "../../../config/models-json.js";
|
|
6
5
|
import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
|
|
6
|
+
import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus, init_channel_catalog_service } from "../../../channels/catalog/channel-catalog-service.js";
|
|
7
7
|
import { getProviderRegistry, init_plugin_registry } from "../../../providers/plugin-registry.js";
|
|
8
8
|
import { getAllProviders, init_providers, isProviderConfigured } from "../../../providers/index.js";
|
|
9
9
|
import { normalizeConfiguredMcpServers } from "../../../config/mcp-config-normalize.js";
|
|
@@ -19,4 +19,7 @@ export declare function auth(config?: AuthConfig): import("hono").MiddlewareHand
|
|
|
19
19
|
}, 429, "json">) | (Response & import("hono").TypedResponse<{
|
|
20
20
|
error: string;
|
|
21
21
|
code: string;
|
|
22
|
-
}, 401, "json">)
|
|
22
|
+
}, 401, "json">) | (Response & import("hono").TypedResponse<{
|
|
23
|
+
error: string;
|
|
24
|
+
code: string;
|
|
25
|
+
}, 403, "json">)>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { logAuthEvent } from "../../../utils/logger/audit.js";
|
|
2
2
|
import { createLogger } from "../../../utils/logger/index.js";
|
|
3
3
|
import { init_logger } from "../../../utils/logger.js";
|
|
4
|
-
import { authenticateDeviceAccessToken } from "../../../storage/sqlite/device-access-repository.js";
|
|
4
|
+
import { authenticateDeviceAccessToken, getDevice } from "../../../storage/sqlite/device-access-repository.js";
|
|
5
5
|
import { safeEqualSecret } from "../../security/secret-equal.js";
|
|
6
6
|
import { resolveClientIpFromRequest } from "../../client-ip.js";
|
|
7
7
|
import { authPolicyConfig, buckets, resolveAuthRateLimit } from "../../rate-limit/buckets.js";
|
|
@@ -9,6 +9,7 @@ import { getClientIpFromHeaders } from "../../security/loopback.js";
|
|
|
9
9
|
import { resolveAuthTracking } from "../../rate-limit/auth-policy.js";
|
|
10
10
|
import { isAuthRateLimitGloballyDisabled } from "../../rate-limit/env-flags.js";
|
|
11
11
|
import "../../rate-limit/index.js";
|
|
12
|
+
import { isChromeExtensionOrigin } from "../../security/origin-check.js";
|
|
12
13
|
import { authorizeTrustedProxy } from "../../trusted-proxy.js";
|
|
13
14
|
import { setGatewayPrincipal } from "../../security/gateway-principal.js";
|
|
14
15
|
import { createMiddleware } from "hono/factory";
|
|
@@ -208,7 +209,12 @@ function auth(config) {
|
|
|
208
209
|
clientIp
|
|
209
210
|
}, "Credential in query string rejected: use Authorization header for this endpoint");
|
|
210
211
|
const providedCredential = authHeader || queryToken;
|
|
212
|
+
const browserExtensionOrigin = isChromeExtensionOrigin(origin) ? origin.toLowerCase() : void 0;
|
|
211
213
|
if (providedCredential && validateCredential(providedCredential, expectedCredential)) {
|
|
214
|
+
if (browserExtensionOrigin) return c.json({
|
|
215
|
+
error: "Forbidden",
|
|
216
|
+
code: "device_credential_required"
|
|
217
|
+
}, 403);
|
|
212
218
|
recordSuccess(rl);
|
|
213
219
|
setGatewayPrincipal(c, {
|
|
214
220
|
kind: "owner",
|
|
@@ -220,6 +226,11 @@ function auth(config) {
|
|
|
220
226
|
}
|
|
221
227
|
const deviceIdentity = providedCredential?.startsWith("xopc_at_") ? authenticateDeviceAccessToken(providedCredential) : void 0;
|
|
222
228
|
if (deviceIdentity) {
|
|
229
|
+
const device = getDevice(deviceIdentity.deviceId);
|
|
230
|
+
if (browserExtensionOrigin && (device?.platform !== "chrome" || `chrome-extension://${device.extensionId}` !== browserExtensionOrigin)) return c.json({
|
|
231
|
+
error: "Forbidden",
|
|
232
|
+
code: "extension_origin_mismatch"
|
|
233
|
+
}, 403);
|
|
223
234
|
recordSuccess(rl);
|
|
224
235
|
setGatewayPrincipal(c, {
|
|
225
236
|
kind: "device",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createGatewayRouteLogger } from "../lib/route-logger.js";
|
|
2
1
|
import { acquireBrowserInstallLock, cancelBrowserInstall } from "../../../browser/install-lock.js";
|
|
2
|
+
import { createGatewayRouteLogger } from "../lib/route-logger.js";
|
|
3
3
|
import { runPlaywrightChromiumInstallWithProgress } from "../../../browser/providers/playwright-install.js";
|
|
4
4
|
import { streamSSE } from "hono/streaming";
|
|
5
5
|
//#region src/gateway/hono/routes/browser-install.ts
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
+
import { deleteBrowserTabBinding, getBrowserTabBinding, setBrowserTabBinding } from "../../../storage/sqlite/browser-tab-binding-repository.js";
|
|
2
|
+
import { browserTabBindingRequestSchema } from "../../../../packages/gateway-contract/src/browser-tab-binding.js";
|
|
3
|
+
import { getDevice } from "../../../storage/sqlite/device-access-repository.js";
|
|
1
4
|
import { decideBrowserApproval, listBrowserApprovals } from "../../../browser/policy/approval-store.js";
|
|
2
5
|
import { createBrowserDriver } from "../../../browser/drivers/create-driver.js";
|
|
3
6
|
import { checkBrowserReadiness } from "../../../browser/readiness.js";
|
|
4
7
|
import { isLoopbackClientIp } from "../../security/loopback.js";
|
|
8
|
+
import { getGatewayPrincipal } from "../../security/gateway-principal.js";
|
|
5
9
|
import { getConnInfo } from "@hono/node-server/conninfo";
|
|
6
10
|
//#region src/gateway/hono/routes/browser.ts
|
|
7
11
|
/** Browser Control status, approvals, and driver diagnostics. */
|
|
@@ -48,6 +52,8 @@ async function extensionStatus() {
|
|
|
48
52
|
};
|
|
49
53
|
}
|
|
50
54
|
function isLocalOwnerRequest(c, service) {
|
|
55
|
+
const principal = getGatewayPrincipal(c);
|
|
56
|
+
if (principal.kind !== "owner" && principal.kind !== "trusted-proxy") return false;
|
|
51
57
|
if (service.currentConfig.gateway?.bind === "loopback") return true;
|
|
52
58
|
try {
|
|
53
59
|
return isLoopbackClientIp(getConnInfo(c).remote.address);
|
|
@@ -55,8 +61,99 @@ function isLocalOwnerRequest(c, service) {
|
|
|
55
61
|
return false;
|
|
56
62
|
}
|
|
57
63
|
}
|
|
64
|
+
function chromeDevicePrincipal(c) {
|
|
65
|
+
const principal = getGatewayPrincipal(c);
|
|
66
|
+
if (principal.kind !== "device" || !principal.deviceId) return void 0;
|
|
67
|
+
const device = getDevice(principal.deviceId);
|
|
68
|
+
return device?.platform === "chrome" && device.revokedAt === void 0 ? principal : void 0;
|
|
69
|
+
}
|
|
70
|
+
function canManageBrowserSession(c, service, sessionKey) {
|
|
71
|
+
const principal = chromeDevicePrincipal(c);
|
|
72
|
+
if (principal) return getBrowserTabBinding(sessionKey)?.principalId === principal.deviceId;
|
|
73
|
+
return isLocalOwnerRequest(c, service);
|
|
74
|
+
}
|
|
58
75
|
function registerBrowserRoutes(authenticated, deps) {
|
|
59
76
|
const { service, strictRateLimitMiddleware } = deps;
|
|
77
|
+
authenticated.get("/api/browser/tab-bindings/:sessionKey", (c) => {
|
|
78
|
+
const sessionKey = c.req.param("sessionKey").trim();
|
|
79
|
+
const binding = getBrowserTabBinding(sessionKey);
|
|
80
|
+
if (!binding) return c.json({
|
|
81
|
+
ok: false,
|
|
82
|
+
error: {
|
|
83
|
+
code: "NOT_FOUND",
|
|
84
|
+
message: "Tab binding not found"
|
|
85
|
+
}
|
|
86
|
+
}, 404);
|
|
87
|
+
if (!canManageBrowserSession(c, service, sessionKey)) return c.json({
|
|
88
|
+
ok: false,
|
|
89
|
+
error: {
|
|
90
|
+
code: "FORBIDDEN",
|
|
91
|
+
message: "Tab binding belongs to another device"
|
|
92
|
+
}
|
|
93
|
+
}, 403);
|
|
94
|
+
return c.json({
|
|
95
|
+
ok: true,
|
|
96
|
+
payload: binding
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
authenticated.put("/api/browser/tab-bindings/:sessionKey", async (c) => {
|
|
100
|
+
const principal = chromeDevicePrincipal(c);
|
|
101
|
+
if (!principal?.deviceId) return c.json({
|
|
102
|
+
ok: false,
|
|
103
|
+
error: {
|
|
104
|
+
code: "FORBIDDEN",
|
|
105
|
+
message: "Chrome device access required"
|
|
106
|
+
}
|
|
107
|
+
}, 403);
|
|
108
|
+
const parsed = browserTabBindingRequestSchema.safeParse(await c.req.json().catch(() => null));
|
|
109
|
+
if (!parsed.success) return c.json({
|
|
110
|
+
ok: false,
|
|
111
|
+
error: {
|
|
112
|
+
code: "BAD_REQUEST",
|
|
113
|
+
message: "Invalid tab binding"
|
|
114
|
+
}
|
|
115
|
+
}, 400);
|
|
116
|
+
const endpoint = service.endpointTools.registry.get(parsed.data.endpointId);
|
|
117
|
+
if (!service.endpointTools.registry.verifyTurnClaim(parsed.data.endpointId, parsed.data.turnToken) || endpoint?.kind !== "browser" || endpoint.principalId !== principal.deviceId) return c.json({
|
|
118
|
+
ok: false,
|
|
119
|
+
error: {
|
|
120
|
+
code: "INVALID_ENDPOINT",
|
|
121
|
+
message: "Browser endpoint is not active"
|
|
122
|
+
}
|
|
123
|
+
}, 401);
|
|
124
|
+
const sessionKey = c.req.param("sessionKey").trim();
|
|
125
|
+
if (!sessionKey || !await service.sessions.getSession(sessionKey)) return c.json({
|
|
126
|
+
ok: false,
|
|
127
|
+
error: {
|
|
128
|
+
code: "NOT_FOUND",
|
|
129
|
+
message: "Session not found"
|
|
130
|
+
}
|
|
131
|
+
}, 404);
|
|
132
|
+
const { turnToken: _turnToken, ...bindingInput } = parsed.data;
|
|
133
|
+
const binding = setBrowserTabBinding({
|
|
134
|
+
...bindingInput,
|
|
135
|
+
sessionKey,
|
|
136
|
+
principalId: principal.deviceId
|
|
137
|
+
});
|
|
138
|
+
return c.json({
|
|
139
|
+
ok: true,
|
|
140
|
+
payload: binding
|
|
141
|
+
});
|
|
142
|
+
});
|
|
143
|
+
authenticated.delete("/api/browser/tab-bindings/:sessionKey", (c) => {
|
|
144
|
+
const sessionKey = c.req.param("sessionKey").trim();
|
|
145
|
+
if (!canManageBrowserSession(c, service, sessionKey)) return c.json({
|
|
146
|
+
ok: false,
|
|
147
|
+
error: {
|
|
148
|
+
code: "FORBIDDEN",
|
|
149
|
+
message: "Tab binding belongs to another device"
|
|
150
|
+
}
|
|
151
|
+
}, 403);
|
|
152
|
+
return c.json({
|
|
153
|
+
ok: true,
|
|
154
|
+
payload: { removed: deleteBrowserTabBinding(sessionKey) }
|
|
155
|
+
});
|
|
156
|
+
});
|
|
60
157
|
authenticated.get("/api/browser/extension-status", async (c) => {
|
|
61
158
|
try {
|
|
62
159
|
return c.json(await extensionStatus());
|
|
@@ -169,33 +266,35 @@ function registerBrowserRoutes(authenticated, deps) {
|
|
|
169
266
|
}
|
|
170
267
|
});
|
|
171
268
|
authenticated.get("/api/browser/approvals", (c) => {
|
|
172
|
-
|
|
269
|
+
const sessionKey = c.req.query("sessionKey");
|
|
270
|
+
if (!isLocalOwnerRequest(c, service) && (!sessionKey || !canManageBrowserSession(c, service, sessionKey))) return c.json({
|
|
173
271
|
ok: false,
|
|
174
272
|
error: "Local owner access required."
|
|
175
273
|
}, 403);
|
|
176
274
|
return c.json({
|
|
177
275
|
ok: true,
|
|
178
|
-
approvals: listBrowserApprovals(
|
|
276
|
+
approvals: listBrowserApprovals(sessionKey)
|
|
179
277
|
});
|
|
180
278
|
});
|
|
181
279
|
authenticated.post("/api/browser/approvals/respond", strictRateLimitMiddleware, async (c) => {
|
|
182
|
-
|
|
280
|
+
const body = await c.req.json().catch(() => null);
|
|
281
|
+
const approval = typeof body?.id === "string" ? listBrowserApprovals().find((candidate) => candidate.id === body.id) : void 0;
|
|
282
|
+
if (!isLocalOwnerRequest(c, service) && (!approval || !canManageBrowserSession(c, service, approval.sessionKey))) return c.json({
|
|
183
283
|
ok: false,
|
|
184
284
|
error: "Local owner access required."
|
|
185
285
|
}, 403);
|
|
186
|
-
const body = await c.req.json().catch(() => null);
|
|
187
286
|
if (typeof body?.id !== "string" || body.decision !== "approved" && body.decision !== "denied") return c.json({
|
|
188
287
|
ok: false,
|
|
189
288
|
error: "id and decision are required."
|
|
190
289
|
}, 400);
|
|
191
|
-
const
|
|
192
|
-
if (!
|
|
290
|
+
const decided = decideBrowserApproval(body.id, body.decision);
|
|
291
|
+
if (!decided) return c.json({
|
|
193
292
|
ok: false,
|
|
194
293
|
error: "Approval not found."
|
|
195
294
|
}, 404);
|
|
196
295
|
return c.json({
|
|
197
296
|
ok: true,
|
|
198
|
-
approval
|
|
297
|
+
approval: decided
|
|
199
298
|
});
|
|
200
299
|
});
|
|
201
300
|
authenticated.get("/api/browser/playwright/doctor", async (c) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { runSqliteWriteTransaction } from "../../../storage/sqlite/transaction.js";
|
|
2
|
-
import { DEFAULT_MOBILE_SCOPES } from "../../security/gateway-scopes.js";
|
|
2
|
+
import { DEFAULT_BROWSER_EXTENSION_SCOPES, DEFAULT_MOBILE_SCOPES } from "../../security/gateway-scopes.js";
|
|
3
3
|
import { createDevice, issueDeviceTokenPair, listDevices, revokeDevice, rotateDeviceRefreshToken } from "../../../storage/sqlite/device-access-repository.js";
|
|
4
4
|
import { getGatewayIdentityPublicKeyRaw, getOrCreateGatewayIdentity, signGatewayPayload } from "../../../storage/sqlite/gateway-identity-repository.js";
|
|
5
5
|
import { consumeDevicePairingToken, createDevicePairingSetup, isDevicePairingSetupActive } from "../../../storage/sqlite/device-pairing-repository.js";
|
|
@@ -21,7 +21,12 @@ const pairingExchangeSchema = z.strictObject({
|
|
|
21
21
|
pairingToken: z.string().min(1).max(256),
|
|
22
22
|
device: z.strictObject({
|
|
23
23
|
displayName: z.string().trim().min(1).max(80),
|
|
24
|
-
platform: z.enum([
|
|
24
|
+
platform: z.enum([
|
|
25
|
+
"ios",
|
|
26
|
+
"android",
|
|
27
|
+
"chrome"
|
|
28
|
+
]),
|
|
29
|
+
extensionId: z.string().regex(/^[a-p]{32}$/).optional(),
|
|
25
30
|
publicKeyJwk: z.strictObject({
|
|
26
31
|
kty: z.literal("EC"),
|
|
27
32
|
crv: z.literal("P-256"),
|
|
@@ -29,6 +34,17 @@ const pairingExchangeSchema = z.strictObject({
|
|
|
29
34
|
y: z.string().min(40).max(64)
|
|
30
35
|
})
|
|
31
36
|
})
|
|
37
|
+
}).superRefine((value, context) => {
|
|
38
|
+
if (value.device.platform === "chrome" && !value.device.extensionId) context.addIssue({
|
|
39
|
+
code: "custom",
|
|
40
|
+
path: ["device", "extensionId"],
|
|
41
|
+
message: "Chrome devices require an extension id"
|
|
42
|
+
});
|
|
43
|
+
if (value.device.platform !== "chrome" && value.device.extensionId) context.addIssue({
|
|
44
|
+
code: "custom",
|
|
45
|
+
path: ["device", "extensionId"],
|
|
46
|
+
message: "Only Chrome devices may set an extension id"
|
|
47
|
+
});
|
|
32
48
|
});
|
|
33
49
|
const pairingProbeSchema = z.strictObject({ pairingId: z.string().uuid() });
|
|
34
50
|
function pairingLinkPayload(input) {
|
|
@@ -100,7 +116,8 @@ function registerDeviceAuthPublicRoutes(app) {
|
|
|
100
116
|
displayName: parsed.data.device.displayName,
|
|
101
117
|
platform: parsed.data.device.platform,
|
|
102
118
|
publicKeyJwk: parsed.data.device.publicKeyJwk,
|
|
103
|
-
|
|
119
|
+
extensionId: parsed.data.device.extensionId,
|
|
120
|
+
scopes: parsed.data.device.platform === "chrome" ? DEFAULT_BROWSER_EXTENSION_SCOPES : DEFAULT_MOBILE_SCOPES
|
|
104
121
|
});
|
|
105
122
|
return {
|
|
106
123
|
success: true,
|
|
@@ -207,6 +224,22 @@ function registerDeviceRoutes(authenticated, deps) {
|
|
|
207
224
|
}
|
|
208
225
|
}, 404);
|
|
209
226
|
});
|
|
227
|
+
authenticated.delete("/api/devices/me", (c) => {
|
|
228
|
+
const principal = getGatewayPrincipal(c);
|
|
229
|
+
if (principal.kind !== "device" || !principal.deviceId) return c.json({
|
|
230
|
+
ok: false,
|
|
231
|
+
error: {
|
|
232
|
+
code: "DEVICE_REQUIRED",
|
|
233
|
+
message: "Device access required"
|
|
234
|
+
}
|
|
235
|
+
}, 403);
|
|
236
|
+
const revoked = revokeDevice(principal.deviceId);
|
|
237
|
+
if (revoked) deps.service.realtime.disconnectPrincipal(principal.deviceId);
|
|
238
|
+
return c.json({
|
|
239
|
+
ok: true,
|
|
240
|
+
revoked
|
|
241
|
+
});
|
|
242
|
+
});
|
|
210
243
|
authenticated.delete("/api/devices/:deviceId", (c) => {
|
|
211
244
|
const deviceId = c.req.param("deviceId");
|
|
212
245
|
const revoked = revokeDevice(deviceId);
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { getDevice } from "../../../storage/sqlite/device-access-repository.js";
|
|
1
2
|
import { endpointPrincipalRegistrationSchema, endpointSessionBindingRequestSchema } from "../../../../packages/endpoint-tools-protocol/src/index.js";
|
|
2
3
|
import { createEndpointPrincipal, getEndpointPrincipal, listEndpointPrincipals, revokeEndpointPrincipal } from "../../../storage/sqlite/endpoint-principal-repository.js";
|
|
3
4
|
import { listEndpointToolInvocationAudits } from "../../../storage/sqlite/endpoint-tool-invocation-repository.js";
|
|
4
5
|
import "../../../storage/sqlite/index.js";
|
|
5
6
|
import { parseEndpointPublicKey } from "../../../endpoint-tools/auth.js";
|
|
6
7
|
import { ENDPOINT_UPLOAD_MAX_BYTES, EndpointUploadError } from "../../../endpoint-tools/upload-service.js";
|
|
8
|
+
import { getGatewayPrincipal } from "../../security/gateway-principal.js";
|
|
7
9
|
//#region src/gateway/hono/routes/endpoint-tools.ts
|
|
8
10
|
async function readBoundedBody(body, maxBytes) {
|
|
9
11
|
if (!body) return new Uint8Array();
|
|
@@ -54,6 +56,19 @@ function registerEndpointToolRoutes(authenticated, deps) {
|
|
|
54
56
|
message: "Invalid endpoint principal"
|
|
55
57
|
}
|
|
56
58
|
}, 400);
|
|
59
|
+
const gatewayPrincipal = getGatewayPrincipal(c);
|
|
60
|
+
if (gatewayPrincipal.kind === "device") {
|
|
61
|
+
const device = gatewayPrincipal.deviceId ? getDevice(gatewayPrincipal.deviceId) : void 0;
|
|
62
|
+
const ownsPrincipal = parsed.data.principalId === gatewayPrincipal.deviceId;
|
|
63
|
+
const compatibleKind = device?.platform === "chrome" ? parsed.data.kind === "browser" && parsed.data.platform === "chrome" : parsed.data.kind === "mobile";
|
|
64
|
+
if (!ownsPrincipal || !compatibleKind) return c.json({
|
|
65
|
+
ok: false,
|
|
66
|
+
error: {
|
|
67
|
+
code: "FORBIDDEN",
|
|
68
|
+
message: "Endpoint identity does not match this device"
|
|
69
|
+
}
|
|
70
|
+
}, 403);
|
|
71
|
+
}
|
|
57
72
|
try {
|
|
58
73
|
parseEndpointPublicKey(parsed.data.publicKey);
|
|
59
74
|
} catch {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { resolveModelsJsonPath } from "../../../config/paths.js";
|
|
2
1
|
import { init_resolve_config_value, testApiKeyResolution } from "../../../config/resolve-config-value.js";
|
|
2
|
+
import { resolveModelsJsonPath } from "../../../config/paths.js";
|
|
3
3
|
import { init_models_json, loadModelsJson, saveModelsJson, validateModelsConfig } from "../../../config/models-json.js";
|
|
4
4
|
import { getModelCatalogStore, init_model_catalog_store } from "../../../providers/model-catalog-store.js";
|
|
5
5
|
import { getModelRegistry } from "../../../providers/model-registry.js";
|