dsh-codex-approval 0.2.0 → 0.2.2

package/README.md

@@ -58,6 +58,18 @@ approval/request 到达（toolName + callId + reason）
 
 **模式持久化**：会话覆盖存 `~/.dsh/settings.yaml` 的 `dsh-codex-approval` 命名空间（settings 服务不可用时降级为纯内存，重启丢失）。默认模式由配置 `mode` 字段决定。
 
+**与 dsh 沙箱模式的关系**：
+
+| 沙箱模式 | AI 审核是否生效 |
+|---|---|
+| `read-only` | ✅ 生效——沙箱拒绝写操作，模型可申请升级（`WIDER_MODES` 允许），升级请求照常走审批链 |
+| `workspace-write` | ✅ 生效（推荐组合：工作区内自由，越界 AI 把关） |
+| `danger-full-access` | ⏸ 不触发——沙箱从不拒绝任何操作，没有升级请求，插件自然空闲 |
+
+**命令多语言**：`/approval-mode` 的返回文案跟随 dsh 设置的语言（`locale.preference`，中/英）。命令 `description` 在启动时按当时语言注册，运行中切换语言后需重启才更新 description（返回文本每次实时跟随）。
+
+**npm publish 默认 ask**：内置规则 `Bash(npm publish*) → ask`——agent 执行 `npm publish` 的升级请求**必定弹窗询问人类**，AI 无权自动放行（`ai` 模式下弹窗；`ai-auto` 模式下按 `mode3OnAsk` 处理，默认拒绝）。`npm unpublish` 无规则，由 AI 默认判定（通常判 high 直接拒绝）。
+
 ## 安装
 
 ```bash
@@ -74,6 +86,7 @@ dsh plugin --profile web add dsh-codex-approval
   config:
     mode: ai                   # manual | ai | ai-auto（默认 ai）
     mode3OnAsk: deny           # deny | allow（ai-auto 下 ask 的归宿；默认 deny 安全）
+    locale: auto               # auto | zh | en（命令文案语言；auto=跟随 dsh 设置的语言偏好）
     rules:
       - match: 'Bash(git status*)'   # 命中即自动通过（Codex approve-always）
         action: allow

package/i18n.js

@@ -0,0 +1,57 @@
+/**
+ * dsh-codex-approval — i18n.js
+ *
+ * zh/en copy for the /approval-mode command. The host reads the user's
+ * locale preference from the dsh settings service (`locale.preference`,
+ * owned by dsh-client-locale, persisted in settings.yaml); without a value
+ * (or without settings at all) the copy falls back to English.
+ *
+ * Pure functions only: pick the locale, render command texts.
+ */
+
+export const LOCALES = ["zh", "en"];
+
+/**
+ * The full message table. Keys are identical across locales so a missing
+ * translation fails loudly in tests rather than silently at runtime.
+ */
+export const T = {
+	zh: {
+		showWithOverride: (effective, override, configDefault) =>
+			`当前模式：${effective}（会话覆盖：${override}，配置默认：${configDefault}）`,
+		showNoOverride: (effective, configDefault) =>
+			`当前模式：${effective}（配置默认：${configDefault}，无会话覆盖）`,
+		cleared: (configDefault) => `已清除会话覆盖 → 回落 ${configDefault}（配置默认）`,
+		clearedMemoryOnly: (configDefault) => `已清除会话覆盖 → 回落 ${configDefault}（配置默认；settings 不可用，仅内存）`,
+		switched: (mode) => `已切换 → ${mode}（本会话）`,
+		switchedMemoryOnly: (mode) => `已切换 → ${mode}（本会话；settings 不可用，重启后丢失）`,
+		unknown: (input) => `未知模式 "${input}" — 用 manual | ai | ai-auto（或 1/2/3），或用 default 清除覆盖`
+	},
+	en: {
+		showWithOverride: (effective, override, configDefault) =>
+			`mode: ${effective} (session override: ${override}, config default: ${configDefault})`,
+		showNoOverride: (effective, configDefault) =>
+			`mode: ${effective} (config default: ${configDefault}, no session override)`,
+		cleared: (configDefault) => `override cleared → ${configDefault} (config default)`,
+		clearedMemoryOnly: (configDefault) => `override cleared → ${configDefault} (config default; memory-only: settings unavailable)`,
+		switched: (mode) => `switched → ${mode} (this session)`,
+		switchedMemoryOnly: (mode) => `switched → ${mode} (this session; memory-only: settings unavailable, lost on restart)`,
+		unknown: (input) => `unknown mode "${input}" — use manual | ai | ai-auto (or 1/2/3), or "default" to clear the override`
+	}
+};
+
+/**
+ * Pick the command copy locale from a raw preference value.
+ * @param pref - settings `locale.preference` (e.g. "zh", "en", or undefined)
+ * @returns "zh" | "en" — valid values pass through; anything else → "en"
+ */
+export function pickLocale(pref) {
+	return pref === "zh" ? "zh" : "en";
+}
+
+/** The command description for the given locale (registered once at boot). */
+export function commandDescription(locale) {
+	return locale === "zh"
+		? "显示或切换审批模式（manual | ai | ai-auto，或 1/2/3）"
+		: "Show or switch the approval mode (manual | ai | ai-auto, or 1/2/3)";
+}

package/index.js

@@ -30,6 +30,7 @@ import { evaluateRules } from "./rules.js";
 import { findToolCallArgs, argsPreview } from "./enrich.js";
 import { judgeWith, decideAuthorization } from "./judge.js";
 import { MODES, parseMode, resolveMode, effectiveOnAsk } from "./modes.js";
+import { T, pickLocale, commandDescription } from "./i18n.js";
 
 export const name = "dsh-codex-approval";
 
@@ -47,6 +48,7 @@ export const DEFAULT_CONFIG = {
 	enabled: true,
 	mode: "ai",
 	mode3OnAsk: "deny",
+	locale: "auto",
 	rules: [
 		// read-only / harmless commands: auto-approve
 		{ match: "Bash(git status*)", action: "allow" },
@@ -68,7 +70,11 @@ export const DEFAULT_CONFIG = {
 		{ match: "reason:*secret*", action: "ask" },
 		{ match: "reason:*password*", action: "ask" },
 		{ match: "reason:*credential*", action: "ask" },
-		{ match: "reason:*token*", action: "ask" }
+		{ match: "reason:*token*", action: "ask" },
+		// publishing: never auto-decided — a human must confirm every publish
+		// (both bare `npm publish` and prefixed forms like `cd x && npm publish`)
+		{ match: "Bash(npm publish*)", action: "ask" },
+		{ match: "Bash(*npm publish*)", action: "ask" }
 	],
 	ai: {
 		enabled: true,
@@ -92,6 +98,7 @@ function assertConfig(cfg) {
 	if (typeof cfg.enabled !== "boolean") throw new TypeError("dsh-codex-approval: config.enabled must be a boolean");
 	if (!MODES.includes(cfg.mode)) throw new TypeError(`dsh-codex-approval: config.mode must be one of ${MODES.join("/")}`);
 	if (!["deny", "allow"].includes(cfg.mode3OnAsk)) throw new TypeError("dsh-codex-approval: config.mode3OnAsk must be deny/allow");
+	if (!["auto", "zh", "en"].includes(cfg.locale)) throw new TypeError("dsh-codex-approval: config.locale must be auto/zh/en");
 	if (!Array.isArray(cfg.rules)) throw new TypeError("dsh-codex-approval: config.rules must be an array");
 	for (const rule of cfg.rules) {
 		if (typeof rule.match !== "string" || rule.match === "") throw new TypeError("dsh-codex-approval: each rule needs a non-empty match");
@@ -253,7 +260,7 @@ export function makeModeStore(ctx, logger) {
 		settings = sctx.settings;
 		try {
 			sctx.settings.register("dsh-codex-approval", z.object({
-				sessionOverrides: z.record(z.string(), z.enum(MODES)).default({})
+				sessionOverrides: z.dict(z.union(MODES)).default({})
 			}), { base: {} });
 			const resolved = sctx.settings.get("dsh-codex-approval");
 			const overrides = resolved?.sessionOverrides;
@@ -293,40 +300,62 @@ export function makeModeStore(ctx, logger) {
 }
 
 /** Register the /approval-mode command (mirrors dsh-plan-mode's /plan). */
-export function registerModeCommand(ctx, cfg, store) {
+export function registerModeCommand(ctx, cfg, store, getLocale) {
+	const locale = getLocale ? getLocale() : "en";
 	ctx.inject(["commands"], (commandCtx) => {
 		commandCtx.commands.register({
 			name: "approval-mode",
-			description: "Show or switch the approval mode (manual | ai | ai-auto, or 1/2/3)",
+			description: commandDescription(locale),
 			input: { hint: "[manual|ai|ai-auto|default]" },
 			handler: async ({ agent, rawInput }) => {
+				const t = T[getLocale ? getLocale() : "en"];
 				const sessionId = agent?.session?.id ?? agent?.id;
 				const input = rawInput.trim();
 				if (input === "") {
 					const override = await store.get(sessionId);
 					const effective = resolveMode(override, cfg.mode);
-					const base = override === void 0
-						? `approval mode: ${effective} (config default: ${cfg.mode}, no session override)`
-						: `approval mode: ${effective} (session override: ${override}, config default: ${cfg.mode})`;
-					return { kind: "success", text: base };
+					const text = override === void 0
+						? t.showNoOverride(effective, cfg.mode)
+						: t.showWithOverride(effective, override, cfg.mode);
+					return { kind: "success", text };
 				}
 				if (input === "default" || input === "off" || input === "reset") {
 					const persisted = await store.clear(sessionId);
-					const note = persisted === "persisted" ? "" : " (memory-only: settings unavailable)";
-					return { kind: "success", text: `approval mode: session override cleared — effective ${cfg.mode} (config default)${note}` };
+					const text = persisted === "persisted"
+						? t.cleared(cfg.mode)
+						: t.clearedMemoryOnly(cfg.mode);
+					return { kind: "success", text };
 				}
 				const mode = parseMode(input);
 				if (mode === null) {
-					return { kind: "success", text: `unknown approval mode "${input}" — use manual | ai | ai-auto (or 1/2/3), or "default" to clear the override` };
+					return { kind: "success", text: t.unknown(input) };
 				}
 				const persisted = await store.set(sessionId, mode);
-				const note = persisted === "persisted" ? "" : " (memory-only: settings unavailable, lost on restart)";
-				return { kind: "success", text: `approval mode → ${mode} for this session${note}` };
+				const text = persisted === "persisted"
+					? t.switched(mode)
+					: t.switchedMemoryOnly(mode);
+				return { kind: "success", text };
 			}
 		});
 	});
 }
 
+/**
+ * Build the command-copy locale resolver. `auto` follows the dsh settings
+ * preference (`locale.preference`, owned by dsh-client-locale); an explicit
+ * `zh`/`en` config wins. Without settings or preference → English.
+ */
+export function makeGetLocale(cfg, ctx) {
+	return () => {
+		if (cfg.locale === "zh" || cfg.locale === "en") return cfg.locale;
+		try {
+			return pickLocale(ctx.get("settings", false)?.get?.("locale")?.preference);
+		} catch {
+			return "en";
+		}
+	};
+}
+
 /** Cordis plugin entry: register the answerer when approval is composed. */
 export async function apply(ctx, userConfig) {
 	const cfg = normalizeConfig(userConfig);
@@ -339,7 +368,8 @@ export async function apply(ctx, userConfig) {
 		getSessionMode: (sessionId) => store.get(sessionId)
 	});
 	ctx.on("approval/request", handler);
-	registerModeCommand(ctx, cfg, store);
+	// Command copy follows config.locale ("auto" → dsh locale preference)
+	registerModeCommand(ctx, cfg, store, makeGetLocale(cfg, ctx));
 	// Self-proving startup record: this line in the log after a restart proves
 	// the plugin loaded (decision records follow it). Awaited so a boot that
 	// cannot even write its own log fails loud instead of silently degrading.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-approval",
-  "version": "0.2.0",
+  "version": "0.2.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",
@@ -8,6 +8,7 @@
     "index.js",
     "rules.js",
     "enrich.js",
+    "i18n.js",
     "judge.js",
     "modes.js",
     "cordis.patch.yml",