@marktrue/dsh-mobile-remote 3.2.3-rc.1 → 3.2.4-alpha.1

package/lib/git-read-service.js

@@ -1,9 +1,17 @@
 import { createHash, randomUUID } from "node:crypto";
 import { basename, isAbsolute, relative, resolve, sep } from "node:path";
-import { realpath } from "node:fs/promises";
+import { lstat, realpath } from "node:fs/promises";
 import { createBundledGitReadProvider } from "./git-read-bundled-provider.js";
 
 const MAX_GRAPH_TIPS = 5;
+const MAX_TRACKED_FILES = 200;
+const FILE_HISTORY_DEFAULT_LIMIT = 20;
+const FILE_HISTORY_MAX_LIMIT = 100;
+const FILE_HISTORY_MAX_COMMITS = 5000;
+const FILE_HISTORY_TIMEOUT_MS = 20_000;
+const MAX_FILE_HISTORY_SNAPSHOTS = 8;
+const REF_KIND_ORDER = { head: 0, localBranch: 1, remoteBranch: 2, other: 3 };
+const FILE_HISTORY_REASONS = new Set(["not-tracked", "no-history", "path-invalid"]);
 
 function failure(code, status, message = code) {
 	const error = new Error(message);
@@ -12,16 +20,144 @@ function failure(code, status, message = code) {
 	return error;
 }
 
-const providerCompatible = (provider) => provider?.contractVersion === "1.0.0"
+// The provider contract is additive: v1.1.0 providers expose the new methods,
+// while legacy v1.0.0 providers stay compatible and their raw ref strings are
+// projected into the structured DTO by this facade.
+const providerCompatible = (provider) => /^1\.\d+\.\d+$/.test(String(provider?.contractVersion ?? ""))
 	&& ["repositoryRoot", "branches", "resolveTip", "graph", "commit"].every((method) => typeof provider[method] === "function");
 
+const compareText = (left, right) => left < right ? -1 : left > right ? 1 : 0;
+const refShortName = (name) => name === "HEAD" ? "HEAD" : String(name).replace(/^refs\/(?:heads|remotes|tags)\//, "");
+const trimSubject = (value) => [...String(value)].slice(0, 200).join("");
+const emptyRefDetails = () => ({ refsDetail: [], tagsDetail: [] });
+const sortRefDetails = (rows) => rows.sort((left, right) => (REF_KIND_ORDER[left.kind] ?? 9) - (REF_KIND_ORDER[right.kind] ?? 9) || compareText(left.name, right.name));
+const sortTagDetails = (rows) => rows.sort((left, right) => compareText(left.name, right.name));
+
+/** Project provider-owned ref records onto the commit they resolve to. */
+function refDetailsFromRecords(records, commitOid, { fullTags = false } = {}) {
+	const target = String(commitOid ?? "").toLowerCase();
+	const refs = [], tags = [], seen = new Set();
+	for (const record of Array.isArray(records) ? records : []) {
+		if (!record || String(record.commitOid ?? "").toLowerCase() !== target) continue;
+		const name = typeof record.name === "string" ? record.name : "";
+		if (!name) continue;
+		const shortName = typeof record.shortName === "string" && record.shortName ? record.shortName : refShortName(name);
+		if (record.kind === "tag") {
+			const key = `tag\0${shortName}`;
+			if (seen.has(key)) continue;
+			seen.add(key);
+			const tag = { name, shortName, oid: target, annotated: record.annotated === true };
+			if (fullTags) {
+				if (typeof record.tagger === "string" && record.tagger) tag.tagger = record.tagger;
+				const date = Number(record.date);
+				if (Number.isFinite(date) && date > 0) tag.date = date;
+				if (typeof record.subject === "string" && record.subject) tag.subject = trimSubject(record.subject);
+				if (typeof record.hint === "string" && record.hint) tag.hint = record.hint;
+			}
+			tags.push(tag);
+			continue;
+		}
+		const kind = ["head", "localBranch", "remoteBranch"].includes(record.kind) ? record.kind : "other";
+		const key = `${kind}\0${shortName}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		const detail = { kind, name, shortName, oid: target };
+		if (record.current === true) detail.current = true;
+		refs.push(detail);
+	}
+	return { refsDetail: sortRefDetails(refs), tagsDetail: sortTagDetails(tags) };
+}
+
+/**
+ * String fallback for legacy providers: parse raw decorations such as
+ * `HEAD -> refs/heads/main`, `refs/remotes/origin/main` and
+ * `tag: refs/tags/v1.0.0`. Annotated metadata is unavailable here, so tags
+ * are advertised as lightweight name-level entries.
+ */
+function refDetailsFromLegacyRefs(rawRefs, commitOid, { tags = [] } = {}) {
+	const target = String(commitOid ?? "");
+	const refs = [], tagRows = [], seen = new Set();
+	let currentBranch = null;
+	const addRef = (kind, name, shortName, extra = {}) => {
+		const key = `${kind}\0${shortName}`;
+		if (seen.has(key)) return;
+		seen.add(key);
+		refs.push({ kind, name, shortName, oid: target, ...extra });
+	};
+	const addTag = (value) => {
+		let name = String(value ?? "").trim();
+		if (name.startsWith("tag: ")) name = name.slice(5).trim();
+		if (!name) return;
+		if (!name.startsWith("refs/tags/")) name = `refs/tags/${name}`;
+		const shortName = name.slice(10);
+		if (!shortName) return;
+		const key = `tag\0${shortName}`;
+		if (seen.has(key)) return;
+		seen.add(key);
+		tagRows.push({ name, shortName, oid: target, annotated: false });
+	};
+	const addRefValue = (value) => {
+		const raw = String(value ?? "").trim();
+		if (!raw) return;
+		if (raw === "HEAD") return addRef("head", "HEAD", "HEAD", { current: true });
+		if (raw.startsWith("HEAD -> ")) {
+			addRef("head", "HEAD", "HEAD", { current: true });
+			const next = raw.slice(8).trim();
+			if (!next) return undefined;
+			// Providers may decorate with shortened branch names (`HEAD -> main`)
+			// instead of full ref names; normalize the branch form here. The target
+			// of HEAD is by definition the current branch, marked after parsing.
+			if (next.startsWith("refs/heads/")) { currentBranch = next.slice(11); return addRef("localBranch", next, currentBranch); }
+			if (next.startsWith("refs/")) return addRefValue(next);
+			currentBranch = next;
+			return addRef("localBranch", `refs/heads/${next}`, next);
+		}
+		if (raw.startsWith("tag: ")) return addTag(raw.slice(5));
+		if (raw === "refs/stash") return;
+		if (raw.startsWith("refs/heads/")) return addRef("localBranch", raw, raw.slice(11));
+		if (raw.startsWith("refs/remotes/")) return raw.endsWith("/HEAD") ? undefined : addRef("remoteBranch", raw, raw.slice(13));
+		if (raw.startsWith("refs/tags/")) return addTag(raw);
+		return addRef("other", raw, raw);
+	};
+	for (const raw of Array.isArray(rawRefs) ? rawRefs : []) addRefValue(raw);
+	for (const raw of Array.isArray(tags) ? tags : []) addTag(raw);
+	// `current` is set once HEAD has been seen, so decoration order does not matter.
+	if (currentBranch !== null) {
+		const row = refs.find((entry) => entry.kind === "localBranch" && entry.shortName === currentBranch);
+		if (row) row.current = true;
+	}
+	return { refsDetail: sortRefDetails(refs), tagsDetail: sortTagDetails(tagRows) };
+}
+
+const mergeRefDetails = (primary, secondary) => {
+	const refs = new Map(), tags = new Map();
+	for (const row of [...primary.refsDetail, ...secondary.refsDetail]) {
+		const key = `${row.kind}\0${row.shortName}`;
+		if (!refs.has(key)) refs.set(key, row);
+	}
+	for (const row of [...primary.tagsDetail, ...secondary.tagsDetail]) {
+		if (!tags.has(row.shortName)) tags.set(row.shortName, row);
+	}
+	return { refsDetail: sortRefDetails([...refs.values()]), tagsDetail: sortTagDetails([...tags.values()]) };
+};
+
+const HISTORY_STATUS_WORDS = { added: "A", modified: "M", deleted: "D", renamed: "R", copied: "C", "type-changed": "T" };
+const historyStatus = (value) => {
+	const text = String(value ?? "").trim();
+	const word = HISTORY_STATUS_WORDS[text.toLowerCase()];
+	if (word) return word;
+	const upper = text.toUpperCase();
+	return ["A", "M", "D", "R", "C", "T"].includes(upper[0]) ? upper[0] : "M";
+};
+
 /** Session-authorized read facade over an optional external or bundled provider. */
 export function createGitReadService(ctx, { bundledProvider, now = () => Date.now(), snapshotTtlMs = 5 * 60_000, pollIntervalMs = 30_000, onChanged } = {}) {
 	const get = (name) => { try { return ctx.get?.(name); } catch { return undefined; } };
 	const external = get("gitReadProvider");
 	let externalAvailable = false;
 	try { externalAvailable = providerCompatible(external) && external.capabilities?.().available === true; } catch {}
-	const provider = externalAvailable ? external : (bundledProvider ?? createBundledGitReadProvider(ctx));
+	const bundled = bundledProvider ?? createBundledGitReadProvider(ctx);
+	const provider = externalAvailable ? external : bundled;
 	const bindings = new Map();
 	const repositoryIdFor = (sessionId, root) => `repo_${createHash("sha256").update(`${sessionId}\0${root}`).digest("base64url").slice(0, 32)}`;
 	const inside = (child, parent) => {
@@ -60,6 +196,8 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 	const worktreeSnapshots = new Map();
 	const snapshots = new Map();
 	const fileCursors = new Map();
+	const historySnapshots = new Map();
+	const historyCursors = new Map();
 	const refSignatures = new Map();
 	const keepBounded = (map, maximum) => {
 		while (map.size > maximum) map.delete(map.keys().next().value);
@@ -67,6 +205,8 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 	const prune = () => {
 		for (const [id, item] of snapshots) if (item.expiresAt <= now()) snapshots.delete(id);
 		for (const [id, item] of fileCursors) if (item.expiresAt <= now()) fileCursors.delete(id);
+		for (const [id, item] of historySnapshots) if (item.expiresAt <= now()) historySnapshots.delete(id);
+		for (const [id, item] of historyCursors) if (item.expiresAt <= now()) historyCursors.delete(id);
 	};
 	let pollTimer = null;
 	let unsubscribeProvider = null;
@@ -74,15 +214,68 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 	const safeFilePath = (value) => typeof value === "string" && value !== "" && !isAbsolute(value) && !/^(?:[A-Za-z]:[\\/]|\\\\|[a-z][a-z\d+.-]*:\/\/)/i.test(value) && !value.split(/[\\/]/).includes("..") && !value.includes("\0");
 	const validRef = (value) => value === "HEAD" || (typeof value === "string" && /^refs\/(?:heads|remotes)\/[A-Za-z0-9._/-]+$/.test(value) && !value.includes("..") && !value.includes("//") && !value.includes("@{") && !/(^|\/)\.|\/$|\.lock(?:\/|$)|[/.]$/.test(value));
 	const stale = () => failure("graph-stale", 409);
+	const hasNewFileMethods = (candidate) => typeof candidate?.files === "function" && typeof candidate?.fileHistory === "function";
+	const bundledProviderReady = () => {
+		try { return bundled.capabilities?.().available === true; } catch { return false; }
+	};
+	// Truthful capability: only the ACTIVE provider may serve the new endpoints.
+	// A legacy external provider must not be mixed with bundled data (its graph
+	// and commit facts come from a different source); a bundled provider also
+	// needs its Git subprocess to be usable.
+	const fileHistoryFeature = () => {
+		if (!hasNewFileMethods(provider)) return false;
+		if (provider !== bundled) return true;
+		return bundledProviderReady();
+	};
+	const fileReader = () => {
+		if (!hasNewFileMethods(provider)) throw failure("provider-incompatible", 503);
+		return provider;
+	};
+	const readRefRecords = async (root) => {
+		if (typeof provider.refs !== "function") return null;
+		try {
+			const records = await provider.refs(root);
+			return Array.isArray(records) ? records : null;
+		} catch { return null; }
+	};
 	const capabilities = () => {
 		const base = provider.capabilities?.() ?? { available: true, reason: null };
 		return {
-			contractVersion: "1.0.0", available: base.available !== false,
+			contractVersion: "1.1.0", available: base.available !== false,
 			reason: ["git-provider-unavailable", "workspace-registry-unavailable"].includes(base.reason) ? base.reason : null,
 			readOnly: true, provider: provider === external ? "external" : "bundled",
-			features: { repository: true, branches: true, graph: true, commit: true, worktree: true, preview: true },
+			features: {
+				repository: true, branches: true, graph: true, commit: true, worktree: true, preview: true,
+				// Both flags are independent and additive: refsDetail can be
+				// synthesized from legacy strings; fileHistory is true only when the
+				// active provider implements the new methods (see fileHistoryFeature).
+				refsDetail: true, fileHistory: fileHistoryFeature(),
+			},
 		};
 	};
+	/**
+	 * Normalize a client-supplied path to a repository-relative POSIX path.
+	 * Returns null for paths that escape the repository (reported as
+	 * `path-invalid`), and throws 400 for directories.
+	 */
+	const normalizeHistoryPath = async (root, input) => {
+		if (typeof input !== "string" || input === "" || input.includes("\0")) return null;
+		// Windows-style absolute paths cannot be mapped on a POSIX host; report
+		// them as invalid instead of treating them as a relative filename.
+		if (/^(?:[A-Za-z]:[\\/]|\\\\)/.test(input) && !isAbsolute(input)) return null;
+		const candidate = isAbsolute(input) ? resolve(input) : resolve(root, input);
+		const rel = relative(root, candidate);
+		if (rel === "") throw failure("path-invalid", 400);
+		if (rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel)) return null;
+		const normalized = sep === "/" ? rel : rel.split(sep).join("/");
+		try {
+			const info = await lstat(candidate);
+			if (info.isDirectory()) throw failure("path-invalid", 400);
+		} catch (error) {
+			if (error?.code === "path-invalid") throw error;
+		}
+		return normalized;
+	};
 	const service = {
 		capabilities,
 		async capabilitiesForSession(sessionId) {
@@ -115,10 +308,10 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 		},
 		async worktree(sessionId, repositoryId) {
 			const authorized = await binding(sessionId, repositoryId);
-			let reader = typeof provider.worktree === "function" ? provider : createBundledGitReadProvider(ctx);
+			let reader = typeof provider.worktree === "function" ? provider : bundled;
 			let raw = await reader.worktree(authorized.root);
 			if (typeof raw?.signature !== "string" || raw.signature === "" || !Array.isArray(raw.entries)) {
-				reader = createBundledGitReadProvider(ctx);
+				reader = bundled;
 				raw = await reader.worktree(authorized.root);
 			}
 			const entries = (raw.entries ?? []).filter((entry) => safeFilePath(entry.path)).slice(0, 2000);
@@ -130,7 +323,7 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 		async preview(sessionId, repositoryId, { kind, snapshotId, path, oid } = {}) {
 			const authorized = await binding(sessionId, repositoryId);
 			if (!safeFilePath(path) || !["staged", "unstaged", "untracked", "commit"].includes(kind)) throw failure("preview-invalid", 400);
-			const reader = createBundledGitReadProvider(ctx);
+			const reader = bundled;
 			let raw;
 			if (kind === "commit") {
 				if (!validOid(oid)) throw failure("invalid-oid", 400);
@@ -205,7 +398,20 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 				keepBounded(fileCursors, 1024);
 			}
 			const stats = allFiles.reduce((sum, file) => ({ additions: sum.additions + (file.additions ?? 0), deletions: sum.deletions + (file.deletions ?? 0), files: sum.files + 1 }), { additions: 0, deletions: 0, files: 0 });
-			return { repositoryId, oid: String(value.oid ?? ""), parents: Array.isArray(value.parents) ? value.parents.map(String) : [], author: String(value.author ?? ""), timestamp: Number(value.timestamp) || 0, message: String(value.message ?? ""), refs: Array.isArray(value.refs) ? value.refs.map(String) : [], tags: Array.isArray(value.tags) ? value.tags.map(String) : [], stats, files: { items, total: allFiles.length, nextCursor } };
+			const commitOid = String(value.oid ?? oid);
+			const legacyRefs = Array.isArray(value.refs) ? value.refs.map(String) : [];
+			const legacyTags = Array.isArray(value.tags) ? value.tags.map(String) : [];
+			const records = await readRefRecords(authorized.root);
+			const refDetails = mergeRefDetails(
+				records ? refDetailsFromRecords(records, commitOid, { fullTags: true }) : emptyRefDetails(),
+				refDetailsFromLegacyRefs(legacyRefs, commitOid, { tags: legacyTags }),
+			);
+			return {
+				repositoryId, oid: commitOid, parents: Array.isArray(value.parents) ? value.parents.map(String) : [],
+				author: String(value.author ?? ""), timestamp: Number(value.timestamp) || 0, message: String(value.message ?? ""),
+				refs: legacyRefs, tags: legacyTags, refsDetail: refDetails.refsDetail, tagsDetail: refDetails.tagsDetail,
+				stats, files: { items, total: allFiles.length, nextCursor },
+			};
 		},
 		async graph(sessionId, repositoryId, { tips, snapshotId, cursor, limit = 100 } = {}) {
 			const authorized = await binding(sessionId, repositoryId);
@@ -260,11 +466,22 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 				try { current = await provider.resolveTip(authorized.root, tip.name); } catch { snapshots.delete(snapshot.id); throw stale(); }
 				if (current.toLowerCase() !== tip.tipOid.toLowerCase()) { snapshots.delete(snapshot.id); throw stale(); }
 			}
-			const commits = (Array.isArray(rawCommits) ? rawCommits : []).map((row) => ({
-				oid: String(row.oid ?? ""), parents: Array.isArray(row.parents) ? row.parents.map(String) : [],
-				author: String(row.author ?? ""), timestamp: Number(row.timestamp) || 0, subject: String(row.subject ?? ""),
-				refs: Array.isArray(row.refs) ? row.refs.map(String) : [],
-			}));
+			const records = await readRefRecords(authorized.root);
+			const commits = (Array.isArray(rawCommits) ? rawCommits : []).map((row) => {
+				const oid = String(row.oid ?? "");
+				const legacy = Array.isArray(row.refs) ? row.refs.map(String) : [];
+				// Graph rows only guarantee name-level refs plus `annotated`; full
+				// tag metadata is reserved for commit details.
+				const refDetails = mergeRefDetails(
+					records ? refDetailsFromRecords(records, oid) : emptyRefDetails(),
+					refDetailsFromLegacyRefs(legacy, oid),
+				);
+				return {
+					oid, parents: Array.isArray(row.parents) ? row.parents.map(String) : [],
+					author: String(row.author ?? ""), timestamp: Number(row.timestamp) || 0, subject: String(row.subject ?? ""),
+					refs: legacy, refsDetail: refDetails.refsDetail, tagsDetail: refDetails.tagsDetail,
+				};
+			});
 			let nextCursor = null;
 			if (commits.length === pageSize) {
 				nextCursor = randomUUID();
@@ -273,6 +490,68 @@ export function createGitReadService(ctx, { bundledProvider, now = () => Date.no
 			}
 			return { repositoryId, snapshotId: snapshot.id, tips: snapshot.tips, commits, nextCursor };
 		},
+		async files(sessionId, repositoryId, { q, limit } = {}) {
+			const authorized = await binding(sessionId, repositoryId);
+			const pageSize = Math.max(1, Math.min(MAX_TRACKED_FILES, Number(limit) || MAX_TRACKED_FILES));
+			const query = typeof q === "string" ? q : "";
+			const raw = await fileReader().files(authorized.root, { q: query, limit: pageSize });
+			const files = [...new Set((Array.isArray(raw?.files) ? raw.files : [])
+				.map((path) => String(path ?? ""))
+				.filter((path) => safeFilePath(path)))].sort(compareText).slice(0, pageSize);
+			return { repositoryId, files, truncated: raw?.truncated === true };
+		},
+		async fileHistory(sessionId, repositoryId, { path, cursor, limit } = {}) {
+			const authorized = await binding(sessionId, repositoryId);
+			const pageSize = Math.max(1, Math.min(FILE_HISTORY_MAX_LIMIT, Number(limit) || FILE_HISTORY_DEFAULT_LIMIT));
+			prune();
+			const normalized = await normalizeHistoryPath(authorized.root, path);
+			if (normalized === null) {
+				return { repositoryId, path: String(path ?? ""), entries: [], nextCursor: null, truncated: false, reason: "path-invalid" };
+			}
+			let snapshot = null, offset = 0;
+			if (cursor !== undefined && cursor !== null && cursor !== "") {
+				const saved = historyCursors.get(String(cursor));
+				if (!saved || saved.expiresAt <= now() || saved.sessionId !== sessionId || saved.repositoryId !== repositoryId || saved.path !== normalized) throw failure("invalid-history-cursor", 400);
+				snapshot = historySnapshots.get(saved.snapshotId);
+				if (!snapshot || snapshot.expiresAt <= now() || snapshot.root !== authorized.root) throw failure("invalid-history-cursor", 400);
+				offset = saved.offset;
+			}
+			if (!snapshot) {
+				const raw = await fileReader().fileHistory(authorized.root, normalized, {
+					maxCommits: FILE_HISTORY_MAX_COMMITS,
+					timeoutMs: FILE_HISTORY_TIMEOUT_MS,
+				});
+				const reason = FILE_HISTORY_REASONS.has(raw?.reason) ? raw.reason : null;
+				const entries = (Array.isArray(raw?.entries) ? raw.entries : []).map((entry) => ({
+					oid: String(entry?.oid ?? ""),
+					shortOid: String(entry?.shortOid ?? String(entry?.oid ?? "").slice(0, 7)),
+					author: String(entry?.author ?? ""),
+					timestamp: Number(entry?.timestamp) || 0,
+					subject: String(entry?.subject ?? ""),
+					status: historyStatus(entry?.status),
+				})).filter((entry) => validOid(entry.oid));
+				if (reason && entries.length === 0) {
+					return { repositoryId, path: normalized, entries: [], nextCursor: null, truncated: false, reason };
+				}
+				snapshot = {
+					id: randomUUID(), sessionId, repositoryId, root: authorized.root, path: normalized,
+					entries, truncated: raw?.truncated === true, expiresAt: now() + snapshotTtlMs,
+				};
+				historySnapshots.set(snapshot.id, snapshot);
+				keepBounded(historySnapshots, MAX_FILE_HISTORY_SNAPSHOTS);
+			}
+			const items = snapshot.entries.slice(offset, offset + pageSize);
+			let nextCursor = null;
+			if (offset + items.length < snapshot.entries.length) {
+				nextCursor = randomUUID();
+				historyCursors.set(nextCursor, {
+					sessionId, repositoryId, path: normalized, snapshotId: snapshot.id,
+					offset: offset + items.length, expiresAt: now() + snapshotTtlMs,
+				});
+				keepBounded(historyCursors, 1024);
+			}
+			return { repositoryId, path: normalized, entries: items, nextCursor, truncated: snapshot.truncated };
+		},
 		async _pollOnce() {
 			for (const [repositoryId, authorized] of bindings) {
 				try {

package/lib/index.js

@@ -2738,6 +2738,14 @@ export function apply(ctx, config, runtime = {}) {
 			backgroundOnBudget: false,
 			runDeadlineMs: budgetMs,
 		});
+	/**
+	 * 审批/问询在手机在线时的保持时长默认值：1 小时。
+	 *
+	 * 原本是 120 秒——人工处理一个需要看代码的审批（尤其手机上）经常来不及，
+	 * 超时后按 unavailable 结算，用户看到的是"莫名其妙失败了"。
+	 * 可用 config.pendingTimeoutMs 覆盖。
+	 */
+	const DEFAULT_PENDING_TIMEOUT_MS = 60 * 60_000;
 	const NOTIF_MAX = 100;
 	let catalogCache = null; // { at, body } 15 秒 TTL
 	let balanceCache = null; // { at, body } 余额缓存 60 秒 TTL（官方 API 抖动时兜底）
@@ -4818,7 +4826,7 @@ export function apply(ctx, config, runtime = {}) {
 			"connection": "keep-alive",
 		});
 		res.write(": connected\n\n");
-		res.write(`data: ${JSON.stringify({ type: "hello", serverTime: Date.now(), capabilities: { eventTimeline: EVENT_TIMELINE_CAPABILITIES, turnOutline: turnOutlineCapabilityOf(ctx), fileRange: FILE_RANGE_CAPABILITIES, hold: { version: 1, onlineMs: Math.max(0, Number(config.pendingTimeoutMs ?? 120_000) || 0), offlineMs: Math.max(0, Number(config.offlineHoldMs ?? 300_000) || 0) } } })}\n\n`);
+		res.write(`data: ${JSON.stringify({ type: "hello", serverTime: Date.now(), capabilities: { eventTimeline: EVENT_TIMELINE_CAPABILITIES, turnOutline: turnOutlineCapabilityOf(ctx), fileRange: FILE_RANGE_CAPABILITIES, hold: { version: 1, onlineMs: Math.max(0, Number(config.pendingTimeoutMs ?? DEFAULT_PENDING_TIMEOUT_MS) || 0), offlineMs: Math.max(0, Number(config.offlineHoldMs ?? 300_000) || 0) } } })}\n\n`);
 		connections.add(res);
 		// 补发断线期间挂起的问询/审批（与 PC 端 GUI 连接时的 pending 回放一致；超 TTL 的僵尸帧先清掉）
 		for (const [key, f] of pendingFrames) {
@@ -5563,7 +5571,7 @@ export function apply(ctx, config, runtime = {}) {
 					// v3.2.4（issue #55）：手机端待办等待上限（仅供显示剩余时间，结算仍以服务端为准）。
 					hold: {
 						version: 1,
-						onlineMs: Math.max(0, Number(config.pendingTimeoutMs ?? 120_000) || 0),
+						onlineMs: Math.max(0, Number(config.pendingTimeoutMs ?? DEFAULT_PENDING_TIMEOUT_MS) || 0),
 						offlineMs: Math.max(0, Number(config.offlineHoldMs ?? 300_000) || 0),
 					},
 				},
@@ -5710,7 +5718,7 @@ export function apply(ctx, config, runtime = {}) {
 			return sendJson(res, result.status, result.body);
 		}
 
-		if (new Set(["/git/capabilities", "/git/repository", "/git/branches", "/git/graph", "/git/commit", "/git/worktree", "/git/preview"]).has(rest)) {
+		if (new Set(["/git/capabilities", "/git/repository", "/git/branches", "/git/graph", "/git/commit", "/git/worktree", "/git/preview", "/git/files", "/git/file-history"]).has(rest)) {
 			if (requireGet(method, res)) return;
 			const sessionId = url.searchParams.get("sessionId") ?? "";
 			if (!sessionId) return error(res, 400, "bad-request", "sessionId is required");
@@ -5724,7 +5732,12 @@ export function apply(ctx, config, runtime = {}) {
 					if (rest === "/git/branches") value = await gitRead.branches(sessionId, repositoryId);
 					else if (rest === "/git/worktree") value = await gitRead.worktree(sessionId, repositoryId);
 					else if (rest === "/git/preview") value = await gitRead.preview(sessionId, repositoryId, { kind: url.searchParams.get("kind"), snapshotId: url.searchParams.get("snapshotId"), path: url.searchParams.get("path"), oid: url.searchParams.get("oid") });
-					else if (rest === "/git/graph") {
+					else if (rest === "/git/files") value = await gitRead.files(sessionId, repositoryId, { q: url.searchParams.get("q") ?? undefined, limit: url.searchParams.get("limit") ?? undefined });
+					else if (rest === "/git/file-history") {
+						const path = url.searchParams.get("path");
+						if (path === null || path === "") return error(res, 400, "bad-request", "path is required");
+						value = await gitRead.fileHistory(sessionId, repositoryId, { path, cursor: url.searchParams.get("cursor") ?? undefined, limit: url.searchParams.get("limit") ?? undefined });
+					} else if (rest === "/git/graph") {
 						let tips;
 						const rawTips = url.searchParams.get("tips");
 						if (rawTips !== null) {
@@ -5738,7 +5751,7 @@ export function apply(ctx, config, runtime = {}) {
 			} catch (err) {
 				// External providers may include host paths or credentials in messages:
 				// only expose stable mobile error codes, never raw provider details.
-				const known = new Set(["session-not-found", "workspace-not-allowed", "not-git-repository", "git-provider-unavailable", "repository-not-authorized", "graph-stale", "graph-tip-invalid", "graph-too-many-tips", "invalid-oid", "invalid-files-cursor", "git-command-failed", "git-output-too-large", "provider-incompatible", "preview-invalid", "preview-file-not-found"]);
+				const known = new Set(["session-not-found", "workspace-not-allowed", "not-git-repository", "git-provider-unavailable", "repository-not-authorized", "graph-stale", "graph-tip-invalid", "graph-too-many-tips", "invalid-oid", "invalid-files-cursor", "invalid-history-cursor", "path-invalid", "git-command-failed", "git-output-too-large", "provider-incompatible", "preview-invalid", "preview-file-not-found"]);
 				const code = known.has(err?.code) ? err.code : "git-provider-unavailable";
 				const status = Number(err?.status);
 				ctx.logger.warn?.(`mobile-remote: Git read failed (${code}): ${err?.message ?? err}`);
@@ -8437,7 +8450,7 @@ export function apply(ctx, config, runtime = {}) {
 	//   desktop —— 一律 next() 交桌面 GUI（手机不弹审批/问询卡），适合常驻电脑前。
 	const approvalMode = config.approvalMode ?? "both";
 	/** 手机待办超时 fail-close（默认沿用 120s；v3.2.4 / issue #55 起可配）。 */
-	const PENDING_TIMEOUT_MS = Math.max(0, Number(config.pendingTimeoutMs ?? 120_000) || 0);
+	const PENDING_TIMEOUT_MS = Math.max(0, Number(config.pendingTimeoutMs ?? DEFAULT_PENDING_TIMEOUT_MS) || 0);
 	/** 手机离线时仍接管审批/问询的等待上限（修复：离线交桌面导致内核悬挂）。 */
 	const OFFLINE_HOLD_MS = Math.max(0, Number(config.offlineHoldMs ?? 300_000) || 0);
 	/** 审批/问询推送的宽限期（0 = 立即推）。 */
@@ -8451,7 +8464,7 @@ export function apply(ctx, config, runtime = {}) {
 	 * 无手机在线时，条目 + 回放帧只是"等手机回来再答"的记录：到期**成对清理**且**不结算**，
 	 * 既不给桌面端流程添乱，也不会留下"点了没反应"的死卡（条目没了帧还在）。
 	 */
-	const OFFLINE_PENDING_TTL_MS = 30 * 60_000;
+	const OFFLINE_PENDING_TTL_MS = 70 * 60_000; // 必须 > 在线保持时长（1h），否则回放帧先于结算消失
 	/**
 	 * 待答帧的回放存储读写（v3.1.4，issue #14 Bug2）。
 	 * 键以 phoneId 为主（与 /respond 结算同源），并兼容 rpcId 形态的旧键；
@@ -8610,9 +8623,9 @@ export function apply(ctx, config, runtime = {}) {
 		const entry = { phoneId: phoneKey, sessionId, rpcId: phoneKey, timer: null, holdMs, settle: resolveHeld };
 		pendingApprovals.set(phoneKey, entry);
 		armTimeout(entry, () => {
-			// 手机无响应：fail-close（与内核 unavailable 语义一致），不悬挂工具调用
-			ctx.logger.warn?.(`mobile-remote: approval/request 手机超时未应答 → unavailable（${phoneKey}）`);
-			finishApproval(entry, "unavailable");
+			// 手机超时未应答：按「超时自动拒绝」结算（rejected），而非 unavailable——前者用户看得到「被拒绝」，后者只显示「没有答复」
+			ctx.logger.warn?.(`mobile-remote: approval/request 手机超时未应答 → rejected（超时自动拒绝）（${phoneKey}）`);
+			finishApproval(entry, "rejected");
 		});
 		const requested = {
 			type: "approval/requested", rpcId: entry.rpcId, sessionId, approvalId: phoneKey,
@@ -8700,8 +8713,8 @@ export function apply(ctx, config, runtime = {}) {
 				armTimeout(entry, () => {
 					// 手机在场但两端均未应答：fail-close（与 mobile 接管语义一致；另一端
 					// 超时前先答则本端已由 cancel 帧收卡，此回调因条目删除而失效）
-					ctx.logger.warn?.(`mobile-remote: approval/request 双端待办超时 → unavailable（${phoneKey}）`);
-					finishApproval(entry, "unavailable");
+					ctx.logger.warn?.(`mobile-remote: approval/request 双端待办超时 → rejected（超时自动拒绝）（${phoneKey}）`);
+					finishApproval(entry, "rejected");
 				});
 			} else {
 				armOfflineReap(entry, "a");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marktrue/dsh-mobile-remote",
-  "version": "3.2.3-rc.1",
+  "version": "3.2.4-alpha.1",
   "description": "DSH Mobile：把 DeepSeek Harness 变成随身控制台——手机远程发消息派活、看进度、收通知、审批决策、管理会话；配套 Flutter App（当前 Android 端，iOS 未开发）",
   "type": "module",
   "main": "lib/index.js",
@@ -52,7 +52,7 @@
     "qrcode"
   ],
   "optionalDependencies": {
-    "@marktrue/dsh-mobile-remote-app": "npm:@marktrue/dsh-mobile-remote@3.2.3-rc.1-app"
+    "@marktrue/dsh-mobile-remote-app": "npm:@marktrue/dsh-mobile-remote@3.2.4-alpha.1-app"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-credentials": ">=0.1.0-rc.6 <0.3.0",