dsh-codex-approval 0.4.0 → 0.4.2

package/package.json

@@ -1,43 +1,76 @@
-{
-  "name": "dsh-codex-approval",
-  "version": "0.4.0",
-  "description": "Codex-style approval autopilot for DeepSeek Harness: ordered glob rules (allow/ask/deny) plus an AI risk judge (low/medium/high) mapped through a risk tolerance, as an approval answerer.",
-  "type": "module",
-  "main": "index.js",
-  "files": [
-    "index.js",
-    "rules.js",
-    "enrich.js",
-    "i18n.js",
-    "judge.js",
-    "modes.js",
-    "transcript.js",
-    "cordis.patch.yml",
-    "README.md",
-    "LICENSE"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    }
-  },
-  "keywords": [
-    "dsh",
-    "dsh-plugin",
-    "deepseek-harness",
-    "approval",
-    "codex",
-    "risk"
-  ],
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/040822/dsh-codex-approval.git"
-  },
-  "engines": {
-    "node": ">=22.19"
-  },
-  "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1"
-  }
-}
+{
+  "name": "dsh-codex-approval",
+  "version": "0.4.2",
+  "description": "Codex-style approval autopilot for DeepSeek Harness: ordered glob rules (allow/ask/deny) plus an AI risk judge (low/medium/high) mapped through a risk tolerance, as an approval answerer.",
+  "type": "module",
+  "main": "index.js",
+  "scripts": {
+    "build:client": "node scripts/build-client.mjs",
+    "test": "node --test"
+  },
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./client": "./lib/client.js"
+  },
+  "files": [
+    "index.js",
+    "lib/client.js",
+    "client-model-picker.js",
+    "client-remote.js",
+    "client-card-style.js",
+    "rules.js",
+    "enrich.js",
+    "i18n.js",
+    "judge.js",
+    "modes.js",
+    "transcript.js",
+    "cordis.patch.yml",
+    "scripts/build-client.mjs",
+    "README.md",
+    "LICENSE"
+  ],
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-renderer",
+        "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-settings-plugins",
+        "@deepseek-ai/dsh-api-remotes",
+        "@deepseek-ai/dsh-client-locale"
+      ]
+    },
+    "compatibility": {
+      "dsh": ">=0.1.2-rc.1",
+      "dshReleases": {
+        "0.1.0-rc.6": "compatible",
+        "0.1.2-rc.1": "compatible",
+        "0.1.5-rc.1": "compatible"
+      }
+    }
+  },
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "deepseek-harness",
+    "approval",
+    "codex",
+    "risk"
+  ],
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/040822/dsh-codex-approval.git"
+  },
+  "engines": {
+    "node": ">=22.19"
+  },
+  "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
+  }
+}

package/rules.js

@@ -1,90 +1,90 @@
-/**
- * dsh-codex-approval — rules.js
- *
- * Codex-style rule matching. A rule matches a request via a single glob
- * pattern over the "matchable text": `ToolName(args preview) reason:<reason>`.
- * Examples:
- *   - `Bash(git *)`      — the recovered bash command starts with "git "
- *   - `Bash(rm -rf /*)`  — destructive command
- *   - `reason:*curl*`    — the approval reason mentions curl
- *
- * Evaluation priority is safety-first regardless of list order:
- *   deny  >  ask  >  allow
- * (an explicit ask or deny can never be overridden by a blanket allow,
- * mirroring Codex where ask/reject rules take precedence over auto-approve).
- */
-
-/** Classic glob match: `*` = any sequence (incl. empty), `?` = one char. Case-insensitive. */
-export function wildcardMatch(pattern, text) {
-	if (typeof pattern !== "string" || typeof text !== "string") return false;
-	pattern = pattern.toLowerCase();
-	text = text.toLowerCase();
-	let pi = 0;
-	let ti = 0;
-	let star = -1;
-	let mark = 0;
-	while (ti < text.length) {
-		if (pi < pattern.length && (pattern[pi] === "?" || pattern[pi] === text[ti])) {
-			pi += 1;
-			ti += 1;
-		} else if (pi < pattern.length && pattern[pi] === "*") {
-			star = pi;
-			pi += 1;
-			mark = ti;
-		} else if (star !== -1) {
-			pi = star + 1;
-			ti = mark + 1;
-			mark += 1;
-		} else {
-			return false;
-		}
-	}
-	while (pi < pattern.length && pattern[pi] === "*") pi += 1;
-	return pi === pattern.length;
-}
-
-/**
- * Build the single string rules match against.
- * @param req - { toolName, argsText, reason }
- */
-export function matchableText(req) {
-	const bits = [];
-	if (req.toolName) bits.push(`${req.toolName}(${req.argsText ?? ""})`);
-	if (req.reason) bits.push(`reason:${req.reason}`);
-	return bits.join(" ");
-}
-
-/**
- * The surfaces a rule pattern is tested against, in order: the tool call
- * alone (`ToolName(args)`), the reason alone (`reason:...`), then the
- * combined string. This lets `Bash(git *)` match regardless of an appended
- * reason, and `reason:*curl*` match the reason alone.
- */
-export function matchSurfaces(req) {
-	const surfaces = [];
-	if (req.toolName) surfaces.push(`${req.toolName}(${req.argsText ?? ""})`);
-	if (req.reason) surfaces.push(`reason:${req.reason}`);
-	const combined = surfaces.join(" ");
-	if (!surfaces.includes(combined)) surfaces.push(combined);
-	return surfaces.filter((surface) => surface !== "");
-}
-
-/**
- * Evaluate an ordered rule list against one request.
- * @param rules - [{ match: string, action: "allow"|"ask"|"deny" }]
- * @param req - { toolName, argsText, reason }
- * @returns the first matching rule under deny > ask > allow priority, or null.
- */
-export function evaluateRules(rules, req) {
-	const surfaces = matchSurfaces(req);
-	if (surfaces.length === 0) return null;
-	for (const action of ["deny", "ask", "allow"]) {
-		for (const rule of rules) {
-			if (rule.action !== action) continue;
-			for (const surface of surfaces) {
-				if (wildcardMatch(rule.match, surface)) return rule;
-			}
-		}
-	}
-	return null;
-}
+/**
+ * dsh-codex-approval — rules.js
+ *
+ * Codex-style rule matching. A rule matches a request via a single glob
+ * pattern over the "matchable text": `ToolName(args preview) reason:<reason>`.
+ * Examples:
+ *   - `Bash(git *)`      — the recovered bash command starts with "git "
+ *   - `Bash(rm -rf /*)`  — destructive command
+ *   - `reason:*curl*`    — the approval reason mentions curl
+ *
+ * Evaluation priority is safety-first regardless of list order:
+ *   deny  >  ask  >  allow
+ * (an explicit ask or deny can never be overridden by a blanket allow,
+ * mirroring Codex where ask/reject rules take precedence over auto-approve).
+ */
+
+/** Classic glob match: `*` = any sequence (incl. empty), `?` = one char. Case-insensitive. */
+export function wildcardMatch(pattern, text) {
+	if (typeof pattern !== "string" || typeof text !== "string") return false;
+	pattern = pattern.toLowerCase();
+	text = text.toLowerCase();
+	let pi = 0;
+	let ti = 0;
+	let star = -1;
+	let mark = 0;
+	while (ti < text.length) {
+		if (pi < pattern.length && (pattern[pi] === "?" || pattern[pi] === text[ti])) {
+			pi += 1;
+			ti += 1;
+		} else if (pi < pattern.length && pattern[pi] === "*") {
+			star = pi;
+			pi += 1;
+			mark = ti;
+		} else if (star !== -1) {
+			pi = star + 1;
+			ti = mark + 1;
+			mark += 1;
+		} else {
+			return false;
+		}
+	}
+	while (pi < pattern.length && pattern[pi] === "*") pi += 1;
+	return pi === pattern.length;
+}
+
+/**
+ * Build the single string rules match against.
+ * @param req - { toolName, argsText, reason }
+ */
+export function matchableText(req) {
+	const bits = [];
+	if (req.toolName) bits.push(`${req.toolName}(${req.argsText ?? ""})`);
+	if (req.reason) bits.push(`reason:${req.reason}`);
+	return bits.join(" ");
+}
+
+/**
+ * The surfaces a rule pattern is tested against, in order: the tool call
+ * alone (`ToolName(args)`), the reason alone (`reason:...`), then the
+ * combined string. This lets `Bash(git *)` match regardless of an appended
+ * reason, and `reason:*curl*` match the reason alone.
+ */
+export function matchSurfaces(req) {
+	const surfaces = [];
+	if (req.toolName) surfaces.push(`${req.toolName}(${req.argsText ?? ""})`);
+	if (req.reason) surfaces.push(`reason:${req.reason}`);
+	const combined = surfaces.join(" ");
+	if (!surfaces.includes(combined)) surfaces.push(combined);
+	return surfaces.filter((surface) => surface !== "");
+}
+
+/**
+ * Evaluate an ordered rule list against one request.
+ * @param rules - [{ match: string, action: "allow"|"ask"|"deny" }]
+ * @param req - { toolName, argsText, reason }
+ * @returns the first matching rule under deny > ask > allow priority, or null.
+ */
+export function evaluateRules(rules, req) {
+	const surfaces = matchSurfaces(req);
+	if (surfaces.length === 0) return null;
+	for (const action of ["deny", "ask", "allow"]) {
+		for (const rule of rules) {
+			if (rule.action !== action) continue;
+			for (const surface of surfaces) {
+				if (wildcardMatch(rule.match, surface)) return rule;
+			}
+		}
+	}
+	return null;
+}

package/scripts/build-client.mjs

@@ -0,0 +1,48 @@
+#!/usr/bin/env node
+/**
+ * dsh-codex-approval — build the browser half (lib/client.js).
+ *
+ * DSH loads a client plugin as `window.__ModuleLoader__.load({ id, factory })`,
+ * so the shipped artifact is an esbuild CJS bundle wrapped in that loader call.
+ * React and every `@deepseek-ai/*` package stay external: the host's module
+ * loader supplies them, and bundling them would duplicate the client runtime.
+ *
+ * Usage (from the package root):
+ *   node scripts/build-client.mjs
+ *
+ * esbuild is not a dependency of this package (the published tarball has none),
+ * so the script resolves it from npx unless ESBUILD_BIN is set.
+ */
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, readFileSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+const PACKAGE_ID = "dsh-codex-approval";
+const ENTRY = "src/client/index.ts";
+const OUT = "lib/client.js";
+
+const workdir = mkdtempSync(join(tmpdir(), "dsh-codex-approval-build-"));
+const bundlePath = join(workdir, "client.bundle.cjs");
+const esbuild = process.env.ESBUILD_BIN ?? "npx";
+const esbuildArgs = process.env.ESBUILD_BIN === undefined ? ["--yes", "esbuild@0.25.0"] : [];
+
+execFileSync(esbuild, [
+	...esbuildArgs,
+	ENTRY,
+	"--bundle",
+	"--format=cjs",
+	"--platform=browser",
+	"--target=es2022",
+	"--jsx=transform",
+	`--outfile=${bundlePath}`,
+	"--external:react",
+	"--external:react/*",
+	"--external:@deepseek-ai/*",
+	"--log-level=warning"
+], { stdio: "inherit" });
+
+const bundle = readFileSync(bundlePath, "utf8");
+const wrapped = `window.__ModuleLoader__.load({ id: ${JSON.stringify(PACKAGE_ID)}, factory: (require) => { var module = { exports: {} }; var exports = module.exports;\n${bundle}\nreturn module.exports; } });\n`;
+writeFileSync(OUT, wrapped);
+console.log(`built ${OUT} (${wrapped.length} bytes) from ${ENTRY}`);

package/transcript.js

@@ -61,15 +61,24 @@ function userText(data) {
 /**
  * Collect semantic items from the raw event stream, newest first.
  * Plugin-sourced user messages and streaming chunks are excluded here.
- * @param events - session.events
+ * @param events - a Session-like object or event array
  * @returns array of { seq, kind, ... } with seq counting only semantic items
  *   (newest first, so index 0 is the most recent).
  */
 export function collectSemanticItems(events) {
-	if (!Array.isArray(events)) return [];
+	const list = Array.isArray(events)
+		? events
+		: typeof events?.snapshotEvents === "function"
+			? (() => { try { return events.snapshotEvents(); } catch { return []; } })()
+			: typeof events?.ownEvents === "function"
+				? (() => { try { return events.ownEvents(); } catch { return []; } })()
+				: Array.isArray(events?.events)
+					? events.events
+					: [];
+	if (!Array.isArray(list)) return [];
 	const items = [];
-	for (let i = events.length - 1; i >= 0; i -= 1) {
-		const event = events[i];
+	for (let i = list.length - 1; i >= 0; i -= 1) {
+		const event = list[i];
 		if (event === null || typeof event !== "object") continue;
 		const type = event.type;
 		if (type === "user/message") {