@askdkc/dsh-cli 0.13.1 → 0.13.2

package/node_modules/@askdkc/dsh-auth/lib/opencode-codec.js

@@ -1,10 +1,12 @@
 /** Convert DSH conversation blocks into low-level SDK prompts without an agent loop. */
 import { LlmError, projectToolUpdates, fileHandleText } from '@deepseek-ai/dsh-llm';
 import { projectReplay, requireReplaySignature } from './opencode-replay.js';
+import { createHash } from 'node:crypto';
 export async function encodePrompt(options, model, attachments, warn) {
     const prompt = [];
     const names = new Map();
     const callIds = new Map();
+    const wireIds = new Set();
     if (options.system)
         prompt.push({ role: 'system', content: options.system });
     const projection = projectToolUpdates(options.messages, options.tools, undefined, options.toolHistory);
@@ -61,14 +63,24 @@ export async function encodePrompt(options, model, attachments, warn) {
             else if (block.type === 'file')
                 content.push({ type: 'text', text: fileHandleText(block.attachment, attachments?.()?.fileHostPath(block.attachment)) });
             else if (block.type === 'reasoning' && message.role === 'assistant') {
+                if (replay.foreign)
+                    continue;
                 requireReplaySignature(block, model.protocol, providerOptions);
                 content.push({ type: 'reasoning', text: block.text, providerOptions });
             }
             else if (block.type === 'tool-call' && message.role === 'assistant') {
-                if (model.protocol === 'responses' && block.id.includes('|') && !replay.callIds.has(block.id))
+                // Foreign pi Responses ids contain an opaque item suffix. Give the
+                // call/result pair a portable id without restoring that foreign item.
+                if (replay.foreign && model.protocol === 'responses' && block.id.includes('|'))
+                    callIds.set(block.id, `dsh_${createHash('sha256').update(block.id).digest('hex').slice(0, 48)}`);
+                if (model.protocol === 'responses' && block.id.includes('|') && !callIds.has(block.id))
                     throw new LlmError('Cannot restore legacy Responses tool call pairing', 'INVALID_REPLAY_STATE');
                 if (names.has(block.id))
                     throw new LlmError('Duplicate stored tool call id', 'INVALID_REPLAY_STATE');
+                const wireId = callIds.get(block.id) ?? block.id;
+                if (wireIds.has(wireId))
+                    throw new LlmError('Duplicate wire tool call id', 'INVALID_REPLAY_STATE');
+                wireIds.add(wireId);
                 if (model.protocol === 'google' && model.reasoning && !providerOptions?.google?.thoughtSignature && !message.content.slice(0, index).some(part => part.type === 'tool-call'))
                     throw new LlmError('Cannot replay Google tool call without its verified thought signature', 'INVALID_REPLAY_STATE');
                 names.set(block.id, block.name);
@@ -79,7 +91,7 @@ export async function encodePrompt(options, model, attachments, warn) {
                 catch {
                     throw new LlmError('Stored tool arguments are not valid JSON', 'INVALID_REPLAY_STATE');
                 }
-                content.push({ type: 'tool-call', toolCallId: callIds.get(block.id) ?? block.id, toolName: block.name, input, providerOptions });
+                content.push({ type: 'tool-call', toolCallId: wireId, toolName: block.name, input, providerOptions });
             }
             else if (block.type === 'image') {
                 if (message.role === 'assistant')
@@ -87,7 +99,8 @@ export async function encodePrompt(options, model, attachments, warn) {
                 content.push(await imagePart(block));
             }
         }
-        prompt.push({ role: message.role, content });
+        if (content.length || !replay.foreign)
+            prompt.push({ role: message.role, content });
     }
     return prompt;
 }

package/node_modules/@askdkc/dsh-auth/lib/opencode-replay.d.ts

@@ -8,6 +8,7 @@ export interface ReplayProjection {
     blocks: (SharedV4ProviderOptions | undefined)[];
     callIds: Map<string, string>;
     trusted: boolean;
+    foreign: boolean;
 }
 /** Validate the entire aligned envelope before restoring any signature or item id. */
 export declare function projectReplay(source: unknown, content: readonly ContentBlock[], model: OpenCodeModel, route: string, warn?: (reason: string) => void): ReplayProjection;

package/node_modules/@askdkc/dsh-auth/lib/opencode-replay.js

@@ -33,9 +33,14 @@ function completeResponseSignatures(blocks, content) {
 const APIS = { messages: 'anthropic-messages', responses: 'openai-responses', chat: 'openai-completions', google: 'google-generative-ai' };
 /** Validate the entire aligned envelope before restoring any signature or item id. */
 export function projectReplay(source, content, model, route, warn) {
-    const empty = () => ({ blocks: content.map(() => undefined), callIds: new Map(), trusted: false });
     const message = record(source);
     const envelope = record(message?.replayState);
+    // A model switch deliberately discards provider-specific replay data. It is
+    // distinct from a damaged native envelope, whose signature checks still apply.
+    const foreign = typeof message?.provider === 'string' && !!message.provider && typeof message.model === 'string' && !!message.model && (message.provider !== route || message.model !== model.id);
+    const empty = () => ({ blocks: content.map(() => undefined), callIds: new Map(), trusted: false, foreign });
+    if (foreign)
+        return empty();
     if (!envelope) {
         if (message?.replayState !== undefined)
             warn?.('OpenCode history: malformed replay envelope; retaining message content');
@@ -122,7 +127,7 @@ export function projectReplay(source, content, model, route, warn) {
         });
         if (model.protocol === 'responses')
             completeResponseSignatures(blocks, content);
-        return { blocks, callIds, trusted: true };
+        return { blocks, callIds, trusted: true, foreign: false };
     }
     catch (error) {
         warn?.(`OpenCode history: ${error instanceof Error ? error.message : 'invalid replay'}; retaining message content`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askdkc/dsh-cli",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "Interactive terminal interface for DeepSeek Harness agents, sessions and tools.",
   "keywords": [
     "dsh",