codex-copilot-dx 0.6.9 → 0.6.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "Use Codex Desktop, Claude Code, and Claude App with GitHub Copilot",
   "author": "Dale Xiao",
   "type": "module",

package/src/doctor.mjs

@@ -590,6 +590,12 @@ export async function collectDoctorChecks({
           fix: "stop the running adapter, then run ccdx start",
         });
       }
+    } else if (pm.app.state === "predecessor") {
+      checks.push({
+        kind: "warn",
+        message: `PM Studio ${version} has a verified predecessor split patch`,
+        fix: "ccdx pms setup",
+      });
     } else if (pm.app.state === "clean") {
       checks.push({
         kind: "warn",

package/src/pm-studio-asar.mjs

@@ -9,7 +9,7 @@ const PM_STUDIO_COPILOT_CONFIG_MODULE_LENGTH = 2_121;
 const PM_STUDIO_COPILOT_CONFIG_MODULE_SOURCE_SHA256 = "3da6245d676015ab6cd26e4d6a0d2f54894a687c370aa419c5ad170533d086aa";
 
 function splitOriginConfigModule() {
-  const source = `47024(I,e,t){"use strict";t.d(e,{qn:()=>l});const l={CLIENT_ID:"Iv1.b507a08c87ecfe98",CLIENT_SECRET:void 0,API_ENDPOINT:"${PM_STUDIO_ORIGIN}",DEVICE_CODE_URL:"https://github.com/login/device/code",ACCESS_TOKEN_URL:"https://github.com/login/oauth/access_token",COPILOT_TOKEN_URL:"https://api.github.com/copilot_internal/v2/token",USER_AGENT:"GitHubCopilotChat/0.26.7",EDITOR_VERSION:"vscode/1.99.3",EDITOR_PLUGIN_VERSION:"copilot-chat/0.26.7",INTEGRATION_ID:"vscode-chat",STANDARD_HEADERS:{Accept:"application/json","Content-Type":"application/json","User-Agent":"GitHubCopilotChat/0.26.7","Editor-Version":"vscode/1.99.3","Editor-Plugin-Version":"copilot-chat/0.26.7","Copilot-Integration-Id":"vscode-chat","X-Request-Id":()=>\`req_\${Date.now()}_\${Math.random().toString(36).substr(2,9)}\`}};const c=fetch.bind(globalThis),n="${CCDX_PM_STUDIO_ORIGIN}",a="${PM_STUDIO_SPLIT_ORIGIN_MARKER}",h="X-CCDX-PM-Relay",d=new Set,m=I=>I.headers.get(h)===a,q=I=>AbortSignal.any([I,AbortSignal.timeout(750)].filter(Boolean)),f=(I,e=400)=>Response.json({error:{code:I}},{status:e,headers:{[h]:a}});globalThis.fetch=async(I,e)=>{const t=I.url||I+"";if(t===\`\${l.API_ENDPOINT}/models\`){try{const t=await c(\`\${n}/models\`,{...e,signal:q(e?.signal)});if(t.ok&&m(t))try{let I=await t.clone().json(),e=I.data||I;if(Array.isArray(e)){d.clear();for(const I of e)/anthropic/i.test(I.vendor||I.owned_by)&&d.add(I.id);return t}}catch{}t.body?.cancel?.()?.catch?.(()=>{})}catch(I){if(e?.signal?.aborted)throw e.signal.reason||I}return c(I,e)}const s=t.startsWith(l.API_ENDPOINT)?t.slice(l.API_ENDPOINT.length):"";if("POST"===e?.method&&["/chat/completions","/responses","/embeddings"].includes(s)){let t="";try{t=(JSON.parse(e.body).model||"").trim()}catch{}if(d.has(t)||/^claude-/i.test(t)){if("/chat/completions"!==s)return f("model_not_supported");try{const I=await c(\`\${n}/models\`,{signal:q(e?.signal)}),t=401===I.status&&m(I);await I.text();if(!t)throw 0;const l=await c(\`\${n}\${s}\`,e);if(!m(l)){await l.body?.cancel?.();throw 0}return l}catch(I){if(e?.signal?.aborted)throw e.signal.reason||I;return f("relay_incompatible",503)}}}return c(I,e)}}`;
+  const source = `47024(I,e,t){"use strict";t.d(e,{qn:()=>l});const l={CLIENT_ID:"Iv1.b507a08c87ecfe98",CLIENT_SECRET:void 0,API_ENDPOINT:"${PM_STUDIO_ORIGIN}",DEVICE_CODE_URL:"https://github.com/login/device/code",ACCESS_TOKEN_URL:"https://github.com/login/oauth/access_token",COPILOT_TOKEN_URL:"https://api.github.com/copilot_internal/v2/token",USER_AGENT:"GitHubCopilotChat/0.26.7",EDITOR_VERSION:"vscode/1.99.3",EDITOR_PLUGIN_VERSION:"copilot-chat/0.26.7",INTEGRATION_ID:"vscode-chat",STANDARD_HEADERS:{Accept:"application/json","Content-Type":"application/json","User-Agent":"GitHubCopilotChat/0.26.7","Editor-Version":"vscode/1.99.3","Editor-Plugin-Version":"copilot-chat/0.26.7","Copilot-Integration-Id":"vscode-chat","X-Request-Id":()=>\`req_\${Date.now()}_\${Math.random().toString(36).substr(2,9)}\`}};const c=fetch.bind(globalThis),n="${CCDX_PM_STUDIO_ORIGIN}",a="${PM_STUDIO_SPLIT_ORIGIN_MARKER}",h="X-CCDX-PM-Relay",d=new Set,m=I=>I.headers.get(h)===a,q=I=>AbortSignal.any([I,AbortSignal.timeout(750)].filter(Boolean)),f=(I,e=400)=>Response.json({error:{code:I}},{status:e,headers:{[h]:a}});globalThis.fetch=async(I,e)=>{const t=I.url||I+"";if(t===\`\${l.API_ENDPOINT}/models\`){try{const t=await c(\`\${n}/models\`,e);if(t.ok&&m(t))try{let I=await t.clone().json(),e=I.data||I;if(Array.isArray(e)){d.clear();for(const I of e)/anthropic/i.test(I.vendor||I.owned_by)&&d.add(I.id);return t}}catch{}t.body?.cancel?.()?.catch?.(()=>{})}catch(I){if(e?.signal?.aborted)throw e.signal.reason||I}return c(I,e)}const s=t.startsWith(l.API_ENDPOINT)?t.slice(l.API_ENDPOINT.length):"";if("POST"===e?.method&&["/chat/completions","/responses","/embeddings"].includes(s)){let t="";try{t=(JSON.parse(e.body).model||"").trim()}catch{}if(d.has(t)||/^claude-/i.test(t)){if("/chat/completions"!==s)return f("model_not_supported");try{const I=await c(\`\${n}/models\`,{signal:q(e?.signal)}),t=401===I.status&&m(I);await I.text();if(!t)throw 0;const l=await c(\`\${n}\${s}\`,e);if(!m(l)){await l.body?.cancel?.();throw 0}return l}catch(I){if(e?.signal?.aborted)throw e.signal.reason||I;return f("relay_incompatible",503)}}}return c(I,e)}}`;
   if (source.length > PM_STUDIO_COPILOT_CONFIG_MODULE_LENGTH) {
     throw new Error("PM Studio split-origin module exceeds its exact source window");
   }
@@ -35,8 +35,20 @@ export const PM_STUDIO_2_9_7_RECIPE = Object.freeze({
   dataOffset: 3_832_764,
   sourceAsarSha256: "36fb8bf2fc9326ddf49baab5cc0b54b38751a7db041bda3c42a3b01107b54118",
   sourceHeaderSha256: "87746d92e00db2d40c03830ea06de22ec7cba112d07729801ccd02e226ffd961",
-  patchedAsarSha256: "d520d115604225c1a3feb749dbe29ad0d2cd175c5233c010de0e1fade527fa0b",
-  patchedHeaderSha256: "83e5fba3b6751b3098d8f6901db361a9b620ab3b924e0e551d3df612ff412642",
+  patchedAsarSha256: "799dc18103a4553daefcaaddbe3410a1bfaf68d84407f4c10ef3d996afd71ad0",
+  patchedHeaderSha256: "08253795176d5471c6f406a29ccb134875d503bb55bca909b2cd131cd7708510",
+  predecessor: Object.freeze({
+    id: "split-origin-v1-model-discovery-750ms",
+    kind: "split-origin-predecessor",
+    asarSha256: "d520d115604225c1a3feb749dbe29ad0d2cd175c5233c010de0e1fade527fa0b",
+    headerSha256: "83e5fba3b6751b3098d8f6901db361a9b620ab3b924e0e551d3df612ff412642",
+    signingMetadata: Object.freeze({
+      identifier: "com.pm-studio.app",
+      flags: "0x10002(adhoc,runtime)",
+      runtime_version: "26.0.0",
+      entitlements_sha256: "9d4ccbda4fe0c81a70df3db93b3e61fe0500f67f14cdcbee4dea230e6512d05c",
+    }),
+  }),
   targets: Object.freeze([
     Object.freeze({
       path: "dist/main/main.js",
@@ -44,13 +56,19 @@ export const PM_STUDIO_2_9_7_RECIPE = Object.freeze({
       size: 9_909_974,
       blockSize: 4_194_304,
       sourceSha256: "58383be112886becdb8d8e7cce1b3efce07be6716190aa4940627f456eb8edb2",
-      patchedSha256: "69156040fb233a835b7be2f86fbe2f653380f03379adfedf46c63ab45de9d39d",
+      patchedSha256: "b219d08290b208fe41fa29b1e8ac4a1dee789e15f68fd4ff01eb5cd21249099b",
+      predecessorSha256: "69156040fb233a835b7be2f86fbe2f653380f03379adfedf46c63ab45de9d39d",
       sourceBlocks: Object.freeze([
         "3ce05a21e8992ccf12966cf9b78fcd28b2f66e6786489b5bb0a06f1d4b2a0c1e",
         "0a4832413d8d8cdda67c8bb318c0e5c25df20c75802d637097ffd045a31cd443",
         "bcc10582d8a74717f8f81b98182d3551f1eaf23eb9cadd908d160ce5e4ef8cba",
       ]),
       patchedBlocks: Object.freeze([
+        "dcbffb0f3aaa79a5ca8f1ee9170826b874d9db237c230abcdc0490335b2dc6a8",
+        "0a4832413d8d8cdda67c8bb318c0e5c25df20c75802d637097ffd045a31cd443",
+        "bcc10582d8a74717f8f81b98182d3551f1eaf23eb9cadd908d160ce5e4ef8cba",
+      ]),
+      predecessorBlocks: Object.freeze([
         "f0b5585d2ff0d403e5c4d35e9bd0b8cbfec5c41a9b9057b8cc808107e889cf46",
         "0a4832413d8d8cdda67c8bb318c0e5c25df20c75802d637097ffd045a31cd443",
         "bcc10582d8a74717f8f81b98182d3551f1eaf23eb9cadd908d160ce5e4ef8cba",
@@ -62,7 +80,8 @@ export const PM_STUDIO_2_9_7_RECIPE = Object.freeze({
         anchor: "47024(I,e,t){",
         anchorCount: 1,
         sourceSha256: PM_STUDIO_COPILOT_CONFIG_MODULE_SOURCE_SHA256,
-        patchedSha256: "a5b9312ed78e8a7fc3bd38f7ea5d4ab008f21bae18ba3dd6aa2d4be6b69191db",
+        patchedSha256: "873d2dd276bd12a7dc2876f5eaf8c67d4ae34749ead8911d0588badf4e9fc0cf",
+        predecessorSha256: "a5b9312ed78e8a7fc3bd38f7ea5d4ab008f21bae18ba3dd6aa2d4be6b69191db",
         replacement: PM_STUDIO_SPLIT_ORIGIN_CONFIG_MODULE,
       }),
     }),
@@ -124,8 +143,20 @@ export const PM_STUDIO_2_9_10_RECIPE = Object.freeze({
   dataOffset: 3_833_292,
   sourceAsarSha256: "d243860770e8b1d8044213924f9704d1fc52f900d6c33461eff6358962330b78",
   sourceHeaderSha256: "5fc77d5b61e9647fba10fd2bd5752d0889c14da5a00b21d31bc48fdcccf74a69",
-  patchedAsarSha256: "ea28d998056b32ca4115d208a4d81ce629c83f3f5f89c6a66d50749849beb6fc",
-  patchedHeaderSha256: "348d80f5f2d1ebb92e6089195b1703b87467678f80d8946b8ab83b3ead03e5be",
+  patchedAsarSha256: "f309fc7e86bb4edaf1fecd9061fb4ddc634357c0ba9299f1d13f8b2ff33efd90",
+  patchedHeaderSha256: "98c4af8656e61cc1a1a8b2188592a499a987136f8e6b763b0e83abda788e798d",
+  predecessor: Object.freeze({
+    id: "split-origin-v1-model-discovery-750ms",
+    kind: "split-origin-predecessor",
+    asarSha256: "ea28d998056b32ca4115d208a4d81ce629c83f3f5f89c6a66d50749849beb6fc",
+    headerSha256: "348d80f5f2d1ebb92e6089195b1703b87467678f80d8946b8ab83b3ead03e5be",
+    signingMetadata: Object.freeze({
+      identifier: "com.pm-studio.app",
+      flags: "0x10002(adhoc,runtime)",
+      runtime_version: "26.0.0",
+      entitlements_sha256: "9d4ccbda4fe0c81a70df3db93b3e61fe0500f67f14cdcbee4dea230e6512d05c",
+    }),
+  }),
   targets: Object.freeze([
     Object.freeze({
       path: "dist/main/main.js",
@@ -133,13 +164,19 @@ export const PM_STUDIO_2_9_10_RECIPE = Object.freeze({
       size: 10_150_157,
       blockSize: 4_194_304,
       sourceSha256: "03607bb1edc068396b99f02b9c9e0d8e10388fb658afc112e06e875c123dbc27",
-      patchedSha256: "b5b5e37af3d06ffc603bdef620fc1e0254580f0ee325f1a77096af6c78379b79",
+      patchedSha256: "71e936c79c3560ab5bd9813479f8a66f4a7b06629edca74953feaaf7904a6564",
+      predecessorSha256: "b5b5e37af3d06ffc603bdef620fc1e0254580f0ee325f1a77096af6c78379b79",
       sourceBlocks: Object.freeze([
         "3910a9bc5459f493956aafee7b3644e8d242027758f0dcdea97d7c10a324c6bf",
         "49fa64c68425d35b1baff0d5745d856d377e014a7a7829322cd1b39aade9532e",
         "bd7cc14a1d2e02abe66c0ec6fc4e97b263cfc1f67c4ae39e956c06d3bcc2fe67",
       ]),
       patchedBlocks: Object.freeze([
+        "203ad1efbdcd869314510086632fdb0089196eb25179c46fb4108133cc65412f",
+        "49fa64c68425d35b1baff0d5745d856d377e014a7a7829322cd1b39aade9532e",
+        "bd7cc14a1d2e02abe66c0ec6fc4e97b263cfc1f67c4ae39e956c06d3bcc2fe67",
+      ]),
+      predecessorBlocks: Object.freeze([
         "63aa15d8c44614a7b2d9656ddba23109d40bab66b66b36339154953bd164da75",
         "49fa64c68425d35b1baff0d5745d856d377e014a7a7829322cd1b39aade9532e",
         "bd7cc14a1d2e02abe66c0ec6fc4e97b263cfc1f67c4ae39e956c06d3bcc2fe67",
@@ -151,7 +188,8 @@ export const PM_STUDIO_2_9_10_RECIPE = Object.freeze({
         anchor: "47024(I,e,t){",
         anchorCount: 1,
         sourceSha256: PM_STUDIO_COPILOT_CONFIG_MODULE_SOURCE_SHA256,
-        patchedSha256: "a5b9312ed78e8a7fc3bd38f7ea5d4ab008f21bae18ba3dd6aa2d4be6b69191db",
+        patchedSha256: "873d2dd276bd12a7dc2876f5eaf8c67d4ae34749ead8911d0588badf4e9fc0cf",
+        predecessorSha256: "a5b9312ed78e8a7fc3bd38f7ea5d4ab008f21bae18ba3dd6aa2d4be6b69191db",
         replacement: PM_STUDIO_SPLIT_ORIGIN_CONFIG_MODULE,
       }),
     }),
@@ -399,8 +437,13 @@ function targetStateIssues(detail, target, state) {
   addMismatch(issues, `${target.path} block size`, detail.integrity?.blockSize, target.blockSize);
 
   const patched = state === "patched";
-  const expectedHash = patched ? target.patchedSha256 : target.sourceSha256;
-  const expectedBlocks = patched ? target.patchedBlocks : target.sourceBlocks;
+  const predecessor = state === "predecessor";
+  const expectedHash = patched
+    ? target.patchedSha256
+    : predecessor ? target.predecessorSha256 : target.sourceSha256;
+  const expectedBlocks = patched
+    ? target.patchedBlocks
+    : predecessor ? target.predecessorBlocks : target.sourceBlocks;
 
   addMismatch(issues, `${target.path} SHA-256`, detail.sha256, expectedHash);
   addMismatch(issues, `${target.path} integrity hash`, detail.integrity?.hash, expectedHash);
@@ -411,7 +454,9 @@ function targetStateIssues(detail, target, state) {
     addMismatch(issues, `${target.path} absolute edit offset`, detail.edit?.absoluteOffset, target.edit.absoluteOffset);
     addMismatch(issues, `${target.path} edit length`, detail.edit?.length, target.edit.length);
     addMismatch(issues, `${target.path} edit SHA-256`, detail.edit?.sha256,
-      patched ? target.edit.patchedSha256 : target.edit.sourceSha256);
+      patched
+        ? target.edit.patchedSha256
+        : predecessor ? target.edit.predecessorSha256 : target.edit.sourceSha256);
     if (!sameArray(detail.edit?.anchorPositions, [target.edit.offset])) {
       issues.push(`${target.path} module anchor position/count does not match recipe`);
     }
@@ -432,11 +477,13 @@ export function inspectAsarBuffer(value, recipe = PM_STUDIO_2_9_7_RECIPE) {
 
   const issuesFor = (state) => {
     const patched = state === "patched";
+    const predecessor = state === "predecessor";
+    const expected = predecessor ? recipe.predecessor : null;
     const issues = [...commonIssues];
     addMismatch(issues, "ASAR SHA-256", asarSha256,
-      patched ? recipe.patchedAsarSha256 : recipe.sourceAsarSha256);
+      patched ? recipe.patchedAsarSha256 : predecessor ? expected?.asarSha256 : recipe.sourceAsarSha256);
     addMismatch(issues, "ASAR header SHA-256", headerSha256,
-      patched ? recipe.patchedHeaderSha256 : recipe.sourceHeaderSha256);
+      patched ? recipe.patchedHeaderSha256 : predecessor ? expected?.headerSha256 : recipe.sourceHeaderSha256);
     for (let index = 0; index < recipe.targets.length; index += 1) {
       issues.push(...targetStateIssues(targets[index], recipe.targets[index], state));
     }
@@ -445,6 +492,9 @@ export function inspectAsarBuffer(value, recipe = PM_STUDIO_2_9_7_RECIPE) {
 
   const cleanIssues = issuesFor("clean");
   const patchedIssues = issuesFor("patched");
+  const predecessorIssues = recipe.predecessor
+    ? issuesFor("predecessor")
+    : ["recipe has no recognized predecessor patch"];
   const legacyIssues = [...commonIssues];
   if (!recipe.legacy) {
     legacyIssues.push("recipe has no recognized legacy patch");
@@ -456,7 +506,9 @@ export function inspectAsarBuffer(value, recipe = PM_STUDIO_2_9_7_RECIPE) {
     ? "clean"
     : patchedIssues.length === 0
       ? "patched"
-      : legacyIssues.length === 0 ? "legacy" : "drift";
+      : predecessorIssues.length === 0
+        ? "predecessor"
+        : legacyIssues.length === 0 ? "legacy" : "drift";
   return {
     recipeId: recipe.id,
     state,
@@ -466,6 +518,7 @@ export function inspectAsarBuffer(value, recipe = PM_STUDIO_2_9_7_RECIPE) {
     targets,
     cleanIssues,
     patchedIssues,
+    predecessorIssues,
     legacyIssues,
   };
 }
@@ -475,6 +528,12 @@ export function patchAsarBuffer(value, recipe = PM_STUDIO_2_9_7_RECIPE) {
   if (before.state === "patched") {
     return { changed: false, buffer: Buffer.from(value), before, after: before };
   }
+  if (before.state === "predecessor") {
+    const error = new Error("Predecessor PM Studio split-origin patch must be migrated from a verified clean backup");
+    error.code = "PM_STUDIO_ASAR_PREDECESSOR";
+    error.inspection = before;
+    throw error;
+  }
   if (before.state === "legacy") {
     const error = new Error("Legacy PM Studio global-origin patch must be migrated from a verified clean backup");
     error.code = "PM_STUDIO_ASAR_LEGACY";
@@ -482,7 +541,7 @@ export function patchAsarBuffer(value, recipe = PM_STUDIO_2_9_7_RECIPE) {
     throw error;
   }
   if (before.state !== "clean") {
-    const error = new Error("PM Studio ASAR does not match the clean, split-origin, or legacy recipe");
+    const error = new Error("PM Studio ASAR does not match the clean, current split-origin, predecessor, or legacy recipe");
     error.code = "PM_STUDIO_ASAR_DRIFT";
     error.inspection = before;
     throw error;

package/src/pm-studio-setup.mjs

@@ -519,6 +519,10 @@ export function inspectPmStudioApp({
     && codeSign?.adHoc === true
     && (!recipe.patchedSigningMetadata
       || JSON.stringify(signingMetadata(codeSign)) === JSON.stringify(recipe.patchedSigningMetadata));
+  const predecessorSignatureAccepted = codeSign?.valid === true
+    && codeSign?.adHoc === true
+    && Boolean(recipe.predecessor?.signingMetadata)
+    && JSON.stringify(signingMetadata(codeSign)) === JSON.stringify(recipe.predecessor.signingMetadata);
   const clean = issues.length === 0
     && asar.state === "clean"
     && integrityMatches(plistIntegrity, "SHA256", recipe.sourceHeaderSha256)
@@ -530,12 +534,16 @@ export function inspectPmStudioApp({
     && asar.state === "patched"
     && integrityMatches(plistIntegrity, "SHA256", recipe.patchedHeaderSha256)
     && patchedSignatureAccepted;
+  const predecessor = issues.length === 0
+    && asar.state === "predecessor"
+    && integrityMatches(plistIntegrity, "SHA256", recipe.predecessor?.headerSha256)
+    && predecessorSignatureAccepted;
   const legacy = issues.length === 0
     && asar.state === "legacy"
     && integrityMatches(plistIntegrity, "SHA256", recipe.legacy?.headerSha256)
     && patchedSignatureAccepted;
 
-  if (!clean && !patched && !legacy) {
+  if (!clean && !patched && !predecessor && !legacy) {
     if (asar.state === "drift") issues.push("app.asar is unknown drift");
     else if (asar.state === "clean"
       && !integrityMatches(plistIntegrity, "SHA256", recipe.sourceHeaderSha256)) {
@@ -543,6 +551,9 @@ export function inspectPmStudioApp({
     } else if (asar.state === "patched"
       && !integrityMatches(plistIntegrity, "SHA256", recipe.patchedHeaderSha256)) {
       issues.push("patched ASAR does not match ElectronAsarIntegrity");
+    } else if (asar.state === "predecessor"
+      && !integrityMatches(plistIntegrity, "SHA256", recipe.predecessor?.headerSha256)) {
+      issues.push("predecessor ASAR does not match ElectronAsarIntegrity");
     } else if (asar.state === "legacy"
       && !integrityMatches(plistIntegrity, "SHA256", recipe.legacy?.headerSha256)) {
       issues.push("legacy ASAR does not match ElectronAsarIntegrity");
@@ -554,7 +565,7 @@ export function inspectPmStudioApp({
       issues.push("codesign verification failed");
     }
     else if (asar.state === "clean" && codeSign.adHoc) issues.push("clean bundle has an unexpected ad-hoc signature");
-    else if (["patched", "legacy"].includes(asar.state) && !codeSign.adHoc) {
+    else if (["patched", "predecessor", "legacy"].includes(asar.state) && !codeSign.adHoc) {
       issues.push(`${asar.state} bundle is not ad-hoc signed`);
     }
     else if (asar.state === "clean" && codeSign.teamIdentifier !== recipe.sourceTeamIdentifier) {
@@ -573,10 +584,16 @@ export function inspectPmStudioApp({
       && !patchedSignatureAccepted) {
       issues.push(`${asar.state} bundle signing metadata does not match the recipe`);
     }
+    if (asar.state === "predecessor" && codeSign?.valid && codeSign?.adHoc
+      && !predecessorSignatureAccepted) {
+      issues.push("predecessor bundle signing metadata does not match the recipe");
+    }
   }
 
   return {
-    state: clean ? "clean" : patched ? "patched" : legacy ? "legacy" : "drift",
+    state: clean
+      ? "clean"
+      : patched ? "patched" : predecessor ? "predecessor" : legacy ? "legacy" : "drift",
     metadata: {
       version: String(metadata.version),
       build: String(metadata.build),
@@ -688,7 +705,9 @@ function backupManifest(recipe, createdAt) {
 function patchRecordMatches(record, recipe, state) {
   const expected = state === "legacy"
     ? recipe.legacy
-    : { asarSha256: recipe.patchedAsarSha256, headerSha256: recipe.patchedHeaderSha256 };
+    : state === "predecessor"
+      ? recipe.predecessor
+      : { asarSha256: recipe.patchedAsarSha256, headerSha256: recipe.patchedHeaderSha256 };
   return Boolean(expected)
     && record?.asar_sha256 === expected.asarSha256
     && record?.asar_header_sha256 === expected.headerSha256
@@ -696,8 +715,11 @@ function patchRecordMatches(record, recipe, state) {
 }
 
 function patchRecordForState(manifest, recipe, state) {
-  if (state === "legacy" && patchRecordMatches(manifest?.legacy_patched, recipe, state)) {
-    return manifest.legacy_patched;
+  const historicalKey = state === "legacy"
+    ? "legacy_patched"
+    : state === "predecessor" ? "predecessor_patched" : "";
+  if (historicalKey && patchRecordMatches(manifest?.[historicalKey], recipe, state)) {
+    return manifest[historicalKey];
   }
   return patchRecordMatches(manifest?.patched, recipe, state) ? manifest.patched : null;
 }
@@ -728,8 +750,11 @@ function validateBackup({ backupDir, recipe, operations }) {
       && JSON.stringify(manifest?.source?.bundle_content) !== JSON.stringify(recipe.sourceBundleContent))
     || (recipe.sourceArtifact
       && JSON.stringify(manifest?.source?.artifact) !== JSON.stringify(recipe.sourceArtifact))
+    || (manifest?.predecessor_patched !== undefined
+      && !patchRecordMatches(manifest.predecessor_patched, recipe, "predecessor"))
     || (!patchRecordForState(manifest, recipe, "patched")
-      && !patchRecordForState(manifest, recipe, "legacy"))) {
+      && !patchRecordForState(manifest, recipe, "legacy")
+      && !patchRecordForState(manifest, recipe, "predecessor"))) {
     throw setupError("PM_STUDIO_BACKUP_INVALID", `Existing PM Studio backup does not match recipe ${recipe.id}`);
   }
   const inspection = inspectPmStudioApp({ appPath: backupAppPath, recipe, operations });
@@ -775,6 +800,14 @@ function ensureBackup({ appPath, backupRoot, recipe, operations }) {
 
 function writePatchedBinaryRecord({ backup, inspection, operations, recipe }) {
   const manifest = JSON.parse(fs.readFileSync(backup.manifestPath, "utf8"));
+  if (manifest.predecessor_patched !== undefined
+    && !patchRecordMatches(manifest.predecessor_patched, recipe, "predecessor")) {
+    throw setupError("PM_STUDIO_BACKUP_INVALID", "Existing PM Studio predecessor record does not match the patch recipe");
+  }
+  if (manifest.predecessor_patched === undefined
+    && patchRecordMatches(manifest.patched, recipe, "predecessor")) {
+    manifest.predecessor_patched = manifest.patched;
+  }
   if (!patchRecordMatches(manifest.legacy_patched, recipe, "legacy")
     && patchRecordMatches(manifest.patched, recipe, "legacy")) {
     manifest.legacy_patched = manifest.patched;
@@ -804,7 +837,9 @@ export function assertPatchedBinaryRecord({
   inspection,
   manifestPath,
   recipe,
-  recordState = inspection?.state === "legacy" ? "legacy" : "patched",
+  recordState = ["legacy", "predecessor"].includes(inspection?.state)
+    ? inspection.state
+    : "patched",
 }) {
   let manifest;
   try {
@@ -966,9 +1001,11 @@ export async function runPmStudioSetup({
     return { status: "already_patched", changed: false, recipe: recipe.id, backup, inspection: source, messages };
   }
   const migratingLegacy = source.state === "legacy";
-  if (source.state !== "clean" && !migratingLegacy) {
+  const migratingPredecessor = source.state === "predecessor";
+  const migratingExistingPatch = migratingLegacy || migratingPredecessor;
+  if (source.state !== "clean" && !migratingExistingPatch) {
     throw setupError("PM_STUDIO_BUNDLE_DRIFT",
-      `PM Studio ${recipe.version} build ${recipe.build} does not match the clean, split-origin, or legacy recipe; no files were changed`, source.issues);
+      `PM Studio ${recipe.version} build ${recipe.build} does not match the clean, current split-origin, predecessor, or legacy recipe; no files were changed`, source.issues);
   }
 
   if (source.sourceVerification === "exact-bundle-content") {
@@ -977,19 +1014,21 @@ export async function runPmStudioSetup({
 
   const backupExists = fs.existsSync(finalBackupDir);
   let verifiedBackup = null;
-  if (migratingLegacy) {
+  if (migratingExistingPatch) {
     if (!backupExists) {
       throw setupError("PM_STUDIO_BACKUP_INVALID",
-        "Legacy PM Studio global-origin patch has no matching verified clean backup; no files were changed");
+        `${migratingLegacy ? "Legacy global-origin" : "Predecessor split-origin"} PM Studio patch has no matching verified clean backup; no files were changed`);
     }
     verifiedBackup = validateBackup({ backupDir: finalBackupDir, recipe, operations });
     assertPatchedBinaryRecord({
       inspection: source,
       manifestPath: verifiedBackup.manifestPath,
       recipe,
-      recordState: "legacy",
+      recordState: source.state,
     });
-    emit("[WARN] Legacy global-origin patch detected; setup will rebuild from the verified clean backup so GPT and enterprise authentication return to PM Studio's native origin.");
+    emit(migratingLegacy
+      ? "[WARN] Legacy global-origin patch detected; setup will rebuild from the verified clean backup so GPT and enterprise authentication return to PM Studio's native origin."
+      : "[WARN] Predecessor split-origin patch detected; setup will rebuild from the verified clean backup so delayed Claude model discovery no longer falls back to the native catalog.");
   }
   assertSpace({ appPath, backupRoot, backupExists, operations });
 
@@ -999,13 +1038,13 @@ export async function runPmStudioSetup({
   let preserveStage = false;
   try {
     operations.copyBundle({
-      source: migratingLegacy ? backup.backupAppPath : appPath,
+      source: migratingExistingPatch ? backup.backupAppPath : appPath,
       destination: stagePath,
       processRunner: operations.processRunner,
     });
     const stagedSource = inspectPmStudioApp({ appPath: stagePath, recipe, operations });
     if (stagedSource.state !== "clean"
-      || (!migratingLegacy && recipe.sourceBundleContent
+      || (!migratingExistingPatch && recipe.sourceBundleContent
         && stagedSource.bundleContent?.sha256 !== source.bundleContent?.sha256)) {
       throw setupError("PM_STUDIO_STAGE_INVALID", "PM Studio staging copy does not match the exact clean source bundle", stagedSource.issues);
     }
@@ -1078,7 +1117,9 @@ export async function runPmStudioSetup({
 
     emit(migratingLegacy
       ? `[OK] Migrated PM Studio ${recipe.version} build ${recipe.build} from the legacy global-origin patch to the split-origin patch.`
-      : `[OK] Patched PM Studio ${recipe.version} build ${recipe.build}.`);
+      : migratingPredecessor
+        ? `[OK] Migrated PM Studio ${recipe.version} build ${recipe.build} from the predecessor split-origin patch to the current split-origin patch.`
+        : `[OK] Patched PM Studio ${recipe.version} build ${recipe.build}.`);
     emit(`[OK] app.asar SHA-256: ${installed.asar.asarSha256}`);
     emit(`[OK] Verified backup: ${backup.backupAppPath}${backup.reused ? " (reused)" : ""}`);
     emit(`[OK] Backup manifest: ${backup.manifestPath}`);
@@ -1088,7 +1129,7 @@ export async function runPmStudioSetup({
     emit(`[INFO] Restore step 3/3: move ${appPath} aside, copy ${backup.backupAppPath} to that exact path, and verify its signature before launch.`);
     emit(`[INFO] Start ${commandName} before using Claude in PM Studio; GPT remains on PM Studio's native GitHub Copilot path.`);
     return {
-      status: migratingLegacy ? "migrated" : "patched",
+      status: migratingExistingPatch ? "migrated" : "patched",
       changed: true,
       recipe: recipe.id,
       backup,

package/src/pm-studio-status.mjs

@@ -170,10 +170,15 @@ export async function inspectPmStudioStatus({
       const recipe = selectRecipe(normalized, recipes);
       if (recipe) {
         app = { ...inspectApp({ appPath, recipe, operations }), recipe: recipe.id };
-        if (app.state === "patched") {
+        if (["patched", "predecessor"].includes(app.state)) {
           const manifestPath = pmStudioPatchManifestPath({ home, backupRoot, recipe });
           try {
-            verifyPatchRecord({ inspection: app, manifestPath, recipe });
+            verifyPatchRecord({
+              inspection: app,
+              manifestPath,
+              recipe,
+              recordState: app.state,
+            });
             app.patchRecord = { valid: true, manifestPath, reason: "" };
           } catch (error) {
             const reason = safeMessage(error);
@@ -239,6 +244,9 @@ function appStatusItem(result, commandName) {
     const reason = app.patchRecord?.reason || "installed patch record is missing";
     return { kind: "err", component: "App patch", detail: `${version}; patch record not verified`, message: `PM Studio ${version} matches the patch recipe, but its installed patch record is not verified: ${reason}` };
   }
+  if (app.state === "predecessor" && app.patchRecord?.valid === true) {
+    return { kind: "warn", component: "App patch", detail: `${version}; verified predecessor split patch`, message: `PM Studio ${version} has a verified predecessor split patch; run ${commandName} pms setup to migrate` };
+  }
   if (app.state === "legacy") {
     return { kind: "err", component: "App patch", detail: `${version}; legacy global-origin patch`, message: `PM Studio ${version} has a legacy global-origin patch; run ${commandName} pms setup to migrate` };
   }

package/src/responses-request.mjs

@@ -6,6 +6,7 @@ import {
   rememberResponseHistoryNode,
   responseHistoryRootId,
 } from "./response-history.mjs";
+import { isResponsesToolOutputItem, readResponsesToolOutputParts } from "./responses-content.mjs";
 import { enforceResponsesImageLimit } from "./responses-image-limit.mjs";
 import { status } from "./status.mjs";
 
@@ -69,27 +70,39 @@ function isEncryptedContentPart(value) {
   return value && typeof value === "object" && value.type === "encrypted_content";
 }
 
+const OMIT_ENCRYPTED_CONTENT = Symbol("omit-encrypted-content");
+const ENCRYPTED_HISTORY_REBASE = Symbol("encrypted-history-rebase");
+const ENCRYPTED_TOOL_OUTPUT_MARKER = "[CCDX: encrypted tool output omitted because upstream could not decrypt it.]";
+
 function stripEncryptedReasoningValue(value, state) {
+  if (isEncryptedContentPart(value)) {
+    state.changed = true;
+    return OMIT_ENCRYPTED_CONTENT;
+  }
+
   if (Array.isArray(value)) {
     const out = [];
     for (const item of value) {
-      if (isEncryptedContentPart(item)) {
-        state.changed = true;
-        continue;
-      }
-      out.push(stripEncryptedReasoningValue(item, state));
+      const stripped = stripEncryptedReasoningValue(item, state);
+      if (stripped !== OMIT_ENCRYPTED_CONTENT) out.push(stripped);
     }
     return out;
   }
 
   if (value && typeof value === "object") {
+    const keys = Object.keys(value);
+    if (keys.length === 1 && keys[0] === "encrypted_content") {
+      state.changed = true;
+      return OMIT_ENCRYPTED_CONTENT;
+    }
     const out = {};
     for (const [key, child] of Object.entries(value)) {
       if (key === "encrypted_content") {
         state.changed = true;
         continue;
       }
-      out[key] = stripEncryptedReasoningValue(child, state);
+      const stripped = stripEncryptedReasoningValue(child, state);
+      if (stripped !== OMIT_ENCRYPTED_CONTENT) out[key] = stripped;
     }
     return out;
   }
@@ -97,28 +110,82 @@ function stripEncryptedReasoningValue(value, state) {
   return value;
 }
 
+function stripEncryptedReasoningInputValue(item, state) {
+  if (!isResponsesToolOutputItem(item)) {
+    const out = stripEncryptedReasoningValue(item, state);
+    if (item?.type === "message"
+      && Array.isArray(item.content)
+      && item.content.length > 0
+      && Array.isArray(out?.content)
+      && out.content.length === 0) {
+      return OMIT_ENCRYPTED_CONTENT;
+    }
+    return out;
+  }
+  const hasOutput = Object.prototype.hasOwnProperty.call(item, "output");
+  const withoutOutput = { ...item };
+  delete withoutOutput.output;
+  const out = stripEncryptedReasoningValue(withoutOutput, state);
+  if (!hasOutput) return out;
+  if (isEncryptedContentPart(item.output)) {
+    state.changed = true;
+    out.output = ENCRYPTED_TOOL_OUTPUT_MARKER;
+    return out;
+  }
+  out.output = typeof item.output === "string" ? item.output : cloneJson(item.output);
+  if (typeof item.output === "string" && !item.output.includes("encrypted_content")) return out;
+  const parsed = readResponsesToolOutputParts(out);
+  if (parsed) {
+    const outputState = { changed: false };
+    const parts = stripEncryptedReasoningValue(parsed.parts, outputState);
+    if (!outputState.changed) return out;
+    state.changed = true;
+    if (!parts.length) {
+      out.output = ENCRYPTED_TOOL_OUTPUT_MARKER;
+      return out;
+    }
+    parsed.parts.splice(0, parsed.parts.length, ...parts);
+    parsed.commit?.();
+    return out;
+  }
+  const output = stripEncryptedReasoningValue(out.output, state);
+  out.output = output === OMIT_ENCRYPTED_CONTENT ? ENCRYPTED_TOOL_OUTPUT_MARKER : output;
+  return out;
+}
+
 function isEncryptedReasoningInputItem(item) {
-  return item && typeof item === "object"
-    && (item.type === "reasoning"
-      || item.type === "encrypted_content"
-      || Object.prototype.hasOwnProperty.call(item, "encrypted_content"));
+  if (!item || typeof item !== "object") return false;
+  if (["reasoning", "encrypted_content", "compaction"].includes(item.type)) return true;
+  const keys = Object.keys(item);
+  return keys.length === 1 && keys[0] === "encrypted_content";
 }
 
 export function sanitizeEncryptedReasoningRequest(reqContext) {
   const state = { changed: false };
   let body = cloneJson(reqContext.body);
   let currentInputStart = reqContext.currentInputStart;
+  let historicalInputChanged = false;
   if (Array.isArray(body.input)) {
     const input = [];
     let retainedBeforeCurrent = 0;
     for (let index = 0; index < body.input.length; index += 1) {
       const item = body.input[index];
+      const historical = Number.isFinite(currentInputStart) && index < currentInputStart;
       if (isEncryptedReasoningInputItem(item)) {
         state.changed = true;
+        if (historical) historicalInputChanged = true;
         continue;
       }
-      input.push(stripEncryptedReasoningValue(item, state));
-      if (Number.isFinite(currentInputStart) && index < currentInputStart) retainedBeforeCurrent += 1;
+      const itemState = { changed: false };
+      const stripped = stripEncryptedReasoningInputValue(item, itemState);
+      if (stripped !== OMIT_ENCRYPTED_CONTENT) input.push(stripped);
+      if (itemState.changed) {
+        state.changed = true;
+        if (historical) historicalInputChanged = true;
+      }
+      if (stripped !== OMIT_ENCRYPTED_CONTENT
+        && Number.isFinite(currentInputStart)
+        && index < currentInputStart) retainedBeforeCurrent += 1;
     }
     body.input = input;
     if (Number.isFinite(currentInputStart)) currentInputStart = retainedBeforeCurrent;
@@ -127,12 +194,19 @@ export function sanitizeEncryptedReasoningRequest(reqContext) {
   }
   if (!state.changed) return null;
   const historyInputItems = Array.isArray(reqContext.historyInputItems)
-    ? reqContext.historyInputItems
-      .filter((item) => !isEncryptedReasoningInputItem(item))
-      .map((item) => stripEncryptedReasoningValue(item, { changed: false }))
+    ? reqContext.historyInputItems.flatMap((item) => {
+      if (isEncryptedReasoningInputItem(item)) return [];
+      const stripped = stripEncryptedReasoningInputValue(item, { changed: false });
+      return stripped === OMIT_ENCRYPTED_CONTENT ? [] : [stripped];
+    })
     : reqContext.historyInputItems;
+  const shouldRebaseHistory = historicalInputChanged
+    && Number.isFinite(reqContext.currentInputStart)
+    && reqContext.historyParentId !== undefined
+    && reqContext.historyParentId !== null;
   return {
     ...reqContext,
+    ...(shouldRebaseHistory ? { [ENCRYPTED_HISTORY_REBASE]: true } : {}),
     body,
     currentInputStart,
     inputItems: Array.isArray(body.input) ? body.input : reqContext.inputItems,
@@ -140,12 +214,30 @@ export function sanitizeEncryptedReasoningRequest(reqContext) {
   };
 }
 
+function finalizeEncryptedHistoryRebase(reqContext) {
+  if (!reqContext[ENCRYPTED_HISTORY_REBASE]) return reqContext;
+  const finalized = {
+    ...reqContext,
+    historyParentId: null,
+    historyRootId: null,
+    historyInputItems: reqContext.body.input,
+    inputItems: reqContext.body.input,
+  };
+  delete finalized[ENCRYPTED_HISTORY_REBASE];
+  return finalized;
+}
+
 export function isEncryptedContentVerificationError(statusCode, text) {
   if (statusCode < 400 || !text) return false;
   const lower = String(text).toLowerCase();
-  return lower.includes("encrypted content")
+  const reasoningFailure = lower.includes("encrypted content")
     && lower.includes("could not be verified")
     && (lower.includes("could not be decrypted") || lower.includes("could not be parsed"));
+  const functionOutputFailure = lower.includes("encrypted function output content")
+    && lower.includes("could not be decrypted or decoded");
+  const missingEncryptedContent = statusCode < 500
+    && /missing required parameter:\s*(['"]?)input\[\d+\](?:\.[a-z0-9_]+|\[\d+\])*\.encrypted_content\1(?=\.?(?:\s|$|["},\]]))/.test(lower);
+  return reasoningFailure || functionOutputFailure || missingEncryptedContent;
 }
 
 export function isImageNamespaceCollisionError(statusCode, text) {
@@ -192,7 +284,10 @@ export async function openCopilotResponse(reqContext, upstream = copilotResponse
     });
     options.assertPrepareActive?.();
     payloadPrepared = true;
-    if (resp.ok) return { resp, reqContext };
+    if (resp.ok) {
+      reqContext = finalizeEncryptedHistoryRebase(reqContext);
+      return { resp, reqContext };
+    }
 
     const errorText = await resp.text();
     options.assertPrepareActive?.();
@@ -210,7 +305,7 @@ export async function openCopilotResponse(reqContext, upstream = copilotResponse
       if (retryContext) {
         encryptedRetried = true;
         reqContext = retryContext;
-        console.warn(status("warn", "encrypted reasoning rejected by upstream; retrying without encrypted reasoning"));
+        console.warn(status("warn", "encrypted replay content rejected by upstream; retrying without unavailable encrypted content"));
         continue;
       }
     }