@xp266/dshtui 0.1.0 → 0.1.1

package/bin/dshtui.js

@@ -29,7 +29,11 @@ function fail(message) {
   process.exit(1)
 }
 
-const dshProbe = spawnSync('dsh', ['--version'], { stdio: 'ignore', shell: process.platform === 'win32' })
+// Windows resolves `dsh` through a .cmd shim, which only spawns with a
+// shell; the command line is built as one quoted string there because
+// passing an args array alongside shell:true is deprecated (DEP0190).
+const windows = process.platform === 'win32'
+const dshProbe = spawnSync('dsh', ['--version'], { stdio: 'ignore', shell: windows })
 if (dshProbe.error !== undefined) {
   fail('the dsh CLI was not found on PATH; install it with: npm install -g @deepseek-ai/dsh')
 }
@@ -47,11 +51,11 @@ if (!existsSync(profileDir)) {
 }
 
 const argv = process.argv.slice(2)
-const child = spawn('dsh', ['--profile', profile, ...argv], {
+const quote = arg => /^[A-Za-z0-9_@%+=:,./-]+$/.test(arg) ? arg : `"${arg.replaceAll('"', '\\"')}"`
+const command = ['dsh', '--profile', profile, ...argv].map(quote).join(' ')
+const child = spawn(windows ? command : 'dsh', windows ? [] : ['--profile', profile, ...argv], {
   stdio: 'inherit',
-  ...(process.platform === 'win32'
-    ? { shell: true, windowsVerbatimArguments: true }
-    : {}),
+  ...(windows ? { shell: true } : {}),
 })
 child.on('error', () => {
   fail('the dsh CLI was not found on PATH; install it with: npm install -g @deepseek-ai/dsh')

package/cordis.patch.yml

@@ -1,29 +1,14 @@
 - insert:
-    - id: storage
-      name: '@deepseek-ai/dsh-storage'
-    - id: storage-json
-      name: '@deepseek-ai/dsh-storage-json'
-      config:
-        root: !!js dshHomePath('storages')
-    - id: storage-domain
-      name: '@deepseek-ai/dsh-storage-domain'
-      config:
-        backend: json
-    # Persisted title/blank hints so the session picker lists cold sessions
-    # without reading their logs.
-    - id: session-projection-cache
-      name: '@deepseek-ai/dsh-session-projection-cache'
-      config:
-        writeEveryEvents: 200
-        writeIntervalMs: 5000
+    # The durable storage stack (storage, storage-json, storage-domain,
+    # session-projection-cache) is inserted by the dsh-base bundle since
+    # 0.1.2-rc.1 with the same configuration this file used to carry —
+    # re-inserting it here would collide with duplicate loader entry ids.
     - id: workspace
       name: '@deepseek-ai/dsh-workspace'
     - id: agent-presets
       name: '@deepseek-ai/dsh-agent-presets'
       config:
         default: standard
-    - id: cordis-host-runner
-      name: '@deepseek-ai/dsh-cordis-host-runner'
     # Durable image storage comes from the dsh base bundle's attachment-local
     # row; the TUI resolves ctx.attachments at send time and degrades to a
     # plain text message when the service is absent.

package/lib/index.mjs

@@ -14,7 +14,6 @@ import Prism from "prismjs";
 import { marked } from "marked";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { resolveSessionPreset } from "@deepseek-ai/dsh-agent-presets";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
 import { ReasoningEffortId, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { SessionId } from "@deepseek-ai/dsh-session";
@@ -10173,6 +10172,16 @@ async function createChatBridge(ctx) {
 			image: info.inputModalities?.includes("image") ?? false
 		};
 	}
+	function resolveSessionPreset(session) {
+		for (let index = session.events.length - 1; index >= 0; index -= 1) {
+			const event = session.events[index];
+			if (event?.type === "agent-preset/selected") {
+				const data = event.data;
+				if (data?.agentPreset !== void 0) return data.agentPreset;
+			}
+		}
+		return session.header?.agentPreset;
+	}
 	async function createAgent(cwd, presetId) {
 		const resolved = presetId ?? (await presets?.resolve())?.id;
 		const meta = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xp266/dshtui",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "ink-based terminal UI plugin for DeepSeek Harness",
   "engines": {

package/src/chat/bridge.ts

@@ -5,7 +5,6 @@ import type {} from '@deepseek-ai/dsh-credentials'
 import type {} from '@deepseek-ai/dsh-settings'
 import type {} from '@deepseek-ai/dsh-agent-default-model'
 import type {} from '@deepseek-ai/dsh-agent-presets'
-import { resolveSessionPreset } from '@deepseek-ai/dsh-agent-presets'
 import { installModelSelection } from '@deepseek-ai/dsh-agent'
 import type { Agent, AgentHandle, AgentOptions, ModelSelection, ModelSelectionRef } from '@deepseek-ai/dsh-agent'
 import type { ContentBlock, LlmDiscoveredModel } from '@deepseek-ai/dsh-llm'
@@ -136,6 +135,11 @@ async function sendContent(
   agent.followup(createUserMessage({ content, source: { kind: 'user' } }))
 }
 
+interface PresetSessionLike {
+  events: ReadonlyArray<{ type?: string; data?: unknown }>
+  header?: { agentPreset?: string }
+}
+
 export const PERMISSION_PRESETS = ['workspace-write', 'danger-full-access', 'read-only'] as const
 
 interface PermissionPresetsLike {
@@ -663,6 +667,21 @@ export async function createChatBridge(ctx: Context): Promise<ChatBridge> {
     }
   }
 
+  // The 0.1.2 presets package dropped its resolveSessionPreset helper, so the
+  // session log is read directly: the newest selection event wins over the
+  // creation-time header value, matching the upstream semantics on every
+  // host version the peer range admits.
+  function resolveSessionPreset(session: PresetSessionLike): string | undefined {
+    for (let index = session.events.length - 1; index >= 0; index -= 1) {
+      const event = session.events[index]
+      if (event?.type === 'agent-preset/selected') {
+        const data = event.data as { agentPreset?: string } | undefined
+        if (data?.agentPreset !== undefined) return data.agentPreset
+      }
+    }
+    return session.header?.agentPreset
+  }
+
   async function createAgent(cwd: string, presetId?: string): Promise<AgentHandle> {
     const resolved = presetId ?? (await presets?.resolve())?.id
     const meta = { cwd, ...(resolved === undefined ? {} : { agentPreset: resolved }) }
@@ -701,7 +720,7 @@ export async function createChatBridge(ctx: Context): Promise<ChatBridge> {
     const setup = async (agentCtx: Context) => {
       installSelection(agentCtx)
       const session = agentCtx.agent?.session
-      const resolved = session === undefined ? undefined : resolveSessionPreset(session)
+      const resolved = session === undefined ? undefined : resolveSessionPreset(session as PresetSessionLike)
       await presets?.mount(agentCtx, resolved)
     }
     const spawnResumedAgent = async (snapshot: { session: { cwd?: string }; events: SessionEvent[] }): Promise<AgentHandle> => {
@@ -809,7 +828,7 @@ export async function createChatBridge(ctx: Context): Promise<ChatBridge> {
   }
 
   function currentPreset(): string {
-    const resolved = resolveSessionPreset(activeAgent.session)
+    const resolved = resolveSessionPreset(activeAgent.session as PresetSessionLike)
     return resolved ?? presets?.defaultId ?? 'standard'
   }