dsh-git-worktree 0.4.0 → 0.6.0

package/lib/types.d.ts

@@ -28,6 +28,16 @@ export interface WorktreeValidationItem {
     status: 'passed' | 'failed' | 'not_run';
     summary?: string;
 }
+/** A saved stage that exists only in the managed Worktree history until final delivery. */
+export interface WorktreeCheckpointView {
+    checkpointId: string;
+    sequence: number;
+    reviewId: string;
+    createdAt: number;
+    summary: string;
+    validationStatus: WorktreeValidationStatus;
+    changedFiles: string[];
+}
 export interface WorktreeReviewView {
     reviewId: string;
     iteration: number;
@@ -110,6 +120,7 @@ export interface WorktreeApplyPreflightFacts {
 export interface WorktreeAcceptanceBlockerView {
     checkoutId: string;
     ownerSessionId: string;
+    revision: number;
     state: 'preview_active' | 'preview_detached' | 'finalized' | 'retained' | 'working' | 'ready_for_review' | 'delivered';
 }
 export type WorktreeApplyPreflightView = ({
@@ -160,6 +171,10 @@ export interface SessionTargetView {
     revision: number;
     /** Delivery state for isolated checkouts; Local targets do not carry it. */
     delivery?: WorktreeDeliveryView;
+    /** Linear saved stages that remain unpublished to Local. */
+    checkpoints?: WorktreeCheckpointView[];
+    /** Host-derived CAS generation for the exact active Review/checkpoint state. */
+    checkpointGeneration?: string;
     /** Current project Local Preview slot state; does not expose another checkout identity. */
     reviewSlot?: 'available' | 'waiting';
     /** Owner Session holding the slot, used only for navigation/status. */
@@ -187,15 +202,83 @@ export interface SessionCheckoutFinishOperation extends SessionCheckoutOperation
 export interface SessionCheckoutPreviewOperation extends SessionCheckoutOperationBase {
     action: 'preview';
 }
+export interface SessionCheckoutCheckpointOperation extends SessionCheckoutOperationBase {
+    action: 'checkpoint';
+    commitMessage: string;
+    expectedReviewId: string;
+    expectedGeneration: string;
+    requestId: string;
+}
+export type WorktreePreviewRecoveryActionBlockReason = 'stale_local' | 'preview_modified' | 'commit_isolation_conflict' | 'operation_not_allowed' | 'project_acceptance_busy';
+export type WorktreePreviewRecoveryRollbackAction = {
+    status: 'safe';
+    targetTreeOid: string;
+} | {
+    status: 'blocked';
+    code: WorktreePreviewRecoveryActionBlockReason;
+    message: string;
+    conflictingFiles?: string[];
+};
+export type WorktreePreviewRecoveryFinalizeAction = {
+    status: 'safe';
+    taskTreeOid: string;
+    finalIndexTreeOid: string;
+    expectedWorkingTreeOid: string;
+    commitRequired: boolean;
+} | {
+    status: 'blocked';
+    code: WorktreePreviewRecoveryActionBlockReason;
+    message: string;
+    conflictingFiles?: string[];
+};
+/** Host-issued read-only recovery context. Mutation always recomputes and compares it under the Host lock. */
+export interface WorktreePreviewRecoveryProof {
+    sessionId: string;
+    checkoutId: string;
+    reviewId: string;
+    previewId: string;
+    revision: number;
+    generation: string;
+    /** SHA-256 over the complete durable receipt; binds proof to retained recovery evidence. */
+    receiptFingerprint: string;
+    localFingerprint: string;
+    localHeadOid: string;
+    localHeadRef: string | null;
+    localHeadTreeOid: string;
+    localIndexTreeOid: string;
+    localWorkingTreeOid: string;
+    rollback: WorktreePreviewRecoveryRollbackAction;
+    finalize: WorktreePreviewRecoveryFinalizeAction;
+    blocker?: WorktreeAcceptanceBlockerView;
+}
+export type WorktreePreviewRecoveryPreflightBlockedReason = 'not_owner' | 'not_preview_detached' | 'stale_target' | 'artifacts_missing' | 'checkout_unavailable' | 'git_error';
+export type WorktreePreviewRecoveryPreflightView = {
+    status: 'assessed';
+    localModified: false;
+    proof: WorktreePreviewRecoveryProof;
+} | {
+    status: 'blocked';
+    localModified: false;
+    checkoutId: string;
+    reviewId: string | null;
+    previewId: string | null;
+    revision: number;
+    reason: WorktreePreviewRecoveryPreflightBlockedReason;
+    message: string;
+};
 export interface SessionCheckoutRollbackPreviewOperation extends SessionCheckoutOperationBase {
     action: 'rollback_preview';
     /** Structured withdraw-and-continue flow returns to working instead of preserving the review. */
     resumeRevision?: boolean;
+    /** Required only for preview_detached; it is context to re-verify, never bearer permission. */
+    recoveryProof?: WorktreePreviewRecoveryProof;
 }
 export interface SessionCheckoutFinalizePreviewOperation extends SessionCheckoutOperationBase {
     action: 'finalize_preview';
     commitMessage: string;
     retention?: WorktreeRetentionMode;
+    /** Required only for preview_detached; it is context to re-verify, never bearer permission. */
+    recoveryProof?: WorktreePreviewRecoveryProof;
 }
 export interface SessionCheckoutRetryCleanupOperation extends SessionCheckoutOperationBase {
     action: 'retry_cleanup';
@@ -208,7 +291,7 @@ export interface SessionCheckoutDiscardOperation extends SessionCheckoutOperatio
 export interface SessionCheckoutRecoverOperation extends SessionCheckoutOperationBase {
     action: 'recover';
 }
-export type SessionCheckoutOperation = SessionCheckoutApplyOperation | SessionCheckoutFinishOperation | SessionCheckoutPreviewOperation | SessionCheckoutRollbackPreviewOperation | SessionCheckoutFinalizePreviewOperation | SessionCheckoutRetryCleanupOperation | SessionCheckoutDiscardOperation | SessionCheckoutRecoverOperation;
+export type SessionCheckoutOperation = SessionCheckoutApplyOperation | SessionCheckoutFinishOperation | SessionCheckoutPreviewOperation | SessionCheckoutCheckpointOperation | SessionCheckoutRollbackPreviewOperation | SessionCheckoutFinalizePreviewOperation | SessionCheckoutRetryCleanupOperation | SessionCheckoutDiscardOperation | SessionCheckoutRecoverOperation;
 export interface SessionCheckoutAppliedResult {
     status: 'applied';
     target: SessionTargetView;
@@ -219,6 +302,12 @@ export interface SessionCheckoutPreviewedResult {
     target: SessionTargetView;
     changedFiles: string[];
 }
+export interface SessionCheckoutCheckpointedResult {
+    status: 'checkpointed';
+    target: SessionTargetView;
+    checkpoint: WorktreeCheckpointView;
+    changedFiles: string[];
+}
 export interface SessionCheckoutPreviewRolledBackResult {
     status: 'preview_rolled_back';
     target: SessionTargetView;
@@ -280,6 +369,8 @@ export interface ManagedWorktreeSummaryView {
     phase: SessionCheckoutPhase;
     dirty: boolean;
     commitOid: string | null;
+    /** Number of saved managed-Worktree stages not yet delivered to Local. */
+    checkpointCount?: number;
     retention?: Exclude<WorktreeRetentionMode, 'cleanup'>;
     retainedAt?: number;
     expiresAt?: number | null;
@@ -321,7 +412,7 @@ export interface SessionCheckoutOperationErrorResult {
     message: string;
     target?: SessionTargetView;
 }
-export type SessionCheckoutOperationResult = SessionCheckoutAppliedResult | SessionCheckoutPreviewedResult | SessionCheckoutPreviewRolledBackResult | SessionCheckoutPreviewDetachedResult | SessionCheckoutFinishedResult | SessionCheckoutConflictResult | SessionCheckoutDiscardedResult | SessionCheckoutRecoveredResult | SessionCheckoutOperationErrorResult;
+export type SessionCheckoutOperationResult = SessionCheckoutAppliedResult | SessionCheckoutPreviewedResult | SessionCheckoutCheckpointedResult | SessionCheckoutPreviewRolledBackResult | SessionCheckoutPreviewDetachedResult | SessionCheckoutFinishedResult | SessionCheckoutConflictResult | SessionCheckoutDiscardedResult | SessionCheckoutRecoveredResult | SessionCheckoutOperationErrorResult;
 export declare const SESSION_CHECKOUT_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"];
 export type SessionCheckoutErrorCode = typeof SESSION_CHECKOUT_ERROR_CODES[number];
 export interface SessionCheckoutFailure {

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA0YH,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,mBAAmB;IACnB,mBAAmB;IACnB,sBAAsB;IACtB,oBAAoB;IACpB,mBAAmB;IACnB,sBAAsB;IACtB,kBAAkB;IAClB,kBAAkB;IAClB,mBAAmB;IACnB,mBAAmB;IACnB,kBAAkB;IAClB,sBAAsB;IACtB,WAAW;IACX,cAAc;IACd,6BAA6B;IAC7B,gBAAgB;IAChB,cAAc;IACd,eAAe;IACf,cAAc;IACd,aAAa;IACb,gBAAgB;IAChB,WAAW;IACX,2BAA2B;IAC3B,wBAAwB;IACxB,yBAAyB;IACzB,uBAAuB;IACvB,oBAAoB;IACpB,kBAAkB;IAClB,iBAAiB;CACT,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgfH,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,mBAAmB;IACnB,mBAAmB;IACnB,sBAAsB;IACtB,oBAAoB;IACpB,mBAAmB;IACnB,sBAAsB;IACtB,kBAAkB;IAClB,kBAAkB;IAClB,mBAAmB;IACnB,mBAAmB;IACnB,kBAAkB;IAClB,sBAAsB;IACtB,WAAW;IACX,cAAc;IACd,6BAA6B;IAC7B,gBAAgB;IAChB,cAAc;IACd,eAAe;IACf,cAAc;IACd,aAAa;IACb,gBAAgB;IAChB,WAAW;IACX,2BAA2B;IAC3B,wBAAwB;IACxB,yBAAyB;IACzB,uBAAuB;IACvB,oBAAoB;IACpB,kBAAkB;IAClB,iBAAiB;CACT,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-git-worktree",
-  "version": "0.4.0",
-  "description": "Experimental Git worktree Session Targets for DeepSeek Harness with real isolated sessions, review ToolViews, human-confirmed delivery, and safe cleanup.",
+  "version": "0.6.0",
+  "description": "Experimental Git worktree Session Targets for DeepSeek Harness with isolated sessions, review checkpoints, human-confirmed delivery, and safe recovery.",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -76,14 +76,14 @@
   },
   "dependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-agent": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-commands": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-session": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-subprocess": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-system-prompt": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-typert-registry": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-commands": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-subprocess": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-typert-registry": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
     "zod": "4.4.3"
   },
@@ -91,9 +91,9 @@
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-api-gateway": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-typert-loader": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-api-gateway": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-typert-loader": "0.1.1-rc.2",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.0.0",
     "@types/react": "~18.3.31",

package/scripts/check-publish.mjs

@@ -94,7 +94,7 @@ try {
 if (hostContribution?.package !== manifest.name || hostContribution.face !== 'host') fail('./typert has invalid package/face identity')
 if (remoteContribution?.package !== manifest.name) fail('./remote has invalid package identity')
 if (hostContribution.invocations !== remoteContribution.descriptors) fail('./typert and ./remote must share one descriptor array instance')
-const expectedRemoteMethods = ['current', 'list', 'create', 'inspect', 'reviewDiff', 'preflight', 'preview', 'resumeRevision', 'rollbackPreview', 'discard', 'finalize', 'finalizePreview', 'setRetention', 'retryCleanup', 'beginNextIteration']
+const expectedRemoteMethods = ['current', 'list', 'create', 'inspect', 'reviewDiff', 'preflight', 'previewRecoveryPreflight', 'preparePreviewRecoveryAnalysis', 'createPreviewRecoveryHandoff', 'preview', 'checkpoint', 'resumeRevision', 'prepareReviewRegeneration', 'rollbackPreview', 'discard', 'finalize', 'finalizePreview', 'setRetention', 'retryCleanup', 'beginNextIteration']
 if (JSON.stringify(hostContribution.invocations.map(value => value.method)) !== JSON.stringify(expectedRemoteMethods)) {
   fail(`manual Remote methods differ from the required surface: ${hostContribution.invocations.map(value => value.method).join(', ')}`)
 }