@askdkc/dsh-cli 0.13.0 → 0.13.2

package/lib/types/dsh-adapter/channel/session-fork.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-fork.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-fork.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAa,KAAK,OAAO,EAAqB,MAAM,0BAA0B,CAAA;AASrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC,CAAA;AAE9F,8EAA8E;AAC9E,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,IAAI,OAAO,CAAA;IACjB,oBAAoB,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC,CAAA;CACrH,SAEgB,OAAO,CAAC,OAAO,CAAC,CAoFlC"}
+{"version":3,"file":"session-fork.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-fork.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAa,KAAK,OAAO,EAAqB,MAAM,0BAA0B,CAAA;AAUrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC,CAAA;AAE9F,8EAA8E;AAC9E,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,IAAI,OAAO,CAAA;IACjB,oBAAoB,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC,CAAA;CACrH,SAEgB,OAAO,CAAC,OAAO,CAAC,CAiFlC"}

package/lib/types/dsh-adapter/channel/session-fork.js

@@ -2,6 +2,7 @@ import { SessionId } from '@deepseek-ai/dsh-session';
 import { randomUUID } from 'node:crypto';
 import { t } from '../../i18n.js';
 import { resolveDshProfileName } from '../../update.js';
+import { resumeCommand } from '../../sessionHistory.js';
 import { appendSessionTitle, liveSessionCreateOptions, sliceLiveSessionSeed } from '../compat/index.js';
 import { composePreset, runningPresetOf } from '../presets.js';
 import { attachSessionToWorkspace } from '../workspace.js';
@@ -98,10 +99,7 @@ export function createForkSessionAction(ctx, state, deps) {
             reservation.abandon();
         }
         const profile = resolveDshProfileName();
-        const boot = profile === undefined ? 'dsh --config cordis.yml' : `dsh --profile ${profile}`;
-        const command = process.platform === 'win32'
-            ? `dsh-tui --resume ${childId}`
-            : `DSH_TUI_RESUME_SESSION=${childId} ${boot}`;
+        const command = resumeCommand(profile, String(childId));
         deps.notify(t('fork-done', { id: String(childId), command }), { timeoutMs: 8000 });
         return true;
     };

package/lib/types/dsh-adapter/plugin.js

@@ -27,7 +27,7 @@ import { readEffortPref } from '../effortPrefs.js';
 import { composePreset, filterMinimalPresetTools, resolvePersistedPreset, resolvePersistedRoute, runningPresetOf } from './presets.js';
 import { registerBundledPresets } from './bundled-presets.js';
 import { registerTuiSessionEventTypes, snapshotLiveSessionEvents } from './compat/index.js';
-import { clearResumeTarget, resumeTargetFromArgv, writeResumeTarget } from '../sessionHistory.js';
+import { clearResumeTarget, resumeCommand, resumeTargetFromArgv, writeResumeTarget } from '../sessionHistory.js';
 import { readHomePrefs } from '../homePrefs.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
 import { beginRestartAttempt, checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isStandaloneRuntime, isVersionNewer, logRestartEvent, resolveDshProfileName, resolveTuiUpdateTarget, restartTui, updateTuiAndRestart, writeHandoffNotice } from '../update.js';
@@ -1975,20 +1975,6 @@ export function handleStartupError(ctx, error) {
 function disposeRootAndExit(ctx, code) {
     disposeRootAndThen(ctx, () => process.exit(code), code);
 }
-/**
- * The real way back into a session after the TUI process is gone. The
- * package ships no `dsh-tui` bin — resuming means feeding the session id
- * through `DSH_TUI_RESUME_SESSION` (what cordis.patch.yml's `sessionId`
- * reads) and
- * booting the same profile; on Windows the repo's dsh-tui.cmd wrapper
- * does this via --resume + ~/.dsh-tui/resume.txt.
- */
-function resumeCommand(profile, sessionId) {
-    const boot = profile === undefined ? 'dsh --config cordis.yml' : `dsh --profile ${profile}`;
-    return process.platform === 'win32'
-        ? `dsh-tui --resume ${sessionId}`
-        : `DSH_TUI_RESUME_SESSION=${sessionId} ${boot}`;
-}
 /**
  * Dispose the Cordis tree, then run a process-level handoff action. The
  * fallback exit keeps the caller's intended code when disposal stalls — the

package/lib/types/sessionHistory.d.ts

@@ -1,3 +1,5 @@
+/** Render exit and fork guidance using the installed CLI for its own profile. */
+export declare function resumeCommand(profile: string | undefined, sessionId: string, platform?: NodeJS.Platform): string;
 /**
  * Store the session to resume and report the launcher invocation.
  * @param sessionId - Session id for `dsh-tui --resume` on the next launch.

package/lib/types/sessionHistory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionHistory.d.ts","sourceRoot":"","sources":["../../src/sessionHistory.ts"],"names":[],"mappings":"AAyCA;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGzD;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,IAAI,IAAI,CAMxC;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAOrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAehF;AAED;;;GAGG;AACH,wBAAgB,YAAY,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB/D;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAUpD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAYrD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAiBxE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAQ7D;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAU9D"}
+{"version":3,"file":"sessionHistory.d.ts","sourceRoot":"","sources":["../../src/sessionHistory.ts"],"names":[],"mappings":"AAoBA,iFAAiF;AACjF,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,kBAAmB,GAAG,MAAM,CAMjH;AAuBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGzD;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,IAAI,IAAI,CAMxC;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAOrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAehF;AAED;;;GAGG;AACH,wBAAgB,YAAY,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB/D;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAUpD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAYrD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAiBxE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAQ7D;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAU9D"}

package/lib/types/sessionHistory.js

@@ -16,6 +16,14 @@ const RESUME_FILE = join(DIR, 'resume.txt');
 const LAST_USED_FILE = join(DIR, 'last-used.json');
 let lastUsedStamp;
 let lastUsedCache;
+/** Render exit and fork guidance using the installed CLI for its own profile. */
+export function resumeCommand(profile, sessionId, platform = process.platform) {
+    const boot = profile === 'dsh-cli' ? 'dsh-cli'
+        : profile === undefined ? 'dsh --config cordis.yml' : `dsh --profile ${profile}`;
+    return platform === 'win32'
+        ? `${boot} --resume ${sessionId}`
+        : `DSH_TUI_RESUME_SESSION=${sessionId} ${boot}`;
+}
 function lastUsedFileStamp() {
     try {
         const stats = statSync(LAST_USED_FILE);

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

@@ -158,13 +158,22 @@ export class OpenCodeAdapter extends LlmAdapter {
                         }
                     const input = part.usage.inputTokens;
                     const output = part.usage.outputTokens;
-                    yield { type: 'usage', usage: { inputTokens: input.noCache ?? Math.max(0, (input.total ?? 0) - (input.cacheRead ?? 0) - (input.cacheWrite ?? 0)), outputTokens: output.total ?? 0, cacheReadTokens: input.cacheRead, cacheWriteTokens: input.cacheWrite, reasoningTokens: output.reasoning, ...(input.total !== undefined && output.total !== undefined ? { totalTokens: input.total + output.total } : {}) } };
+                    // DSH snapshots chunks losslessly: optional SDK values must be absent,
+                    // not own properties containing undefined. Preserve reported zeroes.
+                    yield { type: 'usage', usage: {
+                            inputTokens: input.noCache ?? Math.max(0, (input.total ?? 0) - (input.cacheRead ?? 0) - (input.cacheWrite ?? 0)),
+                            outputTokens: output.total ?? 0,
+                            ...(input.cacheRead !== undefined ? { cacheReadTokens: input.cacheRead } : {}),
+                            ...(input.cacheWrite !== undefined ? { cacheWriteTokens: input.cacheWrite } : {}),
+                            ...(output.reasoning !== undefined ? { reasoningTokens: output.reasoning } : {}),
+                            ...(input.total !== undefined && output.total !== undefined ? { totalTokens: input.total + output.total } : {}),
+                        } };
                     if (!blocks.size)
                         throw new LlmError('OpenCode returned no content', 'EMPTY_RESPONSE');
                     const finish = part.finishReason.unified;
                     if (finish === 'error' || finish === 'content-filter' || finish === 'other')
                         throw new LlmError(`OpenCode generation ended: ${finish}`, 'PROVIDER_ERROR');
-                    yield { type: 'finish', reason: { kind: finish === 'tool-calls' ? 'tool-calls' : finish === 'length' ? 'max-tokens' : 'stop' }, replayState: { response: { kind: 'dsh-opencode', version: 1, protocol: descriptor.protocol, provider: options.provider, model: descriptor.id, responseId }, blocks: [...blocks.values()].map(entry => ({ type: entry.block.type, ...(entry.providerOptions ? { providerOptions: entry.providerOptions } : {}) })) } };
+                    yield { type: 'finish', reason: { kind: finish === 'tool-calls' ? 'tool-calls' : finish === 'length' ? 'max-tokens' : 'stop' }, replayState: { response: { kind: 'dsh-opencode', version: 1, protocol: descriptor.protocol, provider: options.provider, model: descriptor.id, ...(responseId !== undefined ? { responseId } : {}) }, blocks: [...blocks.values()].map(entry => ({ type: entry.block.type, ...(entry.providerOptions ? { providerOptions: entry.providerOptions } : {}) })) } };
                     return;
                 }
             }

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.0",
+  "version": "0.13.2",
   "description": "Interactive terminal interface for DeepSeek Harness agents, sessions and tools.",
   "keywords": [
     "dsh",