@jayyuen66/dsh-ocr-review 0.1.2 → 0.1.3

package/host.js

@@ -1,7 +1,7 @@
 // GENERATED by build-host.mjs — edit host.ts / lib/*.ts, then run `node build-host.mjs`.
 import { createRequire } from "node:module";
 import Schema from "@deepseek-ai/schemastery";
-import { chmodSync, copyFileSync, existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { chmodSync, copyFileSync, existsSync, mkdtempSync, readFileSync, realpathSync, rmSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
@@ -27,7 +27,7 @@ const MESSAGES = {
 		detailSeparator: "：",
 		stdoutTruncated: "[ocr-review] 注意：输出超过 {limit} 字节上限已截断{spill}",
 		outputSpill: "（完整输出已落盘：{path}）",
-		backgroundPolling: "稍候用 ocr_session(action=list) 找本仓库最新会话（启动几秒后出现，按 scanPaths/时间匹配）；completed_files == selected_files 即已完成；再 ocr_session(action=comments, id) 取全部评论、ocr_session(action=show, id) 看元数据与逐文件检查点。后台运行不设宿主超时，只在 2 小时后兜底回收（挂死不动会一直占着官方作业桶），取消本工具调用即终止该后台 OCR（宿主 kill + 命令内回收守护）。",
+		backgroundPolling: "先 job_output(job_id=<本回执的 jobId>) 读这条后台评审的实时输出与最终结局——按 id 走，启动即可读，一定有结果；要停它就 job_kill(job_id=<同一 id>)。会话落盘后再走 ocr_session：ocr_session(action=list) 找本仓库最新会话（启动几秒后出现，按 scanPaths/时间匹配）；completed_files == selected_files 即已完成；再 ocr_session(action=comments, id) 取全部评论、ocr_session(action=show, id) 看元数据与逐文件检查点。后台运行不设宿主超时，只在 2 小时后兜底回收（挂死不动会一直占着官方作业桶），取消本工具调用即终止该后台 OCR（宿主 kill + 命令内回收守护）。",
 		jobReasonAborted: "ocr-review 工具调用被中止",
 		jobReasonTimeout: "ocr-review 后台评审超过 2 小时，兜底回收",
 		jobReasonUnload: "ocr-review 插件卸载",
@@ -154,7 +154,7 @@ const MESSAGES = {
 		detailSeparator: ": ",
 		stdoutTruncated: "[ocr-review] note: output exceeded the {limit}-byte cap and was truncated{spill}",
 		outputSpill: " (full output spilled to {path})",
-		backgroundPolling: "Look up this repository's newest session shortly with ocr_session(action=list) (it appears a few seconds after start; match by scanPaths/time); completed_files == selected_files means it is done. Then ocr_session(action=comments, id) for all comments and ocr_session(action=show, id) for metadata and per-file checkpoints. Background runs get reclaimed by a 2-hour backstop (a wedged one would otherwise keep occupying the official job bucket); cancelling this tool call terminates the background OCR (host kill + the reaper guard inside the command).",
+		backgroundPolling: "First read this background review's live output and final outcome with job_output(job_id=<the jobId in this receipt>) — that path goes by id, so it is readable immediately after start and always has a result; job_kill(job_id=<the same id>) stops it. Once the session has landed, use ocr_session: ocr_session(action=list) finds this repository's newest session (it appears a few seconds after start; match by scanPaths/time); completed_files == selected_files means it is done. Then ocr_session(action=comments, id) for all comments and ocr_session(action=show, id) for metadata and per-file checkpoints. Background runs get reclaimed by a 2-hour backstop (a wedged one would otherwise keep occupying the official job bucket); cancelling this tool call terminates the background OCR (host kill + the reaper guard inside the command).",
 		jobReasonAborted: "ocr-review tool call aborted",
 		jobReasonTimeout: "ocr-review background review exceeded 2 hours and was reclaimed",
 		jobReasonUnload: "ocr-review plugin unloaded",
@@ -1837,6 +1837,7 @@ const REVIEW_OUTPUT_SCHEMA = { oneOf: [
 			"tool",
 			"repo",
 			"processStatus",
+			"jobId",
 			"polling"
 		],
 		properties: {
@@ -1858,6 +1859,7 @@ const REVIEW_OUTPUT_SCHEMA = { oneOf: [
 					"killed"
 				]
 			},
+			jobId: { type: "string" },
 			polling: { type: "string" }
 		}
 	},
@@ -2103,7 +2105,7 @@ async function runForeground(host, command, workdir, run, signal) {
 	const result = await (await host.shell.execute(spec)).result();
 	if (result.exitCode !== 0 || result.timedOut || result.aborted) {
 		if (result.timedOut) {
-			const minutes = Math.round(run.timeoutMs / 6e4);
+			const minutes = Math.round(spec.timeoutMs / 6e4);
 			throw new Error(format(messages.execTimedOut, { minutes: String(minutes) }));
 		}
 		if (result.aborted) throw new Error(messages.execAborted);
@@ -2266,6 +2268,7 @@ async function startBackground(host, job, signal) {
 		tool: job.tool,
 		repo: job.repo,
 		processStatus: proc.status,
+		jobId,
 		polling: messages.backgroundPolling
 	};
 }
@@ -2559,6 +2562,47 @@ function createGateway(host) {
 function ocrRepo(args, exec, messages) {
 	return resolveRoot(args["repo"], sessionHeaderCwd(exec), messages);
 }
+/** git rev-parse 的墙钟上限：一条本地命令，失败即回退，不值得占用评审预算。 */
+const GIT_TOPLEVEL_TIMEOUT_MS = 1e4;
+/** realpath，失败则原样返回（路径可能已不存在：归档后的 checkout 仍要能查会话）。 */
+function realpathOrSelf(root) {
+	try {
+		return realpathSync(root);
+	} catch {
+		return root;
+	}
+}
+/**
+* 把审查根归一化成 **canonical 的 git 顶层**，让 review 与 ocr_session 落到同一个会话目录。
+*
+* 为什么插件侧要管这件事：OCR 把 review 的 RepoDir 锚定在 git 顶层（`shared.go` 的
+* requireGit=true 分支），而会话目录正是由 RepoDir 编码而来。插件若把模型给的子目录
+* 原样喂给 `--repo`，`ocr review` 写进顶层、`ocr_session` 查子目录 —— 两个不同的
+* `~/.opencodereview/sessions/<encoded>` 目录，查询侧命中「目录不存在」分支静默返回
+* 空，表现为「写得出会话却永远列不出来」。符号链接前缀同理：git 报的是 realpath，
+* 而 filepath.Abs 保留 `/tmp` 这类前缀。
+*
+* 为什么不统一提升所有工具：scan 靠 workdir 限定子目录（OCR 的 scan 路径
+* requireGit=false，保留 CWD 以免 `git ls-files` 走遍整个仓库），一并提升会把扫描
+* 范围扩到整个 monorepo。scan 又不落会话（只有 review 经 agent.New → session.New
+* 建会话），所以它保持原样即可，两侧口径本来就一致。
+*
+* 非 git 目录（归档后的 checkout 等）回退到 realpath：会话仍按同一路径寻址。
+*
+* 刻意不缓存：一次本地 git 命令相对一次评审（分钟级）可忽略，换来的是没有陈旧值，
+* 也不会让「仓库被 git init / 顶层变动」后读到旧结果。
+*/
+async function canonicalReviewRoot(host, root) {
+	try {
+		const { exitCode, output } = await runCollect(host, "git rev-parse --show-toplevel", root, {
+			timeoutMs: GIT_TOPLEVEL_TIMEOUT_MS,
+			stdoutMaxBytes: 4096
+		});
+		const top = exitCode === 0 ? output.trim() : "";
+		if (top.startsWith("/")) return top;
+	} catch {}
+	return realpathOrSelf(root);
+}
 /** POST select 的响应：把 body 里的 provider/model 应用到 OCR 配置，按需附带 llm test 回执。 */
 async function sendSelectResponse(text, res, deps) {
 	const msgs = deps.messages();
@@ -2769,7 +2813,7 @@ function registerReviewTool(host, config) {
 		schema: REVIEW_OUTPUT_SCHEMA,
 		run: async (args, exec) => {
 			const runMsgs = localeMessages(host);
-			const repo = ocrRepo(args, exec, runMsgs);
+			const repo = await canonicalReviewRoot(host, ocrRepo(args, exec, runMsgs));
 			const eff = effortOf(args["effort"], config, runMsgs);
 			const tmp = waitOf(args["wait"], runMsgs) ? mkdtempSync(path.join(tmpdir(), "ocr-review-")) : void 0;
 			const outPath = tmp === void 0 ? void 0 : path.join(tmp, "out.json");
@@ -3057,7 +3101,7 @@ function registerSessionTool(host, config) {
 		schema: SESSION_OUTPUT_SCHEMA,
 		run: async (args, exec) => {
 			const runMsgs = localeMessages(host);
-			const repo = ocrRepo(args, exec, runMsgs);
+			const repo = await canonicalReviewRoot(host, ocrRepo(args, exec, runMsgs));
 			const { command, workdir } = buildSessionCommand({
 				...args,
 				repo

package/package.json

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