@deepseek-harness-tui/dsh-tui 0.8.1 → 0.8.2

package/lib/types/plugin-host.js

@@ -1,17 +1,17 @@
-// Re-export shim: the Cordis-backed implementation lives behind the adapter
-// boundary so UI consumers never import official @deepseek-ai/* packages.
-// Plugin authors import the plugin-host types from here
-// (`@deepseek-harness-tui/dsh-tui/plugin-host`); importing the module also
-// applies the `declare module '@deepseek-ai/cordis'` augmentation for the
-// `tuiPluginHost` property on Context.
-export * from './dsh-adapter/plugin-host.js';
-export * from './dsh-adapter/grants.js';
-export * from './dsh-adapter/host-descriptor.js';
-export * from './dsh-adapter/plugin-storage.js';
-export * from './dsh-adapter/message-observer.js';
-export * from './dsh-adapter/effect-ledger.js';
-export * from './dsh-adapter/command-errors.js';
-export { commandOwner, fiberNameOf, stampCommandOwner, unstampCommandOwner } from './dsh-adapter/command-attribution.js';
-export { DECISION_EVENT_PERMISSIONS, decisionHandlersOf, registerDecisionHandler, withDecisionRegistration, } from './dsh-adapter/decision-guard.js';
-export { DECISION_HANDLER_TIMEOUT_MS, DECISION_TOTAL_TIMEOUT_MS, dispatchTuiNotification, } from './dsh-adapter/extension-events.js';
+// Public plugin-host shim. Keep the Cordis-backed implementation behind the
+// adapter boundary: plugin authors receive protocol types and mediated service
+// contracts, while loader-only admission, host ingress, mutable stores and
+// attribution registries remain adapter-internal. Type-only runtime exports
+// still load the adapter declarations so Context augmentation is available.
+export { name, apply } from './dsh-adapter/plugin-host.js';
+export { PluginStorageError, STORAGE_KEY_MAX_LENGTH, STORAGE_MAX_BYTES, STORAGE_MAX_KEYS } from './dsh-adapter/plugin-storage.js';
+// The host-only message ingress accessor stays in the adapter module. Plugin
+// authors receive the broker's subscribe surface and envelope vocabulary only.
+export { OBSERVE_CALLBACK_QUEUE_LIMIT, OBSERVE_CALLBACK_TIMEOUT_MS, OBSERVE_CONTENT_MAX_CHARS, OBSERVE_ID_MAX_CHARS, OBSERVE_IMAGE_BASE64_MAX_CHARS, OBSERVE_IMAGE_MAX_BYTES, OBSERVE_SCOPE_MAX_CHARS, OBSERVE_SUMMARY_CELLS, } from './dsh-adapter/message-observer.js';
+export { COMMAND_ERROR_CODES, hasCommandErrorCode, mapCommandError, withCommandErrorMapping, } from './dsh-adapter/command-errors.js';
+// Command attribution and decision registration are host-internal. Exposing
+// these functions would let a plugin inspect or rewrite another plugin's
+// checkpoint, or install an unmediated handler.
+export { DECISION_EVENT_PERMISSIONS, } from './dsh-adapter/decision-guard.js';
+export { DECISION_HANDLER_TIMEOUT_MS, DECISION_TOTAL_TIMEOUT_MS, } from './dsh-adapter/extension-events.js';
 export { DECISION_EVENTS_COORDINATE, TUI_EXTENSION_API_VERSION, TUI_DECISION_EVENT_NAMES, TUI_EXTENSION_PERMISSION_NAMES, createAdmissionCatalog, } from './plugin-spec/tui-extension.js';

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 = "a2faa86243a5693ee4970e3d8b3aaf361edea298";
-export declare const ECOSYSTEM_SPEC_REVISION = "be1e9a219bd01decf79d825e0c3ac1685bde2be4";
+export declare const DSH_STD_REVISION = "614dfa1ac168db79fcf4577cf0ebb34e2e3b944b";
+export declare const ECOSYSTEM_SPEC_REVISION = "e1b902b0f95f4280a8e68d414ec7a4d25d6ce106";
 export interface SpecData {
     dir: string;
     registry: ContractRegistry;

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/plugin-spec/registry.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAO5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAErF,eAAO,MAAM,gBAAgB,6CAA6C,CAAA;AAC1E,eAAO,MAAM,uBAAuB,6CAA6C,CAAA;AAEjF,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,WAAW,EAAE,kBAAkB,CAAA;IAC/B,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC/B,CAAA;CACF;AAID,wBAAgB,aAAa,CAAC,KAAK,GAAE,MAAgD,GAAG,MAAM,GAAG,SAAS,CASzG;AA0CD,wBAAgB,YAAY,CAAC,GAAG,GAAE,MAAM,GAAG,SAA2B,GAAG,QAAQ,GAAG,SAAS,CAiB5F;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,aAAa,EAAE,CAI3E;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,MAAM,EAAE,CAE5E;AAED,sEAAsE;AACtE,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CAsBvD;AAED,4EAA4E;AAC5E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CAiC/D"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/plugin-spec/registry.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAO5D,OAAO,KAAK,EAAE,gBAAgB,EAAmB,kBAAkB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAEtG,eAAO,MAAM,gBAAgB,6CAA6C,CAAA;AAC1E,eAAO,MAAM,uBAAuB,6CAA6C,CAAA;AAEjF,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,WAAW,EAAE,kBAAkB,CAAA;IAC/B,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC/B,CAAA;CACF;AAuBD,wBAAgB,aAAa,CAAC,KAAK,GAAE,MAAgD,GAAG,MAAM,GAAG,SAAS,CASzG;AAiFD,wBAAgB,YAAY,CAAC,GAAG,GAAE,MAAM,GAAG,SAA2B,GAAG,QAAQ,GAAG,SAAS,CAiB5F;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,aAAa,EAAE,CAI3E;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,MAAM,EAAE,CAE5E;AAED,sEAAsE;AACtE,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CAuCvD;AAED,4EAA4E;AAC5E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CA2C/D"}

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

@@ -4,14 +4,32 @@ import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createAdmissionCatalog } from './tui-extension.js';
-export const DSH_STD_REVISION = 'a2faa86243a5693ee4970e3d8b3aaf361edea298';
-export const ECOSYSTEM_SPEC_REVISION = 'be1e9a219bd01decf79d825e0c3ac1685bde2be4';
+export const DSH_STD_REVISION = '614dfa1ac168db79fcf4577cf0ebb34e2e3b944b';
+export const ECOSYSTEM_SPEC_REVISION = 'e1b902b0f95f4280a8e68d414ec7a4d25d6ce106';
 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';
+const EXPECTED_STD_SUBMODULE = 'vendor/dsh-std';
+const EXPECTED_STD_MANIFEST_VERSION = '0.15';
+const EXPECTED_PERMISSION_REGISTRY_VERSION = '0.1';
+// The permission registry is policy, not merely input data. Keep the
+// admission defaults and scopes pinned to the reviewed dsh-ecosystem-spec
+// revision so a locally modified copy cannot silently widen a capability.
+const EXPECTED_PERMISSIONS = Object.freeze([
+    { name: 'storage.local.read', default: 'deny', revocable: true, scope: 'plugin namespace' },
+    { name: 'storage.local.write', default: 'deny', revocable: true, scope: 'plugin namespace' },
+    { name: 'commands.invoke', default: 'allow', revocable: true, scope: 'declared command id' },
+    { name: 'messages.observe.read', default: 'deny', revocable: true, scope: 'message observation scope' },
+    { name: 'session.input.intercept', default: 'deny', revocable: true, scope: 'decision event subscription' },
+    { name: 'session.rewind.intercept', default: 'deny', revocable: true, scope: 'decision event subscription' },
+    { name: 'session.switch.intercept', default: 'deny', revocable: true, scope: 'decision event subscription' },
+    { name: 'session.compact.intercept', default: 'deny', revocable: true, scope: 'decision event subscription' },
+]);
 export function locateSpecDir(start = dirname(fileURLToPath(import.meta.url))) {
     let dir = start;
     for (let index = 0; index < 8; index++) {
-        if (existsSync(join(dir, 'ecosystem-spec', REGISTRY_FILE)))
-            return join(dir, 'ecosystem-spec');
+        if (existsSync(join(dir, 'dsh-ecosystem-spec', REGISTRY_FILE)))
+            return join(dir, 'dsh-ecosystem-spec');
         const parent = dirname(dir);
         if (parent === dir)
             return undefined;
@@ -26,41 +44,89 @@ function isRecord(value) {
     return value !== null && typeof value === 'object' && !Array.isArray(value);
 }
 function soundEntry(value, privateDefinition) {
-    if (!isRecord(value) || typeof value.name !== 'string' || typeof value.kind !== 'string')
+    if (!isRecord(value) || typeof value.name !== 'string' || value.name === ''
+        || (value.kind !== 'capability' && value.kind !== 'event'))
         return false;
     if (!isRecord(value.coordinates)
-        || typeof value.coordinates.apiVersion !== 'string'
-        || typeof value.coordinates.kind !== 'string')
+        || typeof value.coordinates.apiVersion !== 'string' || value.coordinates.apiVersion === ''
+        || typeof value.coordinates.kind !== 'string' || value.coordinates.kind === '')
         return false;
     if (!Array.isArray(value.permissions) || !value.permissions.every(permission => typeof permission === 'string'))
         return false;
     if (privateDefinition) {
         return value.authority === 'dsh-tui'
             && typeof value.profile === 'string'
-            && typeof value.profileHash === 'string';
+            && value.profile.length > 0
+            && typeof value.profileHash === 'string'
+            && /^sha256:[0-9a-f]{64}$/u.test(value.profileHash);
     }
-    return typeof value.package === 'string' && value.package.startsWith('@dsh-std/');
+    return typeof value.package === 'string' && /^@dsh-std\/[a-z0-9][a-z0-9-]*$/u.test(value.package);
 }
 function structurallySound(data) {
     if (!isRecord(data.registry)
-        || typeof data.registry.profileVersion !== 'string'
+        || data.registry.profileVersion !== EXPECTED_PROFILE_VERSION
         || !isRecord(data.registry.std)
+        || data.registry.std.repository !== EXPECTED_STD_REPOSITORY
+        || data.registry.std.submodule !== EXPECTED_STD_SUBMODULE
+        || data.registry.std.manifestVersion !== EXPECTED_STD_MANIFEST_VERSION
         || !Array.isArray(data.registry.imports)
         || !Array.isArray(data.registry.definitions)
         || !Array.isArray(data.registry.facetApiVersions)
-        || !data.registry.facetApiVersions.every(version => typeof version === 'string'))
+        || data.registry.facetApiVersions.length === 0
+        || !data.registry.facetApiVersions.every(version => typeof version === 'string'
+            && /^v[0-9]+(?:alpha[0-9]+|beta[0-9]+)?$/u.test(version)))
+        return false;
+    if (new Set(data.registry.facetApiVersions).size !== data.registry.facetApiVersions.length)
         return false;
     if (!data.registry.imports.every(entry => soundEntry(entry, false)))
         return false;
     if (!data.registry.definitions.every(entry => soundEntry(entry, true)))
         return false;
-    if (!isRecord(data.permissions) || !Array.isArray(data.permissions.permissions))
+    const entries = [...data.registry.imports, ...data.registry.definitions];
+    const names = new Set();
+    const coordinates = new Set();
+    for (const entry of entries) {
+        if (names.has(entry.name))
+            return false;
+        names.add(entry.name);
+        const key = `${entry.coordinates.apiVersion}#${entry.coordinates.kind}`;
+        if (coordinates.has(key))
+            return false;
+        coordinates.add(key);
+        if ('authority' in entry && !entry.coordinates.apiVersion.startsWith('tui.dsh/'))
+            return false;
+    }
+    if (!isRecord(data.permissions)
+        || data.permissions.registryVersion !== EXPECTED_PERMISSION_REGISTRY_VERSION
+        || !Array.isArray(data.permissions.permissions)
+        || data.permissions.permissions.length !== EXPECTED_PERMISSIONS.length)
         return false;
+    const expectedPermissions = new Map(EXPECTED_PERMISSIONS.map(permission => [permission.name, permission]));
+    const permissionNames = new Set();
     for (const permission of data.permissions.permissions) {
         if (!isRecord(permission) || typeof permission.name !== 'string'
-            || (permission.default !== 'allow' && permission.default !== 'deny'))
+            || (permission.default !== 'allow' && permission.default !== 'deny')
+            || typeof permission.revocable !== 'boolean'
+            || typeof permission.scope !== 'string'
+            || permission.scope.trim() === '')
+            return false;
+        if (permissionNames.has(permission.name))
+            return false;
+        permissionNames.add(permission.name);
+        const expected = expectedPermissions.get(permission.name);
+        if (expected === undefined
+            || permission.default !== expected.default
+            || permission.revocable !== expected.revocable
+            || permission.scope !== expected.scope)
+            return false;
+        if ('rationale' in permission && permission.rationale !== undefined && typeof permission.rationale !== 'string')
             return false;
     }
+    if (permissionNames.size !== expectedPermissions.size)
+        return false;
+    const knownPermissions = new Set(expectedPermissions.keys());
+    if (!entries.every(entry => entry.permissions.every(permission => knownPermissions.has(permission))))
+        return false;
     return Object.values(data.schemas).every(isRecord);
 }
 export function loadSpecData(dir = locateSpecDir()) {
@@ -94,13 +160,32 @@ export function digestFile(dir, relative) {
 /** Verify definition availability and private profile digest pins. */
 export function verifyRegistry(data) {
     const failures = [];
-    if (!Array.isArray(data.registry.imports)
-        || !Array.isArray(data.registry.definitions)) {
+    const registry = data?.registry;
+    if (!isRecord(registry)
+        || !Array.isArray(registry.imports)
+        || !Array.isArray(registry.definitions)) {
         return ['registry imports/definitions are malformed'];
     }
+    const names = new Set();
+    const coordinates = new Set();
     const { protocols } = createAdmissionCatalog();
-    for (const entry of registryEntries(data.registry)) {
+    for (const raw of [...registry.imports, ...registry.definitions]) {
+        const privateDefinition = registry.definitions.includes(raw);
+        if (!soundEntry(raw, privateDefinition)) {
+            failures.push('registry entry is malformed');
+            continue;
+        }
+        const entry = raw;
         const key = `${entry.coordinates.apiVersion}#${entry.coordinates.kind}`;
+        if (names.has(entry.name))
+            failures.push(`${entry.name}: duplicate registry name`);
+        names.add(entry.name);
+        if (coordinates.has(key))
+            failures.push(`${key}: duplicate registry coordinate`);
+        coordinates.add(key);
+        if ('authority' in entry && !entry.coordinates.apiVersion.startsWith('tui.dsh/')) {
+            failures.push(`${key}: dsh-tui definition must use the private protocol group`);
+        }
         if (!protocols.understands(entry.coordinates))
             failures.push(`${key}: ProtocolCatalog definition unavailable`);
         if ('profile' in entry) {
@@ -125,13 +210,23 @@ export function verifyContractProfiles(data) {
         'errors', 'concurrency', 'timeout', 'cleanup', 'privacyClass', 'securityBoundary',
     ];
     const failures = [];
-    if (!Array.isArray(data.registry.definitions)) {
+    if (!isRecord(data?.registry)
+        || !Array.isArray(data.registry.definitions)) {
         return ['registry definitions are malformed'];
     }
     for (const entry of data.registry.definitions) {
+        if (!soundEntry(entry, true)) {
+            failures.push('registry definition is malformed');
+            continue;
+        }
         let profile;
         try {
-            profile = loadJson(data.dir, entry.profile);
+            const loaded = loadJson(data.dir, entry.profile);
+            if (!isRecord(loaded)) {
+                failures.push(`${entry.name}: private profile is not an object (${entry.profile})`);
+                continue;
+            }
+            profile = loaded;
         }
         catch {
             failures.push(`${entry.name}: private profile unreadable (${entry.profile})`);

package/lib/types/plugin-spec/tui-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-extension.d.ts","sourceRoot":"","sources":["../../../src/plugin-spec/tui-extension.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAE3E,OAAO,EAAE,eAAe,EAAE,KAAK,kBAAkB,EAAsB,MAAM,eAAe,CAAA;AAC5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAK7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,eAAO,MAAM,yBAAyB,qBAAqB,CAAA;AAE3D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,kBAAkB,CAGlE,CAAA;AAEF,eAAO,MAAM,wBAAwB,6HAO1B,CAAA;AAEX,eAAO,MAAM,8BAA8B,2HAKhC,CAAA;AAiBX,eAAO,MAAM,wBAAwB,EAAE,kBAsBrC,CAAA;AAEF,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,eAAe,CAAA;IAC1B,SAAS,EAAE,yBAAyB,CAAA;CACrC;AAED,gFAAgF;AAChF,wBAAgB,sBAAsB,IAAI,gBAAgB,CASzD"}
+{"version":3,"file":"tui-extension.d.ts","sourceRoot":"","sources":["../../../src/plugin-spec/tui-extension.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAE3E,OAAO,EAAE,eAAe,EAAE,KAAK,kBAAkB,EAAsB,MAAM,eAAe,CAAA;AAC5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAM7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,eAAO,MAAM,yBAAyB,qBAAqB,CAAA;AAE3D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,kBAAkB,CAGlE,CAAA;AAEF,eAAO,MAAM,wBAAwB,6HAO1B,CAAA;AAEX,eAAO,MAAM,8BAA8B,2HAKhC,CAAA;AAiBX,eAAO,MAAM,wBAAwB,EAAE,kBAsBrC,CAAA;AAEF,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,eAAe,CAAA;IAC1B,SAAS,EAAE,yBAAyB,CAAA;CACrC;AAED,gFAAgF;AAChF,wBAAgB,sBAAsB,IAAI,gBAAgB,CAUzD"}

package/lib/types/plugin-spec/tui-extension.js

@@ -5,6 +5,7 @@ import { register as registerCommand } from '@dsh-std/command';
 import { register as registerMessages } from '@dsh-std/messages';
 import { register as registerPresentation } from '@dsh-std/presentation';
 import { register as registerStorage } from '@dsh-std/storage';
+import { tuiChannelDefinition } from '#dsh-ecosystem-spec/tui-channel';
 export const TUI_EXTENSION_API_VERSION = 'tui.dsh/v1alpha1';
 export const DECISION_EVENTS_COORDINATE = Object.freeze({
     apiVersion: TUI_EXTENSION_API_VERSION,
@@ -73,5 +74,6 @@ export function createAdmissionCatalog() {
     registerMessages(protocols);
     registerPresentation(protocols);
     protocols.register(decisionEventsDefinition);
+    protocols.register(tuiChannelDefinition);
     return { protocols, manifests };
 }

package/lib/types/plugin-spec/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/plugin-spec/validate.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAG9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAG3D,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,WAAW,EAAE,kBAAkB,CAAA;IAC/B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,SAAS,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,WAAW,CAAC,CAAA;IACjE,SAAS,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,WAAW,CAAC,CAAA;IACjE,cAAc,CAAC,UAAU,EAAE,kBAAkB,GAAG,aAAa,GAAG,SAAS,CAAA;IACzE,kBAAkB,CAAC,GAAG,EAAE,kBAAkB,GAAG;QAAE,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;QAAC,mBAAmB,EAAE,OAAO,CAAA;KAAE,CAAA;IAC1G,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,aAAa,CAAA;CACzD;AAGD,eAAO,MAAM,OAAO,GAAI,YAAY,MAAM,KAAG,MAAwC,CAAA;AAErF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,kBAAkB,GAAG,aAAa,CAsC9G;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAwCnF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CA4B7E"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/plugin-spec/validate.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAG9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAG3D,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,WAAW,EAAE,kBAAkB,CAAA;IAC/B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,SAAS,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,WAAW,CAAC,CAAA;IACjE,SAAS,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,WAAW,CAAC,CAAA;IACjE,cAAc,CAAC,UAAU,EAAE,kBAAkB,GAAG,aAAa,GAAG,SAAS,CAAA;IACzE,kBAAkB,CAAC,GAAG,EAAE,kBAAkB,GAAG;QAAE,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;QAAC,mBAAmB,EAAE,OAAO,CAAA;KAAE,CAAA;IAC1G,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,aAAa,CAAA;CACzD;AAGD,eAAO,MAAM,OAAO,GAAI,YAAY,MAAM,KAAG,MAAwC,CAAA;AAErF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,kBAAkB,GAAG,aAAa,CAsC9G;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CA4DnF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CA4B7E"}

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

@@ -58,7 +58,18 @@ export function validatePlugin(index, manifest) {
         index.resolveSubscription(subscription);
     const knownPermissions = new Set(index.permissions.permissions.map(permission => permission.name));
     const commandIds = new Set(manifest.contributes.commands.map(command => command.id));
-    const requiresDecisionEvents = manifest.requires.contracts.some(requirement => requirement.apiVersion === 'tui.dsh/v1alpha1' && requirement.kind === 'DecisionEvents');
+    const requiresDecisionEvents = manifest.requires.contracts.some(requirement => requirement.kind === 'DecisionEvents'
+        && groupOf(requirement.apiVersion) === groupOf('tui.dsh/v1alpha1'));
+    const capabilityForPermission = {
+        'commands.invoke': { apiVersion: 'commands.dsh/v1alpha1', kind: 'Command' },
+        'storage.local.read': { apiVersion: 'storage.dsh/v1alpha1', kind: 'LocalStorage' },
+        'storage.local.write': { apiVersion: 'storage.dsh/v1alpha1', kind: 'LocalStorage' },
+        'messages.observe.read': { apiVersion: 'messages.dsh/v1alpha1', kind: 'MessageObserver' },
+        'session.input.intercept': { apiVersion: 'tui.dsh/v1alpha1', kind: 'DecisionEvents' },
+        'session.rewind.intercept': { apiVersion: 'tui.dsh/v1alpha1', kind: 'DecisionEvents' },
+        'session.switch.intercept': { apiVersion: 'tui.dsh/v1alpha1', kind: 'DecisionEvents' },
+        'session.compact.intercept': { apiVersion: 'tui.dsh/v1alpha1', kind: 'DecisionEvents' },
+    };
     for (const permission of manifest.permissions) {
         if (!knownPermissions.has(permission.name)) {
             throw new Error(`permission is not admitted by the TUI profile: ${permission.name}`);
@@ -72,6 +83,14 @@ export function validatePlugin(index, manifest) {
         if (INTERCEPT_PERMISSIONS.has(permission.name) && !requiresDecisionEvents) {
             throw new Error(`${permission.name} requires tui.dsh/v1alpha1#DecisionEvents`);
         }
+        const capability = capabilityForPermission[permission.name];
+        // An otherwise valid contract reference may use an unregistered version
+        // from the same protocol group. Keep that manifest structurally valid so
+        // negotiation can return UNKNOWN_PROTOCOL_VERSION rather than letting the
+        // permission/capability cross-check mask the version-drift decision.
+        if (capability !== undefined && !manifest.requires.contracts.some(requirement => requirement.kind === capability.kind && groupOf(requirement.apiVersion) === groupOf(capability.apiVersion))) {
+            throw new Error(`${permission.name} requires ${capability.apiVersion}#${capability.kind}`);
+        }
     }
     for (const commandId of commandIds) {
         if (!manifest.permissions.some(permission => permission.name === 'commands.invoke' && permission.scope === commandId)) {

package/lib/types/scenes.d.ts

@@ -1,3 +1,4 @@
-export * from './dsh-adapter/scenes.js';
+export { name, TuiSceneRuntime } from './dsh-adapter/scenes.js';
+export type { TuiSceneProps, TuiSceneDescriptor } from './dsh-adapter/scenes.js';
 export { default } from './dsh-adapter/scenes.js';
 //# sourceMappingURL=scenes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scenes.d.ts","sourceRoot":"","sources":["../../src/scenes.ts"],"names":[],"mappings":"AAEA,cAAc,yBAAyB,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA"}
+{"version":3,"file":"scenes.d.ts","sourceRoot":"","sources":["../../src/scenes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC/D,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA"}

package/lib/types/scenes.js

@@ -1,4 +1,4 @@
 // Re-export shim: the Cordis-backed implementation lives behind the adapter
 // boundary so UI consumers never import official @deepseek-ai/* packages.
-export * from './dsh-adapter/scenes.js';
+export { name, TuiSceneRuntime } from './dsh-adapter/scenes.js';
 export { default } from './dsh-adapter/scenes.js';

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

@@ -3,7 +3,7 @@ import { type Channel } from '../dsh-adapter/channel.js';
 import type { QuestionStore } from '../dsh-adapter/questions.js';
 import { TuiDialogStore } from '../dsh-adapter/dialogs.js';
 import { TuiStatusStore } from '../dsh-adapter/status.js';
-import type { TuiShortcutRuntime } from '../dsh-adapter/shortcuts.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, }: {
     channel: Channel;
@@ -22,8 +22,8 @@ export declare function Chat({ channel, questionStore, approvalStore, extensionD
     extensionDialogs?: TuiDialogStore;
     /** Plugin status-line contributions (tuiStatus service's store). */
     extensionStatus?: TuiStatusStore;
-    /** Plugin keyboard shortcut registry (tuiShortcuts service). */
-    extensionShortcuts?: TuiShortcutRuntime;
+    /** Host-only keyboard shortcut dispatch path. */
+    extensionShortcuts?: TuiShortcutHost;
     onExit: () => void;
     /** Update the installed package and restart the current TUI process. */
     onUpdate?: () => void;

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,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAwI3D,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,gEAAgE;IAChE,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC,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,qBA6jEA"}
+{"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;AAwI3D,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,qBAwlEA"}

package/lib/types/screens/Chat.js

@@ -164,12 +164,9 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     React.useEffect(() => {
         if (extensionShortcuts === undefined)
             return;
-        extensionShortcuts.onError = combo => {
+        return extensionShortcuts.setErrorHandler(combo => {
             channel.notify(t('ext-shortcut-failed', { combo }), { color: 'error', timeoutMs: 4000 });
-        };
-        return () => {
-            extensionShortcuts.onError = undefined;
-        };
+        });
     }, [extensionShortcuts, channel]);
     // When a questionnaire batch completes, fold a Q&A summary into the
     // transcript (the tool card itself is hidden from the message list).
@@ -277,15 +274,9 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     /**
      * Close the scene.
      *
-     * Leaving the alternate screen makes the terminal restore the main buffer
-     * itself; Ink then repaints once, because `setAltScreenActive(false)` blanks
-     * its front frame. In inline mode that costs one frame of scrollback per
-     * round trip — the same, already-accepted cost as the Ctrl+X external-editor
-     * handoff, and bounded per OPEN rather than per keystroke. Making it zero
-     * needs the render core to save and restore the pre-alt front frame, which
-     * is a separate change to `setAltScreenActive` and deliberately not made
-     * here. `verify-trace-scene` pins the property that matters meanwhile:
-     * navigating inside the scene adds nothing at all.
+     * Leaving the alternate screen makes the terminal restore the main buffer;
+     * Ink restores the matching saved frame and diffs any conversation changes
+     * that happened while the scene was open.
      */
     const closeScene = React.useCallback(() => {
         setSceneOpen(false);
@@ -302,6 +293,8 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     }, []);
     /** The startup summary gives way to transcript rows after the first local command or message. */
     const loadedContextVisible = channel.rows.length === 0 && channel.loadedContext !== undefined;
+    /** Startup context panel: collapsed by default, toggled with Ctrl+P. */
+    const [loadedContextOpen, setLoadedContextOpen] = React.useState(false);
     /** `/` transcript search (less-style incsearch, ported from CC's REPL). */
     const [searchOpen, setSearchOpen] = React.useState(false);
     const [searchQuery, setSearchQuery] = React.useState('');
@@ -581,7 +574,8 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             case 'lang': {
                 // `/lang` shows the current UI language, `/lang en|zh` switches
                 // (hot-swap, persisted to ~/.dsh-tui/lang.json). Precedence on next
-                // launch: DSH_TUI_LANG > cordis.yml `lang` > the persisted choice.
+                // launch: DSH_TUI_LANG > settings.yaml `dsh-tui.lang` > cordis.yml
+                // `lang` > the persisted choice.
                 const parts = rawInput.trim().split(/\s+/).filter(Boolean);
                 if (parts[0] === 'status') {
                     setHelpOpen(false);
@@ -597,6 +591,16 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                     if (isLang(parts[0])) {
                         const ok = writeLangPref(parts[0]);
                         setLang(parts[0]);
+                        // Mirror into the dsh-tui settings namespace when it is served,
+                        // so /settings and the next boot see the same last-write-wins
+                        // choice (best effort; lang.json stays the fallback).
+                        const settingsHost = channel.settingsHost();
+                        const tuiView = settingsHost?.listNamespaces().find(entry => entry.ns === 'dsh-tui');
+                        if (settingsHost !== undefined && tuiView !== undefined) {
+                            void settingsHost
+                                .write('dsh-tui', [{ op: 'set', path: ['lang'], value: parts[0] }], tuiView.revision)
+                                .catch(() => { });
+                        }
                         channel.notify(ok ? t('lang-switched', { lang: parts[0] }) : t('lang-switch-failed', { lang: parts[0] }), { color: ok ? 'success' : 'error' });
                     }
                     else {
@@ -1805,10 +1809,17 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             return;
         }
         if (isMod(key) && input === 't') {
-            // Ctrl+T has one stable meaning; loaded-context details live at /context.
+            // Ctrl+T opens the trajectory scene at any point in the session.
             openScene();
             return;
         }
+        if (isMod(key) && input === 'p' && loadedContextVisible) {
+            // Ctrl+P toggles the startup loaded-context panel while it is on
+            // screen (transcript still empty); once rows take over and the
+            // panel disappears the key has nothing left to do.
+            setLoadedContextOpen(previous => !previous);
+            return;
+        }
         if (isMod(key) && input === 'r' && !helpOpen) {
             setHistoryQuery('');
             setHistoryCursor(0);
@@ -1854,6 +1865,16 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
         else if (isMod(key) && input === 'o') {
             // Leaving transcript mode (Ctrl+O) — search was already handled above.
             setExpanded(previous => !previous);
+            // The toggle rewrites every thinking row's layout at once. The
+            // ordinary scroll-based diff pushes rows into terminal scrollback on
+            // each expand and nothing removes them on collapse — rapid toggling
+            // drifts the virtual↔scrollback mapping until writes misland
+            // (garbled transcript, duplicated rows). Re-anchor the next frame:
+            // in-place viewport repaint, nothing added to scrollback. Lookup
+            // falls back to the only live instance for embedders whose stdout
+            // isn't process.stdout (test harnesses).
+            const ink = instances.get(process.stdout) ?? instances.values().next().value;
+            ink?.reanchorViewport();
         }
         else if (input === '/' && !key.ctrl && !key.meta && !key.super) {
             // `/` in transcript mode (Ctrl+O expanded, CC's REPL semantics:
@@ -1986,7 +2007,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                         seekRow(lastUser.id);
                     else
                         handle?.scrollToBottom();
-                } })), _jsxs(ScrollBox, { ref: setHandle, flexDirection: "column", flexGrow: 1, flexShrink: 1, stickyScroll: true, children: [_jsx(LogoHeader, { model: channel.model, effort: channel.reasoningEffort, cwd: channel.displayCwd }), loadedContextVisible && (_jsx(LoadedContextPanel, { context: channel.loadedContext })), _jsx(MessageList, { rows: channel.rows, failureHintRowId: failureHintRowId, failureHint: t('traj-hint-failure', { key: `${modLabel}t` }), expanded: expanded, expandedRows: expandedRows, selectedId: selectionActive ? selectedId : null, onToggleRow: toggleRowExpanded, model: channel.model, diffLayout: channel.diffLayout, showAll: showAllMessages, thinkingVisible: thinkingVisible, onToggleAll: () => { setShowAllMessages(previous => !previous); }, onLoadOlder: () => channel.loadOlder(), registerRowRef: registerRowRef, scrollHandle: handle, forceMountRowId: forceMountRowId, newSinceRowId: isSticky ? null : lastSeenRowIdRef.current, onUnseenCount: setUnseenCount })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [showPill && (_jsx(NewMessagesPill, { count: unseenCount, onClick: () => handle?.scrollToBottom() })), channel.working &&
+                } })), _jsxs(ScrollBox, { ref: setHandle, flexDirection: "column", flexGrow: 1, flexShrink: 1, stickyScroll: true, children: [_jsx(LogoHeader, { model: channel.model, effort: channel.reasoningEffort, cwd: channel.displayCwd }), loadedContextVisible && (_jsx(LoadedContextPanel, { context: channel.loadedContext, open: loadedContextOpen, onToggle: () => { setLoadedContextOpen(previous => !previous); } })), _jsx(MessageList, { rows: channel.rows, failureHintRowId: failureHintRowId, failureHint: t('traj-hint-failure', { key: `${modLabel}t` }), expanded: expanded, expandedRows: expandedRows, selectedId: selectionActive ? selectedId : null, onToggleRow: toggleRowExpanded, model: channel.model, diffLayout: channel.diffLayout, thinkingFold: channel.thinkingFold, showAll: showAllMessages, thinkingVisible: thinkingVisible, onToggleAll: () => { setShowAllMessages(previous => !previous); }, onLoadOlder: () => channel.loadOlder(), registerRowRef: registerRowRef, scrollHandle: handle, forceMountRowId: forceMountRowId, newSinceRowId: isSticky ? null : lastSeenRowIdRef.current, onUnseenCount: setUnseenCount })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [showPill && (_jsx(NewMessagesPill, { count: unseenCount, onClick: () => handle?.scrollToBottom() })), channel.working &&
                         (channel.activityEnabled &&
                             channel.workingActivity !== undefined &&
                             channel.workingActivity.line !== '' &&

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

@@ -1 +1 @@
-{"version":3,"file":"SessionBrowser.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionBrowser.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAsBzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAoDxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,WAAW,EACX,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,4EAA4E;IAC5E,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;IAC9C,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CAselB"}
+{"version":3,"file":"SessionBrowser.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionBrowser.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAsBzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAoDxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,WAAW,EACX,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,4EAA4E;IAC5E,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;IAC9C,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CA4elB"}

package/lib/types/screens/SessionBrowser.js

@@ -354,13 +354,20 @@ export function SessionBrowser({ channel, home, sameProject, onClose, }) {
             // did. `resumeTo` reports its own reasons; this only has to stay put.
             runAction(async () => {
                 try {
-                    const ok = await channel.resumeTo(target.id);
-                    if (ok) {
+                    const result = await channel.resumeTo(target.id);
+                    if (result.ok) {
                         channel.notify(t('resume-resumed'));
                         onClose();
                     }
                     else {
-                        setNotice({ text: t('session-resume-refused'), tone: 'error' });
+                        if (result.reason === 'cancelled')
+                            return;
+                        const text = result.reason === 'working'
+                            ? t('resume-while-working')
+                            : result.reason === 'unavailable'
+                                ? t('resume-unavailable')
+                                : t('session-resume-failed', { err: result.error });
+                        setNotice({ text, tone: 'error' });
                     }
                 }
                 catch (error) {

package/lib/types/sessions/view.d.ts

@@ -6,8 +6,9 @@
  * flat list of rows. Two reasons it is shaped that way:
  *
  * - Filtering is where this feature's bugs were. Keeping it pure means the
- *   truth table — a sub-agent run is hidden, a rewind fork is not, a boot
- *   artifact is hidden but counted — is checkable without rendering anything.
+ *   truth table — a sub-agent run is hidden, an unrelated rewind fork is not,
+ *   a boot artifact is hidden but counted — is checkable without rendering
+ *   anything.
  * - Rows are flattened rather than nested. A windowed list of variable-height
  *   groups has to guess how much room each group needs; a flat list of
  *   single-line rows is windowed by arithmetic, and the group headers simply

package/lib/types/sessions/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/sessions/view.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEtE,6CAA6C;AAC7C,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,wEAAwE;IACxE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,8DAA8D;IAC9D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,qEAAqE;IACrE,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;CAChC;AAED,oEAAoE;AACpE,eAAO,MAAM,eAAe,EAAE,cAK7B,CAAA;AAED,sCAAsC;AACtC,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1F,uDAAuD;AACvD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,CAAA;IACpC,+CAA+C;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,yDAAyD;IACzD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAA;IAChC,8EAA8E;IAC9E,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;CACrC;AAgBD;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,SAAS,cAAc,EAAE,EACnC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;CAAE,GACtH,WAAW,CAmGb;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAK9F;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAKhG;AAED,+DAA+D;AAC/D,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAGhG;AAED,2EAA2E;AAC3E,wBAAgB,SAAS,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAEjD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,SAAS,UAAU,EAAE,EAC3B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,MAAM,CAoBR;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAU1F"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/sessions/view.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEtE,6CAA6C;AAC7C,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,wEAAwE;IACxE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,8DAA8D;IAC9D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,qEAAqE;IACrE,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;CAChC;AAED,oEAAoE;AACpE,eAAO,MAAM,eAAe,EAAE,cAK7B,CAAA;AAED,sCAAsC;AACtC,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1F,uDAAuD;AACvD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,CAAA;IACpC,+CAA+C;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,yDAAyD;IACzD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAA;IAChC,8EAA8E;IAC9E,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;CACrC;AAgBD;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,SAAS,cAAc,EAAE,EACnC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;CAAE,GACtH,WAAW,CAqHb;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAK9F;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAKhG;AAED,+DAA+D;AAC/D,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAGhG;AAED,2EAA2E;AAC3E,wBAAgB,SAAS,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAEjD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,SAAS,UAAU,EAAE,EAC3B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,MAAM,CAoBR;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAU1F"}

package/lib/types/sessions/view.js

@@ -32,7 +32,25 @@ function matches(session, needle) {
  */
 export function buildView(sessions, filters, context) {
     const needle = filters.query.trim().toLowerCase();
+    // `/model` and `/rewind` continue the live conversation in a fork. Offering
+    // that fork's ancestors in `/resume` makes one conversation look like many,
+    // and selecting one silently jumps back before the fork. Only the live
+    // lineage is excluded: unrelated forks remain recoverable. Treat malformed
+    // cycles as a closed chain rather than looping forever over foreign data.
+    const byId = new Map(sessions.map(session => [session.id, session]));
+    const currentAncestors = new Set();
+    const seen = new Set([context.currentId]);
+    let cursor = byId.get(context.currentId);
+    while (cursor?.kind.kind === 'fork') {
+        const parent = cursor.kind.parent;
+        if (seen.has(parent))
+            break;
+        seen.add(parent);
+        currentAncestors.add(parent);
+        cursor = byId.get(parent);
+    }
     const inScope = (session) => session.id !== context.currentId &&
+        !currentAncestors.has(session.id) &&
         (filters.allProjects || context.sameProject(context.cwd, session.cwd));
     // Empty sessions never reach a view, but they are counted — and the count
     // feeds a DESTRUCTIVE action, so it is scoped exactly as the list is.

package/lib/types/settings-sections.d.ts

@@ -1,3 +1,4 @@
-export * from './dsh-adapter/settings-sections.js';
+export { name, TuiSettingsSectionsRuntime } from './dsh-adapter/settings-sections.js';
+export type { TuiSettingsFieldKind, TuiSettingsFieldOption, TuiSettingsFieldWrite, TuiSettingsField, TuiSettingsSection, } from './dsh-adapter/settings-sections.js';
 export { default } from './dsh-adapter/settings-sections.js';
 //# sourceMappingURL=settings-sections.d.ts.map

package/lib/types/settings-sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../src/settings-sections.ts"],"names":[],"mappings":"AAEA,cAAc,oCAAoC,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA"}
+{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../src/settings-sections.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AACrF,YAAY,EACV,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA"}

package/lib/types/settings-sections.js

@@ -1,4 +1,4 @@
 // Re-export shim: the Cordis-backed implementation lives behind the adapter
 // boundary so UI consumers never import official @deepseek-ai/* packages.
-export * from './dsh-adapter/settings-sections.js';
+export { name, TuiSettingsSectionsRuntime } from './dsh-adapter/settings-sections.js';
 export { default } from './dsh-adapter/settings-sections.js';

package/lib/types/utils/execFileNoThrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execFileNoThrow.d.ts","sourceRoot":"","sources":["../../../src/utils/execFileNoThrow.ts"],"names":[],"mappings":"AAEA,qDAAqD;AACrD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,EACxB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CA8BhC"}
+{"version":3,"file":"execFileNoThrow.d.ts","sourceRoot":"","sources":["../../../src/utils/execFileNoThrow.ts"],"names":[],"mappings":"AAEA,qDAAqD;AACrD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,EACxB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CAiChC"}

package/lib/types/utils/execFileNoThrow.js

@@ -20,6 +20,9 @@ export function execFileNoThrow(file, args, options) {
         child.stderr.on('data', (chunk) => {
             stderrChunks.push(chunk);
         });
+        // A child may exit before consuming the supplied input. The resulting
+        // EPIPE/EOF belongs to that child outcome and must not crash the caller.
+        child.stdin.on('error', () => { });
         child.on('error', () => {
             resolve({
                 code: 1,