@sparkelf/dsh-patch-legacy-code-preset 0.1.0-rc.14 → 0.1.0-rc.26

package/README.i18n.yaml

@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write patches/npm/legacy-code-preset/README.md
-README.md: dd7d80a595574e0c3b0d63379221ce7d53676976
-README.zh.md: 80834862a9a18ca6cda3330f7772c5264ad168c3
+README.md: 9f9623b4ee704768729f3a8afd3293c9eb377eb9
+README.zh.md: 782564481ba7230e382afa498304e07e8f6f5357

package/README.md

@@ -4,6 +4,6 @@ English | [中文](README.zh.md)
 
 This data-only package preserves sessions created before the official `code` agent preset was renamed to `ptc`. Resume first resolves a real `code` preset, then falls back to `ptc` only when `code` is absent; the browser labels that persisted legacy id as the localized PTC preset. Session logs remain unchanged.
 
-The target is exact official source revision `0a53fb55bea101816fa226bb964ae2bed71c343b`. The payload is applied before that source tree is built. The package has no JavaScript entry, lifecycle script, Cordis plugin, accepted-fork fallback, or alternate variant.
+The target is exact official source revision `fb2c4b9e698e30edb738bca4cf0618587db7d203`. The payload is applied before that source tree is built. The package has no JavaScript entry, lifecycle script, Cordis plugin, accepted-fork fallback, or alternate variant.
 
 Retire this package when official DSH provides equivalent legacy preset resolution and display behavior.

package/README.zh.md

@@ -4,6 +4,6 @@
 
 该data-only package让official `code` agent preset改名为`ptc`之前创建的会话仍可恢复。恢复时先解析真实存在的`code` preset；只有`code`不存在时才回退到`ptc`。浏览器把该持久化旧id显示为本地化PTC preset，Session日志保持原样。
 
-target是exact official source revision `0a53fb55bea101816fa226bb964ae2bed71c343b`，payload在该source tree build前应用。本package没有JavaScript entry、lifecycle script、Cordis plugin、accepted-fork fallback或alternate variant。
+target是exact official source revision `fb2c4b9e698e30edb738bca4cf0618587db7d203`，payload在该source tree build前应用。本package没有JavaScript entry、lifecycle script、Cordis plugin、accepted-fork fallback或alternate variant。
 
 official DSH提供同等legacy preset解析与显示行为后，retire本package。

package/package.json

@@ -4,11 +4,11 @@
     "formatVersion": 1,
     "variants": [
       {
-        "dsh": ">=0.1.2-alpha.2",
+        "dsh": ">=0.1.5-rc.2",
         "file": "./patches/legacy-code-preset.patch",
         "id": "legacy-code-preset-ptc-compatibility",
         "target": {
-          "baseRevision": "0a53fb55bea101816fa226bb964ae2bed71c343b",
+          "baseRevision": "fb2c4b9e698e30edb738bca4cf0618587db7d203",
           "kind": "dsh-source",
           "paths": [
             "packages/api/session-controller/src/",
@@ -34,5 +34,5 @@
     "url": "git+https://github.com/SparkElf/deepseek-harness-plus.git"
   },
   "type": "module",
-  "version": "0.1.0-rc.14"
+  "version": "0.1.0-rc.26"
 }

package/patches/legacy-code-preset.patch

@@ -1,10 +1,10 @@
 diff --git a/packages/api/session-controller/src/agent.ts b/packages/api/session-controller/src/agent.ts
-index c17929af5c..8fd0e9e590 100644
+index dd41090c22..8c2cd5029b 100644
 --- a/packages/api/session-controller/src/agent.ts
 +++ b/packages/api/session-controller/src/agent.ts
-@@ -11,10 +11,13 @@ import type {} from '@deepseek-ai/dsh-agent-presets'
- import { ReasoningEffortId } from '@deepseek-ai/dsh-llm'
- import type { Session, SessionEvent, SessionHeader, SessionId } from '@deepseek-ai/dsh-session'
+@@ -12,10 +12,13 @@ import { ReasoningEffortId } from '@deepseek-ai/dsh-llm'
+ import type { Session, SessionId } from '@deepseek-ai/dsh-session'
+ import type { SessionInspection } from '@deepseek-ai/dsh-session-persistence'
  import { SessionQueryError, type SessionObservation } from '@deepseek-ai/dsh-session-query'
 -import { RemoteError } from '@deepseek-ai/dsh-typert-protocol'
 +import { RemoteError, remoteErrorOf } from '@deepseek-ai/dsh-typert-protocol'
@@ -17,10 +17,10 @@ index c17929af5c..8fd0e9e590 100644
  /** Cold Session identity absent from persistence. */
  export class ApiSessionNotFound extends Error {}
  
-@@ -372,7 +375,15 @@ export class ApiSessionAgentController {
-   }> {
-     const presets = this.ctx.get('agentPresets')
-     if (presets === undefined) return { setup: (agentCtx) => { this.installSelection(agentCtx) } }
+@@ -379,7 +382,15 @@ export class ApiSessionAgentController {
+     if (presets === undefined) {
+       return { setup: (_agentCtx, agent) => { this.installSelection(agent) } }
+     }
 -    const resolvedId = (await presets.resolve(presetId)).id
 +    let resolved
 +    try {
@@ -33,20 +33,20 @@ index c17929af5c..8fd0e9e590 100644
 +    const resolvedId = resolved.id
      return {
        agentPreset: resolvedId,
-       setup: async (agentCtx) => {
+       setup: async (agentCtx, agent) => {
 diff --git a/packages/api/session-controller/tests/agent.host.spec.ts b/packages/api/session-controller/tests/agent.host.spec.ts
-index 6bfea1609d..62bdef2405 100644
+index 586d7b4e7b..8f3d42a404 100644
 --- a/packages/api/session-controller/tests/agent.host.spec.ts
 +++ b/packages/api/session-controller/tests/agent.host.spec.ts
 @@ -8,6 +8,7 @@ import { agentPresetProjectionDefinition } from '@deepseek-ai/dsh-agent-presets'
- import SessionStore, { SessionId } from '@deepseek-ai/dsh-session'
+ import SessionStore, { SESSION_FORMAT_VERSION, SessionLogOffset, SessionId } from '@deepseek-ai/dsh-session'
  import type { SessionEvent, SessionHeader } from '@deepseek-ai/dsh-session'
  import type { SessionObservation } from '@deepseek-ai/dsh-session-query'
 +import { RemoteError } from '@deepseek-ai/dsh-typert-protocol'
  import TypertRegistry from '@deepseek-ai/dsh-typert-registry'
  import { afterEach, describe, expect, it, vi } from 'vitest'
  import {
-@@ -390,6 +391,38 @@ describe('ApiSession create or adoption', () => {
+@@ -413,6 +414,38 @@ describe('ApiSession create or adoption', () => {
      expect(resume).toHaveBeenCalledWith(expect.objectContaining({ resumeSessionId: meta.id }))
    })
  
@@ -85,9 +85,9 @@ index 6bfea1609d..62bdef2405 100644
    it('rejects an ownership race before resume and a persisted cwd conflict', async () => {
      const child = await harness()
      const childMeta = header('resume-child-race')
-@@ -431,4 +464,29 @@ describe('ApiSession create or adoption', () => {
-     const composition = await agents.composeAgent(undefined)
-     expect(() => composition.setup(new Context())).toThrow('Agent setup has no scoped Agent')
+@@ -452,4 +485,29 @@ describe('ApiSession create or adoption', () => {
+     await expect(agents.ensureSession(SessionId('mkdir-failure'), join(file, 'child'), false))
+       .rejects.toThrow('failed to ensure project directory')
    })
 +
 +  it('falls back from a missing legacy code preset to ptc', async () => {