dsh-mac-computer-use 0.0.0-stage → 1.3.2

package/locale/en.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "Mac Desktop Control",
+    "description": "Lets DSH see your screen and click, type and scroll in your Mac apps. Works from screenshots and leaves your mouse alone by default."
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "Mac 桌面操作",
+    "description": "让 DSH 看屏幕、点按钮、打字，直接操作你 Mac 上的应用。看截图干活，默认不抢你的鼠标。"
+  }
+}

package/package.json

@@ -1,6 +1,45 @@
 {
   "name": "dsh-mac-computer-use",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
-}
+  "version": "1.3.2",
+  "type": "module",
+  "description": "Vision-first Mac computer use for DSH: window list, screenshots, OCR text targeting, numbered elements, background clicks and typing. Works without the accessibility tree.",
+  "license": "MIT",
+  "author": "OrderG-X",
+  "homepage": "https://github.com/OrderG-X/dsh-mac-computer-use",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/OrderG-X/dsh-mac-computer-use.git",
+    "directory": "plugin"
+  },
+  "exports": {
+    ".": "./index.js",
+    "./client": "./client.js",
+    "./package.json": "./package.json",
+    "./icon.svg": "./icon.svg",
+    "./locale/*.json": "./locale/*.json"
+  },
+  "files": [
+    "index.js",
+    "setup.js",
+    "panel.js",
+    "client.js",
+    "cordis.patch.yml",
+    "locale",
+    "icon.svg",
+    "package.json"
+  ],
+  "icon": "./icon.svg",
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-slots",
+        "@deepseek-ai/dsh-client-ui-plugin-manager"
+      ]
+    }
+  }
+}

package/panel.js

@@ -0,0 +1,140 @@
+/**
+ * DSH 插件页里那张设置卡的后端：一条 HTTP 路由，挂在 DSH 自己的 webServer 上。
+ *
+ *   GET  /dsh-mac-computer-use/panel           → 状态（命令行工具、光标浮层、两项系统权限、看得到几个窗口、光标开关）
+ *   POST /dsh-mac-computer-use/panel {action}  → cursor / copyInstall / copyUpdate / openSettings，回新状态
+ *
+ * 页面（client.js）跑在 DSH 的网页端，只能走 HTTP。webServer 本身不做鉴权，
+ * 而浏览器里随便哪个网页都摸得到 127.0.0.1，所以自己把门：只收本机连接、Host 必须是本机名、
+ * 跨站的 Origin 一律拒、POST 必须是 JSON（跨站发不出来，会先被预检挡住）。
+ */
+
+import { execFile, execFileSync } from 'node:child_process'
+import fs from 'node:fs'
+import {
+  findBin, overlayState, stopOverlay, permissions, readConfig, writeConfig, INSTALL_CMD, UPDATE_CMD, ENGINE_FEATURES, SETTINGS_PANES,
+} from './setup.js'
+
+export const PANEL_ROUTE = '/dsh-mac-computer-use/panel'
+
+const PKG_VERSION = (() => {
+  try { return JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version } catch { return '' }
+})()
+
+const LOOPBACK = new Set(['127.0.0.1', '::1', '::ffff:127.0.0.1'])
+const LOOPBACK_HOST = /^(127\.0\.0\.1|localhost|\[::1\])(:\d+)?$/i
+
+/** 能看到几个窗口：证明命令行工具真的跑得起来。跑不起来回 null。 */
+function countWindows(bin) {
+  return new Promise((resolve) => {
+    execFile(bin, ['winlist'], { timeout: 5000 }, (err, out) => {
+      resolve(err ? null : String(out).split('\n').filter(Boolean).length)
+    })
+  })
+}
+
+/** 引擎支持的增强（dsh-cu features，一行一个）。旧引擎没这个命令，回空集合 */
+function engineFeatures(bin) {
+  return new Promise((resolve) => {
+    execFile(bin, ['features'], { timeout: 5000 }, (err, out) => {
+      resolve(new Set(err ? [] : String(out).split('\n').map((l) => l.trim()).filter(Boolean)))
+    })
+  })
+}
+
+export async function panelState() {
+  const base = { plugin: PKG_VERSION, platform: process.platform, showCursor: readConfig().showCursor !== false, installCmd: INSTALL_CMD, updateCmd: UPDATE_CMD }
+  if (process.platform !== 'darwin') return base
+  const bin = findBin()
+  const [perms, windows, features] = await Promise.all([
+    permissions(), bin ? countWindows(bin.path) : null, bin ? engineFeatures(bin.path) : new Set(),
+  ])
+  const outdated = ENGINE_FEATURES.some((f) => !features.has(f))
+  return { ...base, bin: bin && { source: bin.source, outdated }, overlay: overlayState(), perms, windows }
+}
+
+/** 跨站请求一律拒：没带 Origin（同源 GET、curl）放行；带了就必须是 DSH 自己。 */
+function allowed(req, origin) {
+  if (!LOOPBACK.has(req.socket.remoteAddress)) return false
+  if (!LOOPBACK_HOST.test(req.headers.host || '')) return false
+  const from = req.headers.origin
+  if (!from) return true
+  if (from === 'null') return false
+  let own
+  try { own = origin() } catch { own = '' }
+  if (from === own) return true
+  try {
+    const a = new URL(from), b = new URL(own)
+    return LOOPBACK_HOST.test(a.host) && a.port === b.port && a.protocol === b.protocol
+  } catch {
+    return false
+  }
+}
+
+function readJson(req, limit = 4096) {
+  return new Promise((resolve, reject) => {
+    let size = 0
+    const chunks = []
+    req.on('data', (c) => {
+      size += c.length
+      if (size > limit) { reject(new Error('请求太大')); req.destroy() } else chunks.push(c)
+    })
+    req.on('end', () => {
+      try { resolve(JSON.parse(Buffer.concat(chunks).toString('utf8') || '{}')) } catch { reject(new Error('不是 JSON')) }
+    })
+    req.on('error', reject)
+  })
+}
+
+/**
+ * @param deps.origin - DSH 网页端自己的 origin（webServer.getOrigin）
+ * @param deps.trace - 日志
+ */
+export function panelHandler({ origin, trace = () => {} }) {
+  return async (req, res) => {
+    const send = (code, body) => {
+      res.writeHead(code, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' })
+      res.end(JSON.stringify(body))
+    }
+    if (!allowed(req, origin)) {
+      trace(`设置页路由拒绝了一个请求：${req.socket.remoteAddress} host=${req.headers.host} origin=${req.headers.origin}`)
+      return send(403, { error: 'forbidden' })
+    }
+    if (req.method === 'GET') return send(200, await panelState())
+    if (req.method !== 'POST') return send(405, { error: 'method not allowed' })
+    if (!/^application\/json\b/i.test(req.headers['content-type'] || '')) return send(415, { error: 'expect application/json' })
+
+    let body
+    try { body = await readJson(req) } catch (e) { return send(400, { error: e.message }) }
+    const extra = {}
+    try {
+      switch (body.action) {
+        case 'cursor':
+          writeConfig({ showCursor: !!body.on })
+          if (!body.on) stopOverlay()
+          trace(`设置页：桌面光标 ${body.on ? '开' : '关'}`)
+          break
+        case 'copyInstall':
+          execFileSync('/usr/bin/pbcopy', [], { input: INSTALL_CMD })
+          extra.copied = true
+          break
+        case 'copyUpdate':
+          execFileSync('/usr/bin/pbcopy', [], { input: UPDATE_CMD })
+          extra.copied = true
+          break
+        case 'openSettings': {
+          const url = SETTINGS_PANES[body.pane]
+          if (!url) return send(400, { error: `不认识的 pane: ${body.pane}` })
+          execFileSync('/usr/bin/open', [url], { stdio: 'ignore' })
+          extra.opened = body.pane
+          break
+        }
+        default:
+          return send(400, { error: `不认识的 action: ${body.action}` })
+      }
+    } catch (e) {
+      return send(200, { ...(await panelState()), actionError: String((e && e.message) || e) })
+    }
+    return send(200, { ...(await panelState()), ...extra })
+  }
+}

package/setup.js

@@ -0,0 +1,110 @@
+/**
+ * 本机环境：命令行引擎 dsh-cu 在哪、光标浮层在不在、DSH 有没有系统权限、用户设置。
+ * 工具（index.js）和 DSH 设置页（panel.js）共用。
+ */
+
+import { execFile, execFileSync } from 'node:child_process'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+
+// 找 dsh-cu 的位置：先看环境变量，再看待安装位置，最后是开发目录（本机调试用）
+const CANDIDATES = [
+  ['env', process.env.DSH_CU_BIN],
+  ['installed', path.join(os.homedir(), '.dsh/bin/dsh-cu')],
+  ['dev', path.join(os.homedir(), 'Projects/dsh-cua-patched/tools/dsh-cu')],
+].filter(([, p]) => p)
+
+export const INSTALL_CMD = 'git clone https://github.com/OrderG-X/dsh-mac-computer-use.git && cd dsh-mac-computer-use && ./install.sh'
+
+/** 引擎更新：在家目录拉（或更新）一份源码再重装。之前在别处 clone 过也没关系，装的都是 ~/.dsh/bin */
+export const UPDATE_CMD = 'cd ~ && { [ -d dsh-mac-computer-use ] || git clone https://github.com/OrderG-X/dsh-mac-computer-use.git; } && cd dsh-mac-computer-use && git pull --ff-only && ./install.sh'
+
+/** 协议号不变的引擎增强（dsh-cu features）。缺了不拦着用，只在设置页提示「引擎可以更新」 */
+export const ENGINE_FEATURES = ['window-shot']
+
+/** 找不到二进制时的报错：必须自带公开安装步骤，不能只有本机才看得懂的路径提示。 */
+export const INSTALL_HINT = [
+  'dsh-cu 还没装（一次性前置，装完不用再管）：',
+  '1. 装 Xcode 命令行工具（提供 swiftc）：xcode-select --install',
+  '2. 拉源码并编译：',
+  `     ${INSTALL_CMD}`,
+  '   它会用 swiftc 编译 dsh-cu 与光标浮层，装到 ~/.dsh/bin/',
+  '3. 回到这里重试即可（想看装没装好：ls ~/.dsh/bin/dsh-cu）',
+  '二进制在别处的话，用 DSH_CU_BIN=/path/to/dsh-cu 指过去。',
+].join('\n')
+
+/** @returns {{ path: string, source: 'env'|'installed'|'dev' } | null} */
+export function findBin() {
+  for (const [source, p] of CANDIDATES) {
+    try { fs.accessSync(p, fs.constants.X_OK); return { path: p, source } } catch {}
+  }
+  return null
+}
+
+export const OVERLAY = process.env.DSH_CU_OVERLAY || path.join(os.homedir(), '.dsh/bin/dsh-cursor-overlay')
+
+// 只认当前账号的浮层：别的账号开着的不算、也不去关
+// Windows / Linux 上没有 getuid：模块顶层直接调会让整个插件导入失败（DSH 里显示「没启动」）
+const UID = typeof process.getuid === 'function' ? String(process.getuid()) : ''
+const MINE = ['-U', UID, '-f', 'dsh-cursor-overlay']
+
+export function overlayState() {
+  let installed = false, running = false
+  try { fs.accessSync(OVERLAY, fs.constants.X_OK); installed = true } catch {}
+  try { execFileSync('/usr/bin/pgrep', MINE, { stdio: 'ignore' }); running = true } catch {}
+  return { installed, running }
+}
+
+export function stopOverlay() {
+  try { execFileSync('/usr/bin/pkill', MINE, { stdio: 'ignore' }) } catch { /* 本来就没跑 */ }
+}
+
+// ── 系统权限 ────────────────────────────────────────────────────────────────
+// osascript 是 DSH 派生出来的，系统按「负责的应用」算权限，所以这里查到的就是 DSH 自己有没有。
+// CGPreflightScreenCaptureAccess 不在 JXA 的默认桥里，得手动 bind。
+
+const PERM_JXA = [
+  'ObjC.import("ApplicationServices")',
+  'ObjC.bindFunction("CGPreflightScreenCaptureAccess", ["bool", []])',
+  'JSON.stringify({ screen: $.CGPreflightScreenCaptureAccess(), ax: $.AXIsProcessTrusted() })',
+].join(';')
+
+let permCache = { at: 0, value: null }
+
+/** @returns {Promise<{ screen: boolean|null, ax: boolean|null }>} null = 查不出来 */
+export function permissions(maxAgeMs = 5000) {
+  if (permCache.value && Date.now() - permCache.at < maxAgeMs) return Promise.resolve(permCache.value)
+  return new Promise((resolve) => {
+    execFile('/usr/bin/osascript', ['-l', 'JavaScript', '-e', PERM_JXA], { timeout: 5000 }, (err, out) => {
+      let value = { screen: null, ax: null }
+      if (!err) {
+        try { const p = JSON.parse(String(out).trim()); value = { screen: !!p.screen, ax: !!p.ax } } catch {}
+      }
+      permCache = { at: Date.now(), value }
+      resolve(value)
+    })
+  })
+}
+
+export const SETTINGS_PANES = {
+  screen: 'x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture',
+  ax: 'x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility',
+}
+
+// ── 用户设置 ────────────────────────────────────────────────────────────────
+// 存在 ~/.dsh/dsh-mac-computer-use.json。每次现读（文件很小），设置页一改马上生效，不用重启 DSH。
+
+export const CONFIG_FILE = process.env.DSH_CU_CONFIG || path.join(os.homedir(), '.dsh/dsh-mac-computer-use.json')
+const DEFAULTS = { showCursor: true }
+
+export function readConfig() {
+  try { return { ...DEFAULTS, ...JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8')) } } catch { return { ...DEFAULTS } }
+}
+
+export function writeConfig(patch) {
+  const next = { ...readConfig(), ...patch }
+  fs.mkdirSync(path.dirname(CONFIG_FILE), { recursive: true })
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(next, null, 2) + '\n')
+  return next
+}

package/README.md

@@ -1,3 +0,0 @@
-# Temporary Holding Version
-
-This version is a temporary placeholder for this package. An operational version to replace this has been submitted for review and is awaiting a staged release.