dsh-git-worktree 0.7.5 → 0.9.0

package/lib/client/pre-session/PreSessionWorktreeToggle.js

@@ -1,144 +1,159 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { ReviewIcon } from '../review-console/ReviewIcon.js';
+import { useClientTranslator, defaultClientTranslator } from '../i18n.js';
+import { useEffect, useRef, useState } from 'react';
 import { Modal } from '@deepseek-ai/dsh-client-ui-primitives';
 function errorMessage(value) {
     return value instanceof Error ? value.message : String(value);
 }
 function snapshotInput(input) {
-    return {
-        ...input,
-        imageIds: [...input.imageIds],
-        occurrences: [...input.occurrences],
-    };
+    return { ...input, imageIds: [...input.imageIds], occurrences: [...input.occurrences] };
 }
-function confirmationDescription(input) {
-    const attachmentText = input.imageIds.length === 1
-        ? '1 个附件'
-        : `${input.imageIds.length} 个附件`;
-    if (input.draft.trim() !== '' && input.imageIds.length > 0) {
-        return `当前输入内容和 ${attachmentText}将移动到新的 Worktree 会话。`;
-    }
+function confirmationDescription(input, t = defaultClientTranslator) {
+    const attachmentText = input.imageIds.length === 1 ? t('1.attachment') : t('attachments', { p0: input.imageIds.length });
+    if (input.draft.trim() !== '' && input.imageIds.length > 0)
+        return t('the.current.input.and.will.move.to.the', { p0: attachmentText });
     if (input.imageIds.length > 0)
-        return `${attachmentText}将移动到新的 Worktree 会话。`;
+        return t('will.move.to.the.new.worktree.session', { p0: attachmentText });
     if (input.draft.trim() !== '')
-        return '当前输入内容将移动到新的 Worktree 会话。';
-    return '将创建新的 Worktree 会话；当前 Local 会话不会收到消息。';
+        return t('the.current.input.will.move.to.the.new');
+    return t('a.new.worktree.session.will.be.created.the');
 }
-/** Blank-session Worktree switch mounted in Harness's public composer tool row. */
-export function PreSessionWorktreeToggle({ sessionId, session, input, inputActions, adapter, controller, }) {
+/** Blank-session directory menu mounted in Harness's public composer tool row. */
+export function PreSessionWorktreeToggle({ sessionId, session, input, inputActions, adapter, controller }) {
+    const t = useClientTranslator();
     const [target, setTarget] = useState(null);
     const [state, setState] = useState('loading');
     const [error, setError] = useState(null);
-    const [pendingInput, setPendingInput] = useState(null);
+    const [pending, setPending] = useState(null);
     const latestInput = useRef(input);
     latestInput.current = input;
     const blank = session.composerPhase === 'blank';
-    const refreshCurrent = useCallback(async () => {
-        setState('loading');
-        setError(null);
-        const outcome = await adapter.current({ sessionId });
-        if (!outcome.ok) {
-            setTarget(null);
-            if (outcome.error.code === 'not_git_repository') {
-                setState('unsupported');
-                setError(null);
-            }
-            else {
-                setState('error');
-                setError(`${outcome.error.code}: ${outcome.error.message}`);
-            }
-            return;
-        }
-        setTarget(outcome.value.target);
-        setState('idle');
-    }, [adapter, sessionId]);
-    useEffect(() => {
-        if (!blank)
+    // Invalidate at render: an old continuation must never navigate or clear
+    // the newly selected Session's draft, even before effect cleanup runs.
+    const scopeRef = useRef({ sessionId, adapter, blank, alive: true, busy: false });
+    if (scopeRef.current.sessionId !== sessionId || scopeRef.current.adapter !== adapter || scopeRef.current.blank !== blank) {
+        scopeRef.current.alive = false;
+        scopeRef.current = { sessionId, adapter, blank, alive: true, busy: false };
+    }
+    const scope = scopeRef.current;
+    const isCurrent = () => scope.alive && scopeRef.current === scope;
+    const refreshCurrent = async () => {
+        if (scope.busy)
             return;
-        let active = true;
-        setTarget(null);
-        setPendingInput(null);
+        scope.busy = true;
         setState('loading');
         setError(null);
-        void adapter.current({ sessionId }).then((outcome) => {
-            if (!active)
+        try {
+            const outcome = await adapter.current({ sessionId });
+            if (!isCurrent())
                 return;
             if (!outcome.ok) {
                 setTarget(null);
-                if (outcome.error.code === 'not_git_repository') {
-                    setState('unsupported');
-                    setError(null);
-                }
-                else {
-                    setState('error');
-                    setError(`${outcome.error.code}: ${outcome.error.message}`);
-                }
+                setState(outcome.error.code === 'not_git_repository' ? 'unsupported' : 'error');
+                setError(outcome.error.code === 'not_git_repository' ? null : `${outcome.error.code}: ${outcome.error.message}`);
                 return;
             }
             setTarget(outcome.value.target);
             setState('idle');
-            setError(null);
-        });
-        return () => { active = false; };
-    }, [adapter, blank, sessionId]);
+        }
+        catch (cause) {
+            if (!isCurrent())
+                return;
+            setTarget(null);
+            setState('error');
+            setError(errorMessage(cause));
+        }
+        finally {
+            scope.busy = false;
+        }
+    };
+    useEffect(() => {
+        scope.alive = true;
+        setTarget(null);
+        setPending(null);
+        if (blank)
+            void refreshCurrent();
+        return () => { scope.alive = false; };
+    }, [scope]);
     if (!blank || state === 'loading' || state === 'unsupported')
         return null;
     if (target?.state === 'local' && !target.capabilities.create)
         return null;
-    const selected = target?.state !== undefined && target.state !== 'local';
+    const selected = target !== null && target.state !== 'local';
     const canCreate = target?.state === 'local' && target.capabilities.create;
     const busy = state === 'preparing';
     const retryingLookup = state === 'error' && target === null;
     const disabled = busy || selected || (!canCreate && !retryingLookup) || input.phase !== 'plain';
-    const checked = selected || pendingInput !== null || state === 'preparing';
-    const status = state === 'preparing'
-        ? '正在创建…'
-        : selected
-            ? '已创建'
-            : pendingInput !== null
-                ? '待确认'
-                : state === 'error'
-                    ? '重试'
-                    : 'Local';
     const beginConfirmation = async () => {
-        if (disabled)
+        if (disabled || scope.busy || !isCurrent())
             return;
         if (retryingLookup) {
             await refreshCurrent();
             return;
         }
+        scope.busy = true;
+        setState('preparing');
         setError(null);
-        setPendingInput(snapshotInput(input));
+        try {
+            const captured = snapshotInput(latestInput.current);
+            const outcome = adapter.preflightCreate ? await adapter.preflightCreate({ sourceSessionId: sessionId }) : null;
+            if (!isCurrent())
+                return;
+            if (outcome && !outcome.ok)
+                throw new Error(`${outcome.error.code}: ${outcome.error.message}`);
+            const result = outcome?.ok ? outcome.value : { kind: 'ready' };
+            setPending({ input: captured, kind: result.kind, token: result.kind === 'empty' ? result.confirmationToken : undefined });
+            setState('idle');
+        }
+        catch (cause) {
+            if (!isCurrent())
+                return;
+            setPending(null);
+            setState('error');
+            setError(errorMessage(cause));
+        }
+        finally {
+            scope.busy = false;
+        }
     };
     const cancelConfirmation = () => {
-        if (state === 'preparing')
+        if (scope.busy)
             return;
-        setPendingInput(null);
+        setPending(null);
         setError(null);
         setState('idle');
     };
     const confirm = async () => {
-        const captured = pendingInput;
-        if (captured === null || state === 'preparing')
+        if (pending === null || pending.kind === 'files' || scope.busy || !isCurrent())
             return;
+        scope.busy = true;
         setState('preparing');
         setError(null);
+        const captured = pending;
         try {
             const prepared = await controller.prepare({
-                sessionId,
-                input: captured,
-                currentInput: () => latestInput.current,
-                inputActions,
+                sessionId, input: captured.input, currentInput: () => latestInput.current,
+                isCurrentSession: isCurrent, inputActions, initialCommitConfirmationToken: captured.token,
             });
+            if (!isCurrent())
+                return;
             setTarget(prepared);
-            setPendingInput(null);
+            setPending(null);
             setState('idle');
         }
         catch (cause) {
+            if (!isCurrent())
+                return;
+            // Tokens are single-use, including when only the client handoff failed.
+            setPending(null);
             setState('error');
             setError(errorMessage(cause));
         }
+        finally {
+            scope.busy = false;
+        }
     };
-    return (_jsxs("span", { className: "dsh-wt-pre-session", "data-state": state, children: [_jsxs("button", { type: "button", role: "switch", "aria-label": "Worktree", "aria-checked": checked, "aria-describedby": error && pendingInput === null ? `dsh-wt-pre-session-error-${sessionId}` : undefined, className: "dsh-wt-pre-session-switch", disabled: disabled, onClick: () => { void beginConfirmation(); }, children: [_jsx("span", { className: "dsh-wt-pre-session-check", "aria-hidden": true, children: checked ? '✓' : '' }), _jsx("span", { children: "Worktree" }), _jsx("span", { className: "dsh-wt-pre-session-state", "aria-live": "polite", children: status })] }), error && pendingInput === null ? (_jsx("span", { id: `dsh-wt-pre-session-error-${sessionId}`, className: "dsh-wt-pre-session-error", role: "alert", children: error })) : null, _jsxs(Modal, { open: pendingInput !== null, onClose: cancelConfirmation, title: "\u5728 Worktree \u4E2D\u5F00\u59CB\uFF1F", closeLabel: "\u5173\u95ED", description: pendingInput === null ? '' : confirmationDescription(pendingInput), footer: (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", className: "dsh-wt-button", disabled: state === 'preparing', onClick: cancelConfirmation, children: "\u53D6\u6D88" }), _jsx("button", { type: "button", className: "dsh-wt-button dsh-wt-primary", disabled: state === 'preparing', onClick: () => { void confirm(); }, children: state === 'preparing' ? '正在创建…' : '创建并切换' })] })), children: [_jsx("p", { className: "dsh-wt-pre-session-note", children: "Local \u4F1A\u8BDD\u4E0D\u4F1A\u6536\u5230\u8FD9\u6761\u6D88\u606F\uFF1B\u5207\u6362\u540E\u8BF7\u5728\u65B0\u4F1A\u8BDD\u4E2D\u4F7F\u7528\u539F\u751F\u53D1\u9001\u6309\u94AE\u3002" }), error ? _jsx("p", { className: "dsh-wt-error", role: "alert", children: error }) : null] })] }));
+    return (_jsxs("span", { className: "dsh-wt-pre-session", "data-state": state, children: [_jsxs("button", { type: "button", role: "switch", "aria-checked": selected, "aria-label": t('worktree'), "aria-describedby": error ? `dsh-wt-pre-session-error-${sessionId}` : undefined, className: "dsh-wt-pre-session-toggle", disabled: disabled, onClick: () => { void beginConfirmation(); }, children: [_jsx("span", { className: "dsh-wt-pre-session-check", "aria-hidden": "true", children: selected ? _jsx(ReviewIcon, { name: "confirm" }) : null }), _jsx("span", { children: t('worktree') })] }), error ? (_jsxs("span", { id: `dsh-wt-pre-session-error-${sessionId}`, className: "dsh-wt-pre-session-error", role: "alert", children: [error, " ", _jsxs("button", { type: "button", className: "dsh-wt-button", disabled: busy, onClick: () => { void beginConfirmation(); }, children: [_jsx(ReviewIcon, { name: "refresh" }), t('retry')] })] })) : null, _jsxs(Modal, { className: "dsh-wt-create-dialog", open: pending !== null, onClose: cancelConfirmation, title: pending?.kind === 'empty' ? t('pre.session.initial.title') : t('start.in.a.worktree'), closeLabel: t('close'), description: pending === null ? '' : pending.kind === 'empty' ? t('pre.session.initial.description') : pending.kind === 'files' ? t('pre.session.files.description') : confirmationDescription(pending.input, t), footer: (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", className: "dsh-wt-button", disabled: busy, onClick: cancelConfirmation, children: t('cancel') }), pending?.kind !== 'files' ? _jsxs("button", { type: "button", className: "dsh-wt-button dsh-wt-primary", disabled: busy, onClick: () => { void confirm(); }, children: [_jsx(ReviewIcon, { name: "create" }), busy ? t('creating') : pending?.kind === 'empty' ? t('pre.session.initial.confirm') : t('create.and.switch')] }) : null] })), children: [pending?.kind === 'empty' ? _jsx("p", { className: "dsh-wt-pre-session-note", children: confirmationDescription(pending.input, t) }) : null, pending?.kind !== 'files' ? _jsx("p", { className: "dsh-wt-pre-session-note", children: t('the.local.session.will.not.receive.this.message') }) : null] })] }));
 }
 //# sourceMappingURL=PreSessionWorktreeToggle.js.map

package/lib/client/pre-session/PreSessionWorktreeToggle.js.map

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

package/lib/client/pre-session/controller.d.ts

@@ -20,6 +20,9 @@ export interface PreparePreSessionWorktreeRequest {
     /** Live source state used for the final compare-and-clear boundary. */
     currentInput?: () => PreSessionDraftState;
     inputActions: PreSessionDraftActions;
+    initialCommitConfirmationToken?: string;
+    /** Invalidated when the composer leaves its source Session. */
+    isCurrentSession?: () => boolean;
 }
 export declare class PreSessionWorktreeError extends Error {
     readonly recoveryRequired: boolean;

package/lib/client/pre-session/controller.js

@@ -1,3 +1,5 @@
+import { translatorForServices } from '../i18n.js';
+import { adaptHarnessInputActions } from './harness-input.js';
 export class PreSessionWorktreeError extends Error {
     recoveryRequired;
     constructor(message, recoveryRequired = false) {
@@ -14,7 +16,8 @@ function sameStrings(left, right) {
 }
 function sourceStillMatches(request) {
     const current = request.currentInput?.() ?? request.input;
-    return current.phase === 'plain'
+    return request.isCurrentSession?.() !== false
+        && current.phase === 'plain'
         && current.draft === request.input.draft
         && sameStrings(current.imageIds, request.input.imageIds)
         && current.occurrences.length === request.input.occurrences.length
@@ -45,25 +48,33 @@ export class PreSessionWorktreeController {
         return attempt;
     }
     async run(request) {
+        const t = translatorForServices(this.services);
+        if (request.isCurrentSession?.() === false)
+            throw new PreSessionWorktreeError(t("pre.session.changed"));
         if (request.input.phase !== 'plain') {
-            throw new PreSessionWorktreeError('当前草稿正在提交或解析，请等待输入恢复后再创建 Worktree。');
+            throw new PreSessionWorktreeError(t("the.draft.is.being.submitted.or.parsed.wait"));
         }
         if (request.input.occurrences.length > 0) {
-            throw new PreSessionWorktreeError('草稿包含尚未序列化的引用，请先移除引用芯片或发送后再创建 Worktree。');
+            throw new PreSessionWorktreeError(t("the.draft.contains.unserialized.references.remove.the.reference"));
         }
         const previousBlock = this.services.conversation.blocks.storeFor(request.sessionId).getSnapshot();
-        this.services.conversation.blocks.set(request.sessionId, { reason: '正在创建隔离 Worktree…' });
+        this.services.conversation.blocks.set(request.sessionId, { reason: t("creating.isolated.worktree") });
         let created;
         let workspaceId;
         let actualSessionId;
         try {
-            const outcome = await this.adapter.create({ sourceSessionId: request.sessionId });
+            if (request.initialCommitConfirmationToken !== undefined && !this.adapter.createWithInitialCommit) {
+                throw new PreSessionWorktreeError(t("pre.session.initial.unavailable"));
+            }
+            const outcome = request.initialCommitConfirmationToken !== undefined
+                ? await this.adapter.createWithInitialCommit({ sourceSessionId: request.sessionId, confirmationToken: request.initialCommitConfirmationToken })
+                : await this.adapter.create({ sourceSessionId: request.sessionId });
             if (!outcome.ok)
                 throw new PreSessionWorktreeError(`${outcome.error.code}: ${outcome.error.message}`);
             created = outcome.value;
             const workspace = await this.services.workspaces.create({ path: created.managedRoot });
             if (workspace.path !== created.managedRoot) {
-                throw new PreSessionWorktreeError(`Harness 将 managed root 注册到了不同路径：${workspace.path}`);
+                throw new PreSessionWorktreeError(t("harness.registered.the.managed.root.at.a.different", { p0: workspace.path }));
             }
             workspaceId = workspace.workspaceId;
             actualSessionId = await this.services.sessions.create({
@@ -71,15 +82,15 @@ export class PreSessionWorktreeController {
                 sessionId: created.targetSessionId,
             });
             if (actualSessionId !== created.targetSessionId) {
-                throw new PreSessionWorktreeError(`Harness 创建了意外的 Session ${actualSessionId}；预期 ${created.targetSessionId}。`);
+                throw new PreSessionWorktreeError(t("harness.created.unexpected.session.expected.2", { p0: actualSessionId, p1: created.targetSessionId }));
             }
             const targetBinding = this.services.sessions.binding(created.targetSessionId);
             if (targetBinding?.ctx === undefined) {
-                throw new PreSessionWorktreeError('目标 Session 已创建，但 Harness 尚未提供可迁移草稿的 Session binding。');
+                throw new PreSessionWorktreeError(t("the.target.session.was.created.but.harness.has"));
             }
-            const targetInput = this.services.conversation.input.for(targetBinding.ctx);
+            const targetInput = adaptHarnessInputActions(this.services.conversation.input.for(targetBinding.ctx));
             if (!sourceStillMatches(request)) {
-                throw new PreSessionWorktreeError('确认后 Local 草稿或附件发生了变化，已取消迁移以避免覆盖新的输入。');
+                throw new PreSessionWorktreeError(t("the.local.draft.or.attachments.changed.after.confirmation"));
             }
             // From the final source CAS through target writes, navigation and source
             // clear there is no await. This ordering matters for image IDs: a failed
@@ -87,7 +98,7 @@ export class PreSessionWorktreeController {
             // that the preserved source still references.
             targetInput.setDraft(request.input.draft);
             if (!targetInput.addImages(request.input.imageIds)) {
-                throw new PreSessionWorktreeError('目标 Session 暂时拒绝接收草稿附件。');
+                throw new PreSessionWorktreeError(t("the.target.session.is.temporarily.refusing.draft.attachments"));
             }
             this.services.sessions.open(created.targetSessionId);
             request.inputActions.setDraft('');
@@ -105,10 +116,13 @@ export class PreSessionWorktreeController {
             return created.target;
         }
         catch (error) {
+            if (created !== undefined && request.initialCommitConfirmationToken !== undefined) {
+                error = new PreSessionWorktreeError(t("pre.session.initial.created.failure", { p0: messageOf(error) }));
+            }
             if (created !== undefined) {
-                const cleaned = await this.rollback(request.sessionId, created.targetSessionId, created.target, workspaceId, actualSessionId);
+                const cleaned = await this.rollback(request.sessionId, created.targetSessionId, created.target, workspaceId, actualSessionId).catch(() => false);
                 if (!cleaned) {
-                    throw new PreSessionWorktreeError(`${messageOf(error)} Worktree 已持久化但自动回滚失败，请从 Worktree Console 打开 owner Session 继续恢复。`, true);
+                    throw new PreSessionWorktreeError(t("the.worktree.was.persisted.but.automatic.rollback.failed", { p0: messageOf(error) }), true);
                 }
             }
             throw error;

package/lib/client/pre-session/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/client/pre-session/controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/client/pre-session/controller.ts"],"names":[],"mappings":"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"}

package/lib/client/pre-session/harness-input.d.ts

@@ -0,0 +1,13 @@
+import type { PreSessionDraftActions, PreSessionDraftState } from './controller.js';
+/** Harness renamed the image-only composer API when adding general attachments. */
+export type HarnessInputState = PreSessionDraftState | (Omit<PreSessionDraftState, 'imageIds'> & {
+    readonly attachmentIds: readonly string[];
+});
+export type HarnessInputActions = PreSessionDraftActions | {
+    setDraft(text: string): void;
+    addAttachments(ids: readonly string[]): boolean;
+    removeAttachment(id: string): void;
+};
+export declare function readHarnessInput(input: HarnessInputState): PreSessionDraftState;
+/** Bind through the original receiver: target input faces may be class instances. */
+export declare function adaptHarnessInputActions(input: HarnessInputActions): PreSessionDraftActions;

package/lib/client/pre-session/harness-input.js

@@ -0,0 +1,18 @@
+export function readHarnessInput(input) {
+    return {
+        ...input,
+        imageIds: 'attachmentIds' in input ? input.attachmentIds : input.imageIds,
+    };
+}
+/** Bind through the original receiver: target input faces may be class instances. */
+export function adaptHarnessInputActions(input) {
+    if ('addAttachments' in input) {
+        return {
+            setDraft: text => input.setDraft(text),
+            addImages: ids => input.addAttachments(ids),
+            removeImage: id => input.removeAttachment(id),
+        };
+    }
+    return input;
+}
+//# sourceMappingURL=harness-input.js.map

package/lib/client/pre-session/harness-input.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"harness-input.js","sourceRoot":"","sources":["../../../src/client/pre-session/harness-input.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,gBAAgB,CAAC,KAAwB;IACvD,OAAO;QACL,GAAG,KAAK;QACR,QAAQ,EAAE,eAAe,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;KAC1E,CAAA;AACH,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,wBAAwB,CAAC,KAA0B;IACjE,IAAI,gBAAgB,IAAI,KAAK,EAAE,CAAC;QAC9B,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YACtC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC;YAC3C,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;SAC9C,CAAA;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}

package/lib/client/pre-session/index.d.ts

@@ -1,8 +1,19 @@
 import type { ComponentType } from 'react';
+import type { SessionSnapshot } from '@deepseek-ai/dsh-api-session-controller/client';
+import type { SnapshotSelectorHook } from '@deepseek-ai/dsh-client-store';
 import type { WorktreeConsoleAdapter } from '../../console-contract.js';
 import type { PreSessionWorktreeServices } from '../actions.js';
-import { type PreSessionWorktreeToggleProps } from './PreSessionWorktreeToggle.js';
-export type PreSessionSlotProps = Omit<PreSessionWorktreeToggleProps, 'adapter' | 'controller'>;
+import { type HarnessInputActions, type HarnessInputState } from './harness-input.js';
+/** rc.1 input.left has no owner snapshot props; snapshots come from standard hooks. */
+export interface PreSessionSlotProps {
+    sessionId: string;
+    useSession: SnapshotSelectorHook<SessionSnapshot>;
+    useConversation: SnapshotSelectorHook<{
+        readonly activeTargets: ReadonlySet<string>;
+    }>;
+    useInput: SnapshotSelectorHook<HarnessInputState>;
+    inputActions: HarnessInputActions;
+}
 export interface PreSessionSlotContextLike {
     slots: {
         inject(name: 'conversation.input.left', callback: () => unknown): void;

package/lib/client/pre-session/index.js

@@ -1,10 +1,19 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createPreSessionWorktreeController } from './controller.js';
-import { PreSessionWorktreeToggle, } from './PreSessionWorktreeToggle.js';
+import { PreSessionWorktreeToggle } from './PreSessionWorktreeToggle.js';
+import { adaptHarnessInputActions, readHarnessInput } from './harness-input.js';
 /** Register the blank-session switch in Harness's public composer tool row. */
 export function registerPreSessionWorktree(ctx, adapter, services) {
     const controller = createPreSessionWorktreeController(adapter, services);
-    const Entry = (props) => (_jsx(PreSessionWorktreeToggle, { ...props, adapter: adapter, controller: controller }));
+    const Entry = ({ sessionId, useSession, useConversation, useInput, inputActions }) => {
+        // Match Harness's conversationPhase: a pending first turn is not a blank
+        // launcher, and any active Conversation target makes this an existing session.
+        const sessionPhase = useSession(session => (!session.blank && !session.awaitingFirstTurn) || session.running
+            ? 'active' : session.promptAttempted ? 'engaging' : 'blank');
+        const hasActiveTarget = useConversation(conversation => conversation.activeTargets.size > 0);
+        const input = readHarnessInput(useInput(snapshot => snapshot));
+        return _jsx(PreSessionWorktreeToggle, { sessionId: sessionId, session: { composerPhase: hasActiveTarget ? 'active' : sessionPhase }, input: input, inputActions: adaptHarnessInputActions(inputActions), adapter: adapter, controller: controller });
+    };
     ctx.slots.inject('conversation.input.left', () => ctx.slots.register({
         name: 'conversation.input.left',
         id: 'worktree-pre-session',

package/lib/client/pre-session/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/pre-session/index.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,EACL,wBAAwB,GAEzB,MAAM,+BAA+B,CAAA;AActC,+EAA+E;AAC/E,MAAM,UAAU,0BAA0B,CACxC,GAA8B,EAC9B,OAA+B,EAC/B,QAAoC;IAEpC,MAAM,UAAU,GAAG,kCAAkC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACxE,MAAM,KAAK,GAAG,CAAC,KAA0B,EAAE,EAAE,CAAC,CAC5C,KAAC,wBAAwB,OACnB,KAAK,EACT,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACtB,CACH,CAAA;IACD,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAClE;QACE,IAAI,EAAE,yBAAyB;QAC/B,EAAE,EAAE,sBAAsB;QAC1B,KAAK,EAAE,EAAE;KACV,EACD,KAAK,CACN,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAA;AAC3H,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/pre-session/index.tsx"],"names":[],"mappings":";AAKA,OAAO,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAoD,MAAM,oBAAoB,CAAA;AAqBjI,+EAA+E;AAC/E,MAAM,UAAU,0BAA0B,CACxC,GAA8B,EAC9B,OAA+B,EAC/B,QAAoC;IAEpC,MAAM,UAAU,GAAG,kCAAkC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACxE,MAAM,KAAK,GAAG,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,YAAY,EAAuB,EAAE,EAAE;QACxG,yEAAyE;QACzE,+EAA+E;QAC/E,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO;YAC1G,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAC9D,MAAM,eAAe,GAAG,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC,CAAA;QAC5F,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC9D,OAAO,KAAC,wBAAwB,IAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE,EACrE,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,wBAAwB,CAAC,YAAY,CAAC,EACpD,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACtB,CAAA;IACJ,CAAC,CAAA;IACD,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAClE;QACE,IAAI,EAAE,yBAAyB;QAC/B,EAAE,EAAE,sBAAsB;QAC1B,KAAK,EAAE,EAAE;KACV,EACD,KAAK,CACN,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAA;AAC3H,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA"}

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

@@ -1,32 +1,35 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { useClientLanguage, useClientTranslator, defaultClientTranslator } from '../i18n.js';
 function shortOid(value) {
     return value.slice(0, 8);
 }
-function validationLabel(status) {
+function validationLabel(status, t = defaultClientTranslator) {
     if (status === 'passed')
-        return '验证通过';
+        return t("validation.passed");
     if (status === 'failed')
-        return '验证失败';
+        return t("validation.failed");
     if (status === 'partial')
-        return '部分验证';
+        return t("partial.validation");
     if (status === 'not_run')
-        return '未运行验证';
-    return '无验证摘要';
+        return t("validation.not.run");
+    return t("no.validation.summary");
 }
 export function DeliveryProof({ target, compact = false }) {
+    const t = useClientTranslator();
+    const language = useClientLanguage();
     const proof = target.deliveryProof;
     if (!proof)
         return null;
     const lifecycle = target.state === 'delivered'
-        ? '环境已清理'
+        ? t("environment.cleaned.up")
         : target.state === 'retained'
-            ? `环境已保留${target.expiresAt ? `至 ${new Date(target.expiresAt).toLocaleString()}` : ''}`
+            ? t("environment.retained", { p0: target.expiresAt ? t("until", { p0: new Date(target.expiresAt).toLocaleString(language === 'en' ? 'en-US' : 'zh-CN') }) : '' })
             : target.state === 'cleanup_pending'
-                ? 'Commit 已创建，环境清理待完成'
-                : '交付证据已记录';
+                ? t("commit.created.environment.cleanup.pending")
+                : t("delivery.evidence.recorded");
     if (compact) {
-        return (_jsxs("span", { className: "dsh-wt-delivery-proof dsh-wt-delivery-proof-compact", children: ["Commit ", target.commitOid ? shortOid(target.commitOid) : '无新增 Commit', " \u00B7 ", proof.localBranch ?? 'detached', "@", shortOid(proof.localHeadAfter), " \u00B7 ", proof.changedFiles.length, " \u4E2A\u6587\u4EF6 \u00B7 ", lifecycle] }));
+        return (_jsxs("span", { className: "dsh-wt-delivery-proof dsh-wt-delivery-proof-compact", children: [t("commit"), " ", target.commitOid ? shortOid(target.commitOid) : t("no.new.commit"), " \u00B7 ", proof.localBranch ?? t("detached.head"), "@", shortOid(proof.localHeadAfter), " \u00B7 ", t("count.files", { count: proof.changedFiles.length }), " \u00B7 ", lifecycle] }));
     }
-    return (_jsxs("section", { className: "dsh-wt-delivery-proof", "aria-label": "\u4EA4\u4ED8\u8BC1\u660E", children: [_jsxs("header", { children: [_jsx("strong", { children: "Delivery Proof" }), _jsx("span", { children: lifecycle })] }), _jsxs("dl", { children: [_jsxs("div", { children: [_jsx("dt", { children: "Commit" }), _jsx("dd", { children: _jsx("code", { children: target.commitOid ?? '无新增 Commit' }) })] }), _jsxs("div", { children: [_jsx("dt", { children: "Local" }), _jsxs("dd", { children: [proof.localBranch ?? 'detached', " \u00B7 ", _jsx("code", { children: shortOid(proof.localHeadBefore) }), " \u2192 ", _jsx("code", { children: shortOid(proof.localHeadAfter) })] })] }), _jsxs("div", { children: [_jsx("dt", { children: "\u6587\u4EF6" }), _jsxs("dd", { children: [proof.changedFiles.length, " \u4E2A"] })] }), _jsxs("div", { children: [_jsx("dt", { children: "\u9A8C\u8BC1" }), _jsxs("dd", { children: [validationLabel(proof.validationStatus), proof.validationSummary ? ` · ${proof.validationSummary}` : ''] })] }), _jsxs("div", { children: [_jsx("dt", { children: "Local \u5386\u53F2" }), _jsx("dd", { children: proof.commitInLocalHistory === true ? 'Commit 仍在 Local 历史中' : proof.commitInLocalHistory === false ? 'Commit 已不在当前 Local 历史中' : '当前无法确认' })] })] })] }));
+    return (_jsxs("section", { className: "dsh-wt-delivery-proof", "aria-label": t("delivery.proof"), children: [_jsxs("header", { children: [_jsx("strong", { children: t("delivery.proof.2") }), _jsx("span", { children: lifecycle })] }), _jsxs("dl", { children: [_jsxs("div", { children: [_jsx("dt", { children: t("commit") }), _jsx("dd", { children: _jsx("code", { children: target.commitOid ?? t("no.new.commit") }) })] }), _jsxs("div", { children: [_jsx("dt", { children: t("local") }), _jsxs("dd", { children: [proof.localBranch ?? t("detached.head"), " \u00B7 ", _jsx("code", { children: shortOid(proof.localHeadBefore) }), " \u2192 ", _jsx("code", { children: shortOid(proof.localHeadAfter) })] })] }), _jsxs("div", { children: [_jsx("dt", { children: t("files.2") }), _jsx("dd", { children: t("count.files", { count: proof.changedFiles.length }) })] }), _jsxs("div", { children: [_jsx("dt", { children: t("validation") }), _jsxs("dd", { children: [validationLabel(proof.validationStatus, t), proof.validationSummary ? ` · ${proof.validationSummary}` : ''] })] }), _jsxs("div", { children: [_jsx("dt", { children: t("local.history") }), _jsx("dd", { children: proof.commitInLocalHistory === true ? t("commit.is.still.in.local.history") : proof.commitInLocalHistory === false ? t("commit.is.no.longer.in.current.local.history") : t("cannot.confirm.at.this.time") })] })] })] }));
 }
 //# sourceMappingURL=DeliveryProof.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"DeliveryProof.js","sourceRoot":"","sources":["../../../src/client/review-console/DeliveryProof.tsx"],"names":[],"mappings":";AAEA,SAAS,QAAQ,CAAC,KAAa;IAC7B,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAC1B,CAAC;AAED,SAAS,eAAe,CAAC,MAAsF;IAC7G,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAA;IACtC,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAA;IACtC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAA;IACvC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,OAAO,CAAA;IACxC,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,EAAE,MAAM,EAAE,OAAO,GAAG,KAAK,EAA+D;IACpH,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAA;IAClC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAA;IACvB,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,KAAK,WAAW;QAC5C,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC,KAAK,KAAK,UAAU;YAC3B,CAAC,CAAC,QAAQ,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;YACtF,CAAC,CAAC,MAAM,CAAC,KAAK,KAAK,iBAAiB;gBAClC,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,SAAS,CAAA;IACjB,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CACL,gBAAM,SAAS,EAAC,qDAAqD,wBAC3D,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,cAAK,KAAK,CAAC,WAAW,IAAI,UAAU,OAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,cAAK,KAAK,CAAC,YAAY,CAAC,MAAM,iCAAS,SAAS,IACpL,CACR,CAAA;IACH,CAAC;IACD,OAAO,CACL,mBAAS,SAAS,EAAC,uBAAuB,gBAAY,0BAAM,aAC1D,6BAAQ,8CAA+B,EAAA,yBAAO,SAAS,GAAQ,IAAS,EACxE,yBACE,0BAAK,kCAAe,EAAA,uBAAI,yBAAO,MAAM,CAAC,SAAS,IAAI,YAAY,GAAQ,GAAK,IAAM,EAClF,0BAAK,iCAAc,EAAA,yBAAK,KAAK,CAAC,WAAW,IAAI,UAAU,cAAI,yBAAO,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAQ,cAAG,yBAAO,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAQ,IAAK,IAAM,EACpK,0BAAK,wCAAW,EAAA,yBAAK,KAAK,CAAC,YAAY,CAAC,MAAM,eAAQ,IAAM,EAC5D,0BAAK,wCAAW,EAAA,yBAAK,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,IAAM,IAAM,EACxI,0BAAK,8CAAiB,EAAA,uBAAK,KAAK,CAAC,oBAAoB,KAAK,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,KAAK,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,QAAQ,GAAM,IAAM,IAC5K,IACG,CACX,CAAA;AACH,CAAC"}
+{"version":3,"file":"DeliveryProof.js","sourceRoot":"","sources":["../../../src/client/review-console/DeliveryProof.tsx"],"names":[],"mappings":"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"}