@lmzhen/dsh-evolution-merge 0.30.8 → 0.30.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/index.js +7 -3
  2. package/lib/types/channel-port.d.ts +1 -0
  3. package/lib/types/channel-port.js +4 -3
  4. package/lib/types/contracts.d.ts +1 -0
  5. package/package.json +3 -3
package/lib/index.js CHANGED
@@ -2874,12 +2874,16 @@ async function runRound1OverChannel(options, candidate, signal) {
2874
2874
  dispose
2875
2875
  };
2876
2876
  }
2877
- if (!parsed.decision.shouldMerge || parsed.decision.mode === "keep") {
2877
+ const decision = round1.turn.cacheRead === void 0 ? parsed.decision : {
2878
+ ...parsed.decision,
2879
+ cacheRead: round1.turn.cacheRead
2880
+ };
2881
+ if (!decision.shouldMerge || decision.mode === "keep") {
2878
2882
  await dispose();
2879
2883
  return {
2880
2884
  outcome: {
2881
2885
  kind: "keep",
2882
- decision: parsed.decision
2886
+ decision
2883
2887
  },
2884
2888
  dispose
2885
2889
  };
@@ -2888,7 +2892,7 @@ async function runRound1OverChannel(options, candidate, signal) {
2888
2892
  return {
2889
2893
  outcome: {
2890
2894
  kind: "merge",
2891
- decision: parsed.decision
2895
+ decision
2892
2896
  },
2893
2897
  childId: child,
2894
2898
  dispose,
package/lib/types/channel-port.d.ts CHANGED
@@ -9,6 +9,7 @@ import type { ScanRound1Outcome } from './scan-run.ts';
9
9
  export interface ChannelTurnLike {
10
10
  readonly text: string;
11
11
  readonly stopReason: string;
12
+ readonly cacheRead?: number;
12
13
  }
13
14
  export type ChannelTurnOutcome = {
14
15
  readonly kind: 'ok';
package/lib/types/channel-port.js CHANGED
@@ -52,13 +52,14 @@ export async function runRound1OverChannel(options, candidate, signal) {
52
52
  await dispose();
53
53
  return { outcome: { kind: 'failed', failure: { stage: 'decide', code: parsed.code, message: parsed.message, retryable: true, retryFrom: 'agent1' } }, dispose };
54
54
  }
55
- if (!parsed.decision.shouldMerge || parsed.decision.mode === 'keep') {
55
+ const decision = round1.turn.cacheRead === undefined ? parsed.decision : { ...parsed.decision, cacheRead: round1.turn.cacheRead };
56
+ if (!decision.shouldMerge || decision.mode === 'keep') {
56
57
  await dispose();
57
- return { outcome: { kind: 'keep', decision: parsed.decision }, dispose };
58
+ return { outcome: { kind: 'keep', decision }, dispose };
58
59
  }
59
60
  const child = opened.childId;
60
61
  return {
61
- outcome: { kind: 'merge', decision: parsed.decision },
62
+ outcome: { kind: 'merge', decision },
62
63
  childId: child,
63
64
  dispose,
64
65
  async author(row, decision, turnSignal) {
package/lib/types/contracts.d.ts CHANGED
@@ -52,6 +52,7 @@ export interface MergeDecision {
52
52
  readonly confidence?: number;
53
53
  readonly aSummary?: string;
54
54
  readonly bSummary?: string;
55
+ readonly cacheRead?: number;
55
56
  }
56
57
  export interface MergeUsage {
57
58
  readonly inputTokens?: number;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@lmzhen/dsh-evolution-merge",
3
3
  "description": "Skill auto-merge domain: screening, two-round authoring, queues and commit orchestration (community build)",
4
- "version": "0.30.8",
4
+ "version": "0.30.9",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
@@ -27,8 +27,8 @@
27
27
  "license": "MIT",
28
28
  "dependencies": {
29
29
  "@deepseek-ai/schemastery": "^3.18.5",
30
- "@lmzhen/dsh-evolution-core": "^0.30.8",
31
- "@lmzhen/dsh-evolution-merge-engine": "^0.30.8"
30
+ "@lmzhen/dsh-evolution-core": "^0.30.9",
31
+ "@lmzhen/dsh-evolution-merge-engine": "^0.30.9"
32
32
  },
33
33
  "peerDependencies": {
34
34
  "@deepseek-ai/cordis": "^4.0.5"