dsh-git-worktree 0.4.0 → 0.7.1

package/lib/client/review-console/PreflightStatus.js

@@ -11,7 +11,7 @@ function statusLabel(preflight) {
         case 'blocked': return preflight.message;
     }
 }
-export function PreflightStatus({ snapshot, target, compact = false, onRefresh, onResume, onOpenHolder, busy, }) {
+export function PreflightStatus({ snapshot, target, compact = false, onRefresh, onRecovery, onOpenHolder, busy, }) {
     if (snapshot.status === 'idle')
         return null;
     if (snapshot.status === 'loading') {
@@ -22,10 +22,10 @@ export function PreflightStatus({ snapshot, target, compact = false, onRefresh,
     }
     const preflight = snapshot.preflight;
     const blocked = preflight.status === 'blocked';
-    const stale = blocked && (preflight.reason === 'stale_isolated' || preflight.reason === 'stale_target');
+    const staleIsolated = blocked && preflight.reason === 'stale_isolated' && preflight.reviewId !== null;
     const holder = blocked && preflight.reason === 'project_acceptance_busy'
         ? preflight.blocker ?? target?.reviewSlotHolder
         : undefined;
-    return (_jsxs("div", { className: "dsh-wt-preflight", "data-preflight": preflight.status, children: [_jsxs("div", { className: "dsh-wt-preflight-head", children: [_jsx("strong", { children: statusLabel(preflight) }), _jsx("span", { children: "\u53EA\u8BFB\u68C0\u67E5 \u00B7 Local \u672A\u4FEE\u6539" })] }), !compact && preflight.status !== 'blocked' ? (_jsxs("dl", { className: "dsh-wt-preflight-facts", children: [_jsxs("div", { children: [_jsx("dt", { children: "Local" }), _jsxs("dd", { children: [preflight.localBranch ?? 'detached', " \u00B7 ", _jsx("code", { children: shortOid(preflight.localHeadOid) })] })] }), _jsxs("div", { children: [_jsx("dt", { children: "Worktree" }), _jsx("dd", { children: _jsx("code", { children: shortOid(preflight.isolatedHeadOid) }) })] }), _jsxs("div", { children: [_jsx("dt", { children: "Effective base" }), _jsx("dd", { children: _jsx("code", { children: shortOid(preflight.effectiveBaseOid) }) })] }), _jsxs("div", { children: [_jsx("dt", { children: "\u53D8\u66F4" }), _jsxs("dd", { children: [preflight.changedFiles.length, " \u4E2A\u6587\u4EF6"] })] })] })) : null, !compact && preflight.status === 'conflict' && preflight.conflictingFiles.length > 0 ? (_jsx("ul", { className: "dsh-wt-conflict-list", "aria-label": "\u51B2\u7A81\u6587\u4EF6", children: preflight.conflictingFiles.map(path => _jsx("li", { children: _jsx("code", { children: path }) }, path)) })) : null, holder ? _jsxs("p", { children: ["\u5360\u7528\u4EFB\u52A1\uFF1A", holder.checkoutId.slice(0, 8), " \u00B7 Session ", holder.ownerSessionId.slice(0, 8), " \u00B7 ", holder.state] }) : null, preflight.status === 'conflict' || blocked ? (_jsxs("div", { className: "dsh-wt-recovery-actions", children: [_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: onRefresh, children: "\u91CD\u65B0\u68C0\u67E5" }), stale || preflight.status === 'conflict' ? (_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy || !target?.capabilities.resumeRevision, onClick: onResume, children: "\u8FD4\u56DE Worktree \u91CD\u65B0\u751F\u6210\u9A8C\u6536\u7A3F" })) : null, holder ? (_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: onOpenHolder, children: "\u6253\u5F00\u5360\u7528\u4EFB\u52A1" })) : null] })) : null] }));
+    return (_jsxs("div", { className: "dsh-wt-preflight", "data-preflight": preflight.status, children: [_jsxs("div", { className: "dsh-wt-preflight-head", children: [_jsx("strong", { children: statusLabel(preflight) }), _jsx("span", { children: "\u53EA\u8BFB\u68C0\u67E5 \u00B7 Local \u672A\u4FEE\u6539" })] }), !compact && preflight.status !== 'blocked' ? (_jsxs("dl", { className: "dsh-wt-preflight-facts", children: [_jsxs("div", { children: [_jsx("dt", { children: "Local" }), _jsxs("dd", { children: [preflight.localBranch ?? 'detached', " \u00B7 ", _jsx("code", { children: shortOid(preflight.localHeadOid) })] })] }), _jsxs("div", { children: [_jsx("dt", { children: "Worktree" }), _jsx("dd", { children: _jsx("code", { children: shortOid(preflight.isolatedHeadOid) }) })] }), _jsxs("div", { children: [_jsx("dt", { children: "Effective base" }), _jsx("dd", { children: _jsx("code", { children: shortOid(preflight.effectiveBaseOid) }) })] }), _jsxs("div", { children: [_jsx("dt", { children: "\u53D8\u66F4" }), _jsxs("dd", { children: [preflight.changedFiles.length, " \u4E2A\u6587\u4EF6"] })] })] })) : null, !compact && preflight.status === 'conflict' && preflight.conflictingFiles.length > 0 ? (_jsx("ul", { className: "dsh-wt-conflict-list", "aria-label": "\u51B2\u7A81\u6587\u4EF6", children: preflight.conflictingFiles.map(path => _jsx("li", { children: _jsx("code", { children: path }) }, path)) })) : null, holder ? _jsxs("p", { children: ["\u5360\u7528\u4EFB\u52A1\uFF1A", holder.checkoutId.slice(0, 8), " \u00B7 Session ", holder.ownerSessionId.slice(0, 8), " \u00B7 ", holder.state] }) : null, preflight.status === 'conflict' || blocked ? (_jsxs("div", { className: "dsh-wt-recovery-actions", children: [_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: onRefresh, children: "\u91CD\u65B0\u68C0\u67E5" }), preflight.status === 'conflict' ? (_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy || !target?.capabilities.resumeRevision, onClick: () => onRecovery(preflight), children: "\u8BA9 Agent \u89E3\u51B3\u51B2\u7A81" })) : staleIsolated ? (_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: () => onRecovery(preflight), children: "\u91CD\u65B0\u751F\u6210\u9A8C\u6536\u7ED3\u679C" })) : null, holder ? (_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: onOpenHolder, children: "\u6253\u5F00\u5360\u7528\u4EFB\u52A1" })) : null] })) : null] }));
 }
 //# sourceMappingURL=PreflightStatus.js.map

package/lib/client/review-console/PreflightStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"PreflightStatus.js","sourceRoot":"","sources":["../../../src/client/review-console/PreflightStatus.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PreflightStatus.js","sourceRoot":"","sources":["../../../src/client/review-console/PreflightStatus.tsx"],"names":[],"mappings":"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"}