dsh-multigameassistant 2.0.0 → 2.0.1

package/lib/monitor.js

@@ -1,8 +1,8 @@
 import { createRequire as __adgCreateRequire } from 'node:module'; import { dirname as __adgDirname } from 'node:path'; import { fileURLToPath as __adgFileURLToPath } from 'node:url'; const require = __adgCreateRequire(import.meta.url); const __filename = __adgFileURLToPath(import.meta.url); const __dirname = __adgDirname(__filename);
 import {
   parseDuration
-} from "./chunk-5WTH2CYW.js";
-import "./chunk-7XMNAHZ2.js";
+} from "./chunk-D7JEXAT5.js";
+import "./chunk-J46OASOG.js";
 import {
   writeFileAtomic
 } from "./chunk-CCAB6XXZ.js";
@@ -11,7 +11,7 @@ import {
   MONITOR_CAPABILITY,
   MonitorSettings,
   external_exports
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/monitor/lib/index.js

package/lib/notify.js

@@ -16,10 +16,10 @@ import {
   replyPlain,
   sessionConversations,
   textReply
-} from "./chunk-FLQD3DKB.js";
-import "./chunk-2DZ75ANX.js";
+} from "./chunk-BNGDT7YT.js";
+import "./chunk-ZQ6KFVEO.js";
 import "./chunk-CCAB6XXZ.js";
-import "./chunk-BL6OSR2I.js";
+import "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 export {
   AdgNotify,

package/lib/orchestrator.js

@@ -4,17 +4,17 @@ import {
   PARAMS_SCHEMA,
   parseDuration,
   taskParams
-} from "./chunk-5WTH2CYW.js";
+} from "./chunk-D7JEXAT5.js";
 import {
   TaskInputError,
   renderTask
-} from "./chunk-7XMNAHZ2.js";
+} from "./chunk-J46OASOG.js";
 import {
   MAIN,
   finalText,
   sessionConversations
-} from "./chunk-FLQD3DKB.js";
-import "./chunk-2DZ75ANX.js";
+} from "./chunk-BNGDT7YT.js";
+import "./chunk-ZQ6KFVEO.js";
 import {
   writeFileAtomic
 } from "./chunk-CCAB6XXZ.js";
@@ -33,7 +33,7 @@ import {
   isMarker,
   taskMessage,
   withStartEnd
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/orchestrator/lib/index.js

package/lib/qqbot.js

@@ -4,8 +4,8 @@ import {
   questionText,
   replyMarkdown,
   replyPlain
-} from "./chunk-FLQD3DKB.js";
-import "./chunk-2DZ75ANX.js";
+} from "./chunk-BNGDT7YT.js";
+import "./chunk-ZQ6KFVEO.js";
 import {
   writeFileAtomic
 } from "./chunk-CCAB6XXZ.js";
@@ -15,7 +15,7 @@ import {
   QQPending,
   QQSettings,
   external_exports
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/qqbot/lib/index.js

package/lib/runner.js

@@ -19,9 +19,9 @@ import {
   runnerTools,
   setIn,
   taskParams
-} from "./chunk-5WTH2CYW.js";
-import "./chunk-7XMNAHZ2.js";
-import "./chunk-BL6OSR2I.js";
+} from "./chunk-D7JEXAT5.js";
+import "./chunk-J46OASOG.js";
+import "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 export {
   AdgRunner,

package/lib/scheduler.js

@@ -2,7 +2,7 @@ import { createRequire as __adgCreateRequire } from 'node:module'; import { dirn
 import {
   SCHEDULE_CAPABILITY,
   external_exports
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/scheduler/lib/index.js

package/lib/script-registry.js

@@ -24,7 +24,7 @@ import {
   setupExitText,
   setupKind,
   systemHost
-} from "./chunk-KIAOFNCB.js";
+} from "./chunk-YG4B5G7F.js";
 import {
   MANIFEST_FILE,
   SKILL_FILE,
@@ -32,11 +32,11 @@ import {
   globToRegExp,
   parseManifest,
   versionOfTag
-} from "./chunk-7XMNAHZ2.js";
+} from "./chunk-J46OASOG.js";
 import {
   sessionConversations
-} from "./chunk-FLQD3DKB.js";
-import "./chunk-2DZ75ANX.js";
+} from "./chunk-BNGDT7YT.js";
+import "./chunk-ZQ6KFVEO.js";
 import {
   writeFileAtomic
 } from "./chunk-CCAB6XXZ.js";
@@ -59,7 +59,7 @@ import {
   optimizeScriptPrompt,
   parseGitHubLink,
   taskMessage
-} from "./chunk-BL6OSR2I.js";
+} from "./chunk-HPQCV6WO.js";
 import "./chunk-2UFLGPDY.js";
 
 // packages/script-registry/lib/index.js
@@ -407,7 +407,7 @@ var StoredScript = external_exports.object({
 var PendingSetup = external_exports.object({
   scriptId: external_exports.string(),
   name: external_exports.string(),
-  kind: external_exports.enum(["nsis", "inno"]),
+  kind: external_exports.enum(["nsis", "inno", "kachina"]),
   /** The installer, kept in the script's downloads folder until it is done. */
   file: external_exports.string(),
   version: external_exports.string(),
@@ -489,6 +489,7 @@ function stripUndefined(value) {
 // packages/script-registry/lib/library.js
 var CATALOGUE_TTL_MS = 24 * 60 * 6e4;
 var PRE_RUN_CHECK_MS = 3e4;
+var MAX_SETUP_ONLY_FILES = 4;
 var ScriptLibrary = class {
   toolsDir;
   #options;
@@ -971,7 +972,7 @@ var ScriptLibrary = class {
   async #installJob(scriptId, source, request, channels, pack, ctl) {
     const script = this.#state.scripts.find((s) => s.id === scriptId);
     const previous = script === void 0 ? void 0 : currentVersion(script);
-    const have = (version2) => script?.versions.some((v) => v.version === version2) === true;
+    const have = (version2) => script?.versions.some((v) => v.version === version2 && (request.asset === void 0 || v.asset?.name === request.asset)) === true;
     const branch = request.branch ?? (request.tag === void 0 && request.asset === void 0 ? script?.sourceBranch : void 0);
     const previousAsset = script?.versions.find((v) => v.version === previous?.version)?.asset?.name;
     const fetched = await this.#fetch(scriptId, channels, pack, previous?.version, ctl, { ...request, branch, previousAsset }, have);
@@ -1003,6 +1004,10 @@ var ScriptLibrary = class {
     await rm(versionDir, { recursive: true, force: true });
     if (!fetched.incremental) {
       await extract(archive, versionDir, { signal: ctl.signal, ...root === void 0 ? {} : { root } });
+      const inner = await this.#takeSoleSetup(versionDir, archive);
+      if (inner !== void 0) {
+        return this.#handOffSetup(inner.kind, { scriptId, file: inner.file, version, asset: fetched.asset, dir: versionDir, source: script?.source ?? source, ...pack === void 0 ? {} : { packId: pack.manifest.id }, update: script !== void 0 }, request.byAgent === true, ctl);
+      }
     } else {
       const patch = `${versionDir}.patch`;
       await rm(patch, { recursive: true, force: true });
@@ -1096,6 +1101,30 @@ var ScriptLibrary = class {
     }
     return setup.version;
   }
+  /**
+   * An unpacked archive that is only a setup program (one exe, a few files at
+   * most, and that exe an installer): the exe is moved beside the archive,
+   * the unpacked folder and the archive deleted. @returns where the exe is
+   * now and what installer it is; undefined for anything else (left as it is).
+   */
+  async #takeSoleSetup(dir, archive) {
+    const files = await listFiles(dir).catch(() => []);
+    const exes = files.filter((f) => f.toLowerCase().endsWith(".exe"));
+    if (exes.length !== 1 || files.length > MAX_SETUP_ONLY_FILES)
+      return void 0;
+    const inside = join2(dir, ...exes[0].split("/"));
+    const kind = await setupKind(inside);
+    if (kind === void 0)
+      return void 0;
+    const file = join2(dirname2(archive), basename(inside));
+    if (!samePath(file, archive)) {
+      await rm(file, { force: true });
+      await rename2(inside, file);
+      await rm(archive, { force: true });
+    }
+    await rm(dir, { recursive: true, force: true });
+    return { file, kind };
+  }
   /** The setup program waiting to be run for a script, if any. */
   pendingSetup(id) {
     return this.#state.setups.find((s) => s.scriptId === id);
@@ -1202,6 +1231,10 @@ var ScriptLibrary = class {
       ctl.phase("extracting", { message: `\u89E3\u538B ${fetched.asset.name}` });
       await rm(staging, { recursive: true, force: true });
       await extract(archive, staging, { signal: ctl.signal, ...fetched.incremental || root === void 0 ? {} : { root } });
+      const inner = fetched.incremental ? void 0 : await this.#takeSoleSetup(staging, archive);
+      if (inner !== void 0) {
+        return this.#handOffSetup(inner.kind, { scriptId: script.id, file: inner.file, version, asset: fetched.asset, dir: target, source: script.source, ...pack === void 0 ? {} : { packId: pack.manifest.id }, update: true }, byAgent, ctl);
+      }
       const prefix = fetched.incremental ? await patchPrefix(staging, target, root) : void 0;
       const from = prefix === void 0 ? staging : join2(staging, prefix);
       const keep = await keptFiles(pack, target);
@@ -3253,7 +3286,7 @@ function scriptTools(library, approve) {
     }),
     tool({
       name: TOOL_NAMES.setupRun,
-      description: `\u8FD0\u884C\u811A\u672C\u5B89\u88C5\u6216\u66F4\u65B0\u65F6\u4E0B\u8F7D\u5230\u7684\u5B89\u88C5\u7A0B\u5E8F\uFF08NSIS / Inno Setup \u7684 setup.exe\uFF0C\u6709\u7684\u811A\u672C\u53EA\u53D1\u5E03\u8FD9\u79CD\u5B8C\u6574\u5305\uFF09\u3002quiet\uFF08\u9ED8\u8BA4 true\uFF09\uFF1A\u4E0D\u5F39\u7A97\u53E3\uFF0C\u9759\u9ED8\u88C5\u8FDB\u811A\u672C\u7684\u7248\u672C\u76EE\u5F55\u5E76\u7B49\u5B83\u88C5\u5B8C\uFF0C\u8FD4\u56DE\u9000\u51FA\u7801\u548C\u88C5\u51FA\u6765\u7684\u6587\u4EF6\uFF1Bfalse\uFF1A\u6253\u5F00\u5B89\u88C5\u7A0B\u5E8F\u81EA\u5DF1\u7684\u7A97\u53E3\uFF08\u5B89\u88C5\u4F4D\u7F6E\u5DF2\u9884\u5148\u586B\u597D\uFF09\u540E\u7ACB\u5373\u8FD4\u56DE\uFF0C\u518D\u7528 screen_capture / screen_tap \u4E00\u6B65\u6B65\u70B9\u5B8C\u3002\u88C5\u597D\u540E\u7528 ${TOOL_NAMES.import} \u5BFC\u5165\u90A3\u4E2A\u76EE\u5F55\uFF08path \u586B\u8FD4\u56DE\u7684 dir\uFF0Cid \u586B\u8FD9\u4E2A\u811A\u672C\u7684 id\uFF09\uFF0C\u5B89\u88C5\u624D\u7B97\u5B8C\u6210\u3002\u53EA\u80FD\u8FD0\u884C\u811A\u672C\u5E93\u4E0B\u8F7D\u7684\u5B89\u88C5\u7A0B\u5E8F\u3002`,
+      description: `\u8FD0\u884C\u811A\u672C\u5B89\u88C5\u6216\u66F4\u65B0\u65F6\u4E0B\u8F7D\u5230\u7684\u5B89\u88C5\u7A0B\u5E8F\uFF08NSIS / Inno Setup / Kachina \u7684 setup.exe\uFF0C\u6216\u53EA\u88C5\u7740\u5B83\u7684\u538B\u7F29\u5305\uFF0C\u4F8B\u5982 Mirror\u9171 \u7684 BetterGI\uFF1B\u6709\u7684\u811A\u672C\u53EA\u53D1\u5E03\u8FD9\u79CD\u5B8C\u6574\u5305\uFF09\u3002quiet\uFF08\u9ED8\u8BA4 true\uFF09\uFF1A\u4E0D\u5F39\u7A97\u53E3\uFF0C\u9759\u9ED8\u88C5\u8FDB\u811A\u672C\u7684\u7248\u672C\u76EE\u5F55\u5E76\u7B49\u5B83\u88C5\u5B8C\uFF0C\u8FD4\u56DE\u9000\u51FA\u7801\u548C\u88C5\u51FA\u6765\u7684\u6587\u4EF6\uFF1Bfalse\uFF1A\u6253\u5F00\u5B89\u88C5\u7A0B\u5E8F\u81EA\u5DF1\u7684\u7A97\u53E3\uFF08\u5B89\u88C5\u4F4D\u7F6E\u5DF2\u9884\u5148\u586B\u597D\uFF09\u540E\u7ACB\u5373\u8FD4\u56DE\uFF0C\u518D\u7528 screen_capture / screen_tap \u4E00\u6B65\u6B65\u70B9\u5B8C\u3002\u88C5\u597D\u540E\u7528 ${TOOL_NAMES.import} \u5BFC\u5165\u90A3\u4E2A\u76EE\u5F55\uFF08path \u586B\u8FD4\u56DE\u7684 dir\uFF0Cid \u586B\u8FD9\u4E2A\u811A\u672C\u7684 id\uFF09\uFF0C\u5B89\u88C5\u624D\u7B97\u5B8C\u6210\u3002\u53EA\u80FD\u8FD0\u884C\u811A\u672C\u5E93\u4E0B\u8F7D\u7684\u5B89\u88C5\u7A0B\u5E8F\u3002`,
       properties: {
         id: { type: "string", description: "\u811A\u672C id\uFF08script_install / script_update \u7684\u7ED3\u679C\u91CC\u6709\uFF09\u3002" },
         quiet: { type: "boolean", description: "\u9759\u9ED8\u5B89\u88C5\u5E76\u7B49\u5F85\u7ED3\u675F\uFF1B\u9ED8\u8BA4 true\u3002\u9759\u9ED8\u5931\u8D25\u6216\u9700\u8981\u5728\u754C\u9762\u91CC\u9009\u62E9\u65F6\u7528 false\u3002" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-multigameassistant",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "多游戏助手 MultiGameAssistant 的 dsh 插件版：让 agent 管好各个游戏的日常脚本（安装、编排定时流水线、看护运行、查活动），界面在自己的网页里。",
   "keywords": [
     "dsh",
@@ -16,7 +16,8 @@
   "homepage": "https://github.com/haaahhhis/MultiGameAssistant",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/haaahhhis/MultiGameAssistant.git"
+    "url": "git+https://github.com/haaahhhis/MultiGameAssistant.git",
+    "directory": "packages/dsh-plugin"
   },
   "bugs": {
     "url": "https://github.com/haaahhhis/MultiGameAssistant/issues"
@@ -59,7 +60,7 @@
   ],
   "peerDependencies": {
     "@deepseek-ai/cordis": "*",
-    "@deepseek-ai/dsh-credentials": "*"
+    "@deepseek-ai/dsh-credentials": ">=0.2.1-rc.5 <0.3.0-0"
   },
   "dsh": {
     "bundle": {

package/skills/game-intel.md

@@ -27,6 +27,14 @@ description: 游戏活动信息：查有什么活动、还剩几天、商店换
 7. 最后用 `ask_user_question` 问用户要不要把游戏关掉，选项「关掉游戏」「先开着」。游戏是你这次用 `game_launch` 打开的，就把「关掉游戏」放第一个、标签后面加 ` (Recommended)`。用户选关掉就 `game_close`，然后告诉用户已经关了；选开着就结束。第 2 步因为有脚本在用而结束的，不要问、也不要关。
    - 流水线的 agent 节点里没人等着回答：不要问，节点要求里说了关就关，没说就开着。
 
+## 用户自己加或改活动
+
+用户说「帮我加一个活动」「把 XX 改成 …结束」「给这个活动换张图」时用 `game_activity_save`，不要用 `game_record`（那是记读到的）：
+
+- 新加：写 `game`、`name`，有时间就写 `starts_at` / `ends_at`（游戏服务器时间）。改已有的：先 `game_activities` 找到 `id`，只写要改的字段。
+- 图片 `image`：用户给的图片网址、本机图片文件路径，或 `screenshot`（这个对话最近一张截图，比如刚用 `screen_capture` 截的活动页）。
+- 用户填的内容比数据站优先，刷新不会改掉。要恢复成来源的：`clear` 列出字段，或 `game_activity_remove`（what=mine）。用户要删掉才用 `game_activity_remove`（what=all）。
+
 ## 日报
 
 每天按「游戏」页里设置的时间自动发到飞书。用户要现在看：`game_report`；要发出去：`game_report`（send=true）。