dsh-bots 0.0.1 → 0.2.11

package/lib/version.js

@@ -0,0 +1,109 @@
+/**
+ * Minimal semver caret-range matching for the prerelease patterns this plugin
+ * actually uses (e.g. `^4.0.1`, `^0.1.1-rc.2`).
+ *
+ * Ported from the community dsh-plugin-template (MIT) and kept
+ * dependency-free: it implements the subset of node-semver semantics needed to
+ * turn a silent peer mismatch into a loud, actionable error.
+ * See tests/version.spec.ts for the behavior matrix.
+ * @module dsh-plugin-bots/version
+ */
+/** Parse `X.Y.Z` or `X.Y.Z-pre` into a comparable structure, or null. */
+export function parseVersion(input) {
+    const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/.exec(input.trim());
+    if (match === null)
+        return null;
+    const prerelease = match[4] !== undefined && match[4] !== '' ? match[4].split('.') : null;
+    return {
+        major: Number(match[1]),
+        minor: Number(match[2]),
+        patch: Number(match[3]),
+        prerelease,
+    };
+}
+function compareIdentifier(a, b) {
+    const aNumeric = /^\d+$/.test(a);
+    const bNumeric = /^\d+$/.test(b);
+    if (aNumeric && bNumeric) {
+        const diff = BigInt(a) - BigInt(b);
+        return diff === 0n ? 0 : diff > 0n ? 1 : -1;
+    }
+    if (aNumeric)
+        return -1; // numeric identifiers always sort lower
+    if (bNumeric)
+        return 1;
+    return a < b ? -1 : a > b ? 1 : 0;
+}
+/** Compare two prerelease identifier lists; a stable version (null) is higher. */
+export function comparePrerelease(a, b) {
+    if (a === null && b === null)
+        return 0;
+    if (a === null)
+        return 1;
+    if (b === null)
+        return -1;
+    const length = Math.max(a.length, b.length);
+    for (let i = 0; i < length; i++) {
+        const left = a[i];
+        const right = b[i];
+        if (left === undefined)
+            return -1; // shorter prerelease sorts lower
+        if (right === undefined)
+            return 1;
+        const diff = compareIdentifier(left, right);
+        if (diff !== 0)
+            return diff;
+    }
+    return 0;
+}
+function tupleOf(version) {
+    return [version.major, version.minor, version.patch];
+}
+function compareTuple(a, b) {
+    for (let i = 0; i < 3; i++) {
+        const diff = a[i] - b[i];
+        if (diff !== 0)
+            return diff > 0 ? 1 : -1;
+    }
+    return 0;
+}
+/** Upper exclusive bound of a caret range: ^0.1.0 → 0.2.0, ^1.2.3 → 2.0.0. */
+export function caretUpperBound(version) {
+    if (version.major > 0)
+        return [version.major + 1, 0, 0];
+    if (version.minor > 0)
+        return [0, version.minor + 1, 0];
+    return [0, 0, version.patch + 1];
+}
+/**
+ * Whether `version` satisfies the caret range `^X.Y.Z` or `^X.Y.Z-pre`.
+ * Mirrors node-semver for the subset this plugin declares.
+ */
+export function satisfiesCaret(version, range) {
+    const match = /^\^([0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z.-]+)?)$/.exec(range.trim());
+    if (match === null)
+        return false;
+    const parsed = parseVersion(version);
+    const parsedRange = parseVersion(match[1] ?? '');
+    if (parsed === null || parsedRange === null)
+        return false;
+    const versionTuple = tupleOf(parsed);
+    const rangeTuple = tupleOf(parsedRange);
+    const tupleDiff = compareTuple(versionTuple, rangeTuple);
+    // Lower bound.
+    if (tupleDiff < 0)
+        return false;
+    if (tupleDiff === 0) {
+        if (parsedRange.prerelease === null) {
+            // A range without a prerelease does not match prereleases of the same tuple.
+            if (parsed.prerelease !== null)
+                return false;
+        }
+        else if (comparePrerelease(parsed.prerelease, parsedRange.prerelease) < 0) {
+            return false;
+        }
+    }
+    // Upper bound (exclusive).
+    const upper = caretUpperBound(parsedRange);
+    return compareTuple(versionTuple, upper) < 0;
+}

package/lib/workspace.js

@@ -0,0 +1,129 @@
+/**
+ * Per-agent workspace jail configuration bridge (plugin side).
+ *
+ * The ENGINE owns the isolation mechanism (`sdk-bots src/host/runner/
+ * agent-workspace-jail.ts`): when an agent's settings.json declares
+ * `workspaceRoot`, every shell that agent runs is wrapped in a generated
+ * macOS Seatbelt profile that denies file WRITES outside the agent's own
+ * workspace directory (+ allowPaths + OS temp). Reads stay unrestricted so
+ * shared blackboards remain readable. The jail resolves lazily per turn —
+ * editing settings.json takes effect on the agent's next turn, no restart.
+ *
+ * This module only mirrors the engine's config contract so the plugin can
+ * read and write it safely:
+ *   `<dataDir>/agents/<agentId>/settings.json` →
+ *     { workspaceRoot?: "/workspace/<slug>", workspaceAllowPaths?: string[] }
+ *
+ * Validation mirrors the engine exactly (SLUG_PATTERN, agentId pattern,
+ * virtual-prefix form) because the engine FAILS CLOSED on malformed config —
+ * a bad write would break the agent's turns, not silently run unjailed.
+ * @module dsh-bots/workspace
+ */
+import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+/** Bot-facing virtual root prefix; the daemon maps it under the box root. */
+export const WORKSPACE_VIRTUAL_PREFIX = '/workspace/';
+/** Same shape as the engine's `AGENT_ID_FILENAME_PATTERN`. */
+const AGENT_ID_PATTERN = /^[\w-]{1,128}$/;
+/** Same shape as the engine's `SLUG_PATTERN` (unicode letters allowed: 录音师). */
+const SLUG_PATTERN = /^[\p{L}\p{N}][\p{L}\p{N}._-]{0,78}$/u;
+/** Read one agent's settings.json jail keys, preserving unknown fields. */
+function readRawSettings(agentDir) {
+    const path = join(agentDir, 'settings.json');
+    if (!existsSync(path))
+        return {};
+    try {
+        const parsed = JSON.parse(readFileSync(path, 'utf8'));
+        return parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)
+            ? parsed
+            : {};
+    }
+    catch {
+        return {};
+    }
+}
+/** Validate the `/workspace/<slug>` virtual form exactly like the engine. */
+export function validateVirtualRoot(requested) {
+    if (typeof requested !== 'string' || !requested.startsWith(WORKSPACE_VIRTUAL_PREFIX)) {
+        throw new Error(`workspaceRoot 必须是 "${WORKSPACE_VIRTUAL_PREFIX}<slug>" 形式（如 /workspace/录音师）`);
+    }
+    const slug = requested.slice(WORKSPACE_VIRTUAL_PREFIX.length);
+    if (slug.includes('..') || slug.includes('/') || !SLUG_PATTERN.test(slug)) {
+        throw new Error(`workspaceRoot 的 slug 不合法（字母/数字/点/横线/下划线，1-79 位）："${slug}"`);
+    }
+    return requested;
+}
+/** Read one agent's jail config; null when the agent dir does not exist. */
+export function readAgentWorkspace(dataDir, agentId) {
+    if (typeof agentId !== 'string' || !AGENT_ID_PATTERN.test(agentId))
+        return null;
+    const agentDir = join(dataDir, 'agents', agentId);
+    if (!existsSync(agentDir))
+        return null;
+    const raw = readRawSettings(agentDir);
+    const allowPaths = Array.isArray(raw.workspaceAllowPaths)
+        ? raw.workspaceAllowPaths.filter((v) => typeof v === 'string' && v.trim() !== '')
+        : [];
+    return {
+        agentId,
+        workspaceRoot: typeof raw.workspaceRoot === 'string' && raw.workspaceRoot.trim() !== ''
+            ? raw.workspaceRoot.trim()
+            : null,
+        allowPaths,
+    };
+}
+/** Scan every agent directory for its jail config (missing settings → unjailed). */
+export function listAgentWorkspaces(dataDir) {
+    const agentsDir = join(dataDir, 'agents');
+    let entries = [];
+    try {
+        entries = readdirSync(agentsDir);
+    }
+    catch {
+        return [];
+    }
+    return entries
+        .filter((id) => AGENT_ID_PATTERN.test(id))
+        .sort()
+        .map((id) => readAgentWorkspace(dataDir, id) ?? { agentId: id, workspaceRoot: null, allowPaths: [] });
+}
+/**
+ * Write one agent's jail keys into its settings.json, preserving every other
+ * field. Creates the agent dir when missing (a freshly created bot may not
+ * have its settings.json yet).
+ */
+export function setAgentWorkspace(dataDir, agentId, request) {
+    if (typeof agentId !== 'string' || !AGENT_ID_PATTERN.test(agentId)) {
+        throw new Error(`agentId 不合法："${agentId}"`);
+    }
+    const agentDir = join(dataDir, 'agents', agentId);
+    const raw = readRawSettings(agentDir);
+    if (request.workspaceRoot === null || request.workspaceRoot === undefined || request.workspaceRoot === '') {
+        delete raw.workspaceRoot;
+    }
+    else {
+        raw.workspaceRoot = validateVirtualRoot(request.workspaceRoot);
+    }
+    if (request.allowPaths === undefined) {
+        // Leave existing allowPaths untouched unless explicitly replaced.
+    }
+    else if (Array.isArray(request.allowPaths)) {
+        const cleaned = request.allowPaths.filter((v) => typeof v === 'string' && v.trim() !== '');
+        if (cleaned.length === 0)
+            delete raw.workspaceAllowPaths;
+        else
+            raw.workspaceAllowPaths = cleaned;
+    }
+    else {
+        throw new Error('allowPaths 必须是字符串数组');
+    }
+    mkdirSync(agentDir, { recursive: true });
+    writeFileSync(join(agentDir, 'settings.json'), JSON.stringify(raw, null, 2) + '\n', 'utf8');
+    return {
+        agentId,
+        workspaceRoot: typeof raw.workspaceRoot === 'string' ? raw.workspaceRoot : null,
+        allowPaths: Array.isArray(raw.workspaceAllowPaths)
+            ? raw.workspaceAllowPaths
+            : [],
+    };
+}

package/package.json

@@ -1,21 +1,57 @@
 {
   "name": "dsh-bots",
-  "version": "0.0.1",
-  "description": "The plural form of the dsh bot framework - name reserved; first release in development.",
-  "license": "MIT",
-  "author": "dushaobindoudou",
+  "version": "0.2.11",
+  "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",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "cordis.patch.yml",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json && tsc -p tsconfig.client.json",
+    "prepare": "pnpm run build",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "vitest run",
+    "test:integration": "node scripts/integration-test.mjs",
+    "test:dsh-smoke": "bash scripts/dsh-smoke.sh"
+  },
   "keywords": [
-    "dsh",
-    "dsh-plugin",
     "deepseek-harness",
-    "cordis-plugin",
-    "bot",
-    "bots"
+    "dsh-plugin",
+    "bots",
+    "multibot",
+    "cordis"
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dushaobindoudou/dsh-plugin.git",
-    "directory": "packages/dsh-bots"
+  "license": "MIT",
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.0-rc.6"
+  },
+  "devDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.1-rc.2",
+    "@types/node": "^22.20.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.8"
   },
-  "homepage": "https://github.com/dushaobindoudou/dsh-plugin/tree/main/packages/dsh-bots#readme"
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web"
+    }
+  }
 }