🤖 Open-source, local-first alternative to Grok Bot, OpenAI dots and Claude Duet. Your own AI bots on any model: GPT, Claude, Gemini, Grok, DeepSeek, Kimi, GLM and 70+ more through one Modelflare key. Reach them in the app, WeChat or Feishu; they remember you, work in the background, run commands and use your computer. Pay per use.
Python ai-agentai-assistantchatbotclaudecomputer-usedeepseekdesktop-appdshelectronfeishugeminigptgrokllmlocal-firstmodelflaremulti-modelopenai-compatiblepersonal-ai-agentwechat
fix(packaging): ship DSH as pruned directory, drop asar (0.1.3)
Marlabe449edbbdd4
diff --git a/package-lock.json b/package-lock.jsonindex bac3f51..1197df0 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,15 +1,14 @@{"name": "anymodel-bot",- "version": "0.1.1",+ "version": "0.1.3","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "anymodel-bot",- "version": "0.1.1",+ "version": "0.1.3","license": "MIT","dependencies": {- "@electron/asar": "^3.4.1","@larksuiteoapi/node-sdk": "1.76.0","htm": "^3.1.1","preact": "^11.0.2",@@ -44,6 +43,7 @@"version": "3.4.1","resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz","integrity": "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==",+ "dev": true,"license": "MIT","dependencies": {"commander": "^5.0.0",@@ -61,12 +61,14 @@"version": "1.0.2","resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz","integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",+ "dev": true,"license": "MIT"},"node_modules/@electron/asar/node_modules/brace-expansion": {"version": "1.1.21","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz","integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",+ "dev": true,"license": "MIT","dependencies": {"balanced-match": "^1.0.0",@@ -77,6 +79,7 @@"version": "3.1.5","resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz","integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",+ "dev": true,"license": "ISC","dependencies": {"brace-expansion": "^1.1.7"@@ -2465,6 +2468,7 @@"version": "5.1.0","resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz","integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",+ "dev": true,"license": "MIT","engines": {"node": ">= 6"@@ -2484,6 +2488,7 @@"version": "0.0.1","resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz","integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",+ "dev": true,"license": "MIT"},"node_modules/core-util-is": {@@ -3381,6 +3386,7 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz","integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",+ "dev": true,"license": "ISC"},"node_modules/fsevents": {@@ -3474,6 +3480,7 @@"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz","integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==","deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting [email protected]",+ "dev": true,"license": "ISC","dependencies": {"fs.realpath": "^1.0.0",@@ -3494,12 +3501,14 @@"version": "1.0.2","resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz","integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",+ "dev": true,"license": "MIT"},"node_modules/glob/node_modules/brace-expansion": {"version": "1.1.21","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz","integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",+ "dev": true,"license": "MIT","dependencies": {"balanced-match": "^1.0.0",@@ -3510,6 +3519,7 @@"version": "3.1.5","resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz","integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",+ "dev": true,"license": "ISC","dependencies": {"brace-expansion": "^1.1.7"@@ -3745,6 +3755,7 @@"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz","integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==","deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",+ "dev": true,"license": "ISC","dependencies": {"once": "^1.3.0",@@ -3755,6 +3766,7 @@"version": "2.0.4","resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz","integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",+ "dev": true,"license": "ISC"},"node_modules/is-fullwidth-code-point": {@@ -4588,6 +4600,7 @@"version": "1.4.0","resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz","integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",+ "dev": true,"license": "ISC","dependencies": {"wrappy": "1"@@ -4652,6 +4665,7 @@"version": "1.0.1","resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz","integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",+ "dev": true,"license": "MIT","engines": {"node": ">=0.10.0"@@ -5985,6 +5999,7 @@"version": "1.0.2","resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz","integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",+ "dev": true,"license": "ISC"},"node_modules/ws": {diff --git a/package.json b/package.jsonindex e6c8894..8e80a4a 100644--- a/package.json+++ b/package.json@@ -1,7 +1,7 @@{"name": "anymodel-bot","productName": "anymodel bot",- "version": "0.1.2",+ "version": "0.1.3","private": true,"description": "anymodel bot:任意模型的个人 AI 助手(飞书 + 微信 iLink),内置 magpie 模型网关","license": "MIT",@@ -21,17 +21,15 @@"typecheck": "tsc -p tsconfig.json --noEmit","test": "vitest run","electron:dev": "npm run build && electron .",- "dist": "npm run build && node scripts/prepare-dsh.mjs && node scripts/pack-dsh-asar.mjs && node scripts/build-magpie.mjs --target current && node scripts/fetch-cua-driver.mjs --target current && electron-builder",+ "dist": "npm run build && node scripts/prepare-dsh.mjs && node scripts/build-magpie.mjs --target current && node scripts/fetch-cua-driver.mjs --target current && electron-builder","electron:smoke": "npm run build && node scripts/electron-smoke.mjs",- "dist:linux": "npm run build && node scripts/prepare-dsh.mjs && node scripts/pack-dsh-asar.mjs && node scripts/build-magpie.mjs --target linux/amd64,linux/arm64 && node scripts/fetch-cua-driver.mjs --target linux/x64,linux/arm64 && electron-builder --linux",- "dist:mac": "npm run build && node scripts/prepare-dsh.mjs && node scripts/pack-dsh-asar.mjs && node scripts/build-magpie.mjs --target darwin/amd64,darwin/arm64 && node scripts/fetch-cua-driver.mjs --target darwin/x64,darwin/arm64 && electron-builder --mac",- "dist:win": "npm run build && node scripts/prepare-dsh.mjs && node scripts/pack-dsh-asar.mjs && node scripts/build-magpie.mjs --target windows/amd64,windows/arm64 && node scripts/fetch-cua-driver.mjs --target win32/x64,win32/arm64 && electron-builder --win",+ "dist:linux": "npm run build && node scripts/prepare-dsh.mjs --os linux --cpu x64 && node scripts/build-magpie.mjs --target linux/amd64,linux/arm64 && node scripts/fetch-cua-driver.mjs --target linux/x64,linux/arm64 && electron-builder --linux",+ "dist:mac": "npm run build && node scripts/prepare-dsh.mjs --os darwin --cpu arm64 && node scripts/build-magpie.mjs --target darwin/amd64,darwin/arm64 && node scripts/fetch-cua-driver.mjs --target darwin/x64,darwin/arm64 && electron-builder --mac",+ "dist:win": "npm run build && node scripts/prepare-dsh.mjs --os win32 --cpu x64 && node scripts/build-magpie.mjs --target windows/amd64,windows/arm64 && node scripts/fetch-cua-driver.mjs --target win32/x64,win32/arm64 && electron-builder --win","prepare:dsh": "node scripts/prepare-dsh.mjs",- "fetch:cua": "node scripts/fetch-cua-driver.mjs",- "pack:dsh": "node scripts/pack-dsh-asar.mjs"+ "fetch:cua": "node scripts/fetch-cua-driver.mjs"},"dependencies": {- "@electron/asar": "^3.4.1","@larksuiteoapi/node-sdk": "1.76.0","htm": "^3.1.1","preact": "^11.0.2",@@ -100,11 +98,20 @@"to": "magpie/magpie"},{- "from": "build/dsh-pack",- "to": ".",+ "from": "dsh-runtime",+ "to": "dsh","filter": [- "dsh.asar",- "dsh.asar.unpacked/**"+ "package.json",+ "plugins/**"+ ]+ },+ {+ "from": "dsh-runtime/node_modules",+ "to": "dsh/node_modules",+ "filter": [+ "**/*",+ "!**/*.map",+ "!**/*.d.ts"]},{@@ -148,11 +155,20 @@"to": "magpie/magpie.exe"},{- "from": "build/dsh-pack",- "to": ".",+ "from": "dsh-runtime",+ "to": "dsh","filter": [- "dsh.asar",- "dsh.asar.unpacked/**"+ "package.json",+ "plugins/**"+ ]+ },+ {+ "from": "dsh-runtime/node_modules",+ "to": "dsh/node_modules",+ "filter": [+ "**/*",+ "!**/*.map",+ "!**/*.d.ts"]},{@@ -194,11 +210,20 @@"to": "magpie/magpie"},{- "from": "build/dsh-pack",- "to": ".",+ "from": "dsh-runtime",+ "to": "dsh",+ "filter": [+ "package.json",+ "plugins/**"+ ]+ },+ {+ "from": "dsh-runtime/node_modules",+ "to": "dsh/node_modules","filter": [- "dsh.asar",- "dsh.asar.unpacked/**"+ "**/*",+ "!**/*.map",+ "!**/*.d.ts"]},{diff --git a/scripts/pack-dsh-asar.mjs b/scripts/pack-dsh-asar.mjsindex 1007e5c..b1236f3 100644--- a/scripts/pack-dsh-asar.mjs+++ b/scripts/pack-dsh-asar.mjs@@ -1,74 +1,9 @@#!/usr/bin/env node/**- * Pack dsh-runtime into build/dsh.asar (+ dsh.asar.unpacked for natives).- * Shipped via electron-builder extraResources so we avoid app FileSet- * excluding the FileSet-root node_modules directory.+ * Deprecated (0.1.3+): DSH ships as a pruned real directory via extraResources+ * (`dsh-runtime` → `resources/dsh`), not as dsh.asar.+ * Giant asar caused Windows Defender thrashing; first-launch extract made startup slow.+ * Follow-up: esbuild-bundle DSH JS into few files + native externals (Claude/Gemini pattern).*/-import fs from "node:fs";-import path from "node:path";-import { fileURLToPath } from "node:url";-import asar from "@electron/asar";--const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");-const src = path.join(root, "dsh-runtime");-const outDir = path.join(root, "build");-const dest = path.join(outDir, "dsh.asar");-const destUnpacked = path.join(outDir, "dsh.asar.unpacked");--if (!fs.existsSync(path.join(src, "node_modules", "@deepseek-ai", "dsh-sdk-client", "package.json"))) {- console.error("dsh-runtime not prepared — run scripts/prepare-dsh.mjs first");- process.exit(1);-}--fs.mkdirSync(outDir, { recursive: true });-fs.rmSync(dest, { force: true });-fs.rmSync(destUnpacked, { recursive: true, force: true });--const unpack =- "{**/*.{node,dll,exe,dylib,so},**/prebuilds/**,**/sharp-*/**,**/libvips*,**/conpty/**,@img/**,@koromix/**,sherpa-onnx-*/**,@vscode/ripgrep-*/**,@deepseek-ai/libreoffice-kit-*/**}";--console.log("packing dsh-runtime → build/dsh.asar …");-await asar.createPackageWithOptions(src, dest, { unpack });--const asarSize = fs.statSync(dest).size;-let unpackedSize = 0;-if (fs.existsSync(destUnpacked)) {- const walk = (d) => {- for (const e of fs.readdirSync(d, { withFileTypes: true })) {- const p = path.join(d, e.name);- if (e.isDirectory()) walk(p);- else unpackedSize += fs.statSync(p).size;- }- };- walk(destUnpacked);-}--// Sanity: sdk-client must be inside the asar (or unpacked)-const list = asar.listPackage(dest);-const hasSdk = list.some((f) => f.replace(/\\/g, "/").includes("node_modules/@deepseek-ai/dsh-sdk-client/package.json"));-const hasDsh = list.some((f) => f.replace(/\\/g, "/").includes("node_modules/@deepseek-ai/dsh/package.json"));-if (!hasSdk || !hasDsh) {- console.error("asar missing @deepseek-ai/dsh or dsh-sdk-client", { hasSdk, hasDsh, sample: list.slice(0, 20) });- process.exit(1);-}--// Stage for electron-builder extraResources (avoids FileSet root node_modules filter)-const packDir = path.join(outDir, "dsh-pack");-fs.rmSync(packDir, { recursive: true, force: true });-fs.mkdirSync(packDir, { recursive: true });-fs.renameSync(dest, path.join(packDir, "dsh.asar"));-if (fs.existsSync(destUnpacked)) {- fs.renameSync(destUnpacked, path.join(packDir, "dsh.asar.unpacked"));-}-// Keep stable paths build/dsh.asar for convenience-fs.linkSync(path.join(packDir, "dsh.asar"), dest);-if (fs.existsSync(path.join(packDir, "dsh.asar.unpacked"))) {- // hardlink tree not practical; leave only under dsh-pack + recreate symlink- try { fs.symlinkSync(path.join(packDir, "dsh.asar.unpacked"), destUnpacked, "dir"); } catch { /* ok */ }-}--console.log(- `dsh.asar ready: ${(asarSize / 1048576).toFixed(1)} MB asar` +- (unpackedSize ? ` + ${(unpackedSize / 1048576).toFixed(1)} MB unpacked` : "") +- ` (${list.length} entries) → build/dsh-pack/`,-);+console.log("pack-dsh-asar: no-op since 0.1.3 — use scripts/prepare-dsh.mjs; extraResources copies dsh-runtime → resources/dsh");+process.exit(0);diff --git a/src/agent/host.ts b/src/agent/host.tsindex 4220d7c..505faf3 100644--- a/src/agent/host.ts+++ b/src/agent/host.ts@@ -1,6 +1,5 @@import fs from "node:fs";import path from "node:path";-import { createRequire } from "node:module";import { execFileSync } from "node:child_process";import { pathToFileURL } from "node:url";import { logger } from "../log.js";@@ -47,16 +46,15 @@ function isDshRuntime(dir: string): boolean {/*** 找到随应用分发的 DSH 运行时目录(含 node_modules/@deepseek-ai/dsh)。- * 打包后优先 `resources/dsh.asar`(extraResources);开发时用 `dsh-runtime/`。- * `ELECTRON_RUN_AS_NODE` 子进程读不了 asar,调用方应再经 {@link materializeDshRuntime} 落到实目录。+ * 打包后优先 `resources/dsh`(extraResources 实目录);开发时用 `dsh-runtime/`。+ * 实目录可直接给 ELECTRON_RUN_AS_NODE 子进程用,无需再 extract。*/export function locateDshRuntime(appRoot: string): string | undefined {const res = (process as any).resourcesPath as string | undefined;const cands = [process.env.AMB_DSH_RUNTIME,path.join(appRoot, "dsh-runtime"), // dev checkout- res ? path.join(res, "dsh.asar") : undefined, // packaged: resources/dsh.asar (+ .unpacked)- res ? path.join(res, "dsh") : undefined, // legacy unpacked extraResources+ res ? path.join(res, "dsh") : undefined, // packaged: resources/dsh (pruned tree)path.join(appRoot, "dsh"), // packaged inside app.asar (older layout)res ? path.join(res, "app.asar", "dsh") : undefined,res ? path.join(res, "app.asar.unpacked", "dsh") : undefined,@@ -65,141 +63,12 @@ export function locateDshRuntime(appRoot: string): string | undefined {}/**- * Resolve cache key for a materialized DSH runtime.- * Prefer the anymodel-bot app package.json version (via findAppRoot), not- * `dsh.asar/../package.json` which is wrong under resources/.+ * Identity for callers that historically extracted asar → dataDir.+ * DSH now ships as a real `resources/dsh` directory (no asar, no first-launch extract).+ * Kept so App / tests can call it without branching; returns `runtimeDir` unchanged.*/-function resolveDshCacheVersion(runtimeDir: string): string {- try {- const appPj = path.join(findAppRoot(), "package.json");- if (fs.existsSync(appPj)) {- const v = JSON.parse(fs.readFileSync(appPj, "utf8")).version;- if (typeof v === "string" && v) return v;- }- } catch {- /* ignore */- }- try {- const v = JSON.parse(fs.readFileSync(path.join(runtimeDir, "package.json"), "utf8")).version;- if (typeof v === "string" && v) return v;- } catch {- /* ignore */- }- try {- const v = JSON.parse(- fs.readFileSync(path.join(runtimeDir, "node_modules", "@deepseek-ai", "dsh", "package.json"), "utf8"),- ).version;- if (typeof v === "string" && v) return v;- } catch {- /* ignore */- }- return "unknown";-}--/**- * Extract an asar archive to dest, then merge sibling `.asar.unpacked` when present.- * Prefer `@electron/asar` extractAll (reads archive + unpacked natives). Fall back to a- * walk that on ENOENT under the asar reads from the `.asar.unpacked` mirror — never use- * plain recursive `fs.cpSync` on an asar with asarUnpack entries (ENOENT in Electron).- */-function extractAsarWithUnpacked(asarPath: string, dest: string): void {- fs.mkdirSync(dest, { recursive: true });- const unpacked = `${asarPath}.unpacked`;- try {- const require = createRequire(import.meta.url);- const asar = require("@electron/asar") as { extractAll: (a: string, d: string) => void };- asar.extractAll(asarPath, dest);- } catch (err) {- log.warn("asar.extractAll failed; falling back to walk+unpacked merge", {- asarPath,- err: err instanceof Error ? err.message : String(err),- });- copyAsarWithUnpackedFallback(asarPath, dest, unpacked);- }- if (fs.existsSync(unpacked)) {- fs.cpSync(unpacked, dest, { recursive: true, force: true });- }-}--/** Recursive copy that treats ENOENT under asarPath as "read from sibling .unpacked". */-function copyAsarWithUnpackedFallback(asarPath: string, dest: string, unpacked: string): void {- const walk = (rel: string): void => {- const src = path.join(asarPath, rel);- const outDir = path.join(dest, rel);- let entries: fs.Dirent[];- try {- entries = fs.readdirSync(src, { withFileTypes: true });- } catch (err) {- const code = (err as NodeJS.ErrnoException)?.code;- if (code === "ENOENT" && fs.existsSync(path.join(unpacked, rel))) {- fs.cpSync(path.join(unpacked, rel), outDir, { recursive: true, force: true });- return;- }- throw err;- }- fs.mkdirSync(outDir, { recursive: true });- for (const e of entries) {- const child = rel ? path.join(rel, e.name) : e.name;- const childSrc = path.join(asarPath, child);- const childOut = path.join(dest, child);- const childUnp = path.join(unpacked, child);- try {- const st = fs.lstatSync(childSrc);- if (st.isDirectory()) walk(child);- else if (st.isSymbolicLink()) {- try {- fs.symlinkSync(fs.readlinkSync(childSrc), childOut);- } catch {- if (fs.existsSync(childUnp)) fs.cpSync(childUnp, childOut, { recursive: true, force: true });- }- } else {- fs.copyFileSync(childSrc, childOut);- }- } catch (err) {- const code = (err as NodeJS.ErrnoException)?.code;- if (code === "ENOENT" && fs.existsSync(childUnp)) {- fs.cpSync(childUnp, childOut, { recursive: true, force: true });- continue;- }- throw err;- }- }- };- walk("");-}--/**- * 若运行时在 asar 内,提取到 cacheRoot/dsh-runtime/<version>,供 ELECTRON_RUN_AS_NODE 子进程使用。- * Packaged layout is `resources/dsh.asar` + `dsh.asar.unpacked` (natives); plain cpSync throws ENOENT.- */-export function materializeDshRuntime(runtimeDir: string, cacheRoot: string): string {- if (!runtimeDir.split(path.sep).some((p) => p.endsWith(".asar"))) return runtimeDir;- const version = resolveDshCacheVersion(runtimeDir);- const dest = path.join(cacheRoot, "dsh-runtime", version);- const marker = path.join(dest, ".amb-dsh-ready");- if (isDshRuntime(dest) && fs.existsSync(marker)) return dest;- const tmp = `${dest}.tmp-${process.pid}`;- fs.rmSync(tmp, { recursive: true, force: true });- fs.mkdirSync(path.dirname(dest), { recursive: true });- log.info("materializing dsh runtime from asar", { from: runtimeDir, to: dest, version });- // runtimeDir may be the asar file itself (…/dsh.asar) or a path inside it.- let asarPath = runtimeDir;- const parts = runtimeDir.split(path.sep);- for (let i = 0; i < parts.length; i++) {- if (parts[i].endsWith(".asar")) {- asarPath = parts.slice(0, i + 1).join(path.sep);- break;- }- }- extractAsarWithUnpacked(asarPath, tmp);- if (!isDshRuntime(tmp)) {- fs.rmSync(tmp, { recursive: true, force: true });- throw new Error(`materializeDshRuntime: extracted tree missing dsh-sdk-client (${asarPath})`);- }- fs.writeFileSync(path.join(tmp, ".amb-dsh-ready"), new Date().toISOString());- fs.rmSync(dest, { recursive: true, force: true });- fs.renameSync(tmp, dest);- return dest;+export function materializeDshRuntime(runtimeDir: string, _cacheRoot?: string): string {+ return runtimeDir;}/** present 工具参数里的文件路径(原样,相对路径以工作区为准)。 */diff --git a/src/app.ts b/src/app.tsindex 1e41004..28b4ffc 100644--- a/src/app.ts+++ b/src/app.ts@@ -13,7 +13,7 @@ import { WeixinLogin } from "./channels/weixin/login.js";import { startWebServer, type WebServer } from "./web/server.js";import { logger, mask } from "./log.js";import { AgentManager } from "./agent/manager.js";-import { locateDshRuntime, materializeDshRuntime } from "./agent/host.js";+import { locateDshRuntime } from "./agent/host.js";import { findAppRoot } from "./magpie/supervisor.js";const log = logger("app");@@ -69,22 +69,7 @@ export class App {this.agent = new AgentManager({store: this.store,dataDir: config.dataDir,- runtimeDir:- config.agent.mode === "dsh"- ? (() => {- const located = locateDshRuntime(findAppRoot());- if (!located) return undefined;- try {- return materializeDshRuntime(located, config.dataDir);- } catch (err) {- log.warn("DSH runtime materialize failed; continuing with plain chat", {- located,- err: err instanceof Error ? err.message : String(err),- });- return undefined;- }- })()- : undefined,+ runtimeDir: config.agent.mode === "dsh" ? locateDshRuntime(findAppRoot()) : undefined,upstream,enabled: config.agent.mode === "dsh" && !opts.models,turnTimeoutMs: config.agent.turnTimeoutMs,diff --git a/test/dsh-materialize.unit.test.ts b/test/dsh-materialize.unit.test.tsindex fdc3b61..2044bfe 100644--- a/test/dsh-materialize.unit.test.ts+++ b/test/dsh-materialize.unit.test.ts@@ -2,19 +2,16 @@ import fs from "node:fs";import os from "node:os";import path from "node:path";import { afterEach, describe, expect, it } from "vitest";-import { materializeDshRuntime } from "../src/agent/host.js";+import { locateDshRuntime, materializeDshRuntime } from "../src/agent/host.js";import { findAppRoot } from "../src/magpie/supervisor.js";-const packagedAsar = path.join(findAppRoot(), "release", "win-unpacked", "resources", "dsh.asar");-const hasPackaged = fs.existsSync(packagedAsar) && fs.existsSync(`${packagedAsar}.unpacked`);-const dirs: string[] = [];afterEach(() => {for (const d of dirs.splice(0)) fs.rmSync(d, { recursive: true, force: true });});describe("materializeDshRuntime", () => {- it("returns plain dirs unchanged", () => {+ it("is identity (no extract) for plain dirs", () => {const dir = fs.mkdtempSync(path.join(os.tmpdir(), "amb-plain-"));dirs.push(dir);fs.mkdirSync(path.join(dir, "node_modules", "@deepseek-ai", "dsh-sdk-client"), { recursive: true });@@ -22,27 +19,25 @@ describe("materializeDshRuntime", () => {const cache = fs.mkdtempSync(path.join(os.tmpdir(), "amb-cache-"));dirs.push(cache);expect(materializeDshRuntime(dir, cache)).toBe(dir);+ expect(fs.readdirSync(cache)).toEqual([]);});- it.skipIf(!hasPackaged)("extracts packaged dsh.asar + unpacked natives into versioned cache", () => {- const cache = fs.mkdtempSync(path.join(os.tmpdir(), "amb-dsh-mat-"));+ it("does not extract even when path looks like an asar", () => {+ const fake = path.join(os.tmpdir(), "amb-fake-dsh.asar");+ const cache = fs.mkdtempSync(path.join(os.tmpdir(), "amb-cache-asar-"));dirs.push(cache);- const dest = materializeDshRuntime(packagedAsar, cache);- expect(dest).toContain(path.join(cache, "dsh-runtime"));- expect(fs.existsSync(path.join(dest, ".amb-dsh-ready"))).toBe(true);- expect(fs.existsSync(path.join(dest, "node_modules", "@deepseek-ai", "dsh-sdk-client", "package.json"))).toBe(true);- // At least one native from dsh.asar.unpacked- const walk = (d: string): string[] => {- const out: string[] = [];- for (const e of fs.readdirSync(d, { withFileTypes: true })) {- const p = path.join(d, e.name);- if (e.isDirectory()) out.push(...walk(p));- else if (e.name.endsWith(".node")) out.push(p);- }- return out;- };- expect(walk(dest).length).toBeGreaterThan(0);- // Second call hits cache marker- expect(materializeDshRuntime(packagedAsar, cache)).toBe(dest);+ expect(materializeDshRuntime(fake, cache)).toBe(fake);+ expect(fs.readdirSync(cache)).toEqual([]);+ });+});++describe("locateDshRuntime", () => {+ it("finds checkout dsh-runtime when prepared", () => {+ const root = findAppRoot();+ const hit = locateDshRuntime(root);+ // In CI/dev after prepare-dsh; skip soft if missing+ if (!hit) return;+ expect(hit).toContain("dsh");+ expect(fs.existsSync(path.join(hit, "node_modules", "@deepseek-ai", "dsh-sdk-client", "package.json"))).toBe(true);});});