@deepseek-harness-tui/dsh-tui 0.10.0 → 0.10.2

package/lib/types/dsh-adapter/compat/sessionLog.js

@@ -8,8 +8,16 @@ import { homeDir } from '../../utils/paths.js';
  * UI frames — safe for the strict read path to accept and skip. Exported
  * for the regression verifier; grow it only with proof the type was always
  * inert (never load-bearing for session reconstruction).
+ *
+ * 0.1.5 note: the vouch is not only for OLD logs. `session/color` is written
+ * by the TUI itself on every host generation (session-metadata.ts), and
+ * 0.1.5's `validateStoredEvents` refuses unknown non-ignorable types at load
+ * — without this registration a single color pick makes that session
+ * permanently unresumable (probed: SessionFormatUnsupportedError without the
+ * vouch, clean load with it). The type stays inert for reconstruction either
+ * way: it only re-tints the row.
  */
-export const LEGACY_SESSION_EVENT_TYPES = ['activity/status'];
+export const LEGACY_SESSION_EVENT_TYPES = ['activity/status', 'session/color'];
 /** Zstd frame magic number, little-endian (0xFD2FB528). */
 const ZSTD_MAGIC = 0xfd2fb528;
 /**
@@ -41,12 +49,65 @@ export function sessionsRoots() {
 function isSafeSessionId(sessionId) {
     return /^[A-Za-z0-9][A-Za-z0-9_-]*$/.test(sessionId);
 }
+/**
+ * Canonical session-log generation basename, mirroring upstream
+ * dsh-session-format's `CANONICAL_LOG_FILENAME` (that package is not a
+ * blessed import, so the rule is re-derived here): version zero keeps the
+ * original `session.jsonl`; every later generation carries a lowercase
+ * numeric `.vN` component (0.1.5 writes `session.v3.jsonl`). Noncanonical,
+ * uppercase, leading-zero, and `.v0` names never identify committed
+ * generations. A `.zstd` suffix marks the compressed encoding.
+ */
+const GENERATION_LOG_NAME = /^session(?:\.v([1-9][0-9]*))?\.jsonl$/;
+function parseGenerationName(name) {
+    const compressed = name.endsWith('.zstd');
+    const match = GENERATION_LOG_NAME.exec(compressed ? name.slice(0, -'.zstd'.length) : name);
+    if (match === null)
+        return undefined;
+    return { name, version: match[1] === undefined ? 0 : Number(match[1]), compressed };
+}
+/**
+ * Pick the newest committed generation inside one session directory — the
+ * backend's `resolveGenerationInDirectory` rule (highest format version
+ * wins), with the compressed twin preferred on a tie (the stock default
+ * encoding; a mixed-encoding directory is something the backend itself
+ * refuses, so either tiebreak is honest for a read-only consumer).
+ * @param dir - Absolute session directory (`<root>/<workspace>/<id>`).
+ * @param compressedOnly - Restrict to zstd artifacts (the rename/delete
+ *   caller's historical contract).
+ */
+function selectGenerationLog(dir, compressedOnly) {
+    let entries;
+    try {
+        entries = readdirSync(dir);
+    }
+    catch {
+        return undefined;
+    }
+    let best;
+    for (const name of entries) {
+        const candidate = parseGenerationName(name);
+        if (candidate === undefined)
+            continue;
+        if (compressedOnly && !candidate.compressed)
+            continue;
+        if (best === undefined ||
+            candidate.version > best.version ||
+            (candidate.version === best.version && candidate.compressed && !best.compressed)) {
+            best = candidate;
+        }
+    }
+    return best === undefined ? undefined : { path: join(dir, best.name), compressed: best.compressed };
+}
 /**
  * Locate a session's log by scanning workspace directories for the session
  * id — deliberately NOT replicating the persistence plugin's workspace-key
- * sanitization, so the helpers survive upstream key-scheme changes.
+ * sanitization, so the helpers survive upstream key-scheme changes. Every
+ * committed generation is considered; the newest wins (the backend migrates
+ * historical artifacts by publishing a `session.vN` sibling and reading only
+ * it, so the newest generation is always the authoritative one).
  * @param sessionId - Session id (directory name under each workspace dir).
- * @returns Absolute path of session.jsonl.zstd, or undefined when absent.
+ * @returns Absolute path of the selected log, or undefined when absent.
  */
 export function findSessionLogFile(sessionId) {
     if (!isSafeSessionId(sessionId))
@@ -60,9 +121,11 @@ export function findSessionLogFile(sessionId) {
             continue;
         }
         for (const ws of workspaces) {
-            const candidate = join(root, ws, sessionId, 'session.jsonl.zstd');
-            if (existsSync(candidate))
-                return candidate;
+            // Historical contract of this helper: the compressed artifact only
+            // (the rename/delete/title-string paths predate plain-encoding logs).
+            const selected = selectGenerationLog(join(root, ws, sessionId), true);
+            if (selected !== undefined)
+                return selected.path;
         }
     }
     return undefined;
@@ -70,11 +133,163 @@ export function findSessionLogFile(sessionId) {
 let cachedDecoder;
 function decodeStorageRecord(value) {
     if (cachedDecoder === undefined) {
-        const req = createRequire(import.meta.url);
-        cachedDecoder = req('@deepseek-ai/dsh-session').decodeStorageRecord;
+        cachedDecoder = loadUpstreamDecoder() ?? decodeStorageRecordLocal;
     }
     return cachedDecoder(value);
 }
+function loadUpstreamDecoder() {
+    try {
+        const req = createRequire(import.meta.url);
+        const mod = req('@deepseek-ai/dsh-session');
+        return typeof mod.decodeStorageRecord === 'function'
+            ? mod.decodeStorageRecord
+            : undefined;
+    }
+    catch {
+        // No resolvable dsh-session copy from this tree — the local decoder is
+        // fully self-contained, so reads still work.
+        return undefined;
+    }
+}
+/* ------------------------------------------------------------------------- *\
+ * Local port of the removed dsh-session chunk-rows decoder (0.1.2-rc.1 and
+ * earlier, lib/types/chunk-rows.js). Storage rows are a durable-encoding
+ * vocabulary, NOT session events: the packChunks writer folded each run of
+ * same-block delta chunks into ONE `text-chunks`/`reasoning-chunks`/
+ * `tool-call-chunks` line. Row-tagged values validate and expand (a malformed
+ * row throws — it is corrupt storage, and treating it as an event would
+ * silently drop a whole run); every other value passes through as a single
+ * event, unvalidated.
+\* ------------------------------------------------------------------------- */
+function isRecordValue(value) {
+    return typeof value === 'object' && value !== null;
+}
+/** Exact-key check: `value` has every key in `keys` and nothing else. */
+function hasExactKeys(value, keys) {
+    return Object.keys(value).length === keys.length && keys.every(k => Object.hasOwn(value, k));
+}
+/** The uniform malformed-row diagnostic. */
+function malformedRow(tag, why) {
+    throw new Error(`malformed ${tag} storage row: ${why}`);
+}
+/** Validate the shared run-data fields and the payload/dt arity; returns the member payload. */
+function validateRunData(tag, data, payloadKey) {
+    if (typeof data.turn !== 'number' || typeof data.step !== 'number' || typeof data.index !== 'number') {
+        malformedRow(tag, 'turn/step/index must be numbers');
+    }
+    const payload = data[payloadKey];
+    if (!Array.isArray(payload) || payload.length === 0 || payload.some(entry => typeof entry !== 'string')) {
+        malformedRow(tag, `${payloadKey} must be a non-empty string array`);
+    }
+    const dt = data.dt;
+    if (!Array.isArray(dt) || dt.some(gap => !Number.isSafeInteger(gap))) {
+        malformedRow(tag, 'dt must be an array of safe integers');
+    }
+    if (dt.length !== payload.length - 1) {
+        malformedRow(tag, `dt length ${dt.length} does not match ${payload.length} members`);
+    }
+    return payload;
+}
+/** Validate a row-tagged parsed value's envelope and data, throwing on any malformation. */
+function validateChunkRow(value, tag) {
+    if (!hasExactKeys(value, ['type', 'seq0', 'time0', 'data'])) {
+        malformedRow(tag, 'envelope must be exactly {type, seq0, time0, data}');
+    }
+    if (!Number.isSafeInteger(value['seq0']) || value['seq0'] < 0) {
+        malformedRow(tag, 'seq0 must be a non-negative safe integer');
+    }
+    if (!Number.isSafeInteger(value['time0'])) {
+        malformedRow(tag, 'time0 must be a safe integer');
+    }
+    const data = value['data'];
+    if (!isRecordValue(data))
+        malformedRow(tag, 'data must be an object');
+    const row = data;
+    let payload;
+    if (tag === 'tool-call-chunks') {
+        const withName = hasExactKeys(row, ['turn', 'step', 'index', 'id', 'name', 'dt', 'args']);
+        if (!withName && !hasExactKeys(row, ['turn', 'step', 'index', 'id', 'dt', 'args'])) {
+            malformedRow(tag, 'data must be exactly {turn, step, index, id, name?, dt, args}');
+        }
+        if (typeof row['id'] !== 'string' || (withName && typeof row['name'] !== 'string')) {
+            malformedRow(tag, 'id (and name when present) must be strings');
+        }
+        payload = validateRunData(tag, row, 'args');
+    }
+    else {
+        if (!hasExactKeys(row, ['turn', 'step', 'index', 'dt', 'texts'])) {
+            malformedRow(tag, 'data must be exactly {turn, step, index, dt, texts}');
+        }
+        payload = validateRunData(tag, row, 'texts');
+    }
+    // Reconstruction bounds. The encoder only packs runs whose member seqs and
+    // times are all safe integers, so a running value that leaves safe range is
+    // outside any encoder's image: float arithmetic would round it to a
+    // different number than exact arithmetic, a silent corruption. Within safe
+    // range every step is exact, so the first departure is always caught.
+    const seq0 = value['seq0'];
+    if (!Number.isSafeInteger(seq0 + payload.length - 1)) {
+        malformedRow(tag, 'member seqs must stay safe integers');
+    }
+    let time = value['time0'];
+    for (const gap of row['dt']) {
+        time += gap;
+        if (!Number.isSafeInteger(time)) {
+            malformedRow(tag, 'member times must stay safe integers');
+        }
+    }
+    return { type: tag, seq0, time0: value['time0'], data: row };
+}
+/** Expand a validated row back into its exact original events, in order. */
+function expandChunkRow(row) {
+    const members = row.type === 'tool-call-chunks' ? row.data.args : row.data.texts;
+    const events = [];
+    let time = row.time0;
+    for (let k = 0; k < members.length; k++) {
+        if (k > 0)
+            time += row.data.dt[k - 1];
+        let chunk;
+        switch (row.type) {
+            case 'text-chunks':
+                chunk = { type: 'text-delta', index: row.data.index, text: members[k] };
+                break;
+            case 'reasoning-chunks':
+                chunk = { type: 'reasoning-delta', index: row.data.index, text: members[k] };
+                break;
+            default:
+                chunk = {
+                    type: 'tool-call-delta',
+                    index: row.data.index,
+                    id: row.data.id,
+                    ...(row.data.name !== undefined ? { name: row.data.name } : {}),
+                    argumentsDelta: members[k],
+                };
+                break;
+        }
+        // assistant/chunk is gone from the 0.1.5 SessionEvent union; the events
+        // are reconstructed structurally for the legacy-log replay path.
+        events.push({
+            type: 'assistant/chunk',
+            seq: row.seq0 + k,
+            time,
+            data: { turn: row.data.turn, step: row.data.step, chunk },
+        });
+    }
+    return events;
+}
+/**
+ * Structural twin of the removed upstream `decodeStorageRecord`: packed
+ * chunk rows expand, everything else passes through as one event.
+ */
+function decodeStorageRecordLocal(value) {
+    if (!isRecordValue(value))
+        return [value];
+    const tag = value['type'];
+    if (tag !== 'text-chunks' && tag !== 'reasoning-chunks' && tag !== 'tool-call-chunks') {
+        return [value];
+    }
+    return expandChunkRow(validateChunkRow(value, tag));
+}
 /** I/O slice for streamed log reads. */
 const READ_CHUNK = 64 * 1024;
 /**
@@ -90,9 +305,10 @@ const MAX_FRAME_BYTES = 64 * 1024 * 1024;
 const MAX_FRAME_TEXT_BYTES = 64 * 1024 * 1024;
 /**
  * Dual-encoding sibling of {@link findSessionLogFile} for the bounded tree
- * reader: also probes `session.jsonl` (a `compression:"none"` backend),
- * which the rename/delete/title-string path has no use for. Same multi-root
- * scan and id whitelist; compressed still wins when both exist.
+ * reader: also accepts plain `session*.jsonl` artifacts (a
+ * `compression:"none"` backend), which the rename/delete/title-string path
+ * has no use for. Same multi-root scan, id whitelist, and newest-generation
+ * selection; the compressed twin still wins a same-generation tie.
  * @param sessionId - Session id (directory name under each workspace dir).
  * @returns The log path and encoding, or undefined when absent.
  */
@@ -108,13 +324,9 @@ function findSessionLogFileAnyEncoding(sessionId) {
             continue;
         }
         for (const ws of workspaces) {
-            const dir = join(root, ws, sessionId);
-            const compressed = join(dir, 'session.jsonl.zstd');
-            if (existsSync(compressed))
-                return { path: compressed, compressed: true };
-            const plain = join(dir, 'session.jsonl');
-            if (existsSync(plain))
-                return { path: plain, compressed: false };
+            const selected = selectGenerationLog(join(root, ws, sessionId), false);
+            if (selected !== undefined)
+                return selected;
         }
     }
     return undefined;
@@ -412,19 +624,31 @@ function sniffLogFile(path) {
  * Resolve a `persistence.locate()` hint to a readable log. The hint may name
  * the physical artifact directly or the backend's LOGICAL name for it (the
  * jsonl backend's raw-artifact filename carries no encoding suffix), so the
- * compressed twin is probed as well. Encoding is sniffed from content, never
+ * compressed twin is probed as well. Since 0.1.5 the hint names the CURRENT
+ * generation (`session.vN.jsonl[.zstd]`) without touching the filesystem —
+ * for a session never opened since its format was superseded that file does
+ * not exist yet, and the authoritative artifact is an older-generation
+ * sibling in the same directory. Encoding is sniffed from content, never
  * inferred from the extension.
  * @param hint - Absolute path from SessionPersistence.locate().
  * @returns The readable log, or undefined when nothing materialized there.
  */
-function resolveLocatedPath(hint) {
+export function resolveLocatedPath(hint) {
     const direct = existsSync(hint) ? sniffLogFile(hint) : undefined;
     if (direct !== undefined)
         return direct;
     const twin = `${hint}.zstd`;
     if (existsSync(twin))
         return { path: twin, compressed: true };
-    return undefined;
+    // Generation fallback: only when the hint itself is a canonical
+    // generation name — a foreign backend's logical name must not steer a
+    // directory scan. The scan stays inside the backend's own session
+    // directory, so locate's authority over root and workspace key is kept.
+    const base = hint.slice(hint.lastIndexOf(sep) + 1);
+    const withoutSuffix = base.endsWith('.zstd') ? base.slice(0, -'.zstd'.length) : base;
+    if (!GENERATION_LOG_NAME.test(withoutSuffix))
+        return undefined;
+    return selectGenerationLog(dirname(hint), false);
 }
 /**
  * Shared bounded read loop over a located log. See readSessionEventsFromLog
@@ -441,9 +665,14 @@ function readEvents(file, maxEvents, maxScanned, skipBelowSeq) {
         return undefined;
     }
     let scanned = 0;
+    let formatVersion;
     const events = [];
+    const result = (complete, failed) => ({ events, complete, scanned, formatVersion, ...(failed ? { failed } : {}) });
     try {
         for (const record of logRecords(fd, file.compressed)) {
+            if (scanned === 0 && isRecordValue(record) && record['type'] === 'session' && Number.isSafeInteger(record['version'])) {
+                formatVersion = record['version'];
+            }
             for (const event of decodeStorageRecord(record)) {
                 // The SCAN budget bounds the real cost drivers — I/O, decompression,
                 // JSON.parse — which are paid for EVERY envelope, collected or not.
@@ -452,7 +681,7 @@ function readEvents(file, maxEvents, maxScanned, skipBelowSeq) {
                 // to collect a handful of events, blocking the TUI on panel open.
                 scanned += 1;
                 if (scanned > maxScanned)
-                    return { events, complete: false, scanned };
+                    return result(false);
                 const envelope = event;
                 if (typeof envelope['seq'] !== 'number' || envelope['ignorable'] === true)
                     continue;
@@ -468,17 +697,17 @@ function readEvents(file, maxEvents, maxScanned, skipBelowSeq) {
                 // Budget check BEFORE the push: an exact-fit log reports complete,
                 // and only a surviving (maxEvents+1)-th event marks truncation.
                 if (events.length >= maxEvents)
-                    return { events, complete: false, scanned };
+                    return result(false);
                 events.push(event);
             }
         }
-        return { events, complete: true, scanned };
+        return result(true);
     }
     catch {
         // An EXISTING but undecodable log (corruption, over-cap frame, decode
         // bomb): fail closed — never silently empty, never eligible for an
         // unbounded fallback re-read.
-        return { events, complete: false, scanned, failed: true };
+        return result(false, true);
     }
     finally {
         try {
@@ -524,11 +753,12 @@ export function readSessionEventsFromFile(path, maxEvents = Number.POSITIVE_INFI
  * cost-bounded. Built for the session tree (buildSessionTree), whose browse
  * must satisfy three constraints the strict backend read cannot:
  *
- *  - READ-ONLY: `persistence.inspect` rejects logs carrying third-party
- *    event types (working-activity's `activity/status`), and the resume
- *    seam's answer (in-process type registration, issue #153) must not be
- *    inverted here: opening a picker never rewrites a history log. This
- *    reader never writes; unknown types are simply passed through
+ *  - READ-ONLY: the strict backend read (`persistence.inspect` on pre-0.1.5
+ *    hosts, the validated `handle.read` path since) rejects logs carrying
+ *    third-party event types (working-activity's `activity/status`), and
+ *    the resume seam's answer (in-process type registration, issue #153)
+ *    must not be inverted here: opening a picker never rewrites a history
+ *    log. This reader never writes; unknown types are simply passed through
  *    (extractEntries skips what it does not know).
  *  - TOLERANT: envelope-shape or decode anomalies degrade to
  *    `failed: true` (a structure-only tree node) instead of rejecting the
@@ -595,10 +825,48 @@ function seedLengthOfPhysicalHeader(record) {
         return seed;
     return undefined;
 }
+/** The header's `isSeeded` flag (V2/V3 headers carry it instead of `seedLength`). */
+function isSeededPhysicalHeader(record) {
+    if (record === null || typeof record !== 'object' || Array.isArray(record))
+        return false;
+    const rec = record;
+    return rec['type'] === 'session' && rec['isSeeded'] === true;
+}
 /**
- * Read the physical JSONL header's `seedLength` from the first record.
- * Logical alpha.4 list headers only have `isSeeded`; the exact cut stays on
- * this first line. Does not scan events or guess from `session/end-seed`.
+ * The inherited cut recorded by a `session/end-seed` marker: seq of the last
+ * marker whose data carries `inherited: true` (the V2/V3 contract — the
+ * marker closes the inherited prefix, so its seq IS the prefix length).
+ */
+function inheritedMarkerCut(record) {
+    if (record === null || typeof record !== 'object' || Array.isArray(record))
+        return undefined;
+    const rec = record;
+    if (rec['type'] !== 'session/end-seed')
+        return undefined;
+    const data = rec['data'];
+    if (data === null || typeof data !== 'object' || data['inherited'] !== true) {
+        return undefined;
+    }
+    const seq = rec['seq'];
+    if (typeof seq === 'number' && Number.isSafeInteger(seq) && seq >= 0 && !Object.is(seq, -0))
+        return seq;
+    return undefined;
+}
+/**
+ * Envelope ceiling for the seeded-header marker scan: a fork's marker closes
+ * its inherited prefix, but earlier markers can belong to an ancestor. Scan
+ * the log to find the last one, bounded so a huge log degrades to "cut unknown"
+ * (the tree detaches the parent edge) instead of an unbounded read.
+ */
+const INHERITED_CUT_SCAN_LIMIT = 2_000_000;
+/**
+ * Read the exact inherited-prefix length from a log. Pre-V2 physical headers
+ * carry it as `seedLength` on the first line; V2/V3 headers only have
+ * `isSeeded`, and the cut is the seq of the `session/end-seed` marker event
+ * stamped with `inherited: true` — scanned for, bounded, only when the
+ * header says the session is seeded. Logical list headers never carry the
+ * cut on any generation. Never guesses from snapshot length, and an
+ * unseeded or marker-less log reports undefined (no cut to report).
  */
 export function readPhysicalHeaderSeedLength(path) {
     const file = resolveLocatedPath(path);
@@ -607,10 +875,31 @@ export function readPhysicalHeaderSeedLength(path) {
     let fd;
     try {
         fd = openSync(file.path, 'r');
+        let first = true;
+        let seeded = false;
+        let scanned = 0;
+        let inheritedCut;
         for (const record of logRecords(fd, file.compressed)) {
-            return seedLengthOfPhysicalHeader(record);
+            if (first) {
+                first = false;
+                const seed = seedLengthOfPhysicalHeader(record);
+                if (seed !== undefined)
+                    return seed;
+                if (!isSeededPhysicalHeader(record))
+                    return undefined;
+                seeded = true;
+                continue;
+            }
+            if (!seeded)
+                return undefined;
+            scanned += 1;
+            if (scanned > INHERITED_CUT_SCAN_LIMIT)
+                return undefined;
+            const cut = inheritedMarkerCut(record);
+            if (cut !== undefined)
+                inheritedCut = cut;
         }
-        return undefined;
+        return inheritedCut;
     }
     catch {
         return undefined;
@@ -626,7 +915,7 @@ export function readPhysicalHeaderSeedLength(path) {
         }
     }
 }
-/** Locate a session log by id and read its physical header `seedLength`. */
+/** Locate a session log by id and read its inherited-prefix cut. */
 export function readPhysicalHeaderSeedLengthForSession(sessionId) {
     const file = findSessionLogFileAnyEncoding(sessionId);
     if (file === undefined)

package/lib/types/dsh-adapter/component-identity.d.ts

@@ -1,6 +1,6 @@
 /** Verified Component identity bound to one Cordis activation owner. */
 import type { Context } from '@deepseek-ai/cordis';
-import type { ComponentManifest, PluginManifest } from '@dsh-std/manifest';
+import type { ComponentManifest, PluginManifest } from '../adapter/standard/types.js';
 export type ComponentIdentityErrorCode = 'COMPONENT_NOT_ADMITTED' | 'COMPONENT_ALREADY_ADMITTED';
 export declare class ComponentIdentityError extends Error {
     readonly code: ComponentIdentityErrorCode;

package/lib/types/dsh-adapter/component-identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-identity.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/component-identity.ts"],"names":[],"mappings":"AAAA,wEAAwE;AAGxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAI1E,MAAM,MAAM,0BAA0B,GAAG,wBAAwB,GAAG,4BAA4B,CAAA;AAEhG,qBAAa,sBAAuB,SAAQ,KAAK;IACnC,QAAQ,CAAC,IAAI,EAAE,0BAA0B;gBAAhC,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,MAAM;CAIvE;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAA;IACjC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAA;CACvC;AAED;;oDAEoD;AACpD,eAAO,MAAM,wBAAwB,MAAM,CAAA;AAqB3C,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,EACxB,UAAU,EAAE,iBAAiB,EAC7B,YAAY,GAAE,MAAqB,GAClC,yBAAyB,CAyB3B;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,yBAAyB,GAAG,SAAS,CAM3F;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,yBAAyB,CASpF;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAClB,OAAO,CAQT;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAE/F;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,yBAAyB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAUvG;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,OAAO,CAEnF;AAED;;;gBAGgB;AAChB,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GACX,OAAO,CAGT"}
+{"version":3,"file":"component-identity.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/component-identity.ts"],"names":[],"mappings":"AAAA,wEAAwE;AAGxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAIrF,MAAM,MAAM,0BAA0B,GAAG,wBAAwB,GAAG,4BAA4B,CAAA;AAEhG,qBAAa,sBAAuB,SAAQ,KAAK;IACnC,QAAQ,CAAC,IAAI,EAAE,0BAA0B;gBAAhC,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,MAAM;CAIvE;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAA;IACjC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAA;CACvC;AAED;;oDAEoD;AACpD,eAAO,MAAM,wBAAwB,MAAM,CAAA;AAqB3C,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,EACxB,UAAU,EAAE,iBAAiB,EAC7B,YAAY,GAAE,MAAqB,GAClC,yBAAyB,CAyB3B;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,yBAAyB,GAAG,SAAS,CAM3F;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,yBAAyB,CASpF;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAClB,OAAO,CAQT;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAE/F;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,yBAAyB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAUvG;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,OAAO,CAEnF;AAED;;;gBAGgB;AAChB,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GACX,OAAO,CAGT"}

package/lib/types/dsh-adapter/component-identity.js

@@ -1,6 +1,6 @@
 /** Verified Component identity bound to one Cordis activation owner. */
 import { randomUUID } from 'node:crypto';
-import { normalizePermissionScope, scopeCovers } from '../plugin-spec/permission-scope.js';
+import { normalizePermissionScope, scopeCovers } from '../adapter/standard/permission-scope.js';
 import { activationFiber, bindCallerEffect } from './host-access.js';
 export class ComponentIdentityError extends Error {
     code;

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

@@ -1,19 +1,21 @@
 /** Primary validated upstream line (newest). */
-export declare const UPSTREAM_VALIDATED_VERSION = "0.1.2-rc.1";
+export declare const UPSTREAM_VALIDATED_VERSION = "0.1.5-rc.1";
 /**
  * Explicitly supported upstream prerelease lines, oldest first.
  *
- * 0.1.2-rc.1 = primary continuous-CI line; alpha.5, alpha.4, and alpha.3 are
- * mapped compatibility lines source-checked when the primary line moves;
- * 0.1.1-rc.2 and rc.1 are compatibility lines (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).
+ * 0.1.5-rc.1 = primary continuous-CI line; 0.1.5-alpha.2/alpha.1 = mapped
+ * compatibility lines (source-checked when the primary line moves);
+ * 0.1.3-alpha.2 = compatibility line (the only 0.1.3 build on npm);
+ * 0.1.2-rc.1 = previous family (full CI coverage); 0.1.2-alpha.3–alpha.5 =
+ * mapped compatibility lines; 0.1.1-rc.1/rc.2 = compatibility lines
+ * (install- and type-level compatibility); 0.1.0-rc.7/rc.8 = full CI
+ * coverage; 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", "0.1.2-alpha.3", "0.1.2-alpha.4", "0.1.2-alpha.5", "0.1.2-rc.1"];
+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", "0.1.2-alpha.3", "0.1.2-alpha.4", "0.1.2-alpha.5", "0.1.2-rc.1", "0.1.3-alpha.2", "0.1.5-alpha.1", "0.1.5-alpha.2", "0.1.5-rc.1"];
 /**
  * Framework packages version on their own lines; the contract validates
  * their MAJOR (breaking surface), not the harness prerelease number.

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":"AAiBA,gDAAgD;AAChD,eAAO,MAAM,0BAA0B,eAAe,CAAA;AAEtD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,2BAA2B,kJAU9B,CAAA;AAEV;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAG5D,CAAA;AAED,qEAAqE;AACrE,eAAO,MAAM,yBAAyB,06BA8B5B,CAAA;AAEV,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,4EAA4E;AAC5E,MAAM,MAAM,yBAAyB,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAA;AAE/D,4FAA4F;AAC5F,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,yBAAyB,EAAE,MAAM,CAAC,CAAA;AAEvG,wEAAwE;AACxE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,oBAAoB,GAAG,SAAS,CAKlG;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE,oBAAoB,GAAG,MAAM,CAQxF;AAkBD,sEAAsE;AACtE,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,CACpC,iBAAiB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAA+B,GAC5F,MAAM,EAAE,CAQV;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,iBAAiB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAA+B,GAC5F,kBAAkB,EAAE,CAuBtB;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,CAClC,iBAAiB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAA+B,GAC5F,oBAAoB,GAAG,SAAS,CAyBlC"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/contract.ts"],"names":[],"mappings":"AAkBA,gDAAgD;AAChD,eAAO,MAAM,0BAA0B,eAAe,CAAA;AAEtD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,mNAc9B,CAAA;AAEV;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAG5D,CAAA;AAED,qEAAqE;AACrE,eAAO,MAAM,yBAAyB,06BA8B5B,CAAA;AAEV,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,4EAA4E;AAC5E,MAAM,MAAM,yBAAyB,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAA;AAE/D,4FAA4F;AAC5F,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,yBAAyB,EAAE,MAAM,CAAC,CAAA;AAEvG,wEAAwE;AACxE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,oBAAoB,GAAG,SAAS,CAKlG;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE,oBAAoB,GAAG,MAAM,CAQxF;AAkBD,sEAAsE;AACtE,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,CACpC,iBAAiB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAA+B,GAC5F,MAAM,EAAE,CAQV;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,iBAAiB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAA+B,GAC5F,kBAAkB,EAAE,CAuBtB;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,CAClC,iBAAiB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAA+B,GAC5F,oBAAoB,GAAG,SAAS,CAyBlC"}

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

@@ -2,10 +2,11 @@
  * Upstream compatibility contract.
  *
  * The TUI is validated against a set of upstream prerelease lines — the
- * current primary (0.1.2-rc.1) 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.
+ * current primary (0.1.5-rc.1) plus older lines kept in backward
+ * compatibility across the 0.1.5, 0.1.3, 0.1.2, 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 the CI gate (scripts/verify-upstream-contract.ts)
  * so a mismatched install fails in CI before it fails on a user's machine.
@@ -15,17 +16,19 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 /** Primary validated upstream line (newest). */
-export const UPSTREAM_VALIDATED_VERSION = '0.1.2-rc.1';
+export const UPSTREAM_VALIDATED_VERSION = '0.1.5-rc.1';
 /**
  * Explicitly supported upstream prerelease lines, oldest first.
  *
- * 0.1.2-rc.1 = primary continuous-CI line; alpha.5, alpha.4, and alpha.3 are
- * mapped compatibility lines source-checked when the primary line moves;
- * 0.1.1-rc.2 and rc.1 are compatibility lines (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).
+ * 0.1.5-rc.1 = primary continuous-CI line; 0.1.5-alpha.2/alpha.1 = mapped
+ * compatibility lines (source-checked when the primary line moves);
+ * 0.1.3-alpha.2 = compatibility line (the only 0.1.3 build on npm);
+ * 0.1.2-rc.1 = previous family (full CI coverage); 0.1.2-alpha.3–alpha.5 =
+ * mapped compatibility lines; 0.1.1-rc.1/rc.2 = compatibility lines
+ * (install- and type-level compatibility); 0.1.0-rc.7/rc.8 = full CI
+ * coverage; 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.
  */
@@ -39,6 +42,10 @@ export const UPSTREAM_VALIDATED_VERSIONS = [
     '0.1.2-alpha.4',
     '0.1.2-alpha.5',
     '0.1.2-rc.1',
+    '0.1.3-alpha.2',
+    '0.1.5-alpha.1',
+    '0.1.5-alpha.2',
+    '0.1.5-rc.1',
 ];
 /**
  * Framework packages version on their own lines; the contract validates