@lmzhen/dsh-evolution-merge 0.34.0 → 0.36.0

package/lib/index.js

@@ -5041,14 +5041,17 @@ function toHistoryView(items, readAt) {
 	return {
 		wireVersion: 1,
 		readAt,
-		items: items.map((item) => ({
-			name: item.name,
-			kind: item.kind,
-			reason: item.reason,
-			lastVersion: item.lastVersion,
-			archivedAt: Date.parse(item.archivedAt),
-			...item.sourceRunId === void 0 ? {} : { sourceRunId: item.sourceRunId }
-		}))
+		items: items.map((item) => {
+			const parsed = item.archivedAt === null ? null : typeof item.archivedAt === "number" ? item.archivedAt : Date.parse(item.archivedAt);
+			return {
+				name: item.name,
+				kind: item.kind,
+				reason: item.reason,
+				lastVersion: item.lastVersion,
+				archivedAt: parsed === null || Number.isFinite(parsed) ? parsed : null,
+				...item.sourceRunId === void 0 ? {} : { sourceRunId: item.sourceRunId }
+			};
+		})
 	};
 }
 //#endregion
@@ -10840,18 +10843,20 @@ function apply(ctx, rawConfig = {}) {
 						});
 						const archived = await skills.archivedNames?.() ?? [];
 						const reasonOf = skills.readArchiveReason;
+						const archivedAtOf = skills.readArchivedAt;
 						for (const name of archived) {
 							if (items.has(name)) continue;
 							const rawReason = reasonOf === void 0 ? null : await reasonOf.call(skills, name).catch(() => null);
 							const lower = (rawReason ?? "").toLowerCase();
 							const kind = lower.includes("split") ? "split" : lower.includes("delet") || lower.includes("remove") ? "deleted" : "other";
+							const archivedAt = archivedAtOf === void 0 ? null : await archivedAtOf.call(skills, name).catch(() => null);
 							items.set(name, {
 								name,
 								kind,
 								reason: rawReason ?? "技能已归档，最后一版保留可查。",
 								reasonCode: kind === "other" ? "archived" : kind,
 								lastVersion: 1,
-								archivedAt: Date.now()
+								archivedAt
 							});
 						}
 						const out = [];

package/lib/types/domain/merge-snapshot.d.ts

@@ -47,7 +47,7 @@ export interface HistoryItem {
     readonly reason: string;
     readonly reasonCode?: string;
     readonly lastVersion: number;
-    readonly archivedAt: number;
+    readonly archivedAt: number | null;
     readonly sourceRunId?: string;
     readonly runId?: string;
     readonly absorbedInto?: string;

package/lib/types/index.js

@@ -303,13 +303,15 @@ export function apply(ctx, rawConfig = {}) {
                                 items.set(name, { name, kind: 'merged', reason: '已合并进「' + receipt.target + '」，最后一版保留可查。', reasonCode: 'merged', lastVersion: 1, archivedAt: receipt.at, sourceRunId: receipt.runId, runId: receipt.runId, absorbedInto: receipt.target, generation: generationOf.get(receipt.runId) ?? 1 });
                         const archived = await skills.archivedNames?.() ?? [];
                         const reasonOf = skills.readArchiveReason;
+                        const archivedAtOf = skills.readArchivedAt;
                         for (const name of archived) {
                             if (items.has(name))
                                 continue;
                             const rawReason = reasonOf === undefined ? null : await reasonOf.call(skills, name).catch(() => null);
                             const lower = (rawReason ?? '').toLowerCase();
                             const kind = lower.includes('split') ? 'split' : lower.includes('delet') || lower.includes('remove') ? 'deleted' : 'other';
-                            items.set(name, { name, kind, reason: rawReason ?? '技能已归档，最后一版保留可查。', reasonCode: kind === 'other' ? 'archived' : kind, lastVersion: 1, archivedAt: Date.now() });
+                            const archivedAt = archivedAtOf === undefined ? null : await archivedAtOf.call(skills, name).catch(() => null);
+                            items.set(name, { name, kind, reason: rawReason ?? '技能已归档，最后一版保留可查。', reasonCode: kind === 'other' ? 'archived' : kind, lastVersion: 1, archivedAt });
                         }
                         const out = [];
                         for (const item of items.values()) {

package/lib/types/merge-routes.d.ts

@@ -30,7 +30,7 @@ export interface MergeHistoryItem {
     readonly kind: 'merged' | 'deleted' | 'split' | 'other';
     readonly reason: string;
     readonly lastVersion: number;
-    readonly archivedAt: string;
+    readonly archivedAt: string | null;
     readonly sourceRunId?: string;
 }
 export interface MergeRouteSource {

package/lib/types/wire-projection.d.ts

@@ -30,7 +30,7 @@ export declare function toHistoryView(items: readonly {
     kind: 'merged' | 'deleted' | 'split' | 'other';
     reason: string;
     lastVersion: number;
-    archivedAt: string;
+    archivedAt: string | number | null;
     sourceRunId?: string;
 }[], readAt: number): HistoryView;
 //# sourceMappingURL=wire-projection.d.ts.map

package/lib/types/wire-projection.js

@@ -69,6 +69,9 @@ export function toBodyView(name, side, text, readAt) {
     return { wireVersion: 1, readAt, name, side, text, markdown: true, truncated: false, totalBytes: Buffer.byteLength(text, 'utf8') };
 }
 export function toHistoryView(items, readAt) {
-    return { wireVersion: 1, readAt, items: items.map(item => ({ name: item.name, kind: item.kind, reason: item.reason, lastVersion: item.lastVersion, archivedAt: Date.parse(item.archivedAt), ...(item.sourceRunId === undefined ? {} : { sourceRunId: item.sourceRunId }) })) };
+    return { wireVersion: 1, readAt, items: items.map(item => {
+            const parsed = item.archivedAt === null ? null : typeof item.archivedAt === 'number' ? item.archivedAt : Date.parse(item.archivedAt);
+            return { name: item.name, kind: item.kind, reason: item.reason, lastVersion: item.lastVersion, archivedAt: parsed === null || Number.isFinite(parsed) ? parsed : null, ...(item.sourceRunId === undefined ? {} : { sourceRunId: item.sourceRunId }) };
+        }) };
 }
 //# sourceMappingURL=wire-projection.js.map

package/lib/types/wire.d.ts

@@ -184,7 +184,7 @@ export interface HistoryItem {
     readonly reasonCode?: string;
     readonly generation?: number;
     readonly lastVersion: number;
-    readonly archivedAt: number;
+    readonly archivedAt: number | null;
     readonly sourceRunId?: string;
     readonly runId?: string;
     readonly absorbedInto?: string;

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.34.0",
+  "version": "0.36.0",
   "publishConfig": {
     "access": "public"
   },
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.34.0",
-    "@lmzhen/dsh-evolution-commands": "^0.34.0",
-    "@lmzhen/dsh-evolution-merge-engine": "0.34.0"
+    "@lmzhen/dsh-evolution-core": "^0.36.0",
+    "@lmzhen/dsh-evolution-commands": "^0.36.0",
+    "@lmzhen/dsh-evolution-merge-engine": "0.36.0"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"