@logictan/dsh-desktop-agent 0.1.5 → 0.1.6

package/lib/client.js

@@ -14,7 +14,7 @@
  *
  * Two catalogs feed this card, and they are not interchangeable:
  *
- *  - The VISION list comes from this plugin's own loopback route
+ *  - The VISION list comes from this plugin's own same-origin route
  *    (`/api/dsh-desktop-agent/vision-models`). It has to: the host's
  *    `session.modelCatalog` does not carry `inputModalities` at all — its
  *    builder maps a fixed set of fields off the resolved model info and drops

package/lib/index.js

@@ -2,7 +2,7 @@
  * dsh-desktop-agent — host half.
  *
  * Registers one model-facing tool, `desktop_agent`, that runs a native-vision
- * decision loop against the host desktop, plus the loopback route the settings
+ * decision loop against the host desktop, plus the same-origin route the settings
  * card reads its model list from.
  *
  * The plugin owns no execution engine of its own. Every action is dispatched to
@@ -220,7 +220,7 @@ export async function apply(ctx, config, loadSdk) {
   ctx.inject(['webServer'], (scoped) => {
     scoped.effect(
       () => {
-        const disposers = makeRoutes({ llm }).map((route) => scoped.webServer.register(route));
+        const disposers = makeRoutes({ llm, connection: () => scoped.get('connection') }).map((route) => scoped.webServer.register(route));
         return () => {
           for (const dispose of disposers) dispose();
         };

package/lib/routes.js

@@ -1,5 +1,5 @@
 /**
- * The /api/dsh-desktop-agent route family: a loopback-only bridge that answers
+ * The /api/dsh-desktop-agent route family: a bridge that answers
  * one question the browser half cannot answer for itself.
  *
  * The settings card must list only models that can actually see, and the fact it
@@ -23,32 +23,33 @@ import { visionCatalog } from './route.js';
 export const VISION_MODELS_API = '/api/dsh-desktop-agent/vision-models';
 
 /**
- * Loopback literal check plus browser same-origin markers (mirrors the imagegen
- * bridge and dsh-ssh).
+ * Ask the composition whether one request may be served.
  *
+ * `connection.requestRejection` is the deployment's single trust fence: it
+ * applies the Host/Origin checks (loopback plus the LAN authorities the
+ * deployment declares) and the browser authentication that rides with them.
+ * This plugin answers with the verdict instead of re-deriving it, because the
+ * declared LAN authorities live in `connection`'s config and a local check
+ * cannot see them.
+ *
+ * A missing `connection` refuses rather than serves: these routes sit in front
+ * of Connection's `/api` prefix route, so serving them without its fence would
+ * serve them unfenced.
+ *
+ * @param connection - the composition's Connection service, when it is up.
  * @param request - the incoming request.
- * @returns whether the request may be served.
+ * @param response - the response, written to when the request is refused.
+ * @returns whether the request was refused.
  */
-function isLoopbackRequest(request) {
-  const address = request.socket.remoteAddress;
-  if (address !== '127.0.0.1' && address !== '::1' && address !== '::ffff:127.0.0.1') return false;
-  const host = request.headers.host;
-  if (typeof host !== 'string') return false;
-  let hostUrl;
-  try {
-    hostUrl = new URL(`http://${host}`);
-  } catch {
-    return false;
-  }
-  if (hostUrl.hostname !== '127.0.0.1' && hostUrl.hostname !== 'localhost' && hostUrl.hostname !== '[::1]') return false;
-  if (request.headers['sec-fetch-site'] === 'cross-site') return false;
-  const origin = request.headers.origin;
-  if (origin === undefined) return true;
-  try {
-    return new URL(origin).host === hostUrl.host;
-  } catch {
-    return false;
+function refuseUntrusted(connection, request, response) {
+  if (connection === undefined) {
+    writeJson(response, 403, { error: 'forbidden' });
+    return true;
   }
+  const rejection = connection.requestRejection(request);
+  if (rejection === undefined) return false;
+  writeJson(response, rejection, { error: rejection === 401 ? 'unauthorized' : 'forbidden' });
+  return true;
 }
 
 /** Write one JSON response. */
@@ -66,7 +67,11 @@ function writeJson(response, status, body) {
 /**
  * Build the route family.
  *
- * @param deps - the host's `ctx.llm` service.
+ * @param deps - the host dependencies.
+ * @param deps.llm - the host's `ctx.llm` service.
+ * @param deps.connection - resolves the composition's trust fence per request.
+ *   Resolved per call rather than captured: a composed row order does not imply
+ *   an activation order, so the service can still be absent when routes are built.
  * @returns the routes to register.
  */
 export function makeRoutes(deps) {
@@ -75,10 +80,7 @@ export function makeRoutes(deps) {
       kind: 'exact',
       path: VISION_MODELS_API,
       async handler(request, response) {
-        if (!isLoopbackRequest(request)) {
-          writeJson(response, 403, { error: 'loopback-only' });
-          return;
-        }
+        if (refuseUntrusted(deps.connection(), request, response)) return;
         if (request.method !== 'GET' && request.method !== 'POST') {
           writeJson(response, 405, { error: 'method-not-allowed' });
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logictan/dsh-desktop-agent",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "DSH desktop agent: a native-vision decision loop that drives the host desktop through the Cua Driver tools. DSH 桌面 Agent 子插件。",
   "type": "module",
   "main": "lib/index.js",
@@ -54,6 +54,7 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.5-alpha.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
     "@deepseek-ai/dsh-llm": "^0.1.5-alpha.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
     "@deepseek-ai/dsh-system-prompt": "^0.1.5-alpha.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
     "@deepseek-ai/dsh-mcp-client": "^0.1.5-alpha.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1 || ^0.1.7-rc.1 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
@@ -64,6 +65,9 @@
     "@deepseek-ai/cordis": {
       "optional": true
     },
+    "@deepseek-ai/dsh-client-connection": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-llm": {
       "optional": true
     },
@@ -85,6 +89,7 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-client-connection": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-llm": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-mcp-client": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-system-prompt": "^0.2.0-rc.2",