dsh-lark-bot 0.19.11 → 0.19.12

package/dist/cli.js

@@ -296,6 +296,16 @@ var init_profile_package = __esm({
   }
 });
 
+// src/adapters/model-choice.ts
+function resolveModelChoice(preferenceModel, envModel) {
+  return preferenceModel?.trim() || envModel;
+}
+var init_model_choice = __esm({
+  "src/adapters/model-choice.ts"() {
+    "use strict";
+  }
+});
+
 // src/adapters/dsh/acp-runtime.ts
 import { spawn as spawn4 } from "cross-spawn";
 import { existsSync as existsSync4, realpathSync as realpathSync3 } from "fs";
@@ -666,7 +676,7 @@ async function buildAcpAgentAdapter(env, preferences) {
     home: homedir2(),
     env: process.env,
     provider: env.provider,
-    model: preferences.model ?? env.model,
+    model: resolveModelChoice(preferences.model, env.model),
     ...env.dshExplicit ? { command: env.dshCommand, args: env.dshArgs } : {}
   };
   const ensure = await ensureAcpProfile(runtimeOptions);
@@ -679,7 +689,7 @@ async function buildAcpAgentAdapter(env, preferences) {
   return new AcpDshAdapter({
     launch,
     provider: env.provider,
-    model: preferences.model ?? env.model
+    model: resolveModelChoice(preferences.model, env.model)
   });
 }
 var AcpDshAdapter;
@@ -688,6 +698,7 @@ var init_acp_adapter = __esm({
     "use strict";
     init_acp_runtime();
     init_event_channel();
+    init_model_choice();
     AcpDshAdapter = class {
       id = "dsh-acp";
       displayName = "DeepSeek Harness (ACP)";
@@ -972,12 +983,18 @@ async function listProcesses(platform = process.platform, run = captureOutput) {
   return listProcessesPosix(run);
 }
 async function listProcessesPosix(run) {
-  const { stdout } = await run("ps", ["-axo", "pid=,args="], 1e4);
+  const { stdout } = await run("ps", ["-axo", "pid=,ppid=,args="], 1e4);
   const result = [];
   for (const line of stdout.split("\n")) {
-    const match = /^\s*(\d+)\s+(.+)$/.exec(line);
-    if (match) {
-      result.push({ pid: Number(match[1]), cmdline: match[2] ?? "" });
+    const match = /^\s*(\d+)\s+(\d+)\s+(.+)$/.exec(line);
+    if (!match) continue;
+    const pid = Number(match[1]);
+    const ppid = Number(match[2]);
+    if (!Number.isInteger(pid) || pid <= 0) continue;
+    if (Number.isInteger(ppid) && ppid > 0) {
+      result.push({ pid, ppid, cmdline: match[3] ?? "" });
+    } else {
+      result.push({ pid, cmdline: match[3] ?? "" });
     }
   }
   return result;
@@ -989,7 +1006,7 @@ async function listProcessesWindows(run) {
       "-NoProfile",
       "-NonInteractive",
       "-Command",
-      "Get-CimInstance Win32_Process | Select-Object ProcessId, CommandLine | ConvertTo-Json -Compress"
+      "Get-CimInstance Win32_Process | Select-Object ProcessId, ParentProcessId, CommandLine | ConvertTo-Json -Compress"
     ],
     1e4
   );
@@ -1000,8 +1017,11 @@ async function listProcessesWindows(run) {
       if (typeof row !== "object" || row === null) return [];
       const record = row;
       const pid = Number(record.ProcessId);
+      const ppid = Number(record.ParentProcessId);
       const cmdline = record.CommandLine;
-      return Number.isInteger(pid) && pid > 0 && typeof cmdline === "string" ? [{ pid, cmdline }] : [];
+      if (!Number.isInteger(pid) || pid <= 0 || typeof cmdline !== "string") return [];
+      if (Number.isInteger(ppid) && ppid > 0) return [{ pid, ppid, cmdline }];
+      return [{ pid, cmdline }];
     });
   } catch {
     return [];
@@ -1703,7 +1723,7 @@ var DshProviderManager = class {
     try {
       catalogProviders = await this.catalog.listProviders();
     } catch (error) {
-      log.warn("model-catalog", "refresh-failed", {
+      log.info("model-catalog", "refresh-failed", {
         error: error instanceof Error ? error.message : String(error)
       });
     }
@@ -3442,6 +3462,7 @@ var WebDshAdapter = class {
 };
 
 // src/adapters/index.ts
+init_model_choice();
 async function resolveAdapterRoute(input, source) {
   const provider = input.provider?.trim() || void 0;
   const model = input.model?.trim() || void 0;
@@ -3461,7 +3482,7 @@ async function resolveAdapterRoute(input, source) {
   return void 0;
 }
 async function buildAgentAdapter(env, preferences = { stopGraceMs: void 0, model: void 0 }) {
-  const configuredModel = preferences.model ?? env.model;
+  const configuredModel = resolveModelChoice(preferences.model, env.model);
   const managedRoute = env.adapterMode === "sdk" || env.adapterMode === "acp" ? await resolveAdapterRoute(
     { provider: env.provider, model: configuredModel },
     new DshProviderManager({ env: process.env })
@@ -3493,7 +3514,7 @@ async function buildAgentAdapter(env, preferences = { stopGraceMs: void 0, model
       return new WebDshAdapter({
         baseUrl: env.webBaseUrl,
         provider: env.provider,
-        model: preferences.model ?? env.model
+        model: resolveModelChoice(preferences.model, env.model)
       });
     }
     case "sdk":
@@ -4189,17 +4210,36 @@ var ConfigStore = class {
 };
 
 // src/guardian/install.ts
-init_own_package();
-init_dsh_runtime();
-init_process();
 import { mkdir as mkdir8, readFile as readFile8, rm as rm3, writeFile as writeFile5 } from "fs/promises";
 import { existsSync as existsSync5 } from "fs";
 import { homedir as homedir6 } from "os";
-import { delimiter, dirname as dirname9, join as join11 } from "path";
+import { dirname as dirname10, join as join11 } from "path";
+
+// src/platform/path.ts
+import { delimiter, dirname as dirname8 } from "path";
+function sanitizeServicePath(nodeBin, inheritedPath = process.env.PATH) {
+  const entries = [dirname8(nodeBin), ...inheritedPath?.split(delimiter) ?? []];
+  const seen = /* @__PURE__ */ new Set();
+  return entries.filter((entry) => {
+    if (!entry) return false;
+    const normalized = entry.replaceAll("\\", "/");
+    if (normalized.includes("/node_modules/.bin") || /\/_npx(?:\/|$)/.test(normalized) || /\/guardian\/update-worker\/npm-cache(?:\/|$)/.test(normalized)) {
+      return false;
+    }
+    if (seen.has(entry)) return false;
+    seen.add(entry);
+    return true;
+  }).join(delimiter);
+}
+
+// src/guardian/install.ts
+init_own_package();
+init_dsh_runtime();
+init_process();
 
 // src/guardian/state.ts
 import { readFile as readFile7 } from "fs/promises";
-import { dirname as dirname8 } from "path";
+import { dirname as dirname9 } from "path";
 import { mkdir as mkdir7 } from "fs/promises";
 var DEFAULT_DSH_PROFILE = "dsh-lark";
 var DEFAULT_BRIDGE_PROFILE = "default";
@@ -4241,7 +4281,7 @@ async function loadGuardianState(file, fallback) {
 }
 async function saveGuardianState(file, state) {
   const next = { ...state, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-  await mkdir7(dirname8(file), { recursive: true });
+  await mkdir7(dirname9(file), { recursive: true });
   await writeFileAtomic(file, `${JSON.stringify(next, null, 2)}
 `, { mode: 384 });
 }
@@ -4295,7 +4335,7 @@ function guardianServiceFilePath(platform, root) {
 }
 function systemdUnit(nodeBin, cliEntry, env = {}) {
   const renderedEnv = {
-    PATH: env.PATH ?? dirname9(nodeBin),
+    PATH: env.PATH ?? dirname10(nodeBin),
     ...env
   };
   const envLines = Object.entries(renderedEnv).map(([key, value]) => `Environment=${key}=${value}`).join("\n");
@@ -4318,18 +4358,7 @@ function systemdUnit(nodeBin, cliEntry, env = {}) {
   ].join("\n");
 }
 function stableGuardianServicePath(nodeBin, inheritedPath = process.env.PATH) {
-  const entries = [dirname9(nodeBin), ...inheritedPath?.split(delimiter) ?? []];
-  const seen = /* @__PURE__ */ new Set();
-  return entries.filter((entry) => {
-    if (!entry) return false;
-    const normalized = entry.replaceAll("\\", "/");
-    if (normalized.includes("/node_modules/.bin") || /\/_npx(?:\/|$)/.test(normalized) || /\/guardian\/update-worker\/npm-cache(?:\/|$)/.test(normalized)) {
-      return false;
-    }
-    if (seen.has(entry)) return false;
-    seen.add(entry);
-    return true;
-  }).join(delimiter);
+  return sanitizeServicePath(nodeBin, inheritedPath);
 }
 function launchdPlist(nodeBin, cliEntry, label2 = `io.dsh-lark.${GUARDIAN_LABEL}`, logPath = "/tmp/dsh-lark-guardian.log") {
   return [
@@ -4666,7 +4695,7 @@ async function detectUpgradeState(options = {}) {
 
 // src/upgrade/state.ts
 import { mkdir as mkdir9, readFile as readFile11 } from "fs/promises";
-import { dirname as dirname10, join as join13 } from "path";
+import { dirname as dirname11, join as join13 } from "path";
 function upgradeStatePath(root) {
   return join13(root, "upgrade-state.json");
 }
@@ -4682,7 +4711,7 @@ async function loadUpgradeState(file) {
   }
 }
 async function saveUpgradeState(file, state) {
-  await mkdir9(dirname10(file), { recursive: true });
+  await mkdir9(dirname11(file), { recursive: true });
   await writeFileAtomic(file, JSON.stringify(state, null, 2));
 }
 
@@ -4765,13 +4794,13 @@ function packageSpecFor(name, version) {
 
 // src/service/manager.ts
 import { mkdir as mkdir14, readFile as readFile14, rename as rename2, rm as rm7, stat as stat5 } from "fs/promises";
-import { dirname as dirname13, join as join19 } from "path";
+import { dirname as dirname14, join as join19 } from "path";
 import { homedir as homedir11 } from "os";
 init_dsh_runtime();
 
 // src/service/command.ts
 import { execFile } from "child_process";
-import { basename as basename3, dirname as dirname11, join as join14 } from "path";
+import { basename as basename3, dirname as dirname12, join as join14 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var runCommand = (command, args, options) => new Promise((resolve6) => {
   execFile(
@@ -4797,7 +4826,7 @@ function resolveCliJsPath(metaUrl = import.meta.url) {
   const current = fileURLToPath2(metaUrl);
   const name = basename3(current);
   if (name === "cli.js" || name === "cli.mjs" || name === "cli.cjs") return current;
-  return join14(dirname11(current), "..", "dist", "cli.js");
+  return join14(dirname12(current), "..", "dist", "cli.js");
 }
 function slugify(value) {
   const slug = value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
@@ -4840,6 +4869,9 @@ function snapshotServiceEnv(source = process.env, extraKeys = [], inherited = {}
       }
     }
   }
+  if (typeof env.PATH === "string" && env.PATH.length > 0) {
+    env.PATH = sanitizeServicePath(process.execPath, env.PATH);
+  }
   return env;
 }
 function formatEnvFile(env) {
@@ -5425,7 +5457,7 @@ var PortableServiceController = class {
 
 // src/service/windows-task.ts
 import { mkdir as mkdir13, writeFile as writeFile7 } from "fs/promises";
-import { dirname as dirname12, join as join18 } from "path";
+import { dirname as dirname13, join as join18 } from "path";
 function psQuote(value) {
   return `'${value.replace(/'/g, "''")}'`;
 }
@@ -5436,7 +5468,7 @@ function buildScheduledTaskScript(action, spec) {
     `$arguments = ${psQuote(spec.commandArgs.map((arg) => `"${arg.replace(/"/g, '\\"')}"`).join(" "))}`,
     `$log = ${psQuote(spec.logFile)}`,
     `$profile = ${psQuote(spec.profile)}`,
-    `$workDir = ${psQuote(dirname12(spec.commandPath))}`
+    `$workDir = ${psQuote(dirname13(spec.commandPath))}`
   ].join("\n");
   const install = [
     `$inner = '"' + $command + '" ' + $arguments + ' >> "' + $log + '" 2>&1'`,
@@ -5655,7 +5687,7 @@ var ServiceManager = class {
   }
   async withLifecycleLock(operation) {
     const lockDir = this.paths.serviceLockDir(this.profile);
-    await mkdir14(dirname13(lockDir), { recursive: true });
+    await mkdir14(dirname14(lockDir), { recursive: true });
     try {
       await mkdir14(lockDir);
     } catch (error) {
@@ -5695,11 +5727,39 @@ var ServiceManager = class {
     if (serviceStatus.state === "running") return;
     const process2 = await this.findProcess(this.profile);
     if (process2) {
+      if (await this.isGuardianSpawned(process2)) {
+        await this.stopGuardianSpawnedProcess(process2.pid);
+        return;
+      }
       throw new Error(
         `\u68C0\u6D4B\u5230\u672A\u53D7\u7BA1\u7684 dsh --profile ${this.profile}\uFF08pid ${process2.pid}\uFF09\u3002\u8BF7\u5148\u5728\u539F\u7EC8\u7AEF\u505C\u6B62\u5B83\uFF0C\u518D\u91CD\u8BD5\u3002`
       );
     }
   }
+  /** True when the profile process was spawned by the resident guardian. */
+  async isGuardianSpawned(process2) {
+    const ppid = process2.ppid;
+    if (!ppid) return false;
+    const parent = (await listProcesses()).find((entry) => entry.pid === ppid);
+    return parent !== void 0 && matchGuardianProcess(parent.cmdline);
+  }
+  /** Best-effort stop of a guardian-spawned profile process (grace, then kill). */
+  async stopGuardianSpawnedProcess(pid) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+      return;
+    }
+    const deadline = Date.now() + 5e3;
+    while (Date.now() < deadline && isPidAlive2(pid)) {
+      await new Promise((resolve6) => setTimeout(resolve6, 100));
+    }
+    if (!isPidAlive2(pid)) return;
+    try {
+      process.kill(pid, "SIGKILL");
+    } catch {
+    }
+  }
   async buildSpec(requireProfile = false) {
     const previous = await this.readMetadata();
     const dshBin = this.dshBinOverride ?? discoverDshBin(this.home, this.sourceEnv) ?? previous?.dshBin;
@@ -5796,8 +5856,8 @@ var ServiceManager = class {
     }
   }
   async prepareFiles(spec, platform) {
-    await mkdir14(dirname13(spec.logFile), { recursive: true });
-    await mkdir14(dirname13(spec.envFile), { recursive: true });
+    await mkdir14(dirname14(spec.logFile), { recursive: true });
+    await mkdir14(dirname14(spec.envFile), { recursive: true });
     await writeServiceEnv(spec.envFile, spec.env);
     if (platform === "win32-task") {
       try {
@@ -10461,7 +10521,7 @@ async function handleConfigHubAction(action, ctx, value = {}) {
 }
 
 // src/commands/archive.ts
-import { dirname as dirname14 } from "path";
+import { dirname as dirname15 } from "path";
 
 // src/media/outbound-files.ts
 import { constants } from "fs";
@@ -10657,7 +10717,7 @@ async function sendArchiveFiles(ctx, record, destination = {
     [record.jsonlPath, `${record.archiveId}.jsonl`]
   ]) {
     try {
-      const prepared = await prepareOutboundFile({ path, baseDir: dirname14(path), allowedRoots: [dirname14(path)], fileName });
+      const prepared = await prepareOutboundFile({ path, baseDir: dirname15(path), allowedRoots: [dirname15(path)], fileName });
       await ctx.channel.sendFile(destination.chatId, prepared.fileName, prepared.content, {
         ...destination.messageId ? { replyTo: destination.messageId } : {},
         ...destination.threadId ? { threadId: destination.threadId } : {}
@@ -16665,7 +16725,7 @@ async function safeRemove(path) {
 import { execFile as execFile3 } from "child_process";
 import { createHash as createHash2, randomBytes as randomBytes4 } from "crypto";
 import { access as access2, copyFile, mkdir as mkdir18, realpath as realpath2 } from "fs/promises";
-import { dirname as dirname15, join as join25 } from "path";
+import { dirname as dirname16, join as join25 } from "path";
 import { promisify as promisify2 } from "util";
 var execFileAsync2 = promisify2(execFile3);
 async function defaultRunGit2(args, cwd) {
@@ -16684,7 +16744,7 @@ async function exists2(path) {
   }
 }
 async function defaultCopyRulesFile(source, target) {
-  await mkdir18(dirname15(target), { recursive: true });
+  await mkdir18(dirname16(target), { recursive: true });
   await copyFile(source, target);
 }
 function slugify2(scope) {
@@ -16902,7 +16962,7 @@ var UpdateNotifier = class {
 
 // src/bot/fleet-store.ts
 import { mkdir as mkdir19, readFile as readFile28 } from "fs/promises";
-import { dirname as dirname16 } from "path";
+import { dirname as dirname17 } from "path";
 function validBotInstanceName(name) {
   return /^[a-z][a-z0-9-]{0,31}$/u.test(name);
 }
@@ -17023,7 +17083,7 @@ var BotFleetStore = class {
     })).sort((a, b) => a.name.localeCompare(b.name));
   }
   async persist() {
-    await mkdir19(dirname16(this.path), { recursive: true });
+    await mkdir19(dirname17(this.path), { recursive: true });
     await writeFileAtomic(this.path, `${JSON.stringify(this.data, null, 2)}
 `, { mode: 384 });
   }
@@ -17043,7 +17103,7 @@ function isFleetEntry(value) {
 
 // src/bot/handoff-guard.ts
 import { mkdir as mkdir20, readFile as readFile29 } from "fs/promises";
-import { dirname as dirname17 } from "path";
+import { dirname as dirname18 } from "path";
 var BotHandoffGuard = class {
   constructor(path) {
     this.path = path;
@@ -17091,7 +17151,7 @@ var BotHandoffGuard = class {
     }
   }
   async write(data) {
-    await mkdir20(dirname17(this.path), { recursive: true });
+    await mkdir20(dirname18(this.path), { recursive: true });
     await writeFileAtomic(this.path, `${JSON.stringify(data, null, 2)}
 `, { mode: 384 });
   }
@@ -17874,7 +17934,7 @@ init_own_package();
 import { createHash as createHash3, randomUUID as randomUUID13 } from "crypto";
 import { spawn as spawn7 } from "child_process";
 import { chmod, mkdir as mkdir21, readFile as readFile31, rm as rm10 } from "fs/promises";
-import { dirname as dirname18, join as join26 } from "path";
+import { dirname as dirname19, join as join26 } from "path";
 init_own_package();
 init_process();
 function guardianUpdateFailureHint(code) {
@@ -17911,7 +17971,7 @@ async function loadState(file) {
   }
 }
 async function saveState(file, state) {
-  await mkdir21(dirname18(file), { recursive: true });
+  await mkdir21(dirname19(file), { recursive: true });
   await writeFileAtomic(file, `${JSON.stringify(state, null, 2)}
 `, { mode: 384 });
 }
@@ -17986,7 +18046,7 @@ async function runGuardianUpdateWorker(request, options = {}) {
   if (delayMs > 0) await new Promise((resolve6) => setTimeout(resolve6, delayMs));
   const spec = `${state.packageName}@${state.targetVersion}`;
   const run = options.run ?? captureOutput;
-  const workerRoot = join26(dirname18(request.stateFile), "update-worker");
+  const workerRoot = join26(dirname19(request.stateFile), "update-worker");
   const cacheRoot = join26(workerRoot, "npm-cache");
   const cacheDir = join26(
     cacheRoot,
@@ -21166,7 +21226,7 @@ function followLogFile(path, lines) {
 // src/cli/commands/supervise.ts
 import { spawn as spawn10 } from "child_process";
 import { closeSync, mkdirSync, openSync } from "fs";
-import { dirname as dirname19 } from "path";
+import { dirname as dirname20 } from "path";
 import { homedir as homedir22 } from "os";
 init_dsh_runtime();
 var BASE_BACKOFF_MS = 5e3;
@@ -21200,8 +21260,8 @@ async function runSupervise(options, deps = {}) {
   const logFile = paths.serviceLogFile(profile);
   const dshBin = deps.dshBin ?? discoverDshBin(homedir22(), childEnv);
   if (!dshBin) throw new Error("\u672A\u627E\u5230 dsh CLI\uFF0Cportable supervisor \u65E0\u6CD5\u542F\u52A8 profile\u3002");
-  mkdirSync(dirname19(statusFile), { recursive: true });
-  mkdirSync(dirname19(logFile), { recursive: true });
+  mkdirSync(dirname20(statusFile), { recursive: true });
+  mkdirSync(dirname20(logFile), { recursive: true });
   const logFd = openSync(logFile, "a");
   const writeStatus = async (state, childPid, restarts2) => {
     const processIdentity = await (deps.readProcessIdentity ?? readLinuxProcessIdentity)(process.pid);