dsh-deeptutor 0.1.6 → 0.1.8

package/cordis.patch.yml

@@ -1,17 +1,17 @@
-# dsh-deeptutor bundle patch: inserts the DeepTutor bridge plugin.
-#
-# Mount into a profile either by adding "dsh-deeptutor" to the profile's
-# `dsh.profile.bundles` list (recommended), or by inserting the same row
-# through a user patch layer:
-#
-#   - insert:
-#       - id: dsh-deeptutor
-#         name: 'dsh-deeptutor'
-#
-# The `name` is the npm package itself; the loader resolves it from the
-# profile's node_modules (installed via `dsh plugin` or the profile's own
-# package manager).
-
-- insert:
-    - id: dsh-deeptutor
-      name: 'dsh-deeptutor'
+# dsh-deeptutor bundle patch: inserts the DeepTutor bridge plugin.
+#
+# Mount into a profile either by adding "dsh-deeptutor" to the profile's
+# `dsh.profile.bundles` list (recommended), or by inserting the same row
+# through a user patch layer:
+#
+#   - insert:
+#       - id: dsh-deeptutor
+#         name: 'dsh-deeptutor'
+#
+# The `name` is the npm package itself; the loader resolves it from the
+# profile's node_modules (installed via `dsh plugin` or the profile's own
+# package manager).
+
+- insert:
+    - id: dsh-deeptutor
+      name: 'dsh-deeptutor'

package/lib/config.js

@@ -44,6 +44,7 @@ export function configGuide() {
         '   export DEEPTUTOR_REMOTE_HOME="remote-DEEPTUTOR_HOME-workspace"\n' +
         "   Verify serve is running on the server (ssh to it: curl http://127.0.0.1:8001/api/v1/system/status)\n" +
         "   Verify passwordless SSH login works (ssh alias + BatchMode)\n" +
+        'PowerShell users: use $env:VAR="value" instead of export VAR=value.\n' +
         "Restart the agent after configuring.\n");
 }
 export const CAPABILITIES = [

package/lib/http-api.js

@@ -31,6 +31,7 @@ export async function ensureApi() {
         return true;
     if (!SSH_HOST)
         return false; // Local deployment: fall back to local CLI when serve is down, no tunnel needed
+    let tunnelDead = false;
     if (!tunnelProc || tunnelProc.exitCode !== null) {
         tunnelProc = spawn("ssh", [
             "-N",
@@ -48,9 +49,17 @@ export async function ensureApi() {
             "ConnectTimeout=10",
             SSH_HOST,
         ], { stdio: "ignore", windowsHide: true });
+        // Fast-fail: a tunnel that exits immediately (bad alias, port in use,
+        // refused connection) is not going to recover — stop waiting for it.
+        tunnelProc.once("exit", () => {
+            tunnelDead = true;
+            tunnelProc = null;
+        });
         tunnelProc.unref();
     }
     for (let i = 0; i < 20; i++) {
+        if (tunnelDead)
+            return false;
         if (await apiProbe(1000))
             return true;
         await new Promise((r) => setTimeout(r, 500));
@@ -62,7 +71,15 @@ export async function apiJson(path, init, opts = {}) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? 60_000);
     const onAbort = () => controller.abort();
-    opts.signal?.addEventListener("abort", onAbort, { once: true });
+    // An already-aborted signal never fires its "abort" event again — check the
+    // flag first so a pre-aborted call fails immediately instead of running to
+    // completion against a still-open controller.
+    if (opts.signal?.aborted) {
+        controller.abort();
+    }
+    else {
+        opts.signal?.addEventListener("abort", onAbort, { once: true });
+    }
     try {
         const res = await fetch(`${API_BASE}${path}`, { ...init, signal: controller.signal });
         if (!res.ok)

package/lib/index.js

@@ -127,6 +127,10 @@ export function apply(ctx) {
                 });
             }
             catch (err) {
+                if (exec.signal.aborted) {
+                    // user cancelled mid-CLI-run: report it as a cancellation, not a failure
+                    throw new Error("[deeptutor_run cancelled]");
+                }
                 throw new Error(configGuide() +
                     `[deeptutor_run failed (HTTP and CLI both unavailable)] ${err?.message ?? String(err)}`);
             }

package/lib/turn.d.ts

@@ -1,3 +1,4 @@
+import { runCli } from "./cli-exec.ts";
 export interface TurnResult {
     answer: string;
     errors: string[];
@@ -19,6 +20,13 @@ export interface RunParams {
 export declare function collectEvent(state: TurnResult, e: any): void;
 /** Execute one turn over WebSocket (streaming). */
 export declare function wsRunTurn(params: RunParams, timeoutMs: number, signal?: AbortSignal): Promise<TurnResult>;
-/** Execute one turn via the CLI (local or SSH). */
-export declare function cliRunTurn(params: RunParams, timeoutMs: number, signal?: AbortSignal): Promise<TurnResult>;
+/**
+ * Build the `deeptutor run` argv for a capability turn (pure, unit-tested).
+ * Scalar config values go as repeatable --config k=v; object/array values are
+ * collected into --config-json (the CLI's documented form for complex config)
+ * instead of being stringified into a k=<json> value that no parser expects.
+ */
+export declare function buildRunArgs(params: RunParams): string[];
+/** Execute one turn via the CLI (local or SSH). `run` is injectable for tests. */
+export declare function cliRunTurn(params: RunParams, timeoutMs: number, signal?: AbortSignal, run?: typeof runCli): Promise<TurnResult>;
 export declare const fmtTurnResult: (capability: string, r: TurnResult, maxChars: number) => string;

package/lib/turn.js

@@ -110,8 +110,13 @@ export function wsRunTurn(params, timeoutMs, signal) {
         };
     });
 }
-/** Execute one turn via the CLI (local or SSH). */
-export async function cliRunTurn(params, timeoutMs, signal) {
+/**
+ * Build the `deeptutor run` argv for a capability turn (pure, unit-tested).
+ * Scalar config values go as repeatable --config k=v; object/array values are
+ * collected into --config-json (the CLI's documented form for complex config)
+ * instead of being stringified into a k=<json> value that no parser expects.
+ */
+export function buildRunArgs(params) {
     const argv = ["run", params.capability, params.prompt, "--format", "json"];
     for (const kb of params.kbs ?? [])
         argv.push("--kb", kb);
@@ -121,11 +126,26 @@ export async function cliRunTurn(params, timeoutMs, signal) {
         argv.push("--session", params.session_id);
     if (params.language)
         argv.push("--language", params.language);
-    for (const [k, v] of Object.entries(params.config ?? {}))
-        argv.push("--config", `${k}=${typeof v === "object" ? JSON.stringify(v) : v}`);
-    const { stdout, stderr, code, killed } = await runCli(argv, { signal, timeoutMs });
-    if (killed)
-        throw new Error(`CLI execution timed out (${Math.round(timeoutMs / 1000)}s)`);
+    const complexConfig = {};
+    for (const [k, v] of Object.entries(params.config ?? {})) {
+        if (typeof v === "object" && v !== null)
+            complexConfig[k] = v;
+        else
+            argv.push("--config", `${k}=${v}`);
+    }
+    if (Object.keys(complexConfig).length > 0) {
+        argv.push("--config-json", JSON.stringify(complexConfig));
+    }
+    return argv;
+}
+/** Execute one turn via the CLI (local or SSH). `run` is injectable for tests. */
+export async function cliRunTurn(params, timeoutMs, signal, run = runCli) {
+    const { stdout, stderr, code, killed } = await run(buildRunArgs(params), { signal, timeoutMs });
+    if (killed) {
+        // A kill can come from the user cancelling (signal) or from the timeout;
+        // report the real reason instead of always blaming the timeout.
+        throw new Error(signal?.aborted ? "Aborted" : `CLI execution timed out (${Math.round(timeoutMs / 1000)}s)`);
+    }
     if (code !== 0)
         throw new Error(`CLI exit=${code}: ${stderr || "(no stderr)"}`);
     const state = { answer: "", errors: [], toolCalls: [] };

package/package.json

@@ -1,62 +1,74 @@
-{
-  "name": "dsh-deeptutor",
-  "version": "0.1.6",
-  "description": "DeepTutor bridge bundle for DeepSeek Harness: learning capabilities, knowledge bases, and note archiving (HTTP/WS first, CLI fallback; auto-adapts local/remote deployment).",
-  "keywords": [
-    "dsh",
-    "dsh-plugin",
-    "dsh-bundle",
-    "deeptutor",
-    "tutoring",
-    "rag",
-    "agent"
-  ],
-  "license": "MIT",
-  "type": "module",
-  "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
-  "bin": {
-    "dsh-deeptutor": "scripts/install-profile.mjs"
-  },
-  "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./cordis.patch.yml": "./cordis.patch.yml",
-    "./scripts/*": "./scripts/*",
-    "./skills/*": "./skills/*",
-    "./src/*": "./src/*",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "src",
-    "scripts",
-    "skills",
-    "cordis.patch.yml",
-    "README.md",
-    "README.zh.md"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    }
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit",
-    "prepack": "npm run build && npm run typecheck",
-    "pack:check": "npm pack --dry-run"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6"
-  },
-  "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
-    "@types/node": "^24.0.0",
-    "typescript": "^5.9.3"
-  }
-}
+{
+  "name": "dsh-deeptutor",
+  "version": "0.1.8",
+  "description": "DeepTutor bridge bundle for DeepSeek Harness: learning capabilities, knowledge bases, and note archiving (HTTP/WS first, CLI fallback; auto-adapts local/remote deployment).",
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "dsh-bundle",
+    "deeptutor",
+    "tutoring",
+    "rag",
+    "agent"
+  ],
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TecFancy/dsh-deeptutor.git"
+  },
+  "homepage": "https://github.com/TecFancy/dsh-deeptutor",
+  "bugs": {
+    "url": "https://github.com/TecFancy/dsh-deeptutor/issues"
+  },
+  "engines": {
+    "node": ">=20.11"
+  },
+  "type": "module",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "bin": {
+    "dsh-deeptutor": "scripts/install-profile.mjs"
+  },
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./scripts/*": "./scripts/*",
+    "./skills/*": "./skills/*",
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "src",
+    "scripts",
+    "skills",
+    "cordis.patch.yml",
+    "README.md",
+    "README.zh.md"
+  ],
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.build.json",
+    "typecheck": "tsc --noEmit",
+    "prepack": "npm run build && npm run typecheck",
+    "pack:check": "npm pack --dry-run",
+    "test": "node --test --experimental-strip-types"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6"
+  },
+  "devDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
+    "@types/node": "^24.0.0",
+    "typescript": "^5.9.3"
+  }
+}