dsh-git-worktree 0.1.2 → 0.3.0

package/lib/commands.d.ts

@@ -1,8 +1,6 @@
 /**
- * `/worktree` human command surface: create, list, apply, finish, discard,
- * remove. Commands run against the receiving agent's session like the tools,
- * but are user-initiated, so destructive verbs carry their own confirmation
- * semantics (dirty discard is the user's own command).
+ * `/worktree` human command surface. Destructive verbs are intentionally
+ * user-initiated; model tools stop at Ready for Review.
  * @module dsh-git-worktree/commands
  */
 import type { Context } from '@deepseek-ai/cordis';

package/lib/commands.js

@@ -1,8 +1,6 @@
 /**
- * `/worktree` human command surface: create, list, apply, finish, discard,
- * remove. Commands run against the receiving agent's session like the tools,
- * but are user-initiated, so destructive verbs carry their own confirmation
- * semantics (dirty discard is the user's own command).
+ * `/worktree` human command surface. Destructive verbs are intentionally
+ * user-initiated; model tools stop at Ready for Review.
  * @module dsh-git-worktree/commands
  */
 import '@deepseek-ai/dsh-commands';
@@ -22,46 +20,86 @@ function sessionIdOf(agent) {
         throw new Error('`/worktree` 只能在 DSH Agent 会话中使用');
     return session.id;
 }
-const USAGE = 'Usage: /worktree create | list | apply | finish <message> | discard | remove <checkoutId>';
+const RETENTIONS = new Set(['cleanup', 'retain_24h', 'retain_3d', 'retain_manual']);
+const USAGE = 'Usage: /worktree status | list | continue | next | finalize [<reviewId> <revision>] [cleanup|retain_24h|retain_3d|retain_manual] | finish <message> | discard | remove <checkoutId>';
+function finishedText(result) {
+    return `Finished: committed ${result.changedFiles.length} file(s) as ${result.commitOid?.slice(0, 7) ?? 'no-op'} (cleanup: ${result.cleanup}).`;
+}
 /** Register the `/worktree` command. */
 export function registerWorktreeCommand(ctx, module) {
     ctx.commands.register({
         name: 'worktree',
-        description: 'manage Domi-grade git worktrees (create / list / apply / finish / discard / remove)',
-        input: { hint: 'create | list | apply | finish <message> | discard | remove <checkoutId>' },
+        description: 'inspect and explicitly accept managed worktree delivery',
+        input: { hint: 'status | list | continue | next | finalize [retention] | finish <message> | discard | remove <checkoutId>' },
         handler: async (invocation) => {
-            const tokens = invocation.rawInput.trim().split(/\s+/u).filter(Boolean);
-            const verb = tokens[0] ?? 'list';
+            const rawInput = invocation.rawInput.trim();
+            const tokens = rawInput.split(/\s+/u).filter(Boolean);
+            const verb = tokens[0] ?? 'status';
             const sessionId = sessionIdOf(invocation.agent);
             try {
                 switch (verb) {
-                    case 'create': {
-                        const target = await module.bind(sessionId, { kind: 'isolated' });
-                        return { kind: 'success', text: `Worktree created:\n${targetText(target)}\n打开新会话并选择该工作区以在其中工作。` };
+                    case 'status': {
+                        return { kind: 'success', text: targetText(await module.inspect(sessionId)) };
                     }
                     case 'list': {
-                        const summaries = await module.listManagedWorktrees();
+                        const summaries = await module.listManagedWorktreesForSession(sessionId);
                         if (summaries.length === 0)
-                            return { kind: 'success', text: 'No managed worktrees.' };
+                            return { kind: 'success', text: 'No managed worktrees visible to this Session.' };
                         return {
                             kind: 'success',
                             text: summaries.map((summary) => (`${summary.checkoutId}  ${summary.project.name}  i${summary.iteration}  ${summary.state}/${summary.phase}  dirty=${summary.dirty}`)).join('\n'),
                         };
                     }
-                    case 'apply': {
+                    case 'continue': {
+                        const current = await module.inspect(sessionId);
+                        if (current.delivery?.state !== 'ready_for_review') {
+                            return { kind: 'error', text: '当前 Worktree 没有尚未同步的 Ready for Review 验收稿。' };
+                        }
+                        const target = await module.resumeRevision(sessionId, current.revision, current.delivery.review.reviewId);
+                        const iteration = target.delivery?.state === 'working' ? target.delivery.iteration : 0;
+                        return { kind: 'success', text: `Resumed Worktree iteration ${iteration}; Local was not modified.` };
+                    }
+                    case 'next': {
+                        const current = await module.inspect(sessionId);
+                        const target = await module.beginNextIteration(sessionId, current.revision);
+                        const iteration = target.delivery?.state === 'working' ? target.delivery.iteration : 0;
+                        return { kind: 'success', text: `Started Worktree iteration ${iteration} in the current Session.` };
+                    }
+                    case 'finalize': {
+                        const hasReviewIdentity = tokens[1] !== undefined && !RETENTIONS.has(tokens[1]);
+                        const expectedReviewId = hasReviewIdentity ? tokens[1] : undefined;
+                        const parsedRevision = hasReviewIdentity ? Number(tokens[2]) : undefined;
+                        const retention = (hasReviewIdentity ? tokens[3] : tokens[1] ?? 'cleanup');
+                        if (!RETENTIONS.has(retention) || (hasReviewIdentity && (!expectedReviewId || !Number.isSafeInteger(parsedRevision)))) {
+                            return { kind: 'error', text: USAGE };
+                        }
                         const target = await module.inspect(sessionId);
-                        const result = await module.operate({ action: 'apply', sessionId, expectedRevision: target.revision });
-                        if (result.status === 'applied')
-                            return { kind: 'success', text: `Applied ${result.changedFiles.length} file(s) to Local.` };
+                        if (target.delivery?.state !== 'ready_for_review') {
+                            return { kind: 'error', text: '当前 Worktree 尚未 Ready for Review，不能 finalize。' };
+                        }
+                        if (expectedReviewId && (target.delivery.review.reviewId !== expectedReviewId
+                            || target.revision !== parsedRevision)) {
+                            return { kind: 'error', text: '该验收卡已过期；请确认会话中的最新 Ready for Review 卡片。' };
+                        }
+                        const result = await module.operate({
+                            action: 'finish',
+                            sessionId,
+                            expectedRevision: parsedRevision ?? target.revision,
+                            commitMessage: target.delivery.review.suggestedCommitMessage,
+                            retention,
+                            ...(expectedReviewId ? { expectedReviewId } : {}),
+                        });
+                        if (result.status === 'finished')
+                            return { kind: 'success', text: finishedText(result) };
                         if (result.status === 'conflict') {
-                            return { kind: 'error', text: `Conflict: ${result.conflictingFiles.join('、')}\nLocal HEAD: ${result.localHeadOid.slice(0, 7)} — 在 worktree 内同步并解决后重试。` };
+                            return { kind: 'error', text: `Conflict: ${result.conflictingFiles.join('、')}\nLocal HEAD: ${result.localHeadOid.slice(0, 7)} — 在 Worktree 内同步并解决后重新 Ready。` };
                         }
                         if (result.status === 'error')
                             return { kind: 'error', text: `${result.code}: ${result.message}` };
-                        return { kind: 'error', text: 'Apply 未返回预期结果' };
+                        return { kind: 'error', text: 'Finalize 未返回预期结果' };
                     }
                     case 'finish': {
-                        const commitMessage = tokens.slice(1).join(' ').trim();
+                        const commitMessage = rawInput.slice(verb.length).trim();
                         if (!commitMessage)
                             return { kind: 'error', text: USAGE };
                         const target = await module.inspect(sessionId);
@@ -71,9 +109,10 @@ export function registerWorktreeCommand(ctx, module) {
                             expectedRevision: target.revision,
                             commitMessage,
                         });
-                        if (result.status === 'finished') {
-                            return { kind: 'success', text: `Finished: committed ${result.changedFiles.length} file(s) as ${result.commitOid?.slice(0, 7) ?? 'no-op'} (cleanup: ${result.cleanup}).` };
-                        }
+                        if (result.status === 'finished')
+                            return { kind: 'success', text: finishedText(result) };
+                        if (result.status === 'conflict')
+                            return { kind: 'error', text: `Conflict: ${result.conflictingFiles.join('、')}` };
                         if (result.status === 'error')
                             return { kind: 'error', text: `${result.code}: ${result.message}` };
                         return { kind: 'error', text: 'Finish 未返回预期结果' };
@@ -85,9 +124,10 @@ export function registerWorktreeCommand(ctx, module) {
                             sessionId,
                             expectedRevision: target.revision,
                             confirmDirty: true,
+                            ...(target.delivery?.state === 'preview_active' ? { rollbackPreview: true } : {}),
                         });
                         return result.status === 'discarded'
-                            ? { kind: 'success', text: 'Worktree discarded.' }
+                            ? { kind: 'success', text: 'Worktree discarded. This Session target is no longer available.' }
                             : result.status === 'error'
                                 ? { kind: 'error', text: `${result.code}: ${result.message}` }
                                 : { kind: 'error', text: 'Discard 未返回预期结果' };
@@ -96,15 +136,16 @@ export function registerWorktreeCommand(ctx, module) {
                         const checkoutId = tokens[1];
                         if (!checkoutId)
                             return { kind: 'error', text: USAGE };
-                        const summaries = await module.listManagedWorktrees({ checkoutId });
+                        const summaries = await module.listManagedWorktreesForSession(sessionId, { checkoutId });
                         const summary = summaries[0];
                         if (!summary)
-                            return { kind: 'error', text: `No managed worktree ${checkoutId}.` };
-                        await module.manageManagedWorktree({
+                            return { kind: 'error', text: `No managed worktree ${checkoutId} visible to this Session.` };
+                        await module.manageManagedWorktreeForSession(sessionId, {
                             checkoutId,
                             expectedRevision: summary.revision,
                             action: 'discard',
                             confirmDirty: true,
+                            ...(summary.state === 'preview_active' ? { rollbackPreview: true } : {}),
                         });
                         return { kind: 'success', text: `Removed worktree ${checkoutId}.` };
                     }

package/lib/commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,2BAA2B,CAAA;AAIlC,SAAS,UAAU,CAAC,MAAyB;IAC3C,MAAM,KAAK,GAAG;QACZ,aAAa,MAAM,CAAC,QAAQ,CAAC,KAAK,KAAK,MAAM,CAAC,QAAQ,CAAC,IAAI,WAAW,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG;QAC9F,UAAU,MAAM,CAAC,KAAK,EAAE;QACxB,YAAY,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,UAAU,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;KACtF,CAAA;IACD,IAAI,MAAM,CAAC,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,aAAa,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;IACrE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,MAAM,OAAO,GAAI,KAAmD,EAAE,OAAO,CAAA;IAC7E,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAClG,OAAO,OAAO,CAAC,EAAE,CAAA;AACnB,CAAC;AAED,MAAM,KAAK,GAAG,2FAA2F,CAAA;AAEzG,wCAAwC;AACxC,MAAM,UAAU,uBAAuB,CAAC,GAAY,EAAE,MAA6B;IACjF,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACpB,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,qFAAqF;QAClG,KAAK,EAAE,EAAE,IAAI,EAAE,0EAA0E,EAAE;QAC3F,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACvE,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAA;YAChC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YAC/C,IAAI,CAAC;gBACH,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACd,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;wBACjE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,UAAU,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAA;oBACnG,CAAC;oBACD,KAAK,MAAM,CAAC,CAAC,CAAC;wBACZ,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,oBAAoB,EAAE,CAAA;wBACrD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;4BAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAA;wBACrF,OAAO;4BACL,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAC/B,GAAG,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,WAAW,OAAO,CAAC,KAAK,EAAE,CACnI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;yBACd,CAAA;oBACH,CAAC;oBACD,KAAK,OAAO,CAAC,CAAC,CAAC;wBACb,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;wBAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;wBACtG,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;4BAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,MAAM,CAAC,YAAY,CAAC,MAAM,oBAAoB,EAAE,CAAA;wBAC5H,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;4BACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,0BAA0B,EAAE,CAAA;wBAC1J,CAAC;wBACD,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO;4BAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,OAAO,EAAE,EAAE,CAAA;wBAClG,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAA;oBACjD,CAAC;oBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACd,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;wBACtD,IAAI,CAAC,aAAa;4BAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;wBACzD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;wBAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;4BAClC,MAAM,EAAE,QAAQ;4BAChB,SAAS;4BACT,gBAAgB,EAAE,MAAM,CAAC,QAAQ;4BACjC,aAAa;yBACd,CAAC,CAAA;wBACF,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;4BACjC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,uBAAuB,MAAM,CAAC,YAAY,CAAC,MAAM,eAAe,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,cAAc,MAAM,CAAC,OAAO,IAAI,EAAE,CAAA;wBAC5K,CAAC;wBACD,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO;4BAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,OAAO,EAAE,EAAE,CAAA;wBAClG,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAA;oBAClD,CAAC;oBACD,KAAK,SAAS,CAAC,CAAC,CAAC;wBACf,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;wBAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;4BAClC,MAAM,EAAE,SAAS;4BACjB,SAAS;4BACT,gBAAgB,EAAE,MAAM,CAAC,QAAQ;4BACjC,YAAY,EAAE,IAAI;yBACnB,CAAC,CAAA;wBACF,OAAO,MAAM,CAAC,MAAM,KAAK,WAAW;4BAClC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,qBAAqB,EAAE;4BAClD,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO;gCACzB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,OAAO,EAAE,EAAE;gCAC9D,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAA;oBAClD,CAAC;oBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACd,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;wBAC5B,IAAI,CAAC,UAAU;4BAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;wBACtD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;wBACnE,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;wBAC5B,IAAI,CAAC,OAAO;4BAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,uBAAuB,UAAU,GAAG,EAAE,CAAA;wBAClF,MAAM,MAAM,CAAC,qBAAqB,CAAC;4BACjC,UAAU;4BACV,gBAAgB,EAAE,OAAO,CAAC,QAAQ;4BAClC,MAAM,EAAE,SAAS;4BACjB,YAAY,EAAE,IAAI;yBACnB,CAAC,CAAA;wBACF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,UAAU,GAAG,EAAE,CAAA;oBACrE,CAAC;oBACD;wBACE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE,EAAE,CAAA;gBACrF,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;YACxF,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"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"}

package/lib/console-contract.d.ts

@@ -0,0 +1,253 @@
+/**
+ * JSON-only shared contract for the future Harness-native Worktree Console.
+ *
+ * This module deliberately contains no Cordis, React, Remote or filesystem
+ * implementation. Host and Client tracks share these DTOs while preserving one
+ * authority rule: every Host operation resolves an exact caller Session and
+ * re-validates project, owner, cwd, revision and review identity at execution.
+ * @module dsh-git-worktree/console-contract
+ */
+import { type SessionCheckoutErrorCode, type SessionCheckoutPhase, type WorktreeRetentionMode, type WorktreeApplyPreflightView, type WorktreeValidationItem, type WorktreeValidationStatus } from './types.js';
+export declare const WORKTREE_CONSOLE_TARGET_STATES: readonly ["local", "creating", "working", "ready_for_review", "preview_active", "preview_detached", "retained", "cleanup_pending", "recovery_required", "delivered"];
+export type WorktreeConsoleTargetState = typeof WORKTREE_CONSOLE_TARGET_STATES[number];
+export type WorktreeConsoleDeliveryState = 'working' | 'ready_for_review' | 'preview_active' | 'preview_detached' | 'finalized' | 'retained' | 'delivered';
+/** Minimal domain facts required to project a stable, UI-facing state. */
+export interface WorktreeConsoleProjectionSource {
+    kind: 'local' | 'isolated';
+    phase: SessionCheckoutPhase;
+    deliveryState?: WorktreeConsoleDeliveryState;
+}
+/** Recovery and mutation phases take precedence over a stale delivery label. */
+export declare function consoleStateFromDomain(source: WorktreeConsoleProjectionSource): WorktreeConsoleTargetState;
+export interface WorktreeConsoleProject {
+    id: string;
+    name: string;
+}
+export interface WorktreeConsoleCapabilities {
+    create: boolean;
+    open: boolean;
+    inspect: boolean;
+    discard: boolean;
+    preflight: boolean;
+    preview: boolean;
+    /** Invalidate an unsynced review and resume the same iteration without touching Local. */
+    resumeRevision: boolean;
+    rollbackPreview: boolean;
+    /** Direct Ready → Commit path that skips Local Preview. */
+    finalize: boolean;
+    finalizePreview: boolean;
+    setRetention: boolean;
+    retryCleanup: boolean;
+    /** Recreate a cleaned delivered owner's immutable cwd for iteration + 1. */
+    beginNextIteration: boolean;
+}
+export interface WorktreeConsolePreviewRecovery {
+    reason: 'stale_local' | 'preview_modified';
+    attemptedAction: 'rollback_preview' | 'finalize_preview' | 'discard';
+}
+export interface WorktreeConsoleReviewSummary {
+    reviewId: string;
+    revision: number;
+    iteration: number;
+    preparedAt: number;
+    summary: string;
+    validationStatus: WorktreeValidationStatus;
+    validationSummary?: string;
+    tests: WorktreeValidationItem[];
+    changedFiles: string[];
+    suggestedCommitMessage: string;
+}
+/** Path-free row safe for project lists and header status chips. */
+export interface WorktreeConsoleTargetSummary {
+    project: WorktreeConsoleProject;
+    checkoutId: string | null;
+    sourceSessionId: string;
+    ownerSessionId: string;
+    targetSessionId: string | null;
+    iteration: number;
+    revision: number;
+    state: WorktreeConsoleTargetState;
+    phase: SessionCheckoutPhase | 'local';
+    dirty: boolean;
+    currentOid: string;
+    commitOid: string | null;
+    retention?: Exclude<WorktreeRetentionMode, 'cleanup'>;
+    retainedAt?: number;
+    expiresAt?: number | null;
+    cleanupMessage?: string;
+    review?: WorktreeConsoleReviewSummary;
+    reviewSlot?: 'available' | 'waiting';
+    reviewSlotOwnerSessionId?: string;
+    previewRecovery?: WorktreeConsolePreviewRecovery;
+    capabilities: WorktreeConsoleCapabilities;
+}
+/** Identity-validated detail used only when the caller may open this target. */
+export interface WorktreeConsoleTargetDetails extends WorktreeConsoleTargetSummary {
+    managedRoot: string | null;
+    sourceOid: string;
+    currentBranch: string | null;
+}
+export interface WorktreeConsoleCurrentRequest {
+    sessionId: string;
+}
+export interface WorktreeConsoleCurrentResponse {
+    target: WorktreeConsoleTargetDetails;
+}
+export interface WorktreeConsoleListRequest {
+    sessionId: string;
+    needsAttention?: boolean;
+    includeDelivered?: boolean;
+}
+export interface WorktreeConsoleListResponse {
+    project: WorktreeConsoleProject;
+    worktrees: WorktreeConsoleTargetSummary[];
+}
+/** targetSessionId is allocated on the Host; the browser never chooses ownership identity. */
+export interface WorktreeConsoleCreateRequest {
+    sourceSessionId: string;
+}
+export interface WorktreeConsoleCreateResponse {
+    target: WorktreeConsoleTargetDetails;
+    targetSessionId: string;
+    managedRoot: string;
+}
+export interface WorktreeConsoleInspectRequest {
+    sessionId: string;
+    checkoutId: string;
+}
+export interface WorktreeConsoleInspectResponse {
+    target: WorktreeConsoleTargetDetails;
+}
+export interface WorktreeConsoleDiscardRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    confirmDirty: boolean;
+    rollbackPreview?: boolean;
+}
+export interface WorktreeConsolePreflightRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    expectedReviewId: string;
+}
+export interface WorktreeConsolePreflightResponse {
+    preflight: WorktreeApplyPreflightView;
+}
+export interface WorktreeConsolePreviewRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    expectedReviewId: string;
+}
+export interface WorktreeConsoleResumeRevisionRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    expectedReviewId: string;
+}
+export interface WorktreeConsoleRollbackPreviewRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    resumeRevision?: boolean;
+}
+export interface WorktreeConsoleFinalizeRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    expectedReviewId: string;
+    /** Explicit user-confirmed message; Host revalidates the bounded value. */
+    commitMessage: string;
+    retention: WorktreeRetentionMode;
+}
+export interface WorktreeConsoleFinalizePreviewRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    expectedReviewId: string;
+    commitMessage: string;
+    retention: WorktreeRetentionMode;
+}
+export interface WorktreeConsoleSetRetentionRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    retention: Exclude<WorktreeRetentionMode, 'cleanup'>;
+}
+export interface WorktreeConsoleRetryCleanupRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+}
+export interface WorktreeConsoleBeginNextIterationRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+}
+export interface WorktreeConsoleMutationResponse {
+    target: WorktreeConsoleTargetSummary;
+    changedFiles?: string[];
+    commitOid?: string | null;
+}
+export type WorktreeConsoleFileStatus = 'added' | 'modified' | 'deleted' | 'renamed' | 'binary';
+export interface WorktreeConsoleDiffFile {
+    path: string;
+    previousPath?: string;
+    status: WorktreeConsoleFileStatus;
+    patch: string | null;
+    truncated: boolean;
+}
+/** Review reads are bound to the same immutable identity required by Finalize. */
+export interface WorktreeConsoleReviewDiffRequest {
+    sessionId: string;
+    checkoutId: string;
+    expectedRevision: number;
+    expectedReviewId: string;
+}
+export interface WorktreeConsoleReviewDiffResponse {
+    reviewId: string;
+    revision: number;
+    files: WorktreeConsoleDiffFile[];
+    truncated: boolean;
+}
+export declare const WORKTREE_CONSOLE_ERROR_CODES: readonly ["session_not_found", "project_not_found", "project_root_missing", "not_git_repository", "target_unselected", "target_already_bound", "project_mismatch", "checkout_missing", "checkout_mismatch", "recovery_required", "registry_corrupt", "git_operation_failed", "not_owner", "stale_target", "dirty_confirmation_required", "apply_conflict", "apply_failed", "invalid_input", "invalid_plan", "stale_local", "stale_isolated", "git_error", "commit_isolation_conflict", "checkout_limit_reached", "project_acceptance_busy", "operation_not_allowed", "preview_not_active", "preview_modified", "recovery_unsafe", "transport_unavailable", "malformed_response"];
+export type WorktreeConsoleErrorCode = SessionCheckoutErrorCode | 'transport_unavailable' | 'malformed_response';
+export type WorktreeConsoleErrorCategory = 'permission' | 'stale' | 'confirmation' | 'recovery' | 'conflict' | 'unavailable' | 'invalid' | 'internal';
+export type WorktreeConsoleRecovery = 'none' | 'refresh' | 'confirm_dirty' | 'open_recovery' | 'retry';
+export interface WorktreeConsoleError {
+    code: WorktreeConsoleErrorCode;
+    message: string;
+    details?: Record<string, string | number | boolean | null>;
+}
+export type WorktreeConsoleOutcome<T> = {
+    ok: true;
+    value: T;
+} | {
+    ok: false;
+    error: WorktreeConsoleError;
+};
+export interface WorktreeConsoleErrorMeta {
+    category: WorktreeConsoleErrorCategory;
+    recovery: WorktreeConsoleRecovery;
+    retryable: boolean;
+}
+export declare function worktreeConsoleErrorMeta(code: WorktreeConsoleErrorCode): WorktreeConsoleErrorMeta;
+/** Normalized Client seam; Remote transport details stay behind one adapter. */
+export interface WorktreeConsoleAdapter {
+    current(request: WorktreeConsoleCurrentRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleCurrentResponse>>;
+    list(request: WorktreeConsoleListRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleListResponse>>;
+    create(request: WorktreeConsoleCreateRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleCreateResponse>>;
+    inspect(request: WorktreeConsoleInspectRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleInspectResponse>>;
+    reviewDiff(request: WorktreeConsoleReviewDiffRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleReviewDiffResponse>>;
+    preflight(request: WorktreeConsolePreflightRequest): Promise<WorktreeConsoleOutcome<WorktreeConsolePreflightResponse>>;
+    preview(request: WorktreeConsolePreviewRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    resumeRevision(request: WorktreeConsoleResumeRevisionRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    rollbackPreview(request: WorktreeConsoleRollbackPreviewRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    discard(request: WorktreeConsoleDiscardRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    finalize(request: WorktreeConsoleFinalizeRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    finalizePreview(request: WorktreeConsoleFinalizePreviewRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    setRetention(request: WorktreeConsoleSetRetentionRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    retryCleanup(request: WorktreeConsoleRetryCleanupRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    beginNextIteration(request: WorktreeConsoleBeginNextIterationRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+}

package/lib/console-contract.js

@@ -0,0 +1,86 @@
+/**
+ * JSON-only shared contract for the future Harness-native Worktree Console.
+ *
+ * This module deliberately contains no Cordis, React, Remote or filesystem
+ * implementation. Host and Client tracks share these DTOs while preserving one
+ * authority rule: every Host operation resolves an exact caller Session and
+ * re-validates project, owner, cwd, revision and review identity at execution.
+ * @module dsh-git-worktree/console-contract
+ */
+import { SESSION_CHECKOUT_ERROR_CODES, } from './types.js';
+export const WORKTREE_CONSOLE_TARGET_STATES = [
+    'local',
+    'creating',
+    'working',
+    'ready_for_review',
+    'preview_active',
+    'preview_detached',
+    'retained',
+    'cleanup_pending',
+    'recovery_required',
+    'delivered',
+];
+/** Recovery and mutation phases take precedence over a stale delivery label. */
+export function consoleStateFromDomain(source) {
+    if (source.kind === 'local')
+        return 'local';
+    if (source.phase === 'recovery_required')
+        return 'recovery_required';
+    if (source.phase === 'preparing')
+        return 'creating';
+    if (source.deliveryState === 'retained' || source.phase === 'retained')
+        return 'retained';
+    if (source.deliveryState === 'finalized' || source.phase === 'finalized')
+        return 'cleanup_pending';
+    if (source.deliveryState === 'delivered' || source.phase === 'discarded')
+        return 'delivered';
+    if (source.deliveryState === 'preview_detached')
+        return 'preview_detached';
+    if (source.deliveryState === 'preview_active')
+        return 'preview_active';
+    if (source.deliveryState === 'ready_for_review')
+        return 'ready_for_review';
+    return 'working';
+}
+export const WORKTREE_CONSOLE_ERROR_CODES = [
+    ...SESSION_CHECKOUT_ERROR_CODES,
+    'transport_unavailable',
+    'malformed_response',
+];
+const ERROR_META = {
+    session_not_found: { category: 'unavailable', recovery: 'refresh', retryable: true },
+    project_not_found: { category: 'unavailable', recovery: 'refresh', retryable: true },
+    project_root_missing: { category: 'unavailable', recovery: 'open_recovery', retryable: false },
+    not_git_repository: { category: 'invalid', recovery: 'none', retryable: false },
+    target_unselected: { category: 'unavailable', recovery: 'refresh', retryable: true },
+    target_already_bound: { category: 'invalid', recovery: 'refresh', retryable: true },
+    project_mismatch: { category: 'permission', recovery: 'none', retryable: false },
+    checkout_missing: { category: 'unavailable', recovery: 'refresh', retryable: true },
+    checkout_mismatch: { category: 'permission', recovery: 'open_recovery', retryable: false },
+    recovery_required: { category: 'recovery', recovery: 'open_recovery', retryable: false },
+    registry_corrupt: { category: 'recovery', recovery: 'open_recovery', retryable: false },
+    git_operation_failed: { category: 'internal', recovery: 'retry', retryable: true },
+    not_owner: { category: 'permission', recovery: 'none', retryable: false },
+    stale_target: { category: 'stale', recovery: 'refresh', retryable: true },
+    dirty_confirmation_required: { category: 'confirmation', recovery: 'confirm_dirty', retryable: true },
+    apply_conflict: { category: 'conflict', recovery: 'open_recovery', retryable: false },
+    apply_failed: { category: 'internal', recovery: 'retry', retryable: true },
+    invalid_input: { category: 'invalid', recovery: 'none', retryable: false },
+    invalid_plan: { category: 'invalid', recovery: 'refresh', retryable: true },
+    stale_local: { category: 'stale', recovery: 'refresh', retryable: true },
+    stale_isolated: { category: 'stale', recovery: 'refresh', retryable: true },
+    git_error: { category: 'internal', recovery: 'retry', retryable: true },
+    commit_isolation_conflict: { category: 'conflict', recovery: 'open_recovery', retryable: false },
+    checkout_limit_reached: { category: 'invalid', recovery: 'none', retryable: false },
+    project_acceptance_busy: { category: 'conflict', recovery: 'retry', retryable: true },
+    operation_not_allowed: { category: 'invalid', recovery: 'refresh', retryable: true },
+    preview_not_active: { category: 'invalid', recovery: 'refresh', retryable: true },
+    preview_modified: { category: 'stale', recovery: 'open_recovery', retryable: false },
+    recovery_unsafe: { category: 'recovery', recovery: 'open_recovery', retryable: false },
+    transport_unavailable: { category: 'unavailable', recovery: 'retry', retryable: true },
+    malformed_response: { category: 'internal', recovery: 'none', retryable: false },
+};
+export function worktreeConsoleErrorMeta(code) {
+    return ERROR_META[code];
+}
+//# sourceMappingURL=console-contract.js.map

package/lib/console-contract.js.map

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

package/lib/console-host/control-plane.d.ts

@@ -0,0 +1,31 @@
+import type { WorktreeConsoleBeginNextIterationRequest, WorktreeConsoleCreateResponse, WorktreeConsoleCurrentResponse, WorktreeConsoleDiscardRequest, WorktreeConsoleFinalizePreviewRequest, WorktreeConsoleFinalizeRequest, WorktreeConsoleInspectResponse, WorktreeConsoleListRequest, WorktreeConsoleListResponse, WorktreeConsoleMutationResponse, WorktreeConsoleOutcome, WorktreeConsolePreflightRequest, WorktreeConsolePreflightResponse, WorktreeConsolePreviewRequest, WorktreeConsoleResumeRevisionRequest, WorktreeConsoleRollbackPreviewRequest, WorktreeConsoleRetryCleanupRequest, WorktreeConsoleReviewDiffRequest, WorktreeConsoleReviewDiffResponse, WorktreeConsoleSetRetentionRequest } from '../console-contract.js';
+import type { SessionCheckoutFilesPort, SessionCheckoutGitPort, SessionCheckoutLookupPort, SessionCheckoutRegistryPort } from '../ports.js';
+import type { SessionCheckoutModule } from '../index.js';
+import { type WorktreeReviewDiffReader } from './review-diff.js';
+export interface WorktreeConsoleControlPlaneOptions {
+    module: SessionCheckoutModule;
+    lookup: SessionCheckoutLookupPort;
+    files: SessionCheckoutFilesPort;
+    registry: SessionCheckoutRegistryPort;
+    git: SessionCheckoutGitPort;
+    reviewDiff: WorktreeReviewDiffReader;
+    createTargetSessionId?: () => string;
+}
+export interface WorktreeConsoleControlPlane {
+    current(sessionId: string): Promise<WorktreeConsoleOutcome<WorktreeConsoleCurrentResponse>>;
+    list(request: WorktreeConsoleListRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleListResponse>>;
+    create(sourceSessionId: string): Promise<WorktreeConsoleOutcome<WorktreeConsoleCreateResponse>>;
+    inspect(sessionId: string, checkoutId: string): Promise<WorktreeConsoleOutcome<WorktreeConsoleInspectResponse>>;
+    reviewDiff(request: WorktreeConsoleReviewDiffRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleReviewDiffResponse>>;
+    preflight(request: WorktreeConsolePreflightRequest): Promise<WorktreeConsoleOutcome<WorktreeConsolePreflightResponse>>;
+    preview(request: WorktreeConsolePreviewRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    resumeRevision(request: WorktreeConsoleResumeRevisionRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    rollbackPreview(request: WorktreeConsoleRollbackPreviewRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    discard(request: WorktreeConsoleDiscardRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    finalize(request: WorktreeConsoleFinalizeRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    finalizePreview(request: WorktreeConsoleFinalizePreviewRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    setRetention(request: WorktreeConsoleSetRetentionRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    retryCleanup(request: WorktreeConsoleRetryCleanupRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+    beginNextIteration(request: WorktreeConsoleBeginNextIterationRequest): Promise<WorktreeConsoleOutcome<WorktreeConsoleMutationResponse>>;
+}
+export declare function createWorktreeConsoleControlPlane(options: WorktreeConsoleControlPlaneOptions): WorktreeConsoleControlPlane;