feat(DMY-59): open local workbench directly and auto-show devices

Author: HarveySang

packages/device-runtime/src/viewer.ts

@@ -17,7 +17,7 @@ interface Connection {
 }
 interface Viewer {
   id: string; token: string; owner: string; devices: readonly ViewerDevice[]
-  phase: Phase; deadline: number; established: boolean; ended: boolean
+  phase: Phase; openedAt: number; deadline: number; established: boolean; ended: boolean
   firstFrameMs?: number; error?: string; connections: Map<string, Connection>; pages: Set<ScrcpyStreamSink>; lastPage: number
   preparation?: Promise<void>; readyDevices: Set<string>
   nativeOrigins?: Set<string>
@@ -29,7 +29,7 @@ export class ViewerServer {
   private starting: Promise<void> | undefined
   private origin = ''
   private readonly embedOrigins = new Set<string>()
-  /** Only the host's own authenticated local workbench may embed this viewer. */
+  /** The local workbench may embed this viewer. */
   allowEmbedding(origin: string): void {
     const url = new URL(origin)
     if (url.protocol !== 'http:' || !['127.0.0.1', 'localhost', '[::1]'].includes(url.hostname) || url.origin !== origin) throw new Error('Invalid workbench origin')
@@ -69,13 +69,13 @@ export class ViewerServer {
     if (viewer && !this.same(viewer, devices)) throw new Error('device_frozen')
     if (!viewer) {
       if (this.viewers.size >= 100) throw new Error('viewer_capacity')
-      viewer = { id: randomUUID(), token: randomBytes(32).toString('base64url'), owner, devices: [...devices], phase: 'preparing', deadline: 0, established: false, ended: false, connections: new Map(), pages: new Set(), readyDevices: new Set(), lastPage: this.now() }
+      viewer = { id: randomUUID(), token: randomBytes(32).toString('base64url'), owner, devices: [...devices], phase: 'preparing', openedAt: this.now(), deadline: 0, established: false, ended: false, connections: new Map(), pages: new Set(), readyDevices: new Set(), lastPage: this.now() }
       this.viewers.set(viewer.id, viewer)
       const current = viewer
       viewer.preparation = (async () => { try {
         await this.streams.prepare(signal)
         await this.start()
-        current.deadline = this.now() + 30_000
+        current.deadline = owner.startsWith('workbench-preview:') ? 0 : this.now() + 30_000
         current.phase = 'waiting_for_frame'
       } catch (error) {
         current.phase = 'error'
@@ -195,7 +195,7 @@ export class ViewerServer {
             if (!v.error) {
               v.readyDevices.add(c.deviceId)
               if (v.devices.every(d => [...v.connections.values()].some(x => x.deviceId === d.id && x.media && this.now() - x.painted < 2000))) {
-                v.firstFrameMs ??= this.now() - (v.deadline - 30_000)
+                v.firstFrameMs ??= this.now() - v.openedAt
                 v.established = true; v.phase = 'ready'
               }
             }

packages/phone-agent/src/workbench.ts

@@ -1,4 +1,3 @@
-import { randomBytes } from 'node:crypto'
 import { createServer, type Server } from 'node:http'
 import { readFile, writeFile, rename } from 'node:fs/promises'
 import { join } from 'node:path'
@@ -25,17 +24,12 @@ export class Workbench {
   }
   private server: Server | undefined
   private starting: Promise<string> | undefined
-  private readonly sessionTokens = new Map<string, string>()
-  private readonly requestTokens = new Map<string, string>()
   private readonly nativeOrigins = new Map<string, string>()
   constructor(readonly runtime: PhoneRuntime) {}
   async open(owner?: string): Promise<string> {
     this.starting ??= this.start()
     const base = await this.starting
-    if (!owner) return base
-    let token = this.sessionTokens.get(owner)
-    if (!token) { token = randomBytes(32).toString('base64url'); this.sessionTokens.set(owner, token) }
-    return base + 'session/' + token + '/'
+    return owner ? base + '?owner=' + encodeURIComponent(owner) : base
   }
   async close(): Promise<void> { this.server?.closeAllConnections(); await new Promise<void>(resolve => this.server ? this.server.close(() => resolve()) : resolve()); await this.draftWrites }
   private async saveDraft(value: unknown): Promise<void> {
@@ -55,15 +49,13 @@ export class Workbench {
       if (typeof saved.goal === 'string' && saved.goal.length <= 8000) this.draft = saved.goal
     } catch (error) { if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error }
 
-    const token = randomBytes(32).toString('base64url')
     let origin = ''
-    const prefix = '/' + token + '/'
     const server = createServer((req, res) => {
       if (this.maintenance) { res.writeHead(503); res.end(); return }
       this.pendingRequests++
       void (async () => {
         const requested = new URL(req.url ?? '/', origin)
-        const nativeEntry = ((this.runtime.options.host === 'workbuddy' && requested.searchParams.get('mcpApp') === '1') || (this.runtime.options.host === 'codex' && requested.searchParams.get('mcpApp') === 'codex')) && req.method === 'GET' && /^session\/[A-Za-z0-9_-]+\/$/.test(requested.pathname.slice(prefix.length))
+        const nativeEntry = ((this.runtime.options.host === 'workbuddy' && requested.searchParams.get('mcpApp') === '1') || (this.runtime.options.host === 'codex' && requested.searchParams.get('mcpApp') === 'codex')) && req.method === 'GET' && requested.pathname === '/'
         let nativeOrigin = ''
         if (nativeEntry && requested.searchParams.has('hostOrigin')) {
           try {
@@ -75,27 +67,12 @@ export class Workbench {
         res.setHeader('X-Content-Type-Options', 'nosniff')
         res.setHeader('Content-Security-Policy', `default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'; img-src 'self'; frame-src http://127.0.0.1:*; connect-src 'self'; frame-ancestors ${nativeOrigin ? `file: ${nativeOrigin}` : this.embedOrigin ?? "'none'"}; base-uri 'none'`)
         const send = (status: number, data: unknown) => { res.writeHead(status, { 'Content-Type': 'application/json' }); res.end(JSON.stringify(data)) }
-        const embedded = req.method === 'GET' && req.headers['sec-fetch-dest'] === 'iframe' && this.embedOrigin && req.headers.referer?.startsWith(this.embedOrigin + '/')
-        // A native MCP App may navigate to its owner-bound capability URL.
-        // WorkBuddy uses a file renderer and a loopback sandbox ancestor. Only the
-        // bound page GET may embed; API requests retain same-origin checks.
-        const nativeDocument = nativeEntry && (req.headers['sec-fetch-dest'] === 'document' || (req.headers['sec-fetch-dest'] === 'iframe' && Boolean(nativeOrigin)))
-        if (req.headers.host !== new URL(origin).host || !req.url?.startsWith(prefix) || (!embedded && !nativeDocument && req.headers['sec-fetch-site'] === 'cross-site') || (req.headers.origin && req.headers.origin !== origin)) { send(403, { error: 'Forbidden' }); return }
         this.lastRead = Date.now()
-        let route = req.url.slice(prefix.length)
-        let owner = 'workbench'
-        if (route.startsWith('session/')) {
-          const match = /^session\/([A-Za-z0-9_-]+)\/(.*)$/.exec(route)
-          const session = match && [...this.sessionTokens].find(([, token]) => token === match[1])
-          if (!session) { send(403, { error: 'Unknown workbench session' }); return }
-          owner = session[0]; route = match![2]!
-          if (nativeEntry) {
-            route = ''
-            if (nativeOrigin) {
-              this.nativeOrigins.set(owner, nativeOrigin)
-              if (!this.requestTokens.has(owner)) this.requestTokens.set(owner, randomBytes(32).toString('base64url'))
-            }
-          }
+        const route = requested.pathname.slice(1)
+        const owner = requested.searchParams.get('owner') || 'workbench'
+        if (owner.length > 256) { send(400, { error: 'Invalid owner' }); return }
+        if (nativeEntry && nativeOrigin) {
+          this.nativeOrigins.set(owner, nativeOrigin)
         }
         if (req.method === 'GET') {
           if (!route) { res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' }); res.end(workbenchPage); return }
@@ -105,7 +82,7 @@ export class Workbench {
             if (native) for (const task of tasks) {
               if (task.owner === owner && task.viewerId && ['preparing', 'running', 'waiting', 'stopping'].includes(task.phase)) this.runtime.viewers.allowNativeEmbedding(task.viewerId, task.id, native)
             }
-            send(200, { host: this.runtime.options.host, workbenchOwner: owner, nativeRequestToken: this.requestTokens.get(owner), embedOrigin: this.embedOrigin, executionMode: this.runtime.hostDriven ? 'host' : 'byok', draft: this.draft, tasks, profiles: this.runtime.hostDriven ? [] : [...this.runtime.profiles.values()] }); return
+            send(200, { host: this.runtime.options.host, workbenchOwner: owner, embedOrigin: this.embedOrigin, executionMode: this.runtime.hostDriven ? 'host' : 'byok', draft: this.draft, tasks, profiles: this.runtime.hostDriven ? [] : [...this.runtime.profiles.values()] }); return
           }
           if (route === 'devices') { send(200, await this.runtime.options.hardware.listDevices(AbortSignal.timeout(10_000))); return }
           const history = /^events\/([a-f0-9-]+)$/.exec(route)
@@ -117,13 +94,7 @@ export class Workbench {
           }
           send(404, { error: 'Not found' }); return
         }
-        // WorkBuddy's native container omits Origin on same-origin fetches.
-        // A separate owner-bound token plus Fetch Metadata permits only that case.
-        const nativePost = this.runtime.options.host === 'workbuddy' && this.nativeOrigins.has(owner) &&
-          req.headers.origin === undefined && req.headers['sec-fetch-site'] === 'same-origin' &&
-          req.headers['sec-fetch-dest'] === 'empty' && Boolean(this.requestTokens.get(owner)) &&
-          req.headers['x-opengui-request-token'] === this.requestTokens.get(owner)
-        if (req.method !== 'POST' || (req.headers.origin !== origin && !nativePost) || req.headers['content-type'] !== 'application/json') { send(403, { error: 'Same-origin JSON required' }); return }
+        if (req.method !== 'POST' || req.headers['content-type'] !== 'application/json') { send(405, { error: 'JSON POST required' }); return }
         let body = ''
         for await (const part of req) { body += String(part); if (Buffer.byteLength(body) > 65536) { send(413, { error: 'Request too large' }); req.destroy(); return } }
         const args = JSON.parse(body) as Record<string, unknown>
@@ -142,11 +113,14 @@ export class Workbench {
       })().catch(() => { if (!res.headersSent) res.writeHead(400, { 'Content-Type': 'application/json' }); res.end(JSON.stringify({ error: this.runtime.hostDriven ? '请求未完成，请检查手机连接和宿主任务状态。' : '请求未完成，请检查手机、模型配置与任务状态。' })) }).finally(() => { this.pendingRequests-- })
     })
     this.server = server
-    await new Promise<void>((resolve, reject) => { server.once('error', reject); server.listen(0, '127.0.0.1', resolve) })
+    const configuredPort = process.env.OPENGUI_WORKBENCH_PORT
+    const port = configuredPort ? Number(configuredPort) : 0
+    if (!Number.isInteger(port) || port < 0 || port > 65535) throw new Error('Invalid workbench port')
+    await new Promise<void>((resolve, reject) => { server.once('error', reject); server.listen(port, '127.0.0.1', resolve) })
     const address = server.address()
     if (!address || typeof address === 'string') throw new Error('Workbench bind failed')
     origin = `http://127.0.0.1:${address.port}`
     this.runtime.viewers.allowEmbedding(origin)
-    return origin + prefix
+    return origin + '/'
   }
 }

packages/task-service/src/client.ts

@@ -1,11 +1,10 @@
 import { lstat } from 'node:fs/promises'
 import { createConnection } from 'node:net'
-import { readFile } from 'node:fs/promises'
 import { spawn } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { setTimeout as delay } from 'node:timers/promises'
 import { isTaskTool } from '../../phone-agent/src/host.ts'
-import { TASK_SERVICE_PROTOCOL, serviceRoot, socketPath, tokenPath } from './paths.ts'
+import { TASK_SERVICE_PROTOCOL, serviceRoot, socketPath } from './paths.ts'
 
 export type TaskHostName = 'codex' | 'workbuddy' | 'dsh'
 export interface PhoneTasks {
@@ -23,16 +22,14 @@ interface Reply { result?: unknown; error?: string }
 const entry = fileURLToPath(new URL('./task-service.js', import.meta.url))
 
 async function request(root: string, name: string, args: Record<string, unknown>, owner: string, host: TaskHostName): Promise<unknown> {
-  const token = (await readFile(tokenPath(root), 'utf8').catch(() => '')).trim()
-  if (!token) throw Object.assign(new Error('task service is not installed'), { code: 'ENOENT' })
   return new Promise((resolve, reject) => {
     const socket = createConnection(socketPath(root))
     let body = ''
     const fail = (error: Error) => { socket.destroy(); reject(error) }
     socket.setEncoding('utf8')
     socket.setTimeout(125_000, () => fail(new Error('task service timeout')))
     socket.once('error', fail)
-    socket.once('connect', () => socket.write(JSON.stringify({ protocol: TASK_SERVICE_PROTOCOL, token, host, name, args, owner }) + '\n'))
+    socket.once('connect', () => socket.write(JSON.stringify({ protocol: TASK_SERVICE_PROTOCOL, host, name, args, owner }) + '\n'))
     socket.on('data', chunk => {
       body += chunk
       if (!body.includes('\n')) return

packages/task-service/src/launchd.ts

@@ -5,7 +5,7 @@ import { TASK_SERVICE_LABEL, serviceRoot } from './paths.ts'
 
 const xml = (value: string) => value.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;').replaceAll('"', '&quot;')
 
-/** User launch agent. The plist holds paths only; the service token stays in a 0600 file. */
+/** User launch agent for the shared service. */
 export function taskServicePlist(options: { node: string; entry: string; root?: string }): string {
   for (const value of [options.node, options.entry]) {
     if (!isAbsolute(value) || /[\x00-\x1f]/.test(value)) throw new Error('task service paths must be absolute')
@@ -17,7 +17,7 @@ export function taskServicePlist(options: { node: string; entry: string; root?:
 <plist version="1.0"><dict>
 <key>Label</key>${str(TASK_SERVICE_LABEL)}
 <key>ProgramArguments</key><array>${[options.node, options.entry].map(str).join('')}</array>
-<key>EnvironmentVariables</key><dict><key>OPENGUI_TASK_SERVICE_ROOT</key>${str(root)}</dict>
+<key>EnvironmentVariables</key><dict><key>OPENGUI_TASK_SERVICE_ROOT</key>${str(root)}<key>OPENGUI_WORKBENCH_PORT</key>${str('58894')}</dict>
 <key>RunAtLoad</key><true/>
 <key>KeepAlive</key><true/>
 <key>ThrottleInterval</key><integer>10</integer>

packages/task-service/src/paths.ts

@@ -1,7 +1,7 @@
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 
-export const TASK_SERVICE_PROTOCOL = 1
+export const TASK_SERVICE_PROTOCOL = 2
 export const TASK_SERVICE_LABEL = 'org.opengui.task-service'
 
 /** User-level service root. Tests override it; installers do not point this at a plugin directory. */
@@ -10,5 +10,4 @@ export function serviceRoot(): string {
 }
 
 export const socketPath = (root: string): string => join(root, 'service.sock')
-export const tokenPath = (root: string): string => join(root, 'service.token')
 export const dataPath = (root: string): string => join(root, 'data')

packages/task-service/src/server.ts

@@ -1,14 +1,13 @@
-import { randomBytes, timingSafeEqual } from 'node:crypto'
-import { chmod, lstat, mkdir, readFile, rm, writeFile } from 'node:fs/promises'
+import { chmod, lstat, mkdir, rm } from 'node:fs/promises'
 import { createServer, type Socket } from 'node:net'
 import { TaskHost } from '../../phone-agent/src/host.ts'
 import { PhoneRuntime } from '../../phone-agent/src/runtime.ts'
 import { keychain } from '../../phone-agent/src/credentials.ts'
 import type { Credentials, Executor, Hardware } from '../../phone-agent/src/contracts.ts'
 import type { ViewerServer } from '../../device-runtime/src/viewer.ts'
-import { TASK_SERVICE_PROTOCOL, dataPath, socketPath, tokenPath } from './paths.ts'
+import { TASK_SERVICE_PROTOCOL, dataPath, socketPath } from './paths.ts'
 
-export interface TaskService { endpoint: string; token: string; close: () => Promise<void> }
+export interface TaskService { endpoint: string; close: () => Promise<void> }
 export interface TaskServiceOptions {
   root: string
   hardware: Hardware
@@ -20,7 +19,6 @@ export interface TaskServiceOptions {
 
 interface Request {
   protocol?: number
-  token?: string
   host?: string
   name?: string
   args?: Record<string, unknown>
@@ -29,24 +27,12 @@ interface Request {
 
 const hosts = new Set(['codex', 'workbuddy', 'dsh'])
 
-function same(left: string, right: string): boolean {
-  const a = Buffer.from(left)
-  const b = Buffer.from(right)
-  return a.length === b.length && timingSafeEqual(a, b)
-}
-
 /** One macOS process owns phone tasks for every host. Closing a client does not cancel accepted work. */
 export async function startTaskService(options: TaskServiceOptions): Promise<TaskService> {
   await mkdir(options.root, { recursive: true, mode: 0o700 })
   const info = await lstat(options.root)
   if (!info.isDirectory() || info.isSymbolicLink()) throw new Error('task service root must be a private directory')
   await chmod(options.root, 0o700)
-  const tokenFile = tokenPath(options.root)
-  let token = await readFile(tokenFile, 'utf8').catch(() => '')
-  if (!/^[a-f0-9]{64}$/.test(token)) {
-    token = randomBytes(32).toString('hex')
-    await writeFile(tokenFile, token, { mode: 0o600 })
-  }
   const runtime = new PhoneRuntime({
     root: dataPath(options.root), host: 'shared', hardware: options.hardware,
     credentials: options.credentials ?? keychain('shared'), executor: options.executor,
@@ -78,7 +64,6 @@ export async function startTaskService(options: TaskServiceOptions): Promise<Tas
         try {
           const request = JSON.parse(body) as Request
           if (request.protocol !== TASK_SERVICE_PROTOCOL) throw new Error('task service protocol mismatch')
-          if (typeof request.token !== 'string' || !same(request.token, token)) throw new Error('task service authentication failed')
           if (request.name === '__ping__') { send({ result: { protocol: TASK_SERVICE_PROTOCOL, activeTasks: tasks.activeCount, watching: tasks.watching } }); return }
           if (request.name === '__prepare_upgrade__') { send({ result: { ready: tasks.prepareMaintenance() } }); return }
           if (request.name === '__shutdown__') {
@@ -109,5 +94,5 @@ export async function startTaskService(options: TaskServiceOptions): Promise<Tas
   })
   await chmod(endpoint, 0o600)
   const close = (): Promise<void> => closing ??= (async () => { server.close(); await tasks.close(); await options.hardware.dispose() })()
-  return { endpoint, token, close }
+  return { endpoint, close }
 }

packages/workbench/src/native-bridge.ts

@@ -25,12 +25,12 @@ export const nativeBridgeScript = String.raw`
   if(typeof value!=='string'||! /^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i.test(value))return false;
   const result=await request('tools/call',{name:'opengui_open_workbench',arguments:{}});
   if(result?.isError)return false;
-  try{const url=new URL(result?.structuredContent?.url);return url.origin===location.origin&&url.pathname===location.pathname&&!url.search&&!url.hash}catch{return false}
+  try{const url=new URL(result?.structuredContent?.url);return url.origin===location.origin&&url.pathname===location.pathname&&url.searchParams.get('owner')===new URLSearchParams(location.search).get('owner')&&!url.hash}catch{return false}
  }
  async function connect(){
   const initialized=await request('ui/initialize',{protocolVersion:'2026-01-26',appInfo:{name:'OpenGUI',version:'1'},appCapabilities:{}});
   window.parent.postMessage({jsonrpc:'2.0',method:'ui/notifications/initialized'},'*');
-  const response=await fetch(location.pathname+'state');if(!response.ok)throw Error('工作台状态不可用');const state=await response.json();
+  const response=await fetch(location.pathname+'state'+location.search);if(!response.ok)throw Error('工作台状态不可用');const state=await response.json();
   if(!await identityMatches(state.workbenchOwner))throw Error('工作台与宿主聊天不匹配，请从原聊天重新打开。');
   if(!initialized?.hostCapabilities?.message)throw Error('当前宿主没有开放工作台消息入口。');
   owner=state.workbenchOwner;