@deepseek-harness-tui/dsh-tui 0.9.0 → 0.9.2

package/lib/types/oauth.js

@@ -0,0 +1,14 @@
+/**
+ * Re-export of the `@deepseek-harness-tui/dsh-auth` plugin under this
+ * package's own name, so the bundle patch layer can mount the OAuth row as
+ * `@deepseek-harness-tui/dsh-tui/oauth` instead of the bare package name —
+ * the same anchor the working-activity row uses (#60): the dsh Loader
+ * resolves row names from the *profile* directory, where only the profile's
+ * direct dependencies are linked, and pnpm's isolated layout never hoists a
+ * transitive dependency there. Mounting through this subpath keeps plugin
+ * resolution anchored at @deepseek-harness-tui/dsh-tui itself, always a
+ * direct profile dependency, under every package-manager layout.
+ *
+ * @module @deepseek-harness-tui/dsh-tui/oauth
+ */
+export * from '@deepseek-harness-tui/dsh-auth';

package/lib/types/plugin-spec/registry.d.ts

@@ -1,7 +1,7 @@
 /** Load and verify the pinned dsh-TUI admission profile. */
 import type { ContractRegistry, PermissionRegistry, RegistryEntry } from './types.js';
 export declare const DSH_STD_REVISION = "614dfa1ac168db79fcf4577cf0ebb34e2e3b944b";
-export declare const ECOSYSTEM_SPEC_REVISION = "e1b902b0f95f4280a8e68d414ec7a4d25d6ce106";
+export declare const ECOSYSTEM_SPEC_REVISION = "2d0236f7d4579814d9d177a58d03ebd168025960";
 export interface SpecData {
     dir: string;
     registry: ContractRegistry;

package/lib/types/plugin-spec/registry.js

@@ -5,7 +5,7 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createAdmissionCatalog } from './tui-extension.js';
 export const DSH_STD_REVISION = '614dfa1ac168db79fcf4577cf0ebb34e2e3b944b';
-export const ECOSYSTEM_SPEC_REVISION = 'e1b902b0f95f4280a8e68d414ec7a4d25d6ce106';
+export const ECOSYSTEM_SPEC_REVISION = '2d0236f7d4579814d9d177a58d03ebd168025960';
 const REGISTRY_FILE = join('registry', 'registry-0.15.json');
 const EXPECTED_PROFILE_VERSION = 'tui-admission/0.15';
 const EXPECTED_STD_REPOSITORY = 'https://github.com/Yan-Zero/dsh-std';

package/lib/types/reload.d.ts

@@ -0,0 +1,109 @@
+/**
+ * `/reload` planning — the pi-style soft reload: re-read the TUI's persisted
+ * preference files (`~/.dsh-tui/{theme,lang,agent-preset,model,
+ * working-activity}.json`) and decide what to re-apply live, honoring the
+ * same boot-time precedence every picker does:
+ *
+ *   - theme:    DSH_TUI_THEME wins; else theme.json.
+ *   - lang:     DSH_TUI_LANG > settings `dsh-tui.lang` (folded in by the
+ *               caller as `langOverriddenBySettings`) > cordis.yml `lang`
+ *               > lang.json.
+ *   - preset:   cordis.yml `preset` wins; else agent-preset.json.
+ *   - model:    a COMPLETE cordis.yml provider/model pair wins whole
+ *               (issue #67 — never merge halves); else model.json.
+ *   - activity: cordis.yml `activityFrames` wins; else
+ *               working-activity.json.
+ *
+ * Settings-namespace values (settings.yaml user layer) are deliberately NOT
+ * re-read here: the dsh-tui namespace applies live through its settings
+ * watch and hot-reloads its document through the platform's file watcher,
+ * so /reload only needs the five boot-only pref files. What no reload can
+ * re-read (cordis.yml root config, frozen fullscreen layout, newly built
+ * code) is the job of `/restart`.
+ *
+ * Pure and injectable so scripts/verify-reload.ts can exercise every branch
+ * without a UI or a file system.
+ */
+import type { Lang } from './i18n.js';
+import type { ModelPref } from './modelPrefs.js';
+import type { ModelRoute } from './modelRoute.js';
+/** The five boot-only preference surfaces /reload re-reads. */
+export type ReloadKind = 'theme' | 'lang' | 'preset' | 'model' | 'activity';
+export type ReloadSkipReason = 
+/** A launch-time environment variable pins the value (DSH_TUI_THEME / DSH_TUI_LANG). */
+'env-wins'
+/** cordis.yml or the settings user layer pins the value; the pref must not override it. */
+ | 'config-wins'
+/** The pref file is missing or unparsable. */
+ | 'invalid';
+/** One live change /reload applies. Kind `model` carries the route halves. */
+export interface ReloadApply {
+    kind: ReloadKind;
+    /** The live value before this reload. */
+    from: string;
+    /** The value the pref file now names. */
+    to: string;
+    /** Present for kind `model`: the full route halves to switch to. */
+    route?: ModelRoute;
+}
+/** A pref /reload did not apply, and why. */
+export interface ReloadSkip {
+    kind: ReloadKind;
+    reason: ReloadSkipReason;
+}
+/** What one /reload run decided, before any side effects. */
+export interface ReloadPlan {
+    /** Apply these in order (theme → lang → preset → model → activity). */
+    apply: ReloadApply[];
+    /** Pref files whose value already matches the live state. */
+    unchanged: ReloadKind[];
+    /** Pref files not applied, and why. */
+    skipped: ReloadSkip[];
+}
+/** Everything the planner needs — caller reads the files and live values. */
+export interface ReloadInput {
+    /** DSH_TUI_THEME, when it holds a valid theme name. */
+    envTheme?: string;
+    /** DSH_TUI_LANG, when it holds a valid language. */
+    envLang?: string;
+    /** Fresh readThemePref(). */
+    themePref?: string;
+    /** The live theme name (ThemeProvider state). */
+    currentTheme: string;
+    /** Fresh readLangPref(). */
+    langPref?: Lang;
+    /** The live UI language. */
+    currentLang: Lang;
+    /** True when the settings user layer (settings.yaml `dsh-tui.lang`) pins a language. */
+    langOverriddenBySettings: boolean;
+    /** cordis.yml's raw `lang` key, when set. */
+    configuredLang?: string;
+    /** cordis.yml's explicit `preset` key, when set. */
+    configuredPreset?: string;
+    /** Fresh readPresetPref(). */
+    presetPref?: string;
+    /** The live preset id (channel.agentPreset; undefined = roster default). */
+    currentPreset?: string;
+    /** cordis.yml's raw `provider`/`model` keys, when set. */
+    configuredModel?: {
+        provider?: string;
+        model?: string;
+    };
+    /** Fresh readModelPref(). */
+    modelPref?: ModelPref;
+    /** The live route (channel provider/model). */
+    currentModel?: ModelRoute;
+    /** cordis.yml's explicit `activityFrames` key, when set. */
+    configuredActivity?: string;
+    /** Fresh readActivityFrames(). */
+    activityPref?: string;
+    /** The live activity preset (channel.activityFrames). */
+    currentActivity?: string;
+}
+/**
+ * Decide what one /reload applies. Pure: returns the plan, never touches
+ * the UI or the channel. The caller executes `apply` in order and renders
+ * the report.
+ */
+export declare function planReload(input: ReloadInput): ReloadPlan;
+//# sourceMappingURL=reload.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reload.d.ts","sourceRoot":"","sources":["../../src/reload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGjD,+DAA+D;AAC/D,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,CAAA;AAE3E,MAAM,MAAM,gBAAgB;AAC1B,wFAAwF;AACtF,UAAU;AACZ,2FAA2F;GACzF,aAAa;AACf,8CAA8C;GAC5C,SAAS,CAAA;AAEb,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAA;IAChB,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,yCAAyC;IACzC,EAAE,EAAE,MAAM,CAAA;IACV,oEAAoE;IACpE,KAAK,CAAC,EAAE,UAAU,CAAA;CACnB;AAED,6CAA6C;AAC7C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,gBAAgB,CAAA;CACzB;AAED,6DAA6D;AAC7D,MAAM,WAAW,UAAU;IACzB,uEAAuE;IACvE,KAAK,EAAE,WAAW,EAAE,CAAA;IACpB,6DAA6D;IAC7D,SAAS,EAAE,UAAU,EAAE,CAAA;IACvB,uCAAuC;IACvC,OAAO,EAAE,UAAU,EAAE,CAAA;CACtB;AAED,6EAA6E;AAC7E,MAAM,WAAW,WAAW;IAC1B,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,6BAA6B;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iDAAiD;IACjD,YAAY,EAAE,MAAM,CAAA;IACpB,4BAA4B;IAC5B,QAAQ,CAAC,EAAE,IAAI,CAAA;IACf,4BAA4B;IAC5B,WAAW,EAAE,IAAI,CAAA;IACjB,wFAAwF;IACxF,wBAAwB,EAAE,OAAO,CAAA;IACjC,6CAA6C;IAC7C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,0DAA0D;IAC1D,eAAe,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACvD,6BAA6B;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,UAAU,CAAA;IACzB,4DAA4D;IAC5D,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kCAAkC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,yDAAyD;IACzD,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,UAAU,CA6EzD"}

package/lib/types/reload.js

@@ -0,0 +1,118 @@
+/**
+ * `/reload` planning — the pi-style soft reload: re-read the TUI's persisted
+ * preference files (`~/.dsh-tui/{theme,lang,agent-preset,model,
+ * working-activity}.json`) and decide what to re-apply live, honoring the
+ * same boot-time precedence every picker does:
+ *
+ *   - theme:    DSH_TUI_THEME wins; else theme.json.
+ *   - lang:     DSH_TUI_LANG > settings `dsh-tui.lang` (folded in by the
+ *               caller as `langOverriddenBySettings`) > cordis.yml `lang`
+ *               > lang.json.
+ *   - preset:   cordis.yml `preset` wins; else agent-preset.json.
+ *   - model:    a COMPLETE cordis.yml provider/model pair wins whole
+ *               (issue #67 — never merge halves); else model.json.
+ *   - activity: cordis.yml `activityFrames` wins; else
+ *               working-activity.json.
+ *
+ * Settings-namespace values (settings.yaml user layer) are deliberately NOT
+ * re-read here: the dsh-tui namespace applies live through its settings
+ * watch and hot-reloads its document through the platform's file watcher,
+ * so /reload only needs the five boot-only pref files. What no reload can
+ * re-read (cordis.yml root config, frozen fullscreen layout, newly built
+ * code) is the job of `/restart`.
+ *
+ * Pure and injectable so scripts/verify-reload.ts can exercise every branch
+ * without a UI or a file system.
+ */
+import { explicitModelRoute } from './modelRoute.js';
+/**
+ * Decide what one /reload applies. Pure: returns the plan, never touches
+ * the UI or the channel. The caller executes `apply` in order and renders
+ * the report.
+ */
+export function planReload(input) {
+    const apply = [];
+    const unchanged = [];
+    const skipped = [];
+    // Theme: env override wins at launch; else the persisted choice.
+    if (input.envTheme !== undefined) {
+        skipped.push({ kind: 'theme', reason: 'env-wins' });
+    }
+    else if (input.themePref === undefined) {
+        skipped.push({ kind: 'theme', reason: 'invalid' });
+    }
+    else if (input.themePref === input.currentTheme) {
+        unchanged.push('theme');
+    }
+    else {
+        apply.push({ kind: 'theme', from: input.currentTheme, to: input.themePref });
+    }
+    // Language: env, then the settings user layer, then cordis.yml, then the
+    // persisted choice — mirror the boot precedence in plugin.apply.
+    if (input.envLang !== undefined) {
+        skipped.push({ kind: 'lang', reason: 'env-wins' });
+    }
+    else if (input.langOverriddenBySettings || input.configuredLang !== undefined) {
+        skipped.push({ kind: 'lang', reason: 'config-wins' });
+    }
+    else if (input.langPref === undefined) {
+        skipped.push({ kind: 'lang', reason: 'invalid' });
+    }
+    else if (input.langPref === input.currentLang) {
+        unchanged.push('lang');
+    }
+    else {
+        apply.push({ kind: 'lang', from: input.currentLang, to: input.langPref });
+    }
+    // Preset: cordis.yml's static choice wins; else the persisted one.
+    if (input.configuredPreset !== undefined) {
+        skipped.push({ kind: 'preset', reason: 'config-wins' });
+    }
+    else if (input.presetPref === undefined) {
+        skipped.push({ kind: 'preset', reason: 'invalid' });
+    }
+    else if (input.presetPref === input.currentPreset) {
+        unchanged.push('preset');
+    }
+    else {
+        apply.push({ kind: 'preset', from: input.currentPreset ?? '—', to: input.presetPref });
+    }
+    // Model route: the atomic rule (issue #67) — a complete cordis.yml pair
+    // wins whole; a half-pinned config never merges with the pref's other half.
+    // (Normalize to an object: callers may pass undefined when no route is pinned.)
+    if (explicitModelRoute(input.configuredModel ?? {}) !== undefined) {
+        skipped.push({ kind: 'model', reason: 'config-wins' });
+    }
+    else if (input.modelPref === undefined) {
+        skipped.push({ kind: 'model', reason: 'invalid' });
+    }
+    else if (input.currentModel !== undefined
+        && input.currentModel.provider === input.modelPref.provider
+        && input.currentModel.model === input.modelPref.model) {
+        unchanged.push('model');
+    }
+    else {
+        apply.push({
+            kind: 'model',
+            from: input.currentModel === undefined
+                ? '—'
+                : `${input.currentModel.provider}/${input.currentModel.model}`,
+            to: `${input.modelPref.provider}/${input.modelPref.model}`,
+            route: { provider: input.modelPref.provider, model: input.modelPref.model },
+        });
+    }
+    // Working-activity indicator: cordis.yml's static choice wins.
+    if (input.configuredActivity !== undefined) {
+        skipped.push({ kind: 'activity', reason: 'config-wins' });
+    }
+    else if (input.activityPref === undefined) {
+        skipped.push({ kind: 'activity', reason: 'invalid' });
+    }
+    else if (input.activityPref === input.currentActivity) {
+        unchanged.push('activity');
+    }
+    else {
+        apply.push({ kind: 'activity', from: input.currentActivity ?? 'claude', to: input.activityPref });
+    }
+    return { apply, unchanged, skipped };
+}

package/lib/types/screens/Chat.d.ts

@@ -5,7 +5,7 @@ import { TuiDialogStore } from '../dsh-adapter/dialogs.js';
 import { TuiStatusStore } from '../dsh-adapter/status.js';
 import type { TuiShortcutHost } from '../dsh-adapter/shortcuts.js';
 import { ApprovalStore } from '../dsh-adapter/approvals.js';
-export declare function Chat({ channel, questionStore, approvalStore, extensionDialogs, extensionStatus, extensionShortcuts, onExit, onUpdate, fullscreen, trajectorySeen: trajectorySeenProp, }: {
+export declare function Chat({ channel, questionStore, approvalStore, extensionDialogs, extensionStatus, extensionShortcuts, onExit, onUpdate, onRestart, fullscreen, trajectorySeen: trajectorySeenProp, }: {
     channel: Channel;
     questionStore: QuestionStore;
     /**
@@ -27,6 +27,8 @@ export declare function Chat({ channel, questionStore, approvalStore, extensionD
     onExit: () => void;
     /** Update the installed package and restart the current TUI process. */
     onUpdate?: () => void;
+    /** Restart the current TUI process and resume this session (no update). */
+    onRestart?: () => void;
     /**
      * True when the host already wrapped this tree in `<AlternateScreen>`
      * (`fullscreen: true`). Both full-screen surfaces need this — the trajectory

package/lib/types/screens/Chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AASzB,OAAO,EAAqB,KAAK,OAAO,EAAsE,MAAM,2BAA2B,CAAA;AAC/I,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AA8J3D,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,MAAM,EACN,QAAQ,EACR,UAAkB,EAClB,cAAc,EAAE,kBAAkB,GACnC,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,oEAAoE;IACpE,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,4BAusFA"}
+{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAwBzB,OAAO,EAAqB,KAAK,OAAO,EAAsE,MAAM,2BAA2B,CAAA;AAC/I,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAuK3D,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAkB,EAClB,cAAc,EAAE,kBAAkB,GACnC,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,oEAAoE;IACpE,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,4BA8vGA"}