@deepseek-ai/dsh-subagent 0.1.7-alpha.2 → 0.1.7-rc.2

package/lib/types/list-children.js

@@ -1,10 +1,6 @@
 /**
- * Direct-child discovery from a parent-owned `subagent/catalog` projection,
- * plus complete descendant-tree enumeration from the Session corpus. A direct
- * listing owns one parent observation and reads no child log. Descendant
- * enumeration retains the complete corpus and the child identity projection
- * because ordinary Sessions and one-shot children remain traversal nodes.
- *
+ * Direct-child and recursive descendant discovery from parent-owned catalogs.
+ * Each catalog read releases its Session observation before the next branch.
  * @module @deepseek-ai/dsh-subagent
  */
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
@@ -60,12 +56,6 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 import { SubagentError } from "./error.js";
-/**
- * Concurrent cold observations per explicit catalog listing. Current Session
- * persistence providers are local; a networked provider must promote this to
- * a validated deployment setting.
- */
-const COLD_READ_CONCURRENCY = 4;
 /**
  * Read one parent's durable catalog through a live-preferred Session observation.
  * @param ctx - context carrying the Session query service.
@@ -99,279 +89,78 @@ export async function listChildren(ctx, parentSessionId, signal) {
     }
 }
 /**
- * Enumerate every session-backed subagent below one root in stable pre-order.
- * Ordinary sessions and one-shot children remain traversal nodes, so a
- * continuable child below either is still discovered. Classification uses the
- * registered child identity projection; no Agent is loaded or resumed.
- * @see SubagentRuntime.listDescendants for the public cancellation and failure contract.
- * @param ctx - context carrying the session store, projection registry, and optional persistence/cache.
- * @param rootSessionId - session whose complete descendant tree is listed.
- * @param signal - caller-owned cancellation observed around every persistence read.
- * @returns interpreted subagents with durable direct-parent and root-relative depth.
- * @throws {@link SubagentError} when listing dependencies are unavailable or the caller cancels.
+ * Walk reachable parent catalogs in stable pre-order without loading Agents.
+ * @see SubagentRuntime.listDescendants for failure and cancellation semantics.
+ * @param ctx - context carrying the Session store and query service.
+ * @param rootSessionId - parent whose catalog starts the traversal.
+ * @param signal - cancellation checked around each catalog read.
+ * @returns children and branch diagnostics with catalog parent and depth.
  */
 export async function listDescendants(ctx, rootSessionId, signal) {
-    const listing = await prepareListing(ctx, signal);
-    const positioned = descendantCandidates(listing.corpus, rootSessionId);
-    const rows = await resolveCandidateRows(positioned.map(candidate => candidate.record), listing, signal);
-    const entries = [];
-    positioned.forEach((position, index) => {
-        const row = rows[index];
-        if (row !== undefined) {
-            entries.push({ ...row, parentId: position.parentId, depth: position.depth });
-        }
-    });
-    return entries;
-}
-/** Resolve listing services once and build one live-preferred session corpus. */
-async function prepareListing(ctx, signal) {
-    const projections = ctx.get('sessionProjections');
-    // Checked before any read, even with zero candidates: mode/label are the
-    // row's strong contract, so a missing fold capability is a deterministic
-    // deployment configuration error, never an empty success.
-    if (projections === undefined) {
-        throw new SubagentError('listing subagents requires the sessionProjections registry (load @deepseek-ai/dsh-session-projection)', 'SUBAGENT_CONTROL_PROJECTIONS_UNAVAILABLE');
-    }
-    // Strict global read, never the `ctx.sessions` property proxy: the proxy is
-    // caller-scope bound, so a consumer plugin without its own `sessions`
-    // injection (the model-facing tool, the API proxy) would throw on access.
     const sessions = ctx.get('sessions');
     if (sessions === undefined) {
         throw new SubagentError('listing subagents requires the session store (load @deepseek-ai/dsh-session)', 'SUBAGENT_CONTROL_SESSION_STORE_UNAVAILABLE');
     }
-    assertListingNotCancelled(signal);
-    const query = ctx.get('sessionQuery');
-    if (query === undefined) {
-        throw new SubagentError('listing subagents requires the sessionQuery service (load @deepseek-ai/dsh-session-query)', 'SUBAGENT_CONTROL_QUERY_UNAVAILABLE');
-    }
-    // Optional acceleration only: an absent cache service just means every
-    // cold candidate takes the authoritative preparation rung, so it carries
-    // no error code and no configuration check.
-    const cache = ctx.get('sessionProjectionCache');
-    let records;
-    try {
-        records = await query.listSessions(signal);
-    }
-    catch (error) {
+    const readChildren = async (id) => {
         assertListingNotCancelled(signal);
-        throw error;
-    }
-    assertListingNotCancelled(signal);
-    // Live-preferred merge without header reconciliation: a live record wins
-    // its id wholesale, exactly as a live-preferred corpus would serve it.
-    const corpus = new Map();
-    for (const record of records) {
-        const live = sessions.get(record.header.id);
-        corpus.set(record.header.id, {
-            header: live?.header ?? record.header,
-            live,
-        });
-    }
-    const subagentParents = new Set();
-    for (const record of corpus.values()) {
-        if (record.header.origin === 'subagent' && record.header.parentSession !== undefined) {
-            subagentParents.add(record.header.parentSession);
-        }
-    }
-    return { projections, query, cache, corpus, subagentParents };
-}
-/** Resolve projection-backed rows for aligned candidates with bounded cold reads. */
-async function resolveCandidateRows(candidates, listing, signal) {
-    const { projections, query, cache, subagentParents } = listing;
-    const rows = Array.from({ length: candidates.length });
-    const coldReads = [];
-    candidates.forEach((candidate, index) => {
-        const childId = candidate.header.id;
-        if (candidate.live === undefined) {
-            coldReads.push({ index, header: candidate.header });
-            return;
-        }
-        // Read only the identity unit. A live child without an identity yet is the
-        // creation window before the establishing provider appends its descriptor.
-        let identity;
+        let children;
         try {
-            identity = projections.snapshot(candidate.live, ['subagent']).values.subagent;
+            children = await listChildren(ctx, id, signal);
         }
-        catch {
-            // A rejecting identity fold is deterministic data damage in this child;
-            // contain it as one diagnostic instead of failing the whole listing.
-            rows[index] = { kind: 'diagnostic', id: childId, reason: 'corrupt' };
-            return;
+        catch (error) {
+            assertListingNotCancelled(signal);
+            throw error;
         }
-        // The unit's serializable no-value sentinel is `null`; `undefined` can
-        // only mean the key was dropped at a JSON boundary. Both are no value.
-        if (identity === undefined || identity === null
-            || !candidate.live.isOwnSeq(identity.seq))
-            return;
-        rows[index] = childRow(childId, identity, 'running', subagentParents.has(childId));
-    });
-    // Cold candidates came from the query corpus and are resolved concurrently.
-    if (coldReads.length > 0) {
-        const queue = [...coldReads];
-        await Promise.all(Array.from({ length: Math.min(COLD_READ_CONCURRENCY, queue.length) }, async () => {
-            for (let job = queue.shift(); job !== undefined; job = queue.shift()) {
-                rows[job.index] = await resolveColdIdentity(query, cache, job.header, subagentParents.has(job.header.id), signal);
-            }
-        }));
-    }
-    assertListingNotCancelled(signal);
-    return rows;
-}
-/** Build origin-classified candidates from the complete tree without recursion. */
-function descendantCandidates(corpus, rootSessionId) {
-    const children = new Map();
-    for (const record of corpus.values()) {
-        const parentId = record.header.parentSession;
-        if (parentId === undefined)
-            continue;
-        const siblings = children.get(parentId);
-        if (siblings === undefined)
-            children.set(parentId, [record]);
-        else
-            siblings.push(record);
-    }
-    for (const siblings of children.values())
-        siblings.sort(compareCorpusRecords);
-    const positioned = [];
-    const stack = (children.get(rootSessionId) ?? [])
-        .map(record => ({ record, parentId: rootSessionId, depth: 1 }))
+        assertListingNotCancelled(signal);
+        return children;
+    };
+    const stack = (await readChildren(rootSessionId))
+        .map(entry => ({ entry, parentId: rootSessionId, depth: 1 }))
         .reverse();
     const visited = new Set([rootSessionId]);
-    while (stack.length > 0) {
-        // The length guard proves one frame exists.
-        // oxlint-disable-next-line typescript/no-non-null-assertion
-        const position = stack.pop();
-        const id = position.record.header.id;
-        if (visited.has(id))
+    const result = [];
+    for (let position = stack.pop(); position !== undefined; position = stack.pop()) {
+        const { entry, parentId, depth } = position;
+        if (visited.has(entry.id))
             continue;
-        visited.add(id);
-        if (position.record.header.origin === 'subagent')
-            positioned.push(position);
-        const descendants = children.get(id) ?? [];
-        for (const record of [...descendants].reverse()) {
-            stack.push({ record, parentId: id, depth: position.depth + 1 });
-        }
-    }
-    return positioned;
-}
-/** Compare siblings by durable creation time, then id. */
-function compareCorpusRecords(a, b) {
-    return a.header.createdAt - b.header.createdAt || a.header.id.localeCompare(b.header.id);
-}
-/**
- * Resolve one cold candidate down the remaining ladder: an unseeded durable
- * projection-cache row, otherwise one shared Session observation. An absent or transiently failed
- * observation is one `unavailable` row retried on the next listing; an observation
- * source naming another lifecycle, and a
- * settled log the fold cannot identify — or that makes any registered unit
- * throw — are final, so they report `corrupt`.
- */
-async function resolveColdIdentity(query, cache, header, hasChildren, signal) {
-    const env_2 = { stack: [], error: void 0, hasError: false };
-    try {
-        const childId = header.id;
-        // A header deliberately exposes only whether a fork cut exists, not its
-        // integer. An unseeded lifecycle has the exact cut 0, so its cached
-        // descriptor is owned at every valid seq; a seeded lifecycle must read the
-        // body before an identity seq can be classified as inherited or owned.
-        if (cache !== undefined && !header.isSeeded) {
-            let cached;
-            try {
-                cached = cache.cachedSnapshot(header, ['subagent'])?.values.subagent;
-            }
-            catch {
-                // Unlike the preparation fold below, a throwing cache read renders no
-                // verdict: the cache is derived data, so its damage (a poisoned stored
-                // row of ANY unit) silently falls through to the authoritative re-fold.
-                cached = undefined;
-            }
-            // An unseeded child's descriptor is owned at every valid seq. Everything
-            // else falls through to preparation: an absent key and the `null`
-            // sentinel, whose verdict belongs to the authoritative re-fold, not to a
-            // derived row.
-            if (cached !== undefined && cached !== null) {
-                return childRow(childId, cached, 'inactive', hasChildren);
-            }
-        }
-        assertListingNotCancelled(signal);
-        let observation;
+        visited.add(entry.id);
+        let children;
         try {
-            observation = await query.observeSession(childId, {
-                ...(signal === undefined ? {} : { signal }),
-            });
+            children = await readChildren(entry.id);
         }
         catch (error) {
-            // Per-child isolation: durable corruption is stable; absence and backend
-            // failures remain retryable. Either way, the listing itself still succeeds.
-            assertListingNotCancelled(signal);
-            return {
-                kind: 'diagnostic',
-                id: childId,
-                reason: sessionQueryCode(error) === 'SESSION_QUERY_CORRUPT_SESSION'
-                    || sessionQueryCode(error) === 'SESSION_QUERY_SOURCE_CONFLICT'
-                    ? 'corrupt'
-                    : 'unavailable',
-            };
+            if (error instanceof SubagentError)
+                throw error;
+            const code = error instanceof Error && 'code' in error ? error.code : undefined;
+            result.push({
+                kind: 'diagnostic', id: entry.id, parentId, depth,
+                reason: code === 'SESSION_QUERY_CORRUPT_SESSION' || code === 'SESSION_QUERY_SOURCE_CONFLICT'
+                    ? 'corrupt' : 'unavailable',
+            });
+            continue;
         }
-        const ownedObservation = __addDisposableResource(env_2, observation, false);
-        assertListingNotCancelled(signal);
-        // A session id names a slot, not a lifecycle: a child deleted and
-        // re-published under another owner between the enumeration and this read
-        // must not leak into the old parent's listing.
-        if (!sameLifecycle(ownedObservation.header, header)) {
-            return { kind: 'diagnostic', id: childId, reason: 'corrupt' };
+        if (entry.mode === 'unknown') {
+            result.push({ kind: 'diagnostic', id: entry.id, parentId, depth, reason: 'unsupported' });
         }
-        const identity = ownedObservation.projections?.values.subagent;
-        if (identity === undefined || identity === null
-            || identity.seq < ownedObservation.inheritedEventCount) {
-            return { kind: 'diagnostic', id: childId, reason: 'corrupt' };
+        else {
+            const { createdAt: _createdAt, ...identity } = entry;
+            result.push({
+                ...identity, kind: 'child', parentId, depth,
+                activity: sessions.get(entry.id) === undefined ? 'inactive' : 'running',
+                hasChildren: children.length > 0,
+            });
         }
-        return childRow(childId, identity, 'inactive', hasChildren);
-    }
-    catch (e_2) {
-        env_2.error = e_2;
-        env_2.hasError = true;
-    }
-    finally {
-        __disposeResources(env_2);
-    }
-}
-/** Materialize one served identity as its child row. */
-function childRow(id, identity, activity, hasChildren) {
-    return identity.mode === 'one-shot'
-        ? {
-            kind: 'child',
-            id,
-            mode: 'one-shot',
-            ...identity.label !== undefined ? { label: identity.label } : {},
-            activity,
-            hasChildren,
+        // Catalog event order defines siblings; the stack visits the first one next.
+        for (const child of [...children].reverse()) {
+            stack.push({ entry: child, parentId: entry.id, depth: depth + 1 });
         }
-        : {
-            kind: 'child',
-            id,
-            mode: 'continuable',
-            label: identity.label,
-            activity,
-            hasChildren,
-        };
-}
-/** Immutable header fields that distinguish one session lifecycle from another under the same id. */
-const LIFECYCLE_WITNESS_KEYS = [
-    'version', 'id', 'createdAt', 'cwd', 'parentSession', 'isSeeded', 'delegationDepth',
-    'origin', 'agentPreset',
-];
-/** Whether an inspected log still belongs to the enumerated lifecycle. */
-function sameLifecycle(meta, expected) {
-    return LIFECYCLE_WITNESS_KEYS.every(key => meta[key] === expected[key]);
+    }
+    return result;
 }
-/** Stop a listing at its next cancellation checkpoint. */
+/** Stop the complete traversal when its caller cancels. */
 function assertListingNotCancelled(signal) {
     if (signal?.aborted) {
         throw new SubagentError('subagent listing was cancelled', 'CANCELLED');
     }
 }
-function sessionQueryCode(error) {
-    return error instanceof Error && 'code' in error ? error.code : undefined;
-}
 //# sourceMappingURL=list-children.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-subagent",
   "description": "Abstract subagent seam (ctx.subagents): named-provider registry for delegating to child agents",
-  "version": "0.1.7-alpha.2",
+  "version": "0.1.7-rc.2",
   "publishConfig": {
     "access": "public"
   },
@@ -54,34 +54,33 @@
   "license": "MIT",
   "dependencies": {
     "zod": "^4.4.3",
-    "@deepseek-ai/dsh-chunked-list": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-brand": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-util-values": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-brand": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-util-values": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-chunked-list": "0.1.7-rc.2",
     "@deepseek-ai/schemastery": "~3.18.4"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-agent": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-agent-preset-registry": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-attachment": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-invariants": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-jobs": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-sandbox": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-scope": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-persistence": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-projection": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-system-prompt": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-tools": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-user-approval": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-workspace": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-util-time": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-query": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-projection-cache": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-permission-presets": "0.1.7-alpha.2"
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-agent-preset-registry": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-jobs": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-scope": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-query": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-user-approval": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-util-time": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-persistence": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-workspace": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-permission-presets": "0.1.7-rc.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-agent-preset-registry": {
@@ -102,9 +101,6 @@
     "@deepseek-ai/dsh-session-projection": {
       "optional": true
     },
-    "@deepseek-ai/dsh-session-projection-cache": {
-      "optional": true
-    },
     "@deepseek-ai/dsh-session-query": {
       "optional": true
     },
@@ -122,31 +118,30 @@
     }
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.2",
     "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-agent-preset-registry": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-attachment": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-invariants": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-jobs": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-sandbox": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-scope": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-schedule": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-persistence": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-projection": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-projection-cache": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-storage": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-storage-json": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-system-prompt": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-tools": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-user-approval": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-util-time": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-workspace": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-permission-presets": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-storage-domain": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-query": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-agent": "0.1.7-alpha.2"
+    "@deepseek-ai/dsh-agent-preset-registry": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-jobs": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-schedule": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-scope": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-persistence": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-query": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-storage": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-storage-domain": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-storage-json": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-user-approval": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-util-time": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-permission-presets": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-workspace": "0.1.7-rc.2"
   }
 }