@eddyskywalker/dsh-chatgpt-subscription 0.48.2 → 0.48.4

package/lib/index.js

@@ -145,7 +145,7 @@ const ROUTE_PREFIX$5 = "/api/dsh-chatgpt-subscription";
 * `test/responses-client.test.ts` asserts the two agree, so a release that
 * forgets this constant fails the suite instead of shipping quietly.
 */
-const PLUGIN_VERSION = "0.48.2";
+const PLUGIN_VERSION = "0.48.4";
 const CODEX_CHATGPT_PROVIDER_ID = "codex-chatgpt";
 const CODEX_API_BASE = "https://chatgpt.com/backend-api/codex";
 const CODEX_RESPONSES_URL = `${CODEX_API_BASE}/responses`;
@@ -5025,12 +5025,52 @@ function readBlocks(raw) {
 	return raw.filter((block) => isRecord$58(block) && typeof block.type === "string");
 }
 /**
+* The first value that is a non-empty string.
+*
+* Used for fields the two generations spell in different places: a value that
+* is present but empty must not shadow a real one further down the chain, which
+* is what `??` alone does.
+*/
+function firstNonEmptyString(...values) {
+	for (const value of values) if (typeof value === "string" && value !== "") return value;
+	return "";
+}
+/**
+* The result block a `role: 'tool'` message already carries inside its body.
+*
+* Some harness generations deliver the call id inside the result block rather
+* than on the message, and one shape carries both: `role: 'tool'` with a
+* `tool-result` block holding the id. Reading only the message-level fields
+* leaves {@link toolCallIdOf} nothing to find.
+*/
+function embeddedToolResult(content) {
+	if (content.length !== 1) return void 0;
+	const [block] = content;
+	return block?.type === "tool-result" ? block : void 0;
+}
+/**
+* The call id one `role: 'tool'` message associates with its `tool-call`.
+*
+* The id is the only thing tying a result to the call it answers: a mapper that
+* sends it empty makes every result an orphan and tells the repair pass that no
+* call was answered, which some gateways reject outright (WorkBuddy answers
+* `11148`, "tool calls and tool results do not match"). It therefore has to be
+* read from every place the harness generations put it — the message, the
+* message's source, and the result block inside the body — and an empty string
+* must not shadow a later, real one.
+*/
+function toolCallIdOf(raw, source, embedded) {
+	return firstNonEmptyString(raw.toolCallId, raw.callId, source?.callId, embedded?.toolCallId);
+}
+/**
 * Normalize one harness message list into {@link Message}.
 *
 * A 0.1.7 `role: 'tool'` message is re-wrapped as the user-role message holding
 * one {@link ToolResultBlock} that the mappers expect, keeping the tool
 * provenance (`kind: 'tool'`) they use to tell a real tool result from a user
-* turn. Everything a newer harness adds beside that keeps its own shape.
+* turn. A message that already carries that block keeps its own body instead of
+* nesting a second `tool-result` around it. Everything a newer harness adds
+* beside that keeps its own shape.
 * @param messages - Messages straight off the request options, in either generation's shape.
 * @returns The same conversation in the pre-0.1.7 vocabulary.
 */
@@ -5041,15 +5081,17 @@ function normalizeMessages(messages) {
 		const content = readBlocks(raw.content);
 		if (raw.role === "tool") {
 			const source = isRecord$58(raw.source) ? raw.source : void 0;
-			const callId = String(raw.toolCallId ?? source?.callId ?? "");
+			const embedded = embeddedToolResult(content);
+			const callId = toolCallIdOf(raw, source, embedded);
+			const isError = raw.isError === true || embedded?.isError === true;
 			normalized.push({
 				id: raw.id,
 				role: "user",
 				content: [{
 					type: "tool-result",
 					toolCallId: callId,
-					content,
-					...raw.isError === true ? { isError: true } : {}
+					content: embedded === void 0 ? content : embedded.content,
+					...isError ? { isError: true } : {}
 				}],
 				source: {
 					kind: "tool",

package/lib/types/client/workbuddy/WorkBuddySection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkBuddySection.d.ts","sourceRoot":"","sources":["../../../../src/client/workbuddy/WorkBuddySection.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAA8B,MAAM,OAAO,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EACV,8BAA8B,EAE9B,qBAAqB,EACrB,qBAAqB,EAIrB,eAAe,EAChB,MAAM,qCAAqC,CAAA;AAS5C,OAAO,EAAuB,KAAK,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAC1F,OAAO,EAAgB,EAAE,EAAE,MAAM,cAAc,CAAA;AAkB/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,qBAAqB,GAAG,SAAS,EAC1C,MAAM,EAAE,eAAe,GAAG,IAAI,EAC9B,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,KAAK,MAAM,CAAA;IACvD,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAA;CAChD,GACA,MAAM,GAAG,IAAI,CA4Bf;AAED,gFAAgF;AAChF,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAInD;AAED,kEAAkE;AAClE,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,OAAO,EAAE,EACP,WAAW,GACX,YAAY,GACZ,kBAAkB,GAClB,iBAAiB,GACjB,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,sBAAsB,GACtB,kBAAkB,GAClB,2BAA2B,GAC3B,+BAA+B,GAC/B,yBAAyB,GACzB,4BAA4B,GAC5B,+BAA+B,GAC/B,mCAAmC,GACnC,6BAA6B,CAChC,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,CAO3F;AAED,6EAA6E;AAC7E,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAOtG;AAED,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAItG;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,qBAAqB,GAAG,SAAS,EACvC,CAAC,EAAE,eAAe,EAClB,GAAG,EAAE,MAAM,GACV;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAgB/D;AAED,sEAAsE;AACtE,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,8BAA8B,GAAG,SAAS,EACvD,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,mBAAmB,GAAG,SAAS,GAAG,0BAA0B,CAAC,GAC/E,MAAM,EAAE,CASV;AAED,wBAAgB,gBAAgB,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,qBAAqB,GAAG,KAAK,CAAC,YAAY,CA0gBjH"}
+{"version":3,"file":"WorkBuddySection.d.ts","sourceRoot":"","sources":["../../../../src/client/workbuddy/WorkBuddySection.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAA8B,MAAM,OAAO,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EACV,8BAA8B,EAE9B,qBAAqB,EACrB,qBAAqB,EAIrB,eAAe,EAChB,MAAM,qCAAqC,CAAA;AAS5C,OAAO,EAAuB,KAAK,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAC1F,OAAO,EAAgB,EAAE,EAAE,MAAM,cAAc,CAAA;AAkB/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,qBAAqB,GAAG,SAAS,EAC1C,MAAM,EAAE,eAAe,GAAG,IAAI,EAC9B,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,KAAK,MAAM,CAAA;IACvD,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAA;CAChD,GACA,MAAM,GAAG,IAAI,CA4Bf;AAED,gFAAgF;AAChF,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAInD;AAED,kEAAkE;AAClE,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,OAAO,EAAE,EACP,WAAW,GACX,YAAY,GACZ,kBAAkB,GAClB,iBAAiB,GACjB,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,sBAAsB,GACtB,kBAAkB,GAClB,2BAA2B,GAC3B,+BAA+B,GAC/B,yBAAyB,GACzB,4BAA4B,GAC5B,+BAA+B,GAC/B,mCAAmC,GACnC,6BAA6B,CAChC,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,CAO3F;AAED,6EAA6E;AAC7E,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAOtG;AAED,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAItG;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,qBAAqB,GAAG,SAAS,EACvC,CAAC,EAAE,eAAe,EAClB,GAAG,EAAE,MAAM,GACV;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAgB/D;AAED,sEAAsE;AACtE,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,8BAA8B,GAAG,SAAS,EACvD,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,mBAAmB,GAAG,SAAS,GAAG,0BAA0B,CAAC,GAC/E,MAAM,EAAE,CASV;AAED,wBAAgB,gBAAgB,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,qBAAqB,GAAG,KAAK,CAAC,YAAY,CA+gBjH"}

package/lib/types/compat.d.ts

@@ -71,7 +71,7 @@ export declare const ROUTE_PREFIX: "/api/dsh-chatgpt-subscription";
  * `test/responses-client.test.ts` asserts the two agree, so a release that
  * forgets this constant fails the suite instead of shipping quietly.
  */
-export declare const PLUGIN_VERSION: "0.48.2";
+export declare const PLUGIN_VERSION: "0.48.4";
 export declare const CODEX_CHATGPT_PROVIDER_ID: "codex-chatgpt";
 export { MINIMAX_CODE_PROVIDER_ID, MINIMAX_CODE_ROUTE_PREFIX } from './shared/minimax-code-contracts.ts';
 export declare const CODEX_API_BASE: "https://chatgpt.com/backend-api/codex";

package/lib/types/host/common/llm-compat.d.ts

@@ -93,7 +93,9 @@ export type GenerateOptions = Omit<HarnessGenerateOptions, 'messages' | 'tools'>
  * A 0.1.7 `role: 'tool'` message is re-wrapped as the user-role message holding
  * one {@link ToolResultBlock} that the mappers expect, keeping the tool
  * provenance (`kind: 'tool'`) they use to tell a real tool result from a user
- * turn. Everything a newer harness adds beside that keeps its own shape.
+ * turn. A message that already carries that block keeps its own body instead of
+ * nesting a second `tool-result` around it. Everything a newer harness adds
+ * beside that keeps its own shape.
  * @param messages - Messages straight off the request options, in either generation's shape.
  * @returns The same conversation in the pre-0.1.7 vocabulary.
  */

package/lib/types/host/common/llm-compat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"llm-compat.d.ts","sourceRoot":"","sources":["../../../../src/host/common/llm-compat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EACV,YAAY,IAAI,mBAAmB,EACnC,eAAe,IAAI,sBAAsB,EACzC,UAAU,IAAI,iBAAiB,EAChC,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,EACL,QAAQ,EACR,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,UAAU,GAChB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAU,gBAAgB;QACxB,yEAAyE;QACzE,0BAA0B,EAAE;YAAE,IAAI,EAAE,0BAA0B,CAAA;SAAE,GAAG,aAAa,CAAA;KACjF;CACF;AAED,6DAA6D;AAC7D,eAAO,MAAM,0BAA0B,EAAG,0BAAmC,CAAA;AAE7E,2FAA2F;AAC3F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,eAAe,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,GAC5E,eAAe,GACf,iBAAiB,GACjB,gBAAgB,CAAA;AAEpB;;;;;;GAMG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,EAAE,eAAe,GAAG,iBAAiB,GAAG,gBAAgB,CAAC,CAAA;AAEhH,mFAAmF;AACnF,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,mEAAmE;AACnE,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,EAAE,CAAC,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,CAAA;IAC5D,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,CAAA;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAA;CAChC;AAED,KAAK,kBAAkB,GAAG,sBAAsB,SAAS;IAAE,WAAW,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,GAAG,OAAO,GAAG,OAAO,CAAA;AAE5G,4DAA4D;AAC5D,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG;IACjF,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,iBAAiB,GAAG;QAAE,YAAY,CAAC,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IAC1D,WAAW,CAAC,EAAE,kBAAkB,CAAA;CACjC,CAAA;AAYD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CA6BrF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAEzF"}
+{"version":3,"file":"llm-compat.d.ts","sourceRoot":"","sources":["../../../../src/host/common/llm-compat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EACV,YAAY,IAAI,mBAAmB,EACnC,eAAe,IAAI,sBAAsB,EACzC,UAAU,IAAI,iBAAiB,EAChC,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,EACL,QAAQ,EACR,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,UAAU,GAChB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAU,gBAAgB;QACxB,yEAAyE;QACzE,0BAA0B,EAAE;YAAE,IAAI,EAAE,0BAA0B,CAAA;SAAE,GAAG,aAAa,CAAA;KACjF;CACF;AAED,6DAA6D;AAC7D,eAAO,MAAM,0BAA0B,EAAG,0BAAmC,CAAA;AAE7E,2FAA2F;AAC3F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,eAAe,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,GAC5E,eAAe,GACf,iBAAiB,GACjB,gBAAgB,CAAA;AAEpB;;;;;;GAMG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,EAAE,eAAe,GAAG,iBAAiB,GAAG,gBAAgB,CAAC,CAAA;AAEhH,mFAAmF;AACnF,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,mEAAmE;AACnE,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,EAAE,CAAC,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,CAAA;IAC5D,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,CAAA;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAA;CAChC;AAED,KAAK,kBAAkB,GAAG,sBAAsB,SAAS;IAAE,WAAW,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,GAAG,OAAO,GAAG,OAAO,CAAA;AAE5G,4DAA4D;AAC5D,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG;IACjF,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,iBAAiB,GAAG;QAAE,YAAY,CAAC,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IAC1D,WAAW,CAAC,EAAE,kBAAkB,CAAA;CACjC,CAAA;AAuDD;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CA+BrF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAEzF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddyskywalker/dsh-chatgpt-subscription",
-  "version": "0.48.2",
+  "version": "0.48.4",
   "description": "DSH provider plugin for Codex access through a ChatGPT subscription.",
   "icon": "./icon.svg",
   "author": {