@eddyskywalker/dsh-chatgpt-subscription 0.1.23 → 0.1.25

package/lib/index.js

@@ -1155,9 +1155,39 @@ function hiddenSandboxControlToolNames(options) {
 	const retryTools = recentSandboxRetryToolNames(options.messages);
 	return new Set(options.tools?.filter((tool) => hasSandboxControls(tool.parameters) && !retryTools.has(tool.name)).map((tool) => tool.name) ?? []);
 }
+function createCallIdNormalizer() {
+	const normalizedByOriginal = /* @__PURE__ */ new Map();
+	const originalByNormalized = /* @__PURE__ */ new Map();
+	return (value) => {
+		const original = String(value);
+		const existing = normalizedByOriginal.get(original);
+		if (existing !== void 0) return existing;
+		const claim = (candidate) => {
+			const owner = originalByNormalized.get(candidate);
+			if (owner !== void 0 && owner !== original) return false;
+			normalizedByOriginal.set(original, candidate);
+			originalByNormalized.set(candidate, original);
+			return true;
+		};
+		if (original.length <= 64 && claim(original)) return original;
+		for (let attempt = 0;; attempt++) {
+			const material = attempt === 0 ? original : `${original}\0${attempt}`;
+			const candidate = `dsh_${createHash("sha256").update(material).digest("hex").slice(0, 60)}`;
+			if (claim(candidate)) return candidate;
+		}
+	};
+}
+function normalizeReplayCallIds(items, normalizeCallId) {
+	if (items === null) return null;
+	return items.map((item) => typeof item.call_id === "string" ? {
+		...item,
+		call_id: normalizeCallId(item.call_id)
+	} : item);
+}
 async function buildResponsesPayload(options, attachments, localRawImages = {}) {
 	const sandboxRetryTools = recentSandboxRetryToolNames(options.messages);
 	const resolveLocalRawImages = supportsImageInput(options);
+	const normalizeCallId = createCallIdNormalizer();
 	const instructionParts = [
 		options.system?.trim(),
 		...options.messages.filter((message) => message.role === "system").map((message) => blocksToText(message.content).trim()),
@@ -1174,7 +1204,7 @@ async function buildResponsesPayload(options, attachments, localRawImages = {})
 	};
 	for (const message of options.messages) {
 		if (message.role === "system") continue;
-		const replayItems = replayOutputItems(message);
+		const replayItems = normalizeReplayCallIds(replayOutputItems(message), normalizeCallId);
 		if (message.role === "assistant" && replayItems !== null) {
 			input.push(...replayItems);
 			for (const item of replayItems) if (item.type === "function_call" && typeof item.call_id === "string") knownToolCalls.set(item.call_id, typeof item.name === "string" ? item.name : void 0);
@@ -1185,12 +1215,13 @@ async function buildResponsesPayload(options, attachments, localRawImages = {})
 					content
 				});
 			}
-			appendMissingToolCalls(input, knownToolCalls, message);
+			appendMissingToolCalls(input, knownToolCalls, message, normalizeCallId);
 			continue;
 		}
 		const toolResult = message.content.find((block) => block.type === "tool-result");
 		if (toolResult?.type === "tool-result") {
-			const callId = String(toolResult.toolCallId);
+			const originalCallId = String(toolResult.toolCallId);
+			const callId = normalizeCallId(originalCallId);
 			const rawOutput = blocksToText(toolResult.content);
 			if (knownToolCalls.has(callId)) {
 				const output = toolResult.isError && knownToolCalls.get(callId) === "run_code" ? runCodeErrorOutput(rawOutput) : rawOutput;
@@ -1203,7 +1234,7 @@ async function buildResponsesPayload(options, attachments, localRawImages = {})
 				role: "user",
 				content: [{
 					type: "input_text",
-					text: `Tool result for unavailable call ${callId}${toolResult.isError ? " (error)" : ""}:\n${rawOutput}`
+					text: `Tool result for unavailable call ${originalCallId}${toolResult.isError ? " (error)" : ""}:\n${rawOutput}`
 				}]
 			});
 			continue;
@@ -1213,7 +1244,7 @@ async function buildResponsesPayload(options, attachments, localRawImages = {})
 			role: message.role,
 			content
 		});
-		if (message.role === "assistant") appendMissingToolCalls(input, knownToolCalls, message);
+		if (message.role === "assistant") appendMissingToolCalls(input, knownToolCalls, message, normalizeCallId);
 	}
 	const payload = {
 		model: options.model,
@@ -1343,10 +1374,10 @@ function recentSandboxRetryToolNames(messages) {
 function isSandboxDenial(output) {
 	return /\[sandbox:\s*file access denied\b/i.test(output) || /\bsandbox\b.*\b(?:access denied|denied access|EPERM)\b/i.test(output);
 }
-function appendMissingToolCalls(input, knownToolCalls, message) {
+function appendMissingToolCalls(input, knownToolCalls, message, normalizeCallId) {
 	for (const block of message.content) {
 		if (block.type !== "tool-call") continue;
-		const callId = String(block.id);
+		const callId = normalizeCallId(block.id);
 		if (knownToolCalls.has(callId)) continue;
 		input.push({
 			type: "function_call",

package/lib/types/host/responses-mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"responses-mapper.d.ts","sourceRoot":"","sources":["../../../src/host/responses-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAsC,MAAM,6BAA6B,CAAA;AACtG,OAAO,KAAK,EAAgB,eAAe,EAAW,MAAM,sBAAsB,CAAA;AAGlF,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC/D,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACrC,MAAM,EAAE,IAAI,CAAA;IACZ,KAAK,EAAE,KAAK,CAAA;CACb;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEhG,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,SAAS,CAAA;CACpB;AAQD,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,CAKnF;AAED,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,EAC/F,cAAc,GAAE,oBAAyB,GACxC,OAAO,CAAC,gBAAgB,CAAC,CA+F3B"}
+{"version":3,"file":"responses-mapper.d.ts","sourceRoot":"","sources":["../../../src/host/responses-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAsC,MAAM,6BAA6B,CAAA;AACtG,OAAO,KAAK,EAAgB,eAAe,EAAW,MAAM,sBAAsB,CAAA;AAIlF,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC/D,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACrC,MAAM,EAAE,IAAI,CAAA;IACZ,KAAK,EAAE,KAAK,CAAA;CACb;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEhG,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,SAAS,CAAA;CACpB;AAQD,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,CAKnF;AAsCD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,EAC/F,cAAc,GAAE,oBAAyB,GACxC,OAAO,CAAC,gBAAgB,CAAC,CAiG3B"}

package/package.json

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