dsh-bots 0.2.14 → 0.2.16

package/cordis.patch.yml

@@ -2,4 +2,4 @@
     - id: bots
       name: dsh-bots
       config:
-        dataDir: '~/.sdk-bots'
+        dataDir: '~/.dsh-bots'

package/lib/gateway.js

@@ -13,6 +13,38 @@ import { readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { AVATAR_DATA_URL_MAX } from './shared.js';
 const TOKEN_RE = /^[A-Za-z0-9._~+-]+$/;
+/** New default root (0.2.16). The gateway may still live at the legacy root
+ * until the engine's SAND_DATA_ROOT migrates — every discovery consumer tries
+ * the configured dir first, then the legacy one. */
+export const LEGACY_DATA_DIR = '~/.sdk-bots';
+/**
+ * Discovery that follows the gateway to wherever it actually lives: the
+ * configured dir when it holds a gateway.json, else the legacy root. Returns
+ * null when neither has one (the gateway is simply down).
+ */
+export function readDiscoveryWithFallback(dataDir, legacyDir = LEGACY_DATA_DIR) {
+    const direct = readDiscovery(dataDir);
+    if (direct !== null)
+        return direct;
+    if (expandHome(dataDir) !== expandHome(legacyDir))
+        return readDiscovery(legacyDir);
+    return null;
+}
+/**
+ * The directory where the gateway (and therefore agents/, box-workspace/,
+ * swarm/) actually lives right now: the configured dir if it has discovery,
+ * else the legacy root, else the configured dir as-is. All state-adjacent
+ * consumers (unread ledger, workspace ops, media allowlist, diag) resolve
+ * through this so they stay co-located with the real data across migration.
+ */
+export function effectiveDataDir(dataDir, legacyDir = LEGACY_DATA_DIR) {
+    if (readDiscovery(dataDir) !== null)
+        return expandHome(dataDir);
+    if (expandHome(dataDir) !== expandHome(legacyDir) && readDiscovery(legacyDir) !== null) {
+        return expandHome(legacyDir);
+    }
+    return expandHome(dataDir);
+}
 export function expandHome(p) {
     if (p === '~')
         return homedir();
@@ -54,7 +86,7 @@ export function readDiscovery(dataDir) {
 }
 /** Discovery + `/health` probe with pid match validation. */
 export async function discover(dataDir) {
-    const d = readDiscovery(dataDir);
+    const d = readDiscoveryWithFallback(dataDir);
     if (d === null)
         return { ok: false, reason: 'no-gateway-json' };
     const baseUrl = `http://${d.host}:${d.port}`;
@@ -87,7 +119,7 @@ export async function discover(dataDir) {
 }
 /** POST one `/api/<method>` command; unwraps `{result}` and throws on errors. */
 export async function callGateway(dataDir, method, args = {}) {
-    const d = readDiscovery(dataDir);
+    const d = readDiscoveryWithFallback(dataDir);
     if (d === null)
         throw new Error('gateway.json not found — sdk-bots host 是否在运行？');
     const baseUrl = `http://${d.host}:${d.port}`;

package/lib/index.js

@@ -23,7 +23,7 @@ import { dirname, extname, join, resolve, sep } from 'node:path';
 import { appendFileSync, readFileSync, realpathSync, statSync } from 'node:fs';
 import { spawn } from 'node:child_process';
 import { pathToFileURL } from 'node:url';
-import { callGateway, discover, expandHome, nextNonce, normalizeAgents, readDiscovery, trimAgent, trimEntry } from './gateway.js';
+import { callGateway, discover, effectiveDataDir, expandHome, nextNonce, normalizeAgents, readDiscoveryWithFallback, trimAgent, trimEntry } from './gateway.js';
 import { GatewaySseClient, SseRingBuffer } from './sse.js';
 import { UnreadStore } from './unread.js';
 import { listAgentWorkspaces, readAgentWorkspace, setAgentWorkspace } from './workspace.js';
@@ -34,7 +34,10 @@ export const name = 'dsh-bots';
 export const inject = [];
 /** Cordis range this plugin is tested against; only surfaces a warning. */
 export const TESTED_CORDIS_RANGE = '^4.0.1';
-const DEFAULT_DATA_DIR = '~/.sdk-bots';
+const DEFAULT_DATA_DIR = '~/.dsh-bots';
+/** Where the gateway lived before the 0.2.16 default rename — discovery and
+ * every data-dir consumer fall back to it until the engine migrates. */
+const LEGACY_DATA_DIR = '~/.sdk-bots';
 /** Append-only diagnostics file, read when a shadow takeover misbehaves. */
 const DIAG_FILE = 'dsh-bots-diag.jsonl';
 /** Persisted read markers ("读到哪了") backing the sidebar unread badge. */
@@ -131,12 +134,12 @@ export class BotsRemote extends TypertRemoteService {
     constructor(ctx, config) {
         super(ctx, 'bots');
         this.cfg = { dataDir: config?.dataDir ?? DEFAULT_DATA_DIR };
-        this.unread = new UnreadStore(join(expandHome(this.cfg.dataDir), UNREAD_FILE));
+        this.unread = new UnreadStore(join(effectiveDataDir(this.cfg.dataDir), UNREAD_FILE));
         const ring = new SseRingBuffer(3000, (channel, data) => { this.observeTranscript(channel, data); });
         this.sse = new GatewaySseClient({
             ring,
             resolveBase: () => {
-                const d = readDiscovery(this.cfg.dataDir);
+                const d = readDiscoveryWithFallback(this.cfg.dataDir);
                 if (d === null)
                     return null;
                 return { url: `http://${d.host}:${d.port}`, token: d.token };
@@ -295,7 +298,7 @@ export class BotsRemote extends TypertRemoteService {
         const p = String(raw ?? '').trim();
         if (p === '')
             throw new Error('path is required');
-        const root = realpathSync(expandHome(this.cfg.dataDir));
+        const root = realpathSync(effectiveDataDir(this.cfg.dataDir));
         let resolved = resolve(expandHome(p));
         try {
             resolved = realpathSync(resolved);
@@ -482,16 +485,16 @@ export class BotsRemote extends TypertRemoteService {
     // these methods only read/write the per-agent settings.json contract.
     // ==========================================================
     async workspaceList(request) {
-        return { workspaces: listAgentWorkspaces(expandHome(this.cfg.dataDir)) };
+        return { workspaces: listAgentWorkspaces(effectiveDataDir(this.cfg.dataDir)) };
     }
     async workspaceGet(request) {
-        const config = readAgentWorkspace(expandHome(this.cfg.dataDir), String(request?.agentId ?? ''));
+        const config = readAgentWorkspace(effectiveDataDir(this.cfg.dataDir), String(request?.agentId ?? ''));
         if (config === null)
             throw new Error(`workspaceGet: agent 不存在或 id 不合法`);
         return config;
     }
     async workspaceSet(request) {
-        return setAgentWorkspace(expandHome(this.cfg.dataDir), String(request?.agentId ?? ''), {
+        return setAgentWorkspace(effectiveDataDir(this.cfg.dataDir), String(request?.agentId ?? ''), {
             workspaceRoot: request?.workspaceRoot,
             allowPaths: request?.allowPaths,
         });
@@ -516,7 +519,7 @@ export class BotsRemote extends TypertRemoteService {
                 stage: request.stage,
                 detail: request.detail ?? null,
             });
-            appendFileSync(join(expandHome(this.cfg.dataDir), DIAG_FILE), line + '\n');
+            appendFileSync(join(effectiveDataDir(this.cfg.dataDir), DIAG_FILE), line + '\n');
             return { written: true };
         }
         catch {

package/lib/types/gateway.d.ts

@@ -15,6 +15,24 @@ export interface Discovery {
     token: string | null;
     host: string;
 }
+/** New default root (0.2.16). The gateway may still live at the legacy root
+ * until the engine's SAND_DATA_ROOT migrates — every discovery consumer tries
+ * the configured dir first, then the legacy one. */
+export declare const LEGACY_DATA_DIR = "~/.sdk-bots";
+/**
+ * Discovery that follows the gateway to wherever it actually lives: the
+ * configured dir when it holds a gateway.json, else the legacy root. Returns
+ * null when neither has one (the gateway is simply down).
+ */
+export declare function readDiscoveryWithFallback(dataDir: string, legacyDir?: string): Discovery | null;
+/**
+ * The directory where the gateway (and therefore agents/, box-workspace/,
+ * swarm/) actually lives right now: the configured dir if it has discovery,
+ * else the legacy root, else the configured dir as-is. All state-adjacent
+ * consumers (unread ledger, workspace ops, media allowlist, diag) resolve
+ * through this so they stay co-located with the real data across migration.
+ */
+export declare function effectiveDataDir(dataDir: string, legacyDir?: string): string;
 export declare function expandHome(p: string): string;
 /** Read loopback discovery from `<dataDir>/gateway.json`; null when absent/stale. */
 export declare function readDiscovery(dataDir: string): Discovery | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-bots",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Multi-bot workbench for DeepSeek Harness: bridges the sdk-bots orchestration gateway (group chats, single bots) into the dsh web shell with official-styled UI.",
   "type": "module",
   "main": "lib/index.js",