@anionex/dsh-computer-use 0.3.2 → 0.3.3

package/src/skill.ts

@@ -2,8 +2,14 @@
 
 import type { SkillRegistration } from '@deepseek-ai/dsh-skill'
 
-/** Stable Skill name used by progressive exposure and durable restore. */
-export const COMPUTER_USE_SKILL_NAME = 'computer-use'
+/** Namespaced entry avoids collisions with filesystem Skills in Agent presets. */
+export const COMPUTER_USE_SKILL_NAME = 'dsh-computer-use'
+/** Existing sessions and slash-command workflows continue to recognize this entry. */
+export const LEGACY_COMPUTER_USE_SKILL_NAME = 'computer-use'
+export const COMPUTER_USE_SKILL_NAMES: ReadonlySet<string> = new Set([
+  COMPUTER_USE_SKILL_NAME,
+  LEGACY_COMPUTER_USE_SKILL_NAME,
+])
 
 /** Complete model-visible operating and confirmation workflow. */
 export const COMPUTER_USE_SKILL_CONTENT = `# DSH Computer Use
@@ -127,3 +133,9 @@ export const COMPUTER_USE_SKILL: SkillRegistration = {
   source: 'runtime',
   content: COMPUTER_USE_SKILL_CONTENT,
 }
+
+/** Compatibility alias for existing Sessions; preset Skills may shadow it. */
+export const LEGACY_COMPUTER_USE_SKILL: SkillRegistration = {
+  ...COMPUTER_USE_SKILL,
+  name: LEGACY_COMPUTER_USE_SKILL_NAME,
+}

package/src/tools.ts

@@ -1,7 +1,8 @@
 /** Focused model-facing Computer Use Tool definitions. */
 
+import type { JsonValue } from '@deepseek-ai/dsh-util-values'
 import { createUserMessage, type ContentBlock } from '@deepseek-ai/dsh-llm'
-import { defineTool, type JsonValue, type ToolDefinition, type ToolRunContext, type ValueSchemaSpec } from '@deepseek-ai/dsh-tools'
+import { defineTool, type ToolDefinition, type ToolRunContext, type ValueSchemaSpec } from '@deepseek-ai/dsh-tools'
 import {
   ComputerConfirmationToken,
   ComputerObservationId,
@@ -38,7 +39,7 @@ function deferVisionHandoff(exec: ToolRunContext, artifact: ComputerArtifact | u
         'Do not inspect OCR executables or use bash, tesseract, screencapture, or an ad hoc Swift/Python OCR implementation.',
       ].join(' '),
     }],
-    source: { kind: 'plugin', plugin: 'dsh-computer-use' },
+    source: { kind: 'tool', callId: exec.callId },
   }))
 }
 

package/src/types.ts

@@ -2,7 +2,8 @@
 
 import type { Agent } from '@deepseek-ai/dsh-agent'
 import type { Branded } from '@deepseek-ai/dsh-brand'
-import type { CallId } from '@deepseek-ai/dsh-llm'
+import type { ToolRunContext } from '@deepseek-ai/dsh-tools'
+type CallId = ToolRunContext['callId']
 
 /** Opaque identifier for one immutable observed UI state. */
 export type ComputerObservationId = Branded<'ComputerObservationId'>

package/src/web.ts

@@ -6,6 +6,7 @@ import { SettingsConflictError, type SettingsDescriptor } from '@deepseek-ai/dsh
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import {
   COMPUTER_USE_SETTINGS_NAMESPACE,
+  resolveConfig,
   type ComputerUseConfig,
 } from './config.ts'
 import type { ComputerUseStatus } from './types.ts'
@@ -59,11 +60,17 @@ function requestError(res: ServerResponse, status: number, code: string, message
   responseJson(res, status, { ok: false, error: { code, message } })
 }
 
-function sameOriginPost(req: IncomingMessage): boolean {
+function sameOriginPost(req: IncomingMessage, authorizeUnmarkedPost?: (req: IncomingMessage) => boolean): boolean {
   const fetchSite = req.headers['sec-fetch-site']
   if (fetchSite === 'cross-site') return false
   const origin = req.headers.origin
-  if (origin === undefined) return fetchSite === 'same-origin' || fetchSite === 'same-site' || fetchSite === 'none'
+  if (origin === undefined) {
+    if (fetchSite === 'same-origin' || fetchSite === 'same-site' || fetchSite === 'none') return true
+    // Desktop strips browser origin metadata before forwarding, but injects a
+    // Host-issued signed cookie. Verify it through Connection's own fence;
+    // mere Cookie header presence is not authentication.
+    return fetchSite === undefined && authorizeUnmarkedPost?.(req) === true
+  }
   const host = req.headers.host
   if (host === undefined) return false
   try {
@@ -123,7 +130,10 @@ function isSettingsConflict(error: unknown): boolean {
 
 /** Same-origin backend used by the optional client Settings section. */
 export class ComputerUseWebBackend {
-  constructor(private readonly ctx: Context) {}
+  constructor(
+    private readonly ctx: Context,
+    private readonly authorizeUnmarkedPost?: (req: IncomingMessage) => boolean,
+  ) {}
 
   /** Current browser-safe Settings and health state. */
   snapshot(): ComputerUseSettingsSnapshot {
@@ -154,7 +164,7 @@ export class ComputerUseWebBackend {
       requestError(res, 405, 'method-not-allowed', 'Use GET or POST')
       return
     }
-    if (!sameOriginPost(req)) {
+    if (!sameOriginPost(req, this.authorizeUnmarkedPost)) {
       requestError(res, 403, 'origin-rejected', 'The request must originate from this DSH Web application')
       return
     }
@@ -167,6 +177,7 @@ export class ComputerUseWebBackend {
     try {
       if (parsed.action === 'save') {
         if (!this.ctx.settings.writable) throw new Error('settings provider is read-only')
+        resolveConfig(parsed.value)
         await this.ctx.settings.replace(COMPUTER_USE_SETTINGS_NAMESPACE, parsed.value as object, parsed.expectedRevision)
       } else if (parsed.action === 'health') {
         await this.ctx.computerUse.health(AbortSignal.timeout(30000))
@@ -184,8 +195,12 @@ export class ComputerUseWebBackend {
 
 /** Attach the optional route when a Web host is present. */
 export function installComputerUseWeb(ctx: Context): void {
-  const backend = new ComputerUseWebBackend(ctx)
-  ctx.inject(['webServer'], (webCtx) => {
+  ctx.inject(['webServer', 'connection'], (webCtx) => {
+    const connection = (webCtx as Context & {
+      connection?: { requestRejection?: (req: IncomingMessage) => 401 | 403 | undefined }
+    }).connection
+    const backend = new ComputerUseWebBackend(webCtx, (req) =>
+      typeof connection?.requestRejection === 'function' && connection.requestRejection(req) === undefined)
     webCtx.effect(() => webCtx.webServer.register({
       kind: 'exact',
       path: COMPUTER_USE_SETTINGS_ROUTE,