@lmzhen/dsh-evolution-merge 0.30.18 → 0.30.19

package/lib/types/wire.d.ts

@@ -8,9 +8,9 @@ export type VerifySubState = 'queued' | 'running' | 'failed' | 'cancelled';
 export type StagingState = 'none' | 'kept' | 'cleared-source-ok' | 'cleared-source-gone';
 export type SkipOrigin = 'agent' | 'human' | 'system';
 export type SkipKind = 'agent-keep' | 'human-reject' | 'over-limit' | 'forced';
-export type ExpiredKind = 'target-taken' | 'source-changed' | 'skipped-ttl';
+export type ExpiredKind = 'target-taken' | 'source-changed' | 'source-gone' | 'skipped-ttl';
 export type WireRunState = 'running' | 'succeeded' | 'failed' | 'cancelled' | 'awaiting-approval' | 'undone' | 'superseded' | 'interrupted' | 'orphan';
-export type ActionId = 'approve' | 'reject' | 'retry-candidates' | 'retry-resume' | 'discard' | 'restore' | 'pair' | 'status' | 'report' | 'cancel';
+export type ActionId = 'approve' | 'reject' | 'retry-candidates' | 'retry-resume' | 'resume' | 'discard' | 'restore' | 'pair' | 'status' | 'report' | 'cancel';
 export interface MergeCounts {
     readonly active: {
         readonly verify: number;
@@ -48,6 +48,8 @@ export interface RowFact {
     readonly state: WireRowState;
     readonly queue: QueueId;
     readonly verifySubState?: VerifySubState;
+    /** Optional Batch4 projection; old staging remains compatibility. */
+    readonly stage?: 'present' | 'lost' | 'expired';
     readonly a: string;
     readonly b: string;
     readonly target?: {
@@ -84,6 +86,7 @@ export interface Facts {
     readonly readAt: number;
     readonly approval: {
         readonly mergeApproval: boolean;
+        readonly platformWrite?: boolean;
     };
     readonly counts: MergeCounts;
     readonly active: RunView | null;
@@ -119,10 +122,11 @@ export interface RunView {
     } | null;
     readonly startedAt: number;
     readonly endedAt?: number;
-    readonly stopReason?: 'timeout' | 'cancelled' | 'error' | 'orphan';
+    readonly stopReason?: string;
     readonly failure?: FailureFact;
     readonly parentRunId?: string;
     readonly currentPairKey?: string;
+    readonly resultRef?: string;
     readonly summary?: {
         readonly merged: number;
         readonly kept: number;
@@ -150,6 +154,12 @@ export interface RunPair {
 export interface RunDetail extends RunView {
     readonly pairs: readonly RunPair[];
     readonly pairsTruncated: boolean;
+    readonly meta?: {
+        readonly pairKey?: string;
+        readonly phase?: string;
+        readonly approval?: string;
+    };
+    readonly reportRef?: string;
 }
 export interface RunsView {
     readonly wireVersion: 1;
@@ -170,9 +180,13 @@ export interface HistoryItem {
     readonly name: string;
     readonly kind: 'merged' | 'deleted' | 'split' | 'other';
     readonly reason: string;
+    readonly reasonCode?: string;
+    readonly generation?: number;
     readonly lastVersion: number;
     readonly archivedAt: number;
     readonly sourceRunId?: string;
+    readonly runId?: string;
+    readonly absorbedInto?: string;
 }
 export interface HistoryView {
     readonly wireVersion: 1;
@@ -205,6 +219,11 @@ export interface DoctorView {
         readonly code: 'E-323';
         readonly detail?: string;
     };
+    /** Set when the read model cannot read the merge state; the rows are empty placeholders. */
+    readonly blocked?: {
+        readonly code: string;
+        readonly message: string;
+    };
     readonly rows: readonly DoctorFact[];
 }
 export interface WireFailure {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-merge",
   "description": "Skill auto-merge domain: screening, two-round authoring, queues and commit orchestration (community build)",
-  "version": "0.30.18",
+  "version": "0.30.19",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,8 @@
   "files": [
     "lib/**/*.js",
     "lib/types/**/*.d.ts",
-    "data/**/*"
+    "data/**/*",
+    "package.json"
   ],
   "license": "MIT",
   "scripts": {
@@ -31,8 +32,9 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.30.18",
-    "@lmzhen/dsh-evolution-merge-engine": "0.30.18"
+    "@lmzhen/dsh-evolution-core": "^0.30.19",
+    "@lmzhen/dsh-evolution-commands": "^0.30.19",
+    "@lmzhen/dsh-evolution-merge-engine": "0.30.19"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"