@deepseek-harness-tui/dsh-tui 0.8.6 → 0.8.8

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

@@ -1,20 +1,83 @@
-export declare const UPSTREAM_VALIDATED_VERSION = "0.1.0-rc.7";
+/** Primary validated upstream line (newest). */
+export declare const UPSTREAM_VALIDATED_VERSION = "0.1.1-rc.2";
+/**
+ * Every upstream prerelease line the adapter has been validated against,
+ * oldest first.
+ *
+ * 0.1.1-rc.2 = primary; 0.1.1-rc.1 = transitional line of the same family
+ * (install- and type-level compatibility); 0.1.0-rc.8 = previous family
+ * (full CI coverage); 0.1.0-rc.7 = full CI coverage as well; 0.1.0-rc.6 =
+ * legacy line (install- and type-level compatibility, feature surface may
+ * lack later additions — new features must degrade gracefully there).
+ * The peer range in package.json is deliberately wider than this list: an
+ * install on an older or newer line is allowed but reports drift at boot.
+ */
+export declare const UPSTREAM_VALIDATED_VERSIONS: readonly ["0.1.0-rc.6", "0.1.0-rc.7", "0.1.0-rc.8", "0.1.1-rc.1", "0.1.1-rc.2"];
 /**
  * Framework packages version on their own lines; the contract validates
  * their MAJOR (breaking surface), not the harness rc number.
  */
 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-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 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-settings", "@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;
     validated: string;
 }
+/** A parsed upstream prerelease version, e.g. `0.1.1-rc.2` → `[0, 1, 1, 2]`. */
+export type UpstreamVersionTuple = readonly [number, number, number, number];
+/** Parse an upstream prerelease version; undefined when unparseable. */
+export declare function parseUpstreamVersion(version: string | undefined): UpstreamVersionTuple | undefined;
+/** Human-readable summary of the validated lines, e.g. `0.1.1-rc.2 (0.1.0-rc.6/7/8, 0.1.1-rc.1/2)`. */
+export declare const UPSTREAM_VALIDATED_LABEL: string;
 export declare function installedUpstreamVersions(): Record<string, string | undefined>;
 /**
- * Report every blessed package whose installed version is NOT the validated
- * release line. Empty array = the running install matches the contract.
+ * The installed upstream version of one blessed package, parsed; undefined
+ * when missing or not on an `x.y.z-rc.n` prerelease line. Feature gates
+ * compare this against the line a behavior was introduced on, so the
+ * adapter degrades on older installs instead of calling APIs they do not
+ * have.
+ */
+export declare function installedUpstreamVersion(packageName: string): UpstreamVersionTuple | undefined;
+/**
+ * Whether the installed version of `packageName` is at or beyond `minimum`
+ * (a literal like `'0.1.0-rc.8'`). Unparseable or older installs return
+ * false so features introduced on the minimum line degrade gracefully.
+ */
+export declare function installedMeetsVersion(packageName: string, minimum: string): boolean;
+/**
+ * The distinct installed prerelease versions across the blessed harness
+ * packages (framework packages excluded). One entry = coherent install;
+ * several = a mixed tree, which the per-package drift check cannot see.
+ * Empty when nothing (or no harness package) is installed.
+ */
+export declare function installedUpstreamLines(): string[];
+/**
+ * Report every blessed package whose installed version is NOT one of the
+ * validated release lines. Empty array = the running install matches the
+ * contract.
  */
 export declare function upstreamDrift(): UpstreamDriftEntry[];
+/**
+ * Classification of a drifted install for the one-line boot notice:
+ * `newer` / `older` — every drifted harness package sits on a single
+ * parseable version off one end of the validated window; `mixed` — several
+ * distinct versions coexist (unstable tree); `broken` — something is
+ * missing or unparseable and wording cannot get more specific.
+ */
+export type UpstreamDriftKind = 'newer' | 'older' | 'mixed' | 'broken';
+/** Merged drift verdict consumed by the logo header notice (LogoV2). */
+export interface UpstreamDriftSummary {
+    kind: UpstreamDriftKind;
+    /** Distinct installed versions among drifted packages ('missing' for absent ones). */
+    versions: string[];
+}
+/**
+ * Collapse {@link upstreamDrift} into a single summary for the boot notice:
+ * undefined when the install matches the contract. Only harness rc packages
+ * decide newer/older/mixed; a framework-only drift (e.g. a cordis major
+ * bump) reports `broken`, since its version line is not comparable.
+ */
+export declare function upstreamDriftSummary(): UpstreamDriftSummary | undefined;
 //# sourceMappingURL=contract.d.ts.map

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,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"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/contract.ts"],"names":[],"mappings":"AAiBA,gDAAgD;AAChD,eAAO,MAAM,0BAA0B,eAAe,CAAA;AAEtD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,2BAA2B,iFAM9B,CAAA;AAEV;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAG5D,CAAA;AAED,qEAAqE;AACrE,eAAO,MAAM,yBAAyB,2zBA2B5B,CAAA;AAEV,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,gFAAgF;AAChF,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AAE5E,wEAAwE;AACxE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,oBAAoB,GAAG,SAAS,CAGlG;AA4BD,uGAAuG;AACvG,eAAO,MAAM,wBAAwB,QAA6D,CAAA;AAYlG,wBAAgB,yBAAyB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAqB9E;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAE9F;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAQjD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,kBAAkB,EAAE,CAuBpD;AAED;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,CAAA;AAEtE,wEAAwE;AACxE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,iBAAiB,CAAA;IACvB,sFAAsF;IACtF,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,oBAAoB,GAAG,SAAS,CAuBvE"}

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

@@ -1,17 +1,40 @@
 /**
  * Upstream compatibility contract.
  *
- * The TUI is validated against one upstream release line (0.1.0-rc.7).
- * Every official package this adapter touches is blessed here; anything
- * else must go through upstream channels or the adapter, never the UI.
+ * The TUI is validated against a set of upstream prerelease lines — the
+ * current primary (0.1.1-rc.2) plus older lines kept in backward
+ * compatibility across the 0.1.1 and 0.1.0 release families. Every official
+ * package this adapter touches is blessed here; anything else must go
+ * through upstream channels or the adapter, never the UI.
  *
- * `upstreamDrift()` powers both the boot-time warning (dev visibility) and
- * the CI gate (scripts/verify-upstream-contract.ts) so a mismatched
- * install fails in CI before it fails on a user's machine.
+ * `upstreamDrift()` powers the CI gate (scripts/verify-upstream-contract.ts)
+ * so a mismatched install fails in CI before it fails on a user's machine.
+ * `upstreamDriftSummary()` collapses the per-package entries into the
+ * single natural-language boot notice the logo header shows (see LogoV2).
  */
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-export const UPSTREAM_VALIDATED_VERSION = '0.1.0-rc.7';
+/** Primary validated upstream line (newest). */
+export const UPSTREAM_VALIDATED_VERSION = '0.1.1-rc.2';
+/**
+ * Every upstream prerelease line the adapter has been validated against,
+ * oldest first.
+ *
+ * 0.1.1-rc.2 = primary; 0.1.1-rc.1 = transitional line of the same family
+ * (install- and type-level compatibility); 0.1.0-rc.8 = previous family
+ * (full CI coverage); 0.1.0-rc.7 = full CI coverage as well; 0.1.0-rc.6 =
+ * legacy line (install- and type-level compatibility, feature surface may
+ * lack later additions — new features must degrade gracefully there).
+ * The peer range in package.json is deliberately wider than this list: an
+ * install on an older or newer line is allowed but reports drift at boot.
+ */
+export const UPSTREAM_VALIDATED_VERSIONS = [
+    '0.1.0-rc.6',
+    '0.1.0-rc.7',
+    '0.1.0-rc.8',
+    '0.1.1-rc.1',
+    '0.1.1-rc.2',
+];
 /**
  * Framework packages version on their own lines; the contract validates
  * their MAJOR (breaking surface), not the harness rc number.
@@ -34,6 +57,7 @@ export const UPSTREAM_BLESSED_PACKAGES = [
     '@deepseek-ai/dsh-llm',
     '@deepseek-ai/dsh-persona',
     '@deepseek-ai/dsh-session',
+    '@deepseek-ai/dsh-settings',
     '@deepseek-ai/dsh-skill',
     '@deepseek-ai/dsh-storage',
     '@deepseek-ai/dsh-storage-domain',
@@ -48,6 +72,39 @@ export const UPSTREAM_BLESSED_PACKAGES = [
     '@deepseek-ai/dsh-user-approval',
     '@deepseek-ai/dsh-user-questions',
 ];
+/** Parse an upstream prerelease version; undefined when unparseable. */
+export function parseUpstreamVersion(version) {
+    const match = /^(\d+)\.(\d+)\.(\d+)-rc\.(\d+)$/u.exec(version ?? '');
+    return match === null ? undefined : [Number(match[1]), Number(match[2]), Number(match[3]), Number(match[4])];
+}
+/** Order two parsed versions: negative/positive/zero as a `<`/`>`/`=`. */
+function compareVersions(a, b) {
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] > b[i])
+            return 1;
+        if (a[i] < b[i])
+            return -1;
+    }
+    return 0;
+}
+/** Collapse {@link UPSTREAM_VALIDATED_VERSIONS} into per-release rc groups,
+ *  e.g. `0.1.0-rc.6/7/8, 0.1.1-rc.1/2`. */
+function validatedLinesLabel() {
+    const groups = [];
+    for (const version of UPSTREAM_VALIDATED_VERSIONS) {
+        const [major, minor, patch, rc] = parseUpstreamVersion(version);
+        const release = `${major}.${minor}.${patch}`;
+        let group = groups.find(candidate => candidate.release === release);
+        if (group === undefined) {
+            group = { release, rcs: [] };
+            groups.push(group);
+        }
+        group.rcs.push(rc);
+    }
+    return groups.map(({ release, rcs }) => `${release}-rc.${rcs.join('/')}`).join(', ');
+}
+/** Human-readable summary of the validated lines, e.g. `0.1.1-rc.2 (0.1.0-rc.6/7/8, 0.1.1-rc.1/2)`. */
+export const UPSTREAM_VALIDATED_LABEL = `${UPSTREAM_VALIDATED_VERSION} (${validatedLinesLabel()})`;
 function resolvePackageJson(packageName) {
     try {
         const path = import.meta.resolve(`${packageName}/package.json`);
@@ -57,7 +114,13 @@ function resolvePackageJson(packageName) {
         return undefined;
     }
 }
+let cachedVersions;
 export function installedUpstreamVersions() {
+    // Package manifests do not change mid-process; memoize so per-call gates
+    // (e.g. the command-images line check) stay cheap. Frozen so callers can
+    // never corrupt the shared cache.
+    if (cachedVersions !== undefined)
+        return cachedVersions;
     const result = {};
     for (const packageName of UPSTREAM_BLESSED_PACKAGES) {
         let version;
@@ -73,17 +136,55 @@ export function installedUpstreamVersions() {
         }
         result[packageName] = version;
     }
-    return result;
+    cachedVersions = Object.freeze(result);
+    return cachedVersions;
+}
+/**
+ * The installed upstream version of one blessed package, parsed; undefined
+ * when missing or not on an `x.y.z-rc.n` prerelease line. Feature gates
+ * compare this against the line a behavior was introduced on, so the
+ * adapter degrades on older installs instead of calling APIs they do not
+ * have.
+ */
+export function installedUpstreamVersion(packageName) {
+    return parseUpstreamVersion(installedUpstreamVersions()[packageName]);
+}
+/**
+ * Whether the installed version of `packageName` is at or beyond `minimum`
+ * (a literal like `'0.1.0-rc.8'`). Unparseable or older installs return
+ * false so features introduced on the minimum line degrade gracefully.
+ */
+export function installedMeetsVersion(packageName, minimum) {
+    const installed = installedUpstreamVersion(packageName);
+    const floor = parseUpstreamVersion(minimum);
+    if (installed === undefined || floor === undefined)
+        return false;
+    return compareVersions(installed, floor) >= 0;
 }
-function rcNumber(version) {
-    const match = /0\.1\.0-rc\.(\d+)/u.exec(version ?? '');
-    return match === null ? undefined : Number(match[1]);
+/**
+ * The distinct installed prerelease versions across the blessed harness
+ * packages (framework packages excluded). One entry = coherent install;
+ * several = a mixed tree, which the per-package drift check cannot see.
+ * Empty when nothing (or no harness package) is installed.
+ */
+export function installedUpstreamLines() {
+    const lines = new Set();
+    for (const packageName of UPSTREAM_BLESSED_PACKAGES) {
+        if (UPSTREAM_FRAMEWORK_MAJORS[packageName] !== undefined)
+            continue;
+        const version = installedUpstreamVersions()[packageName];
+        if (version !== undefined && parseUpstreamVersion(version) !== undefined)
+            lines.add(version);
+    }
+    return [...lines].sort((a, b) => compareVersions(parseUpstreamVersion(a), parseUpstreamVersion(b)));
 }
 /**
- * Report every blessed package whose installed version is NOT the validated
- * release line. Empty array = the running install matches the contract.
+ * Report every blessed package whose installed version is NOT one of the
+ * validated release lines. Empty array = the running install matches the
+ * contract.
  */
 export function upstreamDrift() {
+    const validated = new Set(UPSTREAM_VALIDATED_VERSIONS);
     const drift = [];
     for (const [packageName, installed] of Object.entries(installedUpstreamVersions())) {
         const expected = UPSTREAM_BLESSED_PACKAGES.includes(packageName);
@@ -96,15 +197,48 @@ export function upstreamDrift() {
             matches = installedMajor === frameworkMajor;
         }
         else {
-            matches = rcNumber(installed) === rcNumber(UPSTREAM_VALIDATED_VERSION);
+            matches = installed !== undefined && validated.has(installed);
         }
         if (!matches) {
             drift.push({
                 package: packageName,
                 installed,
-                validated: frameworkMajor !== undefined ? `major ${frameworkMajor}` : UPSTREAM_VALIDATED_VERSION,
+                validated: frameworkMajor !== undefined ? `major ${frameworkMajor}` : UPSTREAM_VALIDATED_LABEL,
             });
         }
     }
     return drift;
 }
+/**
+ * Collapse {@link upstreamDrift} into a single summary for the boot notice:
+ * undefined when the install matches the contract. Only harness rc packages
+ * decide newer/older/mixed; a framework-only drift (e.g. a cordis major
+ * bump) reports `broken`, since its version line is not comparable.
+ */
+export function upstreamDriftSummary() {
+    const drift = upstreamDrift();
+    if (drift.length === 0)
+        return undefined;
+    const harness = drift.filter(entry => UPSTREAM_FRAMEWORK_MAJORS[entry.package] === undefined);
+    const versions = [...new Set(drift.map(entry => entry.installed ?? 'missing'))];
+    if (harness.some(entry => entry.installed === undefined)) {
+        return { kind: 'broken', versions };
+    }
+    const harnessVersions = [...new Set(harness.map(entry => entry.installed))];
+    if (harnessVersions.length > 1) {
+        return { kind: 'mixed', versions };
+    }
+    const installed = parseUpstreamVersion(harnessVersions[0] ?? '');
+    const validated = parseUpstreamVersion(UPSTREAM_VALIDATED_VERSION);
+    if (installed === undefined) {
+        return { kind: 'broken', versions };
+    }
+    const order = compareVersions(installed, validated);
+    if (order > 0)
+        return { kind: 'newer', versions };
+    if (order < 0)
+        return { kind: 'older', versions };
+    // Identical to the primary validated version — cannot happen (it would
+    // not be drift); report broken rather than staying silent.
+    return { kind: 'broken', versions };
+}

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;AACzD,OAAO,EAAsB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAErG,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;;8EAE0E;IAC1E,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IACjC,sEAAsE;IACtE,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACpC;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA8ChC,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;AACzD,OAAO,EAAsB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAErG,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;;8EAE0E;IAC1E,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IACjC,sEAAsE;IACtE,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACpC;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA8ChC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASvE"}

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

@@ -64,12 +64,12 @@ export const Config = Schema.object({
  * @returns a promise settling when the TUI teardown completes.
  */
 export async function apply(ctx, config) {
-    const { upstreamDrift, UPSTREAM_VALIDATED_VERSION } = await import('./contract.js');
-    for (const entry of upstreamDrift()) {
-        console.warn(`[dsh-tui] upstream drift: ${entry.package} installed=${entry.installed ?? 'missing'} ` +
-            `validated=${UPSTREAM_VALIDATED_VERSION} — the TUI was validated against ` +
-            `${UPSTREAM_VALIDATED_VERSION}; upgrade the profile when upstream is bumped.`);
-    }
+    // Upstream drift is NO LONGER spammed to stderr here: per-package
+    // console.warn lines interleave with the TUI frame redraw and arrive
+    // garbled (typewriter animation repaints over them). The merged,
+    // natural-language notice now renders in the logo header under the
+    // startup tip (LogoV2 ← upstreamDriftSummary); CI keeps the hard gate
+    // via scripts/verify-upstream-contract.ts.
     const { apply: ccTuiApply } = await import('./plugin.js');
     return ccTuiApply(ctx, config);
 }

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;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAoCnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsyBvE;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;AAqCnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA60BvE;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

@@ -25,6 +25,7 @@ import { checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isVersion
 import { getLang, isLang, resolveStartupLang, setLang, t, writeLangPref } from '../i18n.js';
 import { DEFAULT_STATUS_BAR, normalizeStatusBar, normalizeToolBackground } from '../tuiDisplayPrefs.js';
 import { detectLegacyEnv, migrateLegacyDataDir, RENAMED_ENV } from '../utils/paths.js';
+import { attachHerdrIntegration } from '../herdr.js';
 import { Chat } from '../screens/Chat.js';
 import { getHostDialogStore } from './dialogs.js';
 import { getHostStatusStore } from './status.js';
@@ -357,6 +358,11 @@ export async function apply(ctx, config) {
                 trajectory: Schema.boolean().default(DEFAULT_STATUS_BAR.trajectory),
                 shortcutHint: Schema.boolean().default(DEFAULT_STATUS_BAR.shortcutHint),
             }).default({ ...DEFAULT_STATUS_BAR }),
+            // Header pixel whale art; on unless settings.yaml says otherwise.
+            whale: Schema.boolean().default(true),
+            // Minimal mode: strips the header splash, emoji glyphs, and
+            // decorative colors; code highlight and tool colors stay.
+            minimal: Schema.boolean().default(false),
             // No default on purpose: an unset `lang` keeps the field showing
             // the effective language (see the section's format below) and lets
             // cordis.yml / lang.json keep their precedence.
@@ -365,6 +371,12 @@ export async function apply(ctx, config) {
         const applyLayout = (value) => {
             channel.setDiffLayout(value.diffLayout ?? config.diffLayout ?? 'auto');
         };
+        const applyWhale = (value) => {
+            channel.setWhale(value.whale ?? true);
+        };
+        const applyMinimal = (value) => {
+            channel.setMinimal(value.minimal ?? false);
+        };
         // The /settings language field writes `lang` through the settings
         // service (user layer): apply it live and mirror it to lang.json so
         // the /lang command and next-boot resolution agree. DSH_TUI_LANG
@@ -385,6 +397,8 @@ export async function apply(ctx, config) {
         };
         const apply = (next) => {
             applyLayout(next);
+            applyWhale(next);
+            applyMinimal(next);
             applyLang(next);
             applyDisplay(next);
         };
@@ -595,6 +609,22 @@ export async function apply(ctx, config) {
                     group: 'status-bar',
                     kind: 'boolean',
                 },
+                {
+                    path: ['whale'],
+                    label: 'Whale art',
+                    descriptions: { zh: '鲸鱼娘' },
+                    hint: 'Show the pixel whale in the header splash.',
+                    hintDescriptions: { zh: '开屏头部显示像素鲸鱼娘。' },
+                    kind: 'boolean',
+                },
+                {
+                    path: ['minimal'],
+                    label: 'Minimal mode',
+                    descriptions: { zh: '极简模式' },
+                    hint: 'Hide the header splash, emoji glyphs, and decorative colors; code highlight and tool colors stay. Trims the status bar to model + cwd.',
+                    hintDescriptions: { zh: '隐藏开屏头部、emoji 状态符与装饰性配色；代码高亮与工具配色保留，底栏只留模型与目录。' },
+                    kind: 'boolean',
+                },
             ],
         });
         ctx.effect(() => unregister);
@@ -612,6 +642,14 @@ export async function apply(ctx, config) {
         ctx.on('approval/request', (req, next) => String(req.agent.id) === channel.agentId ? approvalStore.park(req) : next());
         ctx.effect(() => () => approvalStore.settleAll('cancelled'));
     }
+    const herdr = attachHerdrIntegration({
+        channel,
+        questions: questionStore,
+        approvals: approvalStore,
+    });
+    if (herdr !== undefined) {
+        ctx.effect(() => () => herdr.dispose());
+    }
     // Positional command-line arguments are the initial prompt (issue #53):
     // `dsh-tui "run the tests"` forwards positionals through the dsh CLI,
     // which mounts them as ctx.cmdlineArgs. Submit once the channel exists —

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

@@ -43,9 +43,9 @@ const NAMED_KEYS = {
  * Combos the TUI owns, globally or inside the prompt editor (the editor's
  * bindings are checked AFTER plugin shortcuts, so refusing them here is
  * what keeps "locals win" true). Built-in handlers match a MODIFIER SUBSET
- * (`isMod(key) && input === 'x'` — they never exclude an extra Shift), so
+ * (`key.ctrl && input === 'g'` — they never exclude an extra Shift), so
  * the reserved check below refuses a plugin combo whose SHIFTLESS form is
- * reserved: ctrl+shift+x would shadow Ctrl+X on terminals that report both
+ * reserved: ctrl+shift+g would shadow Ctrl+G on terminals that report both
  * as the same keypress (ConPTY does), and would be dead weight on terminals
  * that don't.
  */
@@ -54,7 +54,7 @@ const RESERVED_COMBOS = new Set([
     'ctrl+d', // exit on empty input
     'ctrl+t', // startup context panel
     'ctrl+r', // history search
-    'ctrl+x', // external editor
+    'ctrl+g', // external editor
     'ctrl+o', // transcript mode toggle
     'ctrl+l', // terminal redraw
     'ctrl+e', // show all messages / line end

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

@@ -0,0 +1,87 @@
+/** Unified subagent activity domain model used by the adapter and every view. */
+export type SubagentStatus = 'starting' | 'running' | 'completed' | 'failed' | 'cancelled' | 'unknown';
+export type SubagentOutputKind = 'text' | 'thinking' | 'tool' | 'error' | 'system';
+export interface SubagentOutputLine {
+    kind: SubagentOutputKind;
+    text: string;
+    at: number;
+    /** False while the line is still absorbing streaming deltas. */
+    settled?: boolean;
+}
+export interface SubagentToolCall {
+    id?: string;
+    name: string;
+    status: 'running' | 'completed' | 'failed';
+    startedAt: number;
+    endedAt?: number;
+    argsPreview?: string;
+    resultPreview?: string;
+    error?: string;
+}
+export interface SubagentTokenUsage {
+    input?: number;
+    output?: number;
+    total?: number;
+    context?: number;
+}
+export interface SubagentState {
+    agentId: string;
+    runId?: string;
+    description: string;
+    provider?: string;
+    model?: string;
+    effort?: string;
+    status: SubagentStatus;
+    startedAt: number;
+    completedAt?: number;
+    endedAt?: number;
+    local?: boolean;
+    parentSessionId?: string;
+    sessionId?: string;
+    stopReason?: string;
+    error?: string;
+    /** Compatibility projection for older consumers. */
+    output: string[];
+    outputEvents: SubagentOutputLine[];
+    toolCalls: SubagentToolCall[];
+    tokens?: SubagentTokenUsage;
+    summary?: string;
+}
+export declare class SubagentActivityStore {
+    private states;
+    private sessionToAgent;
+    private listeners;
+    private commitLine;
+    private pushLine;
+    onSpawned(agentId: string, provider?: string, model?: string, info?: Partial<SubagentState>): void;
+    linkSession(agentId: string, session: unknown): void;
+    getSubagentIdBySession(session: unknown): string | undefined;
+    appendOutput(agentId: string, text: string, kind?: SubagentOutputKind): void;
+    /** Mark the streaming tail line complete (run settlement). */
+    flushOutput(agentId: string): void;
+    onSessionEvent(agentId: string, event: unknown): void;
+    /** Merge partial updates (model discovery, session id) into one subagent. */
+    patch(agentId: string, partial: Partial<SubagentState>): void;
+    /** One-line preview of a tool-result content block (text or item list). */
+    private previewOf;
+    recordTool(agentId: string, input: Partial<SubagentToolCall> & {
+        name?: string;
+    }): void;
+    setTokens(agentId: string, usage: {
+        inputTokens?: number;
+        outputTokens?: number;
+        input?: number;
+        output?: number;
+        total?: number;
+        context?: number;
+    }): void;
+    onCompleted(agentId: string, summary?: string, stopReason?: string): void;
+    onFailed(agentId: string, error: string): void;
+    onCancelled(agentId: string, reason?: string, summary?: string): void;
+    private finish;
+    snapshot(): SubagentState[];
+    get(agentId: string): SubagentState | undefined;
+    subscribe(listener: () => void): () => void;
+    private notify;
+}
+//# sourceMappingURL=subagents.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/subagents.ts"],"names":[],"mappings":"AAAA,iFAAiF;AAEjF,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,CAAA;AACtG,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;AAElF,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,kBAAkB,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,gEAAgE;IAChE,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;IAC1C,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,oDAAoD;IACpD,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,EAAE,kBAAkB,EAAE,CAAA;IAClC,SAAS,EAAE,gBAAgB,EAAE,CAAA;IAC7B,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAKD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,SAAS,CAAwB;IAEzC,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,QAAQ;IAOhB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAa,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,IAAI;IA0B1G,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAMpD,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAE5D,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,kBAA2B,GAAG,IAAI;IA0BpF,8DAA8D;IAC9D,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IASlC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA2CrD,6EAA6E;IAC7E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAO7D,2EAA2E;IAC3E,OAAO,CAAC,SAAS;IAUjB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IASvF,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAU3J,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,SAAc,GAAG,IAAI;IAC9E,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAC9C,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAE1E,OAAO,CAAC,MAAM;IAYd,QAAQ,IAAI,aAAa,EAAE;IAC3B,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAC/C,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAC3C,OAAO,CAAC,MAAM;CACf"}