@jayyuen66/dsh-ocr-review 0.1.4-rc → 0.1.4-rc.1

package/README.md

@@ -31,7 +31,7 @@ dsh plugin --profile web add @jayyuen66/dsh-ocr-review
 - The packages are on the public npm registry, so installation needs no credentials.
 - The published files are only `host.js`, `client.js`, `cordis.patch.yml` and `scripts` (`prepack` rebuilds both bundles); source repository: see `repository.url` in package.json.
 - No `@deepseek-ai/*` goes in `dependencies`, and that is not a style preference. Consumers of this package are dsh plugins installed into a profile (`nodeLinker: hoisted`, `autoInstallPeers: false`), so any host package listed under `dependencies` is written into that profile as a **real directory**, coexisting with the copy the host process already loaded. `@deepseek-ai/dsh-tools` keys its `TOOL_RUNTIME_SCHEDULER` with a plain `Symbol` (not `Symbol.for`), so symbol identity is per module instance: the host's `dsh-agent-loop` reads a `ToolRuntime` mounted from the duplicate using its own copy's symbol, gets `undefined`, and **every native tool call throws** `Cannot read properties of undefined (reading 'prepare')` — the whole profile loses its tools. This package's build, typecheck and tests all stay green right up to that point, so `test/publish-manifest.test.ts` pins the invariant in the manifest instead.
-- The four host packages this bundle imports as **values** are required (non-optional) `peerDependencies`: `@deepseek-ai/schemastery` (the host's fork of schemastery — only it implements the 0.1.7 `.volatile()` resolution), `@deepseek-ai/dsh-credentials`, `@deepseek-ai/dsh-home-paths` and `@deepseek-ai/dsh-atomic-write`. The host provides them at runtime, and a profile installs no peers, so no duplicate appears. `build-host.mjs` externalizes `dependencies` *and* `peerDependencies`, so `host.js` keeps the bare specifiers unchanged.
+- The four host packages this bundle imports as **values** are required (non-optional) `peerDependencies`: `@deepseek-ai/schemastery` (the host's fork of schemastery — only it implements the 0.1.7 `.volatile()` resolution), `@deepseek-ai/dsh-credentials`, `@deepseek-ai/dsh-home-paths` and `@deepseek-ai/dsh-atomic-write`. The host provides them at runtime, and a profile installs no peers, so no duplicate appears. `build-host.mjs` externalizes `dependencies`, `peerDependencies` *and* `optionalDependencies`, so `host.js` keeps the bare specifiers unchanged.
 - Those four are repeated in `devDependencies` — that is what lets this repository's own typecheck, build and tests resolve them. Every other `@deepseek-ai/*` is type-only (erased at build, no specifier left in `host.js`) and stays in `devDependencies` alone.
 - What is left in `dependencies` is genuinely this package's own runtime code: `@jayyuen66/dsh-plugin-shared` and `js-yaml` (the last one used only by `scripts/get-cred.mjs`).
 

package/README.zh-CN.md

@@ -57,7 +57,7 @@ allowBuilds:
 
 如果你更希望完全不执行安装期脚本，可以写 `'@alibaba-group/open-code-review': false`：`ocr` 同样可用（launcher 直接从平台包目录取二进制），但宿主 `readPendingBuilds()` 只认值为 `set this to true or false` 的条目，改成 `false` 后官方审批流程就不再能代为授权，只能手工维护。
 - `dependencies` 里不放任何 `@deepseek-ai/*`，这不是风格偏好。本包的消费方是 dsh 插件，被装进 profile（`nodeLinker: hoisted`、`autoInstallPeers: false`），只要宿主包出现在 `dependencies`，pnpm 就会把它在那颗 profile 里落成**真实目录**，与宿主进程已经加载的那份并存。而 `@deepseek-ai/dsh-tools` 的 `TOOL_RUNTIME_SCHEDULER` 是普通 `Symbol`（不是 `Symbol.for`），符号身份按模块实例计算——宿主 `dsh-agent-loop` 拿自己那份的 Symbol 去读由副本挂载出来的 `ToolRuntime`，得到 `undefined`，于是**每一次原生工具调用都抛** `Cannot read properties of undefined (reading 'prepare')`，整个 profile 的工具一起失效。本包的构建、类型检查与测试在这之前全部照绿，所以判据只能由 `test/publish-manifest.test.ts` 落在 manifest 面。
-- 产物里以**值**导入的四枚宿主包是非 optional 的 `peerDependencies`：`@deepseek-ai/schemastery`（宿主 fork 的 schemastery，0.1.7 的 `.volatile()` 解析只在它有实现）、`@deepseek-ai/dsh-credentials`、`@deepseek-ai/dsh-home-paths`、`@deepseek-ai/dsh-atomic-write`。运行期由宿主在场提供，而 profile 不装 peer，所以不产生副本；`build-host.mjs` 对 `dependencies` 与 `peerDependencies` 两张表一律外部化，`host.js` 里的裸说明符因此一字不变。
+- 产物里以**值**导入的四枚宿主包是非 optional 的 `peerDependencies`：`@deepseek-ai/schemastery`（宿主 fork 的 schemastery，0.1.7 的 `.volatile()` 解析只在它有实现）、`@deepseek-ai/dsh-credentials`、`@deepseek-ai/dsh-home-paths`、`@deepseek-ai/dsh-atomic-write`。运行期由宿主在场提供，而 profile 不装 peer，所以不产生副本；`build-host.mjs` 对 `dependencies`、`peerDependencies` 与 `optionalDependencies` 三张表一律外部化，`host.js` 里的裸说明符因此一字不变。
 - 这四枚同时另列一份进 `devDependencies`——那才是本包自己的 typecheck、build、test 解析得到它们的方式。其余 `@deepseek-ai/*` 全是 type-only（构建即擦除，`host.js` 里不留说明符），只留在 `devDependencies`。
 - `dependencies` 剩下的确实是本包自己的运行期代码：`@jayyuen66/dsh-plugin-shared` 与 `js-yaml`（后者只被 `scripts/get-cred.mjs` 用）。
 

package/client.js

@@ -1,16 +1,17 @@
 // GENERATED by buildClient() in build-client.mjs — edit src/client-entry.ts, then run `node build-client.mjs`.
 window.__ModuleLoader__.load({
-  id: '@jayyuen66/dsh-ocr-review',
+  id: "@jayyuen66/dsh-ocr-review",
   factory: (require) => {
-    var module = { exports: {} };
-    var exports = module.exports;
+    'use strict';
+    const module = { exports: {} };
+    let exports = module.exports;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let react = require("react");
 //#region src/ui-messages.ts
 const UI_MESSAGES = {
 	zh: {
 		cardTitle: "open-code-review 代码审查",
-		cardDescription: "ocr 工具配置：选择 provider/model 应用到 OCR（key 走 api_key_cmd 动态读取，不落明文）+ 审查参数设置",
+		cardDescription: "ocr 工具配置：选择 provider/model 应用到 OCR（应用后 key 由 api_key_cmd 动态读取，不再写入明文）+ 审查参数设置",
 		statusReadOnly: "当前作用域只读",
 		statusDirty: "有未保存的修改，点「保存」生效",
 		statusClean: "无未保存的修改",
@@ -18,6 +19,7 @@ const UI_MESSAGES = {
 		saving: "保存中…",
 		revert: "撤销",
 		saveFailed: "保存失败：",
+		saveRefused: "未写入（宿主拒收或跳过）：{fields}",
 		loadProvidersFailed: "加载 providers 失败：{error}（端点未就绪？重启 dsh 后重试）",
 		loadingProviders: "加载 providers…",
 		noKeySuffix: "（未配置 key）",
@@ -68,7 +70,7 @@ const UI_MESSAGES = {
 	},
 	en: {
 		cardTitle: "open-code-review code review",
-		cardDescription: "ocr tool setup: pick a provider/model and apply it to OCR (keys are read dynamically via api_key_cmd, never stored in plain text) + review parameters",
+		cardDescription: "ocr tool setup: pick a provider/model and apply it to OCR (once applied, keys are read dynamically via api_key_cmd and no longer written in plain text) + review parameters",
 		statusReadOnly: "This scope is read-only",
 		statusDirty: "Unsaved changes — press Save to apply",
 		statusClean: "No unsaved changes",
@@ -76,6 +78,7 @@ const UI_MESSAGES = {
 		saving: "Saving…",
 		revert: "Revert",
 		saveFailed: "save failed: ",
+		saveRefused: "not written (host refused or skipped): {fields}",
 		loadProvidersFailed: "failed to load providers: {error} (endpoint not ready? restart dsh and retry)",
 		loadingProviders: "loading providers…",
 		noKeySuffix: " (no key configured)",
@@ -359,7 +362,7 @@ function OcrPluginCard(props) {
 		}
 	}, headRow, chevron);
 	const body = open ? (0, react.createElement)("div", { className: "ocr-card-body" }, children) : null;
-	return (0, react.createElement)("li", { className: `ocr-card${open ? " ocr-card-open" : ""}` }, header, body);
+	return (0, react.createElement)("div", { className: `ocr-card${open ? " ocr-card-open" : ""}` }, header, body);
 }
 /** 整数数字输入行（保存条模式：合法输入上报草稿，不直写）。 */
 function NumberRow(props) {
@@ -827,7 +830,10 @@ async function runTestConnection(deps) {
 		deps.setBusy(false);
 	}
 }
-/** 只写差异字段：touched 值为 undefined → 写 null（= 清回 schema 默认）。 */
+/** 只写差异字段：touched 值为 undefined → 写 null（= 清回 schema 默认）。
+*  受理位必须回来：`set` 回 `false` 表示宿主拒收或跳过了这次写入（值没落盘），
+*  这时不能清 touched、也不能报成功——否则用户看到「已保存」而配置原封未动。
+*  传输失败仍以 rejection 表达。 */
 async function saveSettingsDraft(deps) {
 	const { t, value, touched } = deps;
 	const keys = diffTouched(touched, value);
@@ -836,11 +842,16 @@ async function saveSettingsDraft(deps) {
 	deps.setSaveError(null);
 	const ops = keys.map(async (field) => {
 		const draft = touched[field];
-		await deps.set(field, draft === void 0 ? null : draft);
+		return deps.set(field, draft === void 0 ? null : draft);
 	});
 	try {
-		await Promise.all(ops);
+		const settled = await Promise.all(ops);
 		deps.setSettingsBusy(false);
+		const refused = keys.filter((_field, index) => settled[index] !== true);
+		if (refused.length > 0) {
+			deps.setSaveError(t("saveRefused", { fields: refused.join(", ") }));
+			return;
+		}
 		deps.setTouched({});
 	} catch (error) {
 		deps.setSettingsBusy(false);
@@ -1012,13 +1023,7 @@ function apply(ctx) {
 			inject: () => ({
 				t,
 				hooks: { card: store },
-				set: async (field, value) => {
-					try {
-						await scope.set(field, value);
-					} catch (error) {
-						console.error(`[ocr-review-card] set ${field} failed:`, error);
-					}
-				}
+				set: (field, value) => scope.set(field, value)
 			})
 		}, OcrCard);
 	});

package/host.js

@@ -341,14 +341,15 @@ function scalarMismatch(type, value) {
 function objectViolations(schema, value, path, walk) {
 	if (!isRecord(value)) return [`${path}: expected object`];
 	const { properties, required, additionalProperties } = schema;
+	const declared = (key) => properties !== void 0 && Object.hasOwn(properties, key) ? properties[key] : void 0;
 	if (additionalProperties === false) {
-		const extra = Object.keys(value).filter((key) => properties?.[key] === void 0);
+		const extra = Object.keys(value).filter((key) => declared(key) === void 0);
 		if (extra.length > 0) return [`${path}: fields outside the schema: ${extra.join(", ")}`];
 	}
-	for (const key of required ?? []) if (!(key in value) || value[key] === void 0) return [`${path}: missing required field ${key}`];
+	for (const key of required ?? []) if (!Object.hasOwn(value, key) || value[key] === void 0) return [`${path}: missing required field ${key}`];
 	const violations = [];
 	for (const key of Object.keys(value)) {
-		const child = properties?.[key];
+		const child = declared(key);
 		if (child !== void 0) violations.push(...walk(child, value[key], `${path}.${key}`));
 	}
 	return violations;
@@ -360,42 +361,6 @@ function arrayViolations(schema, value, path, walk) {
 	if (items === void 0) return [];
 	return value.flatMap((item, index) => walk(items, item, `${path}[${index}]`));
 }
-/** 官方子集的迷你走查（path 限定违规位置，一次列全）。oneOf 语义与官方一致：
-*  恰好一支命中，多支/零支都算违规。 */
-function violationsOf(schema, value, path) {
-	if (schema.oneOf !== void 0) {
-		const passing = schema.oneOf.filter((branch) => violationsOf(branch, value, path).length === 0);
-		if (passing.length !== 1) return [`${path}: matched ${passing.length} of ${schema.oneOf.length} oneOf branches`];
-		return [];
-	}
-	const { type } = schema;
-	if (type === "object") return objectViolations(schema, value, path, violationsOf);
-	if (type === "array") return arrayViolations(schema, value, path, violationsOf);
-	if (type === void 0) return [];
-	if (scalarMismatch(type, value)) return [`${path}: expected ${type}`];
-	if (schema.const !== void 0 && value !== schema.const) return [`${path}: must be exactly ${JSON.stringify(schema.const)}`];
-	if (schema.enum !== void 0 && !schema.enum.includes(value)) return [`${path}: must be one of ${schema.enum.map((entry) => JSON.stringify(entry)).join("/")}`];
-	return [];
-}
-/**
-* 校验并放行工具返回值：必须命中该工具自己的 output schema。
-* 违规抛错而非静默裁剪——静默修正是第二个 bug 的开始，抛错让回归在开发期
-* （vitest/首次调用）就炸出来。
-* @param schema 该工具注册时声明的 output.schema（与宿主校验用的是同一个对象）
-* @param value execute 交回的 canonical 值（结构化对象 / 数组 / 标量 / null）
-* @param toolName 工具名（违规信息要点名，模型才知道该重试哪一次调用）
-* @param messages 双语文案
-* @returns 原值（校验只读不改，值原样交给宿主）
-*/
-function assertToolOutput(schema, value, toolName, messages) {
-	assertGuardable(schema, toolName, messages);
-	const violations = violationsOf(schema, value, "result");
-	if (violations.length > 0) throw new Error(format(messages.resultSchemaViolation, {
-		tool: toolName,
-		violations: violations.join("; ")
-	}));
-	return value;
-}
 /** provider key 形状：`sk-…`/`ark-…`/`ghp-…` 一类「短前缀 + 长随机串」。
 *
 *  为什么额外要求随机串里至少有一个数字或大写字母：真实 key 是随机 base62（32 位
@@ -403,14 +368,19 @@ function assertToolOutput(schema, value, toolName, messages) {
 *  （`src/my-super-long-directory-name/index.ts`）。少了这道约束，session/delegate
 *  透传出的路径会被抹成 ***REDACTED***，模型拿不到可行动的位置信息。 */
 const STANDALONE_KEY = /\b[A-Za-z]{2,5}-(?=[A-Za-z0-9_-]{20,}\b)(?=[A-Za-z0-9_-]*[0-9A-Z])[A-Za-z0-9_-]{20,}\b/gu;
-/** `Authorization: Bearer xxx` / `bearer xxx`。
-*
-*  字符集写 `[a-z…]` 而不是 `[A-Za-z…]`：本条带 `i` 旗标，`a-z` 在大小写不敏感下
-*  已同时匹配 `A-Z`——再并列一枚 `A-Z` 是同一个字符集抄两遍（sonarjs 判为字符类内重复），
-*  删掉重复的那一位，匹配语言不变。 */
-const BEARER_VALUE = /(?<scheme>\bbearer\s+)[a-z0-9._~+/=-]{12,}/giu;
-/** `api_key: "xxx"`、`apiKey=xxx`、`token: xxx`、`x-api-key: xxx` 等赋值形态。 */
-const KEY_ASSIGNMENT = /(?<name>\b(?:api[_-]?key|apikey|access[_-]?key|secret[_-]?key|client[_-]?secret|password|token)["'\s]*[:=]["'\s]*)[^\s"',;)}\]]{6,}/giu;
+/** `Authorization: <scheme> <value>` / `Proxy-Authorization: …`：认**头名**而不是
+*  枚举认证方案。头名本身就是「后面跟着凭据」的信号，Basic / Token / Digest 乃至
+*  vendor 自定义 scheme 都不会漏；而只认头名还避开了正文里「token based
+*  authentication」这类措辞被误抹。scheme 组连同其后的空白一起捕获，回填时凭据被
+*  替换而 scheme 词保留。 */
+const AUTH_HEADER_VALUE = /(?<name>\b(?:proxy-)?authorization["'\s]*[:=]["'\s]*)(?:(?<scheme>[a-z][a-z0-9_-]*[ \t]+))?[^\s"',;)}\]]{4,}/giu;
+/** 裸 scheme + 值（没有头名时 OCR 也会整行回显）。scheme 只留 bearer：它在散文中几乎
+*  不出现，而 token / basic 之类会撞上「token count」「basic usage」等普通措辞。 */
+const BEARER_VALUE = /(?<scheme>\bbearer[ \t]+)[a-z0-9._~+/=-]{4,}/giu;
+/** `api_key: "xxx"`、`apiKey=xxx`、`token: xxx`、`x-api-key: xxx` 等赋值形态。
+*  值下限取 4 且容许一个 scheme 词：`token: Basic <base64>` 里赋值形态先能吃到的只是
+*  scheme 词（Basic 恰好 5 字符），下限更高时整条失配，后面那个 base64 就原样进了日志。 */
+const KEY_ASSIGNMENT = /(?<name>\b(?:api[_-]?key|apikey|access[_-]?key|secret[_-]?key|client[_-]?secret|password|token)["'\s]*[:=]["'\s]*)(?:(?<scheme>[a-z][a-z0-9_-]*[ \t]+))?[^\s"',;)}\]]{4,}/giu;
 const REDACTION = "***REDACTED***";
 /**
 * 抹掉文本里 key 形状的片段。
@@ -425,7 +395,49 @@ const REDACTION = "***REDACTED***";
 * 要求随机串特征，避免把要交给模型的文件路径一起抹掉。
 */
 function redactKeyMaterial(text) {
-	return text.replaceAll(BEARER_VALUE, `$<scheme>${REDACTION}`).replaceAll(KEY_ASSIGNMENT, `$<name>${REDACTION}`).replaceAll(STANDALONE_KEY, REDACTION);
+	return text.replaceAll(AUTH_HEADER_VALUE, `$<name>$<scheme>${REDACTION}`).replaceAll(BEARER_VALUE, `$<scheme>${REDACTION}`).replaceAll(KEY_ASSIGNMENT, `$<name>$<scheme>${REDACTION}`).replaceAll(STANDALONE_KEY, REDACTION);
+}
+/** 官方子集的迷你走查（path 限定违规位置，一次列全）。oneOf 语义与官方一致：
+*  恰好一支命中，多支/零支都算违规。 */
+function violationsOf(schema, value, path) {
+	const violations = [];
+	const { oneOf } = schema;
+	if (oneOf !== void 0) {
+		const passing = oneOf.filter((branch) => violationsOf(branch, value, path).length === 0);
+		if (passing.length !== 1) violations.push(`${path}: matched ${passing.length} of ${oneOf.length} oneOf branches`);
+	}
+	const { type } = schema;
+	if (type === "object") violations.push(...objectViolations(schema, value, path, violationsOf));
+	else if (type === "array") violations.push(...arrayViolations(schema, value, path, violationsOf));
+	else if (type !== void 0 && scalarMismatch(type, value)) violations.push(`${path}: expected ${type}`);
+	if (schema.const !== void 0 && value !== schema.const) violations.push(`${path}: must be exactly ${JSON.stringify(schema.const)}`);
+	if (schema.enum !== void 0 && !schema.enum.includes(value)) violations.push(`${path}: must be one of ${schema.enum.map((entry) => JSON.stringify(entry)).join("/")}`);
+	return violations;
+}
+/**
+* 校验并放行工具返回值：必须命中该工具自己的 output schema。
+* 违规抛错而非静默裁剪——静默修正是第二个 bug 的开始，抛错让回归在开发期
+* （vitest/首次调用）就炸出来。
+* @param schema 该工具注册时声明的 output.schema（与宿主校验用的是同一个对象）
+* @param value execute 交回的 canonical 值（结构化对象 / 数组 / 标量 / null）
+* @param toolName 工具名（违规信息要点名，模型才知道该重试哪一次调用）
+* @param messages 双语文案
+* @returns 原值（校验只读不改，值原样交给宿主）
+*/
+function assertToolOutput(schema, value, toolName, messages) {
+	assertGuardable(schema, toolName, messages);
+	const violations = violationsOf(schema, value, "result");
+	if (violations.length > 0) {
+		const MAX_LISTED = 20;
+		const MAX_CHARS = 2e3;
+		const omitted = violations.length - MAX_LISTED;
+		const listed = violations.slice(0, MAX_LISTED).join("; ") + (omitted > 0 ? ` …(+${omitted})` : "");
+		throw new Error(format(messages.resultSchemaViolation, {
+			tool: toolName,
+			violations: redactKeyMaterial(listed).slice(0, MAX_CHARS)
+		}));
+	}
+	return value;
 }
 //#endregion
 //#region lib/argv-guard.ts
@@ -563,19 +575,23 @@ function idValue(value, name, messages) {
 * 负数/非整数由 OCR 侧报错，但桥接层先做同源校验给出更早的错误）。
 * value 为 undefined/null 时省略 flag（跟随 OCR flag 默认值）。
 *
-* 注入面：数值经 `String(num)` 落进命令串（不走 shq）。Number.isInteger 对
-* 1e21 为 true 而 String() 会写成 `1e+21`，故再加一道「只含数字」的形态校验：
-* 命令串里的数值 token 结构上不可能带 shell 元字符。
+* 注入面：数值经 `String(num)` 落进命令串（不走 shq）。数值 token 结构上不可能带
+* shell 元字符，「只含数字」的形态校验顺带把 1e21 写成 `1e+21` 这类形态也挡住。
 */
 function pushIntFlag(parts, flag, value, min, messages) {
 	if (value === void 0 || value === null) return;
-	const num = typeof value === "number" ? value : Number(value);
+	const reject = () => {
+		throw new Error(format(messages.intFlagMustBeInt, {
+			flag,
+			min: String(min),
+			received: describeValue(value)
+		}));
+	};
+	const decimalString = typeof value === "string" && /^\d+$/u.test(value.trim());
+	if (typeof value !== "number" && !decimalString) reject();
+	const num = Number(value);
 	const text = String(num);
-	if (!Number.isInteger(num) || num < min || !/^\d+$/u.test(text)) throw new Error(format(messages.intFlagMustBeInt, {
-		flag,
-		min: String(min),
-		received: describeValue(value)
-	}));
+	if (!Number.isSafeInteger(num) || num < min || !/^\d+$/u.test(text)) reject();
 	parts.push(flag, text);
 }
 /** 模式参数解析：workspace（默认）/commit/branch 互斥，非法组合与错类型抛错。
@@ -983,14 +999,15 @@ function str(value) {
 * 故作兜底值。
 */
 function nonNegativeInt(value) {
-	if (!Number.isFinite(value) || value < 0) return 0;
-	return Math.trunc(value);
+	const truncated = Math.trunc(value);
+	if (!Number.isSafeInteger(truncated) || truncated < 0) return 0;
+	return truncated;
 }
 function num(value) {
 	if (typeof value === "number") return nonNegativeInt(value);
 	if (typeof value === "string") {
 		const trimmed = value.trim();
-		if (trimmed === "") return 0;
+		if (!/^\d+$/u.test(trimmed)) return 0;
 		return nonNegativeInt(Number(trimmed));
 	}
 	return 0;
@@ -1153,6 +1170,42 @@ function delegatePreviewFailure() {
 		mergeBase: ""
 	};
 }
+/**
+* preview 的条目数组 → 结构化清单；返回 null 表示「上游给了条目却一条都没解析出来」。
+*
+* 判据分两层：部分条目解析不出来照旧丢弃（OCR 偶发脏条目不该毁掉整份清单），
+* 但一条不剩时不能继续以 ok:true 的形态报「0 个文件可审」——那不是「没有可审的
+* 文件」，是半截产出，模型与用户都会拿它当范围结论。
+*/
+function toDelegateFiles(raw) {
+	if (!Array.isArray(raw)) return [];
+	const files = raw.map((entry) => {
+		if (!isRecord(entry)) return null;
+		const entryPath = str(entry["path"]);
+		if (entryPath === "") return null;
+		return {
+			path: entryPath,
+			status: str(entry["status"]),
+			insertions: num(entry["insertions"]),
+			deletions: num(entry["deletions"])
+		};
+	}).filter((fileEntry) => fileEntry !== null);
+	return raw.length > 0 && files.length === 0 ? null : files;
+}
+/** excluded_files 同款门：条目形状与 reviewable 一致，缺 path 即不可用。 */
+function toExcludedFiles(raw) {
+	if (!Array.isArray(raw)) return [];
+	const files = raw.map((entry) => {
+		if (!isRecord(entry)) return null;
+		const entryPath = str(entry["path"]);
+		if (entryPath === "") return null;
+		return {
+			path: entryPath,
+			reason: str(entry["reason"])
+		};
+	}).filter((fileEntry) => fileEntry !== null);
+	return raw.length > 0 && files.length === 0 ? null : files;
+}
 /** 解析 `ocr delegate preview --format json` 输出。 */
 function parseDelegatePreview(text) {
 	let doc;
@@ -1168,22 +1221,9 @@ function parseDelegatePreview(text) {
 		const value = root[key];
 		if (value !== void 0 && !Array.isArray(value)) return delegatePreviewFailure();
 	}
-	const reviewable = Array.isArray(root["reviewable_files"]) ? root["reviewable_files"].map((fileRaw) => {
-		if (!isRecord(fileRaw)) return null;
-		return {
-			path: str(fileRaw["path"]),
-			status: str(fileRaw["status"]),
-			insertions: num(fileRaw["insertions"]),
-			deletions: num(fileRaw["deletions"])
-		};
-	}).filter((fileEntry) => fileEntry !== null && fileEntry.path.length > 0) : [];
-	const excluded = Array.isArray(root["excluded_files"]) ? root["excluded_files"].map((fileRaw) => {
-		if (!isRecord(fileRaw)) return null;
-		return {
-			path: str(fileRaw["path"]),
-			reason: str(fileRaw["reason"])
-		};
-	}).filter((fileEntry) => fileEntry !== null && fileEntry.path.length > 0) : [];
+	const reviewable = toDelegateFiles(root["reviewable_files"]);
+	const excluded = toExcludedFiles(root["excluded_files"]);
+	if (reviewable === null || excluded === null) return delegatePreviewFailure();
 	return {
 		ok: true,
 		mode: str(root["mode"]),
@@ -1223,15 +1263,20 @@ function parseDelegateRules(text) {
 		ok: false,
 		groups: []
 	};
+	const groups = groupsRaw.filter((groupRaw) => isRecord(groupRaw) && Array.isArray(groupRaw["files"])).map((groupRaw) => ({
+		groupId: num(groupRaw["group_id"]),
+		source: str(groupRaw["source"]),
+		pattern: str(groupRaw["pattern"]),
+		files: groupRaw.files.filter((file) => typeof file === "string" && file.trim() !== "").map((file) => file.trim()),
+		rule: str(groupRaw["rule"])
+	})).filter((group) => group.files.length > 0);
+	if (groupsRaw.length > 0 && groups.length === 0) return {
+		ok: false,
+		groups: []
+	};
 	return {
 		ok: true,
-		groups: groupsRaw.filter((groupRaw) => isRecord(groupRaw) && Array.isArray(groupRaw["files"])).map((groupRaw) => ({
-			groupId: num(groupRaw["group_id"]),
-			source: str(groupRaw["source"]),
-			pattern: str(groupRaw["pattern"]),
-			files: groupRaw.files.map((file) => str(file)).filter(Boolean),
-			rule: str(groupRaw["rule"])
-		})).filter((group) => group.files.length > 0)
+		groups
 	};
 }
 //#endregion
@@ -1795,6 +1840,7 @@ async function providersForCard(gateway, paths, messages) {
 */
 async function applyProviderSelection(gateway, paths, selection, messages) {
 	const { provider, model } = selection;
+	if (typeof provider !== "string" || typeof model !== "string" || provider.trim() === "" || model.trim() === "") throw new Error(format(messages.providerModelRequired, {}));
 	const { providers, source } = readProviders(gateway, messages);
 	if (source.status !== "ready") throw new Error(source.message);
 	const target = providers.find((providerCfg) => providerCfg.name === provider);
@@ -1834,11 +1880,11 @@ async function applyProviderSelection(gateway, paths, selection, messages) {
 * api_key_cmd 并删除明文，返回 'migrated'；找不到 envKey 或构造命令失败 →
 * 'unknown'；无明文 → 'noPlain'（不动作）。
 */
-function migrateEntry(entry, envKey, scriptPath, dshHome, messages) {
+function migrateEntry(entry, envKey, context) {
 	if (typeof entry["api_key"] !== "string" || entry["api_key"].length === 0) return "noPlain";
-	if (envKey === void 0 || envKey === "") return "unknown";
+	if (envKey === void 0 || envKey === "" || !context.resolvableEnvKeys.has(envKey)) return "unknown";
 	try {
-		entry["api_key_cmd"] = buildApiKeyCmd(scriptPath, envKey, dshHome, messages);
+		entry["api_key_cmd"] = buildApiKeyCmd(context.scriptPath, envKey, context.dshHome, context.messages);
 	} catch {
 		return "unknown";
 	}
@@ -1865,13 +1911,18 @@ async function migratePlaintextKeys(gateway, paths, messages) {
 	if (source.status !== "ready" && source.status !== "credentials-unavailable") throw new Error(source.message);
 	parseExistingConfig(precheck, paths.ocrConfigJson, messages);
 	const scriptPath = credentialScriptPath(paths);
-	if (!existsSync(scriptPath)) return {
-		migrated: [],
-		skippedUnknown: []
-	};
+	if (!existsSync(scriptPath)) throw new Error(format(messages.credScriptMissing, { path: scriptPath }));
 	const dshHome = resolveDshHome();
 	const envByProvider = /* @__PURE__ */ new Map();
 	for (const providerCfg of providers) if (providerCfg.apiKeyEnv !== null && providerCfg.apiKeyEnv !== "") envByProvider.set(providerCfg.name, providerCfg.apiKeyEnv);
+	const candidateEnvKeys = [...new Set(envByProvider.values())];
+	const resolvedFlags = await Promise.all(candidateEnvKeys.map((envKey) => gateway.credentialResolvable(envKey)));
+	const migrateContext = {
+		scriptPath,
+		dshHome,
+		resolvableEnvKeys: new Set(candidateEnvKeys.filter((_envKey, index) => resolvedFlags[index] === true)),
+		messages
+	};
 	return await updateConfigLocked(paths.ocrConfigJson, async () => {
 		const doc = parseExistingConfig(readText(paths.ocrConfigJson), paths.ocrConfigJson, messages);
 		const customsRaw = fieldOf(doc, "custom_providers");
@@ -1883,7 +1934,7 @@ async function migratePlaintextKeys(gateway, paths, messages) {
 		const migrated = [];
 		const skippedUnknown = [];
 		for (const [name, raw] of Object.entries(customs)) if (isRecord(raw)) {
-			const result = migrateEntry(raw, envByProvider.get(name), scriptPath, dshHome, messages);
+			const result = migrateEntry(raw, envByProvider.get(name), migrateContext);
 			if (result === "migrated") migrated.push(name);
 			else if (result === "unknown") skippedUnknown.push(name);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayyuen66/dsh-ocr-review",
-  "version": "0.1.4-rc",
+  "version": "0.1.4-rc.1",
   "description": "dsh 工作区代码审查插件：把 open-code-review（ocr CLI）封装为 5 个模型工具 + 设置卡片（从 settings.yaml 选 provider/model 应用到 OCR 配置）。",
   "license": "MIT",
   "author": "JayYuen",

package/scripts/get-cred.mjs

@@ -66,16 +66,28 @@ function isRecord(value) {
 
 /**
  * 数据目录：显式参数 > $DSH_HOME > homedir()/.dsh（空/全空白按未设置处理）。
+ *
+ * 相对路径在这里是硬错误而不是照用：本脚本的 cwd 是 OCR 当时所在的那个仓库，
+ * 相对路径会被解析成 `<被审查仓库>/.dsh/…`——正是文件头声明要避免的「拿被审查
+ * 仓库里的文件当用户凭据」。猜不出用户指的是哪个目录，就不猜。
  * @param {string | undefined} fromArg
  * @returns {string}
  */
 function dataDirFrom(fromArg) {
   const arg = typeof fromArg === "string" ? fromArg.trim() : "";
+  const fromEnv = typeof process.env.DSH_HOME === "string" ? process.env.DSH_HOME.trim() : "";
+  let chosen = path.join(homedir(), ".dsh");
+  if (fromEnv !== "") {
+    chosen = fromEnv;
+  }
   if (arg !== "") {
-    return arg;
+    chosen = arg;
   }
-  const fromEnv = typeof process.env.DSH_HOME === "string" ? process.env.DSH_HOME.trim() : "";
-  return fromEnv === "" ? path.join(homedir(), ".dsh") : fromEnv;
+  if (!path.isAbsolute(chosen)) {
+    process.stderr.write(`[get-cred] dsh 数据目录必须是绝对路径，收到 ${JSON.stringify(chosen)}\n`);
+    process.exit(1);
+  }
+  return chosen;
 }
 
 /** 取值过程中遇到的坏消息（文件损坏/权限）；只在最终失败时一并报出，
@@ -113,17 +125,29 @@ function isNotFound(error) {
  */
 function yamlErrorDetail(error) {
   if (error instanceof Error) {
-    // js-yaml 的 YAMLException 覆盖了 toString(compact)：传 true 走紧凑分支。
-    // 别的 Error 会忽略这个参数，返回普通的 "Name: message"，同样不含 snippet。
+    // js-yaml 的 YAMLException 覆盖了 toString(compact)：传 true 走紧凑分支，
+    // 只有这一条路不带 snippet。别的 Error 会忽略这个参数，返回普通的
+    // "Name: message"，同样不含出错点邻域的原文。
     const compact = error.toString(true);
     if (typeof compact === "string" && compact !== "") {
       return compact;
     }
-    return error.message;
+    // 拿不到紧凑形态时**不能**退回 error.message：js-yaml 构造器里赋的就是
+    // this.message = formatError(this, false)，那份 message 正是带 snippet 的
+    // 那一条。改用 reason + 行列定位自行拼装，两者都不含原文。
+    const reason = typeof error.reason === "string" ? error.reason : "";
+    const { mark } = error;
+    const line = isRecord(mark) ? mark.line : undefined;
+    const column = isRecord(mark) ? mark.column : undefined;
+    const located =
+      typeof line === "number" && typeof column === "number"
+        ? ` (line:${line + 1}, column:${column + 1})`
+        : "";
+    return `${reason}${located}`;
   }
-  // 兜底也不能用 String(error)：error 是 unknown，非字符串时会被隐式走
-  // Object.prototype.toString，产出 "[object Object]" 这种毫无信息量的文本。
-  return error instanceof Error ? error.message : "";
+  // 到这里 error 不是 Error 实例：String(error) 会隐式走 Object.prototype.toString
+  // 产出 "[object Object]" 这种毫无信息量的文本，直接给空串。
+  return "";
 }
 
 function fromCredentialsDoc(credPath, refName) {
@@ -146,8 +170,21 @@ function fromCredentialsDoc(credPath, refName) {
     }
   }
   const refs = isRecord(doc) ? doc.refs : undefined;
-  const value = isRecord(refs) ? refs[refName] : undefined;
-  return typeof value === "string" && value.length > 0 ? value : undefined;
+  let value = isRecord(refs) ? refs[refName] : undefined;
+  if (value !== undefined && typeof value !== "string") {
+    // 只报形状，绝不把值本身写进 problems（明文不落日志）。refs.<REF> 被写成
+    // 数字/布尔/映射时若静默当「没有值」，用户改了托管文档却拿到下一层的旧值，
+    // 全程零提示。
+    problems.push(
+      `凭证文件 refs.${refName} 不是字符串（是 ${Array.isArray(value) ? "数组" : typeof value}）：${credPath}`,
+    );
+    value = undefined;
+  }
+  // OCR 的 api_key_cmd 契约只认**单行** stdout（空/多行都是硬错误）。托管文档里
+  // 引号内的空白与块标量（| / >）分别产出空白值与多行值：交给 OCR 只会换来隔了
+  // 一层的「resolve LLM endpoint」报错，而这一层本可以当没有值、继续往下回退。
+  const key = typeof value === "string" ? value.trim() : "";
+  return key !== "" && !/[\r\n]/u.test(key) ? key : undefined;
 }
 
 /**
@@ -157,8 +194,13 @@ function fromCredentialsDoc(credPath, refName) {
  */
 function unquotedValue(raw) {
   const trimmed = raw.trim();
-  const quoted = trimmed.length > 1 && (trimmed.startsWith('"') || trimmed.startsWith("'"));
-  return quoted ? trimmed.slice(1, -1) : trimmed;
+  const [first] = trimmed;
+  // 只有首尾**配对**的引号才剥。单边引号是用户写坏了，硬砍首尾等于把凭据改短
+  // 一位，拿一个错 key 去打上游（401），比报「未配置」难排查得多。
+  if (trimmed.length > 1 && (first === '"' || first === "'") && trimmed.endsWith(first)) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
 }
 
 /**
@@ -178,7 +220,10 @@ function fromUserDotEnv(envPath, refName) {
   }
   const pattern = new RegExp(`^\\s*(?:export\\s+)?${refName}\\s*=\\s*(?<value>.*)$`, "u");
   let hit = "";
-  for (const line of (text ?? "").split("\n")) {
+  // 按 /\r?\n/ 拆而不是 "\n"：上面那条正则的 `.*` 不匹配 \r、`$` 又要求串尾，
+  // 而按 "\n" 拆出来的 CRLF 行每行都带尾随 \r，于是每一行都匹配不上——整个 .env
+  // 层对所有 key 静默失配，用户只看到隔了一层的「取不到凭据」。
+  for (const line of (text ?? "").split(/\r?\n/u)) {
     const value = unquotedValue(pattern.exec(line)?.groups?.value ?? "");
     if (value.length > 0) {
       hit = value;