@deepseek-harness-tui/dsh-tui 0.7.2 → 0.8.0

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

@@ -300,6 +300,17 @@ export function createChannel(ctx, initialAgent, options) {
     // the degraded-boot warning for profile launches.
     const workspaceService = ctx.get('tuiWorkspaces') ?? createLocalWorkspaceRuntime();
     const commandTrees = ctx.get('tuiCommandTrees');
+    // The `/settings` screen reads its host on EVERY render, so the host must
+    // be a stable object: a fresh literal per call would re-fire the screen's
+    // host-keyed effects endlessly (render → new host → effect → state →
+    // render). The underlying services are fixed for the channel's lifetime,
+    // so compute once and cache.
+    let settingsHostCache;
+    let settingsHostResolved = false;
+    // Plugin scene runtime (optional service, same degradation rule as
+    // tuiWorkspaces/tuiCommandTrees): mounted by the bundle patch's
+    // dsh-tui-scenes row; absent the row, `pluginScene` simply stays undefined.
+    const sceneRuntime = ctx.get('tuiScenes');
     // Shift+Tab session-mode cycle: cordis.yml `modes` wins; absent/empty/
     // atom-less → the built-in default/plan/full cycle (sessionModes.ts).
     const { modes: sessionModes, dropped: droppedModeIds } = resolveSessionModes(options.modes);
@@ -641,6 +652,7 @@ export function createChannel(ctx, initialAgent, options) {
         modeIndex: 0,
         workingActivity: undefined,
         activityFrames: options.activityFrames,
+        diffLayout: options.diffLayout ?? 'auto',
         activityEnabled: options.activity !== false,
         contextBarEnabled: options.contextBar !== false,
         agentPreset: options.agentPreset,
@@ -1452,6 +1464,12 @@ export function createChannel(ctx, initialAgent, options) {
                 }
             }, item.timeoutMs);
         },
+        setDiffLayout(layout) {
+            if (layout === state.diffLayout)
+                return;
+            state.diffLayout = layout;
+            state.emit();
+        },
         setActivityFrames(name) {
             if (!isPresetName(name)) {
                 state.notify(t('unknown-activity-preset', { name }), { color: 'error' });
@@ -1561,6 +1579,84 @@ export function createChannel(ctx, initialAgent, options) {
             return Promise.all(providers.map(provider => llm.listModels(provider.id).catch(() => [])))
                 .then(lists => lists.flat());
         },
+        async listSkills() {
+            // snapshot() over list(): only a COMPLETE observation is authoritative
+            // (same contract as the skill-command merge above) — a partial catalog
+            // must surface as "failed", not as a misleading near-empty picker.
+            const registry = skillRegistryFor(agent);
+            if (registry === undefined)
+                return [];
+            try {
+                const observation = await registry.snapshot(skillViewOptions(agent));
+                if (!observation.complete)
+                    return undefined;
+                return observation.skills.map(skill => ({
+                    name: skill.name,
+                    description: skill.description,
+                    userInvocable: isUserInvocable(skill),
+                    source: skill.source,
+                }));
+            }
+            catch {
+                return undefined;
+            }
+        },
+        async describeCredential(ref) {
+            const credentials = ctx.get('credentials');
+            if (!credentials)
+                return undefined;
+            return credentials.describe(ref);
+        },
+        settingsHost() {
+            if (settingsHostResolved)
+                return settingsHostCache;
+            settingsHostResolved = true;
+            // The `/settings` screen's runtime surface, over the same dsh-base
+            // seams the `/provider` wizard uses: settings (namespace descriptors +
+            // revision-fenced mutate) and credentials (secret writes). Structurally
+            // typed like the other optional seams in this file.
+            const settings = ctx.get('settings');
+            const credentials = ctx.get('credentials');
+            if (!settings)
+                return undefined;
+            settingsHostCache = {
+                listNamespaces() {
+                    // redactSecrets: the screen never renders a secret literal — secret
+                    // fields are write-only controls over the credentials seam.
+                    return settings.describe({ redactSecrets: true }).map(descriptor => ({
+                        ns: descriptor.ns,
+                        revision: descriptor.revision,
+                        applies: descriptor.applies,
+                        value: descriptor.value,
+                        user: descriptor.user,
+                    }));
+                },
+                write(ns, ops, expectedRevision) {
+                    return settings.mutate(ns, ops, expectedRevision);
+                },
+                async credentialConfigured(ref) {
+                    // The environment shadows the store (providerSetup.envShadows), so
+                    // an env-provided key counts as configured.
+                    if (process.env[ref] !== undefined)
+                        return true;
+                    return credentials !== undefined && (await credentials.resolve(ref)) !== undefined;
+                },
+                async writeCredential(ref, value) {
+                    if (!credentials)
+                        throw new Error('credentials service unavailable');
+                    await credentials.set(ref, value);
+                },
+            };
+            return settingsHostCache;
+        },
+        settingsSections() {
+            const sections = ctx.get('tuiSettingsSections');
+            return sections?.list() ?? [];
+        },
+        subscribeSettingsSections(listener) {
+            const sections = ctx.get('tuiSettingsSections');
+            return sections?.subscribe(listener) ?? (() => { });
+        },
         providerSetup() {
             // The `/provider` wizard's runtime surface, over the dsh-base seams:
             // settings (profile persistence), credentials (key storage) and the
@@ -1757,6 +1853,13 @@ export function createChannel(ctx, initialAgent, options) {
         runExternalCommand(name, rawInput) {
             return executeRegistryCommand(name, rawInput);
         },
+        pluginScene: sceneRuntime?.active,
+        openPluginScene(id) {
+            return sceneRuntime?.open(id) ?? false;
+        },
+        closePluginScene() {
+            sceneRuntime?.close();
+        },
         pushLocal(title, lines) {
             state.rows.push({ id: nextRowId++, kind: 'local', text: title });
             for (const line of lines) {
@@ -1937,6 +2040,7 @@ export function createChannel(ctx, initialAgent, options) {
         },
         releaseContributions() {
             releaseSkillCommands();
+            unsubscribeScenes?.();
         },
         traceEvents() {
             // Immutable per-append snapshot (dsh-session caches the frozen array);
@@ -2232,25 +2336,38 @@ export function createChannel(ctx, initialAgent, options) {
                 const dispose = commandService.register({
                     name,
                     description,
-                    // The injected body is the payload; recording the (empty) raw input
-                    // would only duplicate the command name into the session log.
+                    // The invocation line is re-submitted as a user message (kernel
+                    // path) or replaced by the injected body (fallback) — recording
+                    // the raw input here too would duplicate it in the session log.
                     recordInput: false,
-                    handler: async ({ agent: invoker, signal }) => {
+                    handler: async ({ agent: invoker, rawInput, signal }) => {
+                        // Kernel gesture path: the `skill` tool and dsh-tool-skill's
+                        // pre-step boundary mount together, so a visible `skill` tool
+                        // means the boundary scans this agent's user messages for the
+                        // `/name` gesture and injects the rendered body host-side —
+                        // the same architecture as the web client's ui-skill. Routing
+                        // through it keeps the user's args in the transcript message
+                        // (rawInput rides along instead of being swallowed by the
+                        // command layer) and matches the kernel's own adjudication.
+                        const tools = ctx.get('tools');
+                        if (tools?.get('skill', invoker) !== undefined) {
+                            deliverUserText(`/${name}${rawInput}`, 'followup');
+                            // Silent success: the submitted message is the feedback.
+                            return { kind: 'success' };
+                        }
+                        // Fallback for compositions without dsh-tool-skill (e.g. the
+                        // minimal preset): inject the rendered body directly, in the
+                        // official user-explicit invocation shape (dsh-skill's
+                        // SkillInvocationSource).
                         const view = { ...skillViewOptions(invoker), signal };
                         const skill = await skillRegistryFor(invoker)?.get(name, view);
                         if (skill === undefined || !isUserInvocable(skill)) {
                             return { kind: 'error', text: t('skill-unavailable', { name }) };
                         }
-                        // The official user-explicit invocation shape (dsh-skill's
-                        // SkillInvocationSource): the rendered body rides as instructions
-                        // the model follows, and transcript consumers present it from the
-                        // source metadata instead of re-parsing model-facing text.
                         invoker.followup(createUserMessage({
                             content: [{ type: 'text', text: renderSkillContent(skill) }],
                             source: { kind: 'skill-invocation', name, form: 'instructions' },
                         }));
-                        // Silent success: the agent visibly starts working on the skill,
-                        // which is the feedback (CC shows no banner either).
                         return { kind: 'success' };
                     },
                 });
@@ -2265,6 +2382,17 @@ export function createChannel(ctx, initialAgent, options) {
     ctx.on('skills/change', () => {
         void refreshSkillCommands();
     });
+    /**
+     * Mirror the scene runtime's active scene into channel state, so screens
+     * swap to it through the ordinary version-bump re-render instead of a
+     * second subscription channel.
+     */
+    const unsubscribeScenes = sceneRuntime?.subscribe(() => {
+        if (state.pluginScene === sceneRuntime.active)
+            return;
+        state.pluginScene = sceneRuntime.active;
+        state.emit();
+    });
     /** See {@link Channel.releaseContributions}. */
     const releaseSkillCommands = () => {
         if (skillCommandsRetry !== undefined)
@@ -2595,12 +2723,18 @@ ${output}
                 break;
             }
             case 'assistant/message': {
-                const row = ensureStreaming(event.seq);
-                row.time = event.time;
                 const text = textOf(event.data.message.content);
-                if (text)
-                    row.text = text;
-                row.streaming = false;
+                // Reasoning/tool-only steps emit no text: creating an assistant row
+                // anyway leaves an empty `●` bullet in the transcript. A pre-existing
+                // streaming row always has text (ensureStreaming is only reached on
+                // non-empty text deltas), so only create one when text arrives.
+                const row = streaming ?? (text ? ensureStreaming(event.seq) : undefined);
+                if (row !== undefined) {
+                    row.time = event.time;
+                    if (text)
+                        row.text = text;
+                    row.streaming = false;
+                }
                 streaming = undefined;
                 if (reasoning !== undefined) {
                     // Seal, don't fold: the per-step duration settles here, but the
@@ -2997,6 +3131,23 @@ ${output}
             }),
         ];
     };
+    // Subagents inherit provider/model from AgentOptions, but resumed TUI
+    // agents can legitimately carry their route only in persisted request
+    // headers. Their child scopes do not share this channel's per-agent
+    // ModelSelectionRef, so fill an otherwise incomplete first request from
+    // the active route. Keep complete child-specific routes authoritative.
+    ctx.on('agent/request', async (_payload, next) => {
+        const resolved = await next();
+        if (typeof resolved.provider === 'string' && resolved.provider.length > 0 &&
+            typeof resolved.model === 'string' && resolved.model.length > 0) {
+            return resolved;
+        }
+        return {
+            ...resolved,
+            provider: state.provider,
+            model: state.model,
+        };
+    });
     bindAgent();
     // Cordis owns the Channel lifetime. Rebinding handles the common case;
     // this effect closes the final timer when the Channel's context unloads.

package/lib/types/dsh-adapter/contract.d.ts

@@ -5,7 +5,7 @@ export declare const UPSTREAM_VALIDATED_VERSION = "0.1.0-rc.6";
  */
 export declare const UPSTREAM_FRAMEWORK_MAJORS: Record<string, number>;
 /** Official packages the adapter consumes at runtime or as types. */
-export declare const UPSTREAM_BLESSED_PACKAGES: readonly ["@deepseek-ai/cordis", "@deepseek-ai/schemastery", "@deepseek-ai/dsh-invariants", "@deepseek-ai/dsh-agent", "@deepseek-ai/dsh-agent-instructions", "@deepseek-ai/dsh-agent-presets", "@deepseek-ai/dsh-commands", "@deepseek-ai/dsh-cordis-host-runner", "@deepseek-ai/dsh-llm", "@deepseek-ai/dsh-persona", "@deepseek-ai/dsh-session", "@deepseek-ai/dsh-skill", "@deepseek-ai/dsh-storage", "@deepseek-ai/dsh-storage-domain", "@deepseek-ai/dsh-storage-json", "@deepseek-ai/dsh-workspace", "@deepseek-ai/dsh-system-prompt", "@deepseek-ai/dsh-terminal", "@deepseek-ai/dsh-terminal-bash", "@deepseek-ai/dsh-tool-ask-user", "@deepseek-ai/dsh-tool-bash-persistent", "@deepseek-ai/dsh-tool-cordis", "@deepseek-ai/dsh-user-approval", "@deepseek-ai/dsh-user-questions"];
+export declare const UPSTREAM_BLESSED_PACKAGES: readonly ["@deepseek-ai/cordis", "@deepseek-ai/schemastery", "@deepseek-ai/dsh-invariants", "@deepseek-ai/dsh-agent", "@deepseek-ai/dsh-agent-instructions", "@deepseek-ai/dsh-agent-presets", "@deepseek-ai/dsh-atomic-write", "@deepseek-ai/dsh-commands", "@deepseek-ai/dsh-cordis-host-runner", "@deepseek-ai/dsh-llm", "@deepseek-ai/dsh-persona", "@deepseek-ai/dsh-session", "@deepseek-ai/dsh-skill", "@deepseek-ai/dsh-storage", "@deepseek-ai/dsh-storage-domain", "@deepseek-ai/dsh-storage-json", "@deepseek-ai/dsh-workspace", "@deepseek-ai/dsh-system-prompt", "@deepseek-ai/dsh-terminal", "@deepseek-ai/dsh-terminal-bash", "@deepseek-ai/dsh-tool-ask-user", "@deepseek-ai/dsh-tool-bash-persistent", "@deepseek-ai/dsh-tool-cordis", "@deepseek-ai/dsh-user-approval", "@deepseek-ai/dsh-user-questions"];
 export interface UpstreamDriftEntry {
     package: string;
     installed: string | undefined;

package/lib/types/dsh-adapter/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/contract.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,0BAA0B,eAAe,CAAA;AAEtD;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAG5D,CAAA;AAED,qEAAqE;AACrE,eAAO,MAAM,yBAAyB,6vBAyB5B,CAAA;AAEV,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB;AAWD,wBAAgB,yBAAyB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAgB9E;AAOD;;;GAGG;AACH,wBAAgB,aAAa,IAAI,kBAAkB,EAAE,CAsBpD"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/contract.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,0BAA0B,eAAe,CAAA;AAEtD;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAG5D,CAAA;AAED,qEAAqE;AACrE,eAAO,MAAM,yBAAyB,8xBA0B5B,CAAA;AAEV,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB;AAWD,wBAAgB,yBAAyB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAgB9E;AAOD;;;GAGG;AACH,wBAAgB,aAAa,IAAI,kBAAkB,EAAE,CAsBpD"}

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

@@ -28,6 +28,7 @@ export const UPSTREAM_BLESSED_PACKAGES = [
     '@deepseek-ai/dsh-agent',
     '@deepseek-ai/dsh-agent-instructions',
     '@deepseek-ai/dsh-agent-presets',
+    '@deepseek-ai/dsh-atomic-write',
     '@deepseek-ai/dsh-commands',
     '@deepseek-ai/dsh-cordis-host-runner',
     '@deepseek-ai/dsh-llm',

package/lib/types/dsh-adapter/index.d.ts

@@ -62,6 +62,10 @@ export interface Config {
      *  persisted in `~/.dsh-tui/agent-preset.json` wins, then the roster
      *  default (`standard`). */
     preset?: string;
+    /** Edit/Write diff presentation: `auto` picks side-by-side on wide
+     *  terminals (≥110 cols) and unified below; `split`/`unified` force one
+     *  layout. Editable live from the `/settings` screen. */
+    diffLayout?: 'auto' | 'split' | 'unified';
     /** Shift+Tab session-mode cycle (array order IS the cycle order; index 0
      *  is the unmarked base mode). Each entry bundles any subset of the
      *  `plan`/`sandbox`/`approval` atoms; absent → the built-in

package/lib/types/dsh-adapter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEzD,eAAO,MAAM,IAAI,YAAY,CAAA;AAU7B,eAAO,MAAM,MAAM,UAAa,CAAA;AAEhC;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;yEAKqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;gDAC4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;gFAE4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;oCACgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;sBAIkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;4BAGwB;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;wDAEoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;kFAC8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;gCAG4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA0BhC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEzD,eAAO,MAAM,IAAI,YAAY,CAAA;AAU7B,eAAO,MAAM,MAAM,UAAa,CAAA;AAEhC;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;yEAKqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;gDAC4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;gFAE4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;oCACgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;sBAIkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;4BAGwB;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;wDAEoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;kFAC8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;gCAG4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;6DAEyD;IACzD,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACzC;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA2BhC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvE"}

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

@@ -27,6 +27,7 @@ export const Config = Schema.object({
     fullscreen: Schema.boolean().default(false),
     lang: Schema.string().required(false),
     preset: Schema.string().required(false),
+    diffLayout: Schema.union(['auto', 'split', 'unified']).default('auto'),
     modes: Schema.array(Schema.object({
         id: Schema.string(),
         label: Schema.string().required(false),

package/lib/types/dsh-adapter/packaged-presets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packaged-presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/packaged-presets.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAA;CACzD;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAmBD,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,MAAwB,GAAG,MAAM,CAQ9E;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,qBAA0B,GAAG,oBAAoB,EAAE,CAkDjG"}
+{"version":3,"file":"packaged-presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/packaged-presets.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAA;CACzD;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAmBD,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,MAAwB,GAAG,MAAM,CAQ9E;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,qBAA0B,GAAG,oBAAoB,EAAE,CAqDjG"}

package/lib/types/dsh-adapter/packaged-presets.js

@@ -56,7 +56,10 @@ export function ensurePackagedPresets(options = {}) {
         const target = join(targetRoot, id);
         if (!existsSync(target)) {
             mkdirSync(targetRoot, { recursive: true });
-            cpSync(source, target, { recursive: true, force: false, errorOnExist: true });
+            // `filter` forces the JS copy path (see src/utils/paths.ts): the native
+            // cpSync fast path fails with EIO or crashes under a non-ASCII home
+            // directory such as `C:\Users\米`.
+            cpSync(source, target, { recursive: true, force: false, errorOnExist: true, filter: () => true });
             results.push({ id, status: 'installed' });
             continue;
         }
@@ -72,7 +75,7 @@ export function ensurePackagedPresets(options = {}) {
         const suffix = `${process.pid}-${randomUUID()}`;
         const staged = join(targetRoot, `.${id}.staged-${suffix}`);
         const backup = join(targetRoot, `.${id}.backup-${suffix}`);
-        cpSync(source, staged, { recursive: true, force: false, errorOnExist: true });
+        cpSync(source, staged, { recursive: true, force: false, errorOnExist: true, filter: () => true });
         try {
             renameSync(target, backup);
             renameSync(staged, target);

package/lib/types/dsh-adapter/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA6BnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2bvE;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA8BnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkgBvE;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}

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

@@ -3,12 +3,15 @@ import React from 'react';
 import { SessionId } from '@deepseek-ai/dsh-session';
 import UserQuestionService from '@deepseek-ai/dsh-user-questions';
 import * as toolAskUser from '@deepseek-ai/dsh-tool-ask-user';
+import { settingsNamespace } from '@deepseek-ai/dsh-settings';
+import Schema from '@deepseek-ai/schemastery';
 import { createChannel } from './channel.js';
 import { createChildStderrReporter, installChildStderrGuard } from './childStderr.js';
 import { logForDebugging } from '../utils/debug.js';
 import { QuestionStore } from './questions.js';
 import { ApprovalStore } from './approvals.js';
 import { registerPackagedSkills } from './packaged-skills.js';
+import { registerPromptDebug } from './promptDebug.js';
 import { readActivityFrames } from '../activityPrefs.js';
 import { readModelPref } from '../modelPrefs.js';
 import { explicitModelRoute, recordedModelRoute, resolveModelRoute, validateModelRoute } from '../modelRoute.js';
@@ -130,6 +133,9 @@ export async function apply(ctx, config) {
     // Packaged skills (/audit, /bug, …): contribute them through the host's
     // skill registry so they resolve with zero manual copying.
     registerPackagedSkills(ctx);
+    // `/debug-prompt` snapshots the final provider-neutral request at the
+    // llm/stream boundary, after every prompt and tool contributor has run.
+    registerPromptDebug(ctx);
     // Yield to an incumbent provider instead of crashing the whole plugin tree
     // (issue #98): the harness allows exactly ONE user-questions provider per
     // context, and stacking this TUI onto a profile that already carries
@@ -211,6 +217,14 @@ export async function apply(ctx, config) {
             'The bundle patch is older than the installed dsh-tui package — update the globally installed dsh-tui launcher to match the profile (issue #183).');
     }
     const workspaceService = mountedWorkspaceService ?? createLocalWorkspaceRuntime();
+    // Same skew guard for the plugin-scene registry (dsh-tui-scenes row): the
+    // channel degrades to never opening scenes when the service is absent, so
+    // say why on profile launches — a plugin's open() otherwise fails with only
+    // its own warn to go on.
+    if (ctx.get('tuiScenes') === undefined && resolveDshProfileName() !== undefined) {
+        ctx.logger.warn('dsh-tui: tuiScenes service is not mounted; plugin scenes will never open. ' +
+            'The bundle patch is older than the installed dsh-tui package — update the globally installed dsh-tui launcher to match the profile (issue #183).');
+    }
     const initialWorkspace = requestedWorkspace === undefined
         ? undefined
         : await workspaceService.resolve(requestedWorkspace);
@@ -267,8 +281,53 @@ export async function apply(ctx, config) {
         // Shift+Tab session-mode cycle (undefined → the built-in default/
         // plan/full cycle in sessionModes.ts).
         modes: config.modes,
+        // Edit/Write diff presentation (schema default 'auto'); the /settings
+        // screen edits this key live through the dsh-tui namespace.
+        diffLayout: config.diffLayout,
         handle,
     });
+    // Register the dsh-tui settings namespace so the /settings screen can
+    // edit it (the section below was '命名空间未注册' without this): the
+    // user layer in settings.yaml wins over cordis.yml's diffLayout, and
+    // watch() lands commits on the live channel — no recompose needed.
+    ctx.inject(['settings'], (settingsCtx) => {
+        const scope = settingsCtx.settings.register(settingsNamespace('dsh-tui'), Schema.object({
+            diffLayout: Schema.union(['auto', 'split', 'unified']).default('auto'),
+        }));
+        const applyLayout = (value) => {
+            channel.setDiffLayout(value.diffLayout ?? config.diffLayout ?? 'auto');
+        };
+        applyLayout(scope.get());
+        scope.watch(next => {
+            applyLayout(next);
+        });
+    });
+    // The /settings screen's own section: the dsh-tui namespace comes from
+    // this plugin's Config schema, and the declared select writes diffLayout
+    // back through the settings service's revision-fenced mutate.
+    const settingsSections = ctx.get('tuiSettingsSections');
+    if (settingsSections !== undefined) {
+        const unregister = settingsSections.register({
+            ns: 'dsh-tui',
+            title: 'dsh-tui',
+            fields: [
+                {
+                    path: ['diffLayout'],
+                    label: 'Diff layout',
+                    descriptions: { zh: 'diff 布局' },
+                    hint: 'Edit/Write tool cards: auto picks by terminal width, or force one layout.',
+                    hintDescriptions: { zh: 'Edit/Write 工具卡的 diff 呈现：auto 按终端宽度选择，或强制一种布局。' },
+                    kind: 'select',
+                    options: [
+                        { value: 'auto', label: 'Auto (by width)', descriptions: { zh: '自动（按宽度）' } },
+                        { value: 'split', label: 'Side-by-side', descriptions: { zh: '双栏对照' } },
+                        { value: 'unified', label: 'Unified', descriptions: { zh: '统一式' } },
+                    ],
+                },
+            ],
+        });
+        ctx.effect(() => unregister);
+    }
     // DSH approval seam: the permission layer asks ApprovalService.request(),
     // which dispatches an `approval/request` waterfall. With no answerer the
     // chain falls through to the fail-closed 'unavailable', so register this
@@ -309,6 +368,7 @@ export async function apply(ctx, config) {
     let instance;
     let exited = false;
     let updateRequested = false;
+    let updateTargetVersion;
     // The profile this process was booted with (`dsh --profile <name>`); dsh
     // exposes it nowhere else, and /update must update the installation the
     // user is actually running, not a hard-coded one.
@@ -336,7 +396,7 @@ export async function apply(ctx, config) {
                 catch {
                     // Resume persistence is best effort and must never block an update.
                 }
-                void finishExit(ctx, instance, config.fullscreen === true, 'Updating @deepseek-harness-tui/dsh-tui and restarting…', undefined, () => runUpdate(ctx, profile, channel.agentId));
+                void finishExit(ctx, instance, config.fullscreen === true, 'Updating @deepseek-harness-tui/dsh-tui and restarting…', undefined, () => runUpdate(ctx, profile, channel.agentId, updateTargetVersion));
                 return;
             }
             // Judge against the live session behind the channel (channel.agentId),
@@ -392,6 +452,9 @@ export async function apply(ctx, config) {
                 if (target.kind === 'unknown') {
                     channel.notify(t('update-check-failed'));
                 }
+                else {
+                    updateTargetVersion = target.latest;
+                }
                 channel.notify(t('update-starting'));
                 updateRequested = true;
                 handleExit();
@@ -665,13 +728,13 @@ function writeStream(stream, data) {
         }
     });
 }
-function runUpdate(ctx, profile, sessionId) {
+function runUpdate(ctx, profile, sessionId, targetVersion) {
     disposeRootAndThen(ctx, () => {
         if (profile === undefined) {
             process.stderr.write(`\n${t('update-aborted-no-profile')}\n`);
             process.exit(1);
         }
-        void updateTuiAndRestart(sessionId, profile).then(({ updateCode, restartCode }) => {
+        void updateTuiAndRestart(sessionId, profile, targetVersion).then(({ updateCode, restartCode }) => {
             if (updateCode !== 0) {
                 process.stderr.write(`\ndsh-tui update failed (exit ${updateCode}). Your session is preserved — resume with:\n` +
                     `${resumeCommand(profile, sessionId)}\n\n`);

package/lib/types/dsh-adapter/promptDebug.d.ts

@@ -0,0 +1,10 @@
+import type { Context } from '@deepseek-ai/cordis';
+export declare const PROMPT_DEBUG_FILENAME = ".dsh-prompt-debug.json";
+/**
+ * Register `/debug-prompt` and retain every final request observed for each
+ * live session. The command writes one private, atomic snapshot into the
+ * receiving session's workspace; it never records credentials, transport
+ * headers, or AbortSignals.
+ */
+export declare function registerPromptDebug(ctx: Context): void;
+//# sourceMappingURL=promptDebug.d.ts.map

package/lib/types/dsh-adapter/promptDebug.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"promptDebug.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/promptDebug.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAMlD,eAAO,MAAM,qBAAqB,2BAA2B,CAAA;AAmF7D;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CA4FtD"}

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

@@ -0,0 +1,148 @@
+/**
+ * On-demand capture of every final AgentLoop request context observed for a
+ * live session.
+ *
+ * The LLM waterfall is the last provider-neutral boundary before adapter
+ * dispatch. Capturing there records the fully assembled system prompt,
+ * messages, and tool schemas after prompt/tool plugins have contributed.
+ * @module @deepseek-harness-tui/dsh-tui/prompt-debug
+ */
+import { join, resolve } from 'node:path';
+import { writeFileAtomic } from '@deepseek-ai/dsh-atomic-write';
+import { isAgentLoopRequest } from '@deepseek-ai/dsh-llm';
+export const PROMPT_DEBUG_FILENAME = '.dsh-prompt-debug.json';
+function latestPosition(agent) {
+    for (let index = agent.session.events.length - 1; index >= 0; index -= 1) {
+        const event = agent.session.events[index];
+        if (event?.type === 'step/start')
+            return event.data;
+    }
+    return undefined;
+}
+function latestRequestHeaderReason(agent) {
+    for (let index = agent.session.events.length - 1; index >= 0; index -= 1) {
+        const event = agent.session.events[index];
+        if (event?.type === 'request/header')
+            return event.data.reason;
+    }
+    return undefined;
+}
+function turnCompleted(agent, turn) {
+    return agent.session.events.some(event => event.type === 'turn/end' && event.data.turn === turn);
+}
+function captureRequest(agent, options, requestIndex, position, attempt) {
+    const requestHeaderReason = latestRequestHeaderReason(agent);
+    return {
+        capturedAt: new Date().toISOString(),
+        requestIndex,
+        ...position,
+        attempt,
+        ...(requestHeaderReason === undefined ? {} : { requestHeaderReason }),
+        finalLlmContext: {
+            provider: options.provider,
+            model: options.model,
+            ...(options.reasoningEffort === undefined ? {} : { reasoningEffort: options.reasoningEffort }),
+            ...(options.system === undefined ? {} : { system: options.system }),
+            messages: options.messages,
+            ...(options.tools === undefined ? {} : { tools: options.tools }),
+            ...(options.temperature === undefined ? {} : { temperature: options.temperature }),
+            ...(options.maxTokens === undefined ? {} : { maxTokens: options.maxTokens }),
+            ...(options.stop === undefined ? {} : { stop: options.stop }),
+        },
+    };
+}
+/**
+ * Register `/debug-prompt` and retain every final request observed for each
+ * live session. The command writes one private, atomic snapshot into the
+ * receiving session's workspace; it never records credentials, transport
+ * headers, or AbortSignals.
+ */
+export function registerPromptDebug(ctx) {
+    const commands = ctx.get('commands');
+    const agents = ctx.get('agents');
+    if (commands === undefined || agents === undefined || ctx.get('llm') === undefined)
+        return;
+    const captureStartedAt = new Date().toISOString();
+    const captures = new Map();
+    ctx.on('llm/stream', (options, next) => {
+        if (!isAgentLoopRequest(options) || options.sessionId === undefined)
+            return next();
+        const agent = agents.get(options.sessionId);
+        if (agent === undefined)
+            return next();
+        const position = latestPosition(agent);
+        if (position === undefined)
+            return next();
+        const sessionId = String(options.sessionId);
+        const capture = captures.get(sessionId) ?? { requests: [] };
+        if (!captures.has(sessionId))
+            captures.set(sessionId, capture);
+        const previous = capture.requests.findLast(request => request.turn === position.turn && request.step === position.step);
+        const attempt = (previous?.attempt ?? 0) + 1;
+        capture.requests.push(captureRequest(agent, options, capture.requests.length + 1, position, attempt));
+        return next();
+    });
+    // Replaced agents are no longer addressable by `/debug-prompt`; release
+    // their potentially large message/tool snapshots with the agent lifecycle.
+    ctx.on('agent/disposed', ({ agent }) => {
+        captures.delete(String(agent.session.id));
+    });
+    ctx.effect(() => commands.register({
+        name: 'debug-prompt',
+        description: 'Write every observed final LLM request context for this session to the workspace root',
+        recordInput: false,
+        handler: async ({ agent, rawInput }) => {
+            if (rawInput.trim().length > 0) {
+                return { kind: 'error', text: 'Usage: /debug-prompt' };
+            }
+            const sessionId = String(agent.session.id);
+            const capture = captures.get(sessionId);
+            if (capture === undefined || capture.requests.length === 0) {
+                return {
+                    kind: 'error',
+                    text: 'No final LLM request is available for this session. Send one prompt, wait for it to finish, then run /debug-prompt.',
+                };
+            }
+            const latest = capture.requests.at(-1);
+            if (!turnCompleted(agent, latest.turn)) {
+                return { kind: 'error', text: 'The latest model turn is still running. Wait for it to finish, then run /debug-prompt.' };
+            }
+            const root = resolve(agent.session.header.cwd ?? process.cwd());
+            const output = join(root, PROMPT_DEBUG_FILENAME);
+            const turns = new Map();
+            for (const request of capture.requests) {
+                const turn = turns.get(request.turn) ?? { turn: request.turn, requests: [] };
+                if (!turns.has(request.turn))
+                    turns.set(request.turn, turn);
+                turn.requests.push(request);
+            }
+            const document = {
+                schemaVersion: 2,
+                generatedAt: new Date().toISOString(),
+                captureStartedAt,
+                captureScope: 'Requests observed by this dsh-tui process; requests from before a session resume cannot be reconstructed.',
+                warning: 'Sensitive debug data: contains system prompts, conversation messages, tool schemas, and tool results. It intentionally excludes credentials and transport headers.',
+                sessionId,
+                turnCount: turns.size,
+                requestCount: capture.requests.length,
+                turns: [...turns.values()].map(turn => ({
+                    ...turn,
+                    requestCount: turn.requests.length,
+                })),
+            };
+            try {
+                await writeFileAtomic(output, `${JSON.stringify(document, null, 2)}\n`, { mode: 0o600 });
+            }
+            catch (error) {
+                return {
+                    kind: 'error',
+                    text: `Could not write prompt debug file: ${error instanceof Error ? error.message : String(error)}`,
+                };
+            }
+            return {
+                kind: 'success',
+                text: `Wrote ${capture.requests.length} final LLM request${capture.requests.length === 1 ? '' : 's'} to ${output}. The file contains sensitive conversation and prompt data.`,
+            };
+        },
+    }));
+}