@xneog/dsh-subagent 0.1.0 → 0.1.3-alpha.1

package/lib/typert.remote-client.d.ts

@@ -0,0 +1,27 @@
+/* Generated by @xneog/dsh-typert-generator from the Host FaceModel — do not edit. */
+import type {
+  RemoteResult,
+  TypertRemoteContribution,
+} from '@xneog/dsh-typert-protocol'
+import type { SessionId } from '@xneog/dsh-session/types'
+import type { SubagentCatalog, SubagentInterruptReceipt, SubagentPromptReceipt, SubagentPromptRequest } from '@xneog/dsh-subagent/client'
+
+declare module '@xneog/dsh-typert-protocol' {
+  interface TypertRemoteNamespace$7375626167656e7473 {
+    interruptByParent: (childSessionId: SessionId, parentSessionId: SessionId, mode: 'continuable') => Promise<RemoteResult<SubagentInterruptReceipt>>
+    list: (parentSessionId: SessionId, signal?: AbortSignal) => Promise<RemoteResult<SubagentCatalog>>
+    prompt: (request: SubagentPromptRequest, signal?: AbortSignal) => Promise<RemoteResult<SubagentPromptReceipt>>
+  }
+  interface TypertRemoteMap {
+    'subagents/interruptByParent': (childSessionId: SessionId, parentSessionId: SessionId, mode: 'continuable') => Promise<RemoteResult<SubagentInterruptReceipt>>
+    'subagents/list': (parentSessionId: SessionId, signal?: AbortSignal) => Promise<RemoteResult<SubagentCatalog>>
+    'subagents/prompt': (request: SubagentPromptRequest, signal?: AbortSignal) => Promise<RemoteResult<SubagentPromptReceipt>>
+  }
+  interface TypertRemoteNamespaceMap {
+    'subagents': TypertRemoteNamespace$7375626167656e7473
+  }
+}
+
+export declare const TYPERT_REMOTE: TypertRemoteContribution
+export default TYPERT_REMOTE
+//# sourceMappingURL=typert.remote-client.d.ts.map

package/lib/typert.remote-client.js

@@ -0,0 +1,159 @@
+/* Generated by @xneog/dsh-typert-generator from the Host FaceModel — do not edit. */
+import { z } from 'zod'
+
+const _xneog_dsh_subagent_subagents_interruptByParent_parameter_0$schema = z.intersection(z.string(), z.unknown())
+const _xneog_dsh_subagent_subagents_interruptByParent_parameter_1$schema = z.intersection(z.string(), z.unknown())
+const _xneog_dsh_subagent_subagents_interruptByParent_parameter_2$schema = z.literal("continuable")
+const _xneog_dsh_subagent_subagents_interruptByParent_result$schema = z.object({
+  'accepted': z.literal(true).readonly(),
+})
+const _xneog_dsh_subagent_subagents_list_parameter_0$schema = z.intersection(z.string(), z.unknown())
+const _xneog_dsh_subagent_subagents_list_result$schema = z.object({
+  'entries': z.array(z.union([z.intersection(z.object({
+  'kind': z.literal("child").readonly(),
+  'id': z.intersection(z.string(), z.unknown()).readonly(),
+  'activity': z.union([z.literal("running"), z.literal("inactive")]).readonly(),
+  'hasChildren': z.boolean().readonly(),
+}), z.object({
+  'mode': z.literal("one-shot").readonly(),
+  'label': z.string().readonly().optional(),
+})), z.intersection(z.object({
+  'kind': z.literal("child").readonly(),
+  'id': z.intersection(z.string(), z.unknown()).readonly(),
+  'activity': z.union([z.literal("running"), z.literal("inactive")]).readonly(),
+  'hasChildren': z.boolean().readonly(),
+}), z.object({
+  'mode': z.literal("continuable").readonly(),
+  'label': z.string().readonly(),
+})), z.object({
+  'kind': z.literal("diagnostic").readonly(),
+  'id': z.intersection(z.string(), z.unknown()).readonly(),
+  'reason': z.union([z.literal("corrupt"), z.literal("unsupported"), z.literal("unavailable")]).readonly(),
+})])).readonly(),
+  'parentAvailable': z.boolean().readonly(),
+})
+const _xneog_dsh_subagent_subagents_prompt_parameter_0$schema = z.object({
+  'requestId': z.intersection(z.string(), z.unknown()).readonly(),
+  'parentSessionId': z.intersection(z.string(), z.unknown()).readonly(),
+  'childSessionId': z.intersection(z.string(), z.unknown()).readonly(),
+  'mode': z.literal("continuable").readonly(),
+  'content': z.array(z.union([z.object({
+  'type': z.literal("text").readonly(),
+  'text': z.string().readonly(),
+}), z.object({
+  'type': z.literal("image").readonly(),
+  'mediaType': z.union([z.literal("image/png"), z.literal("image/jpeg"), z.literal("image/webp"), z.literal("image/gif")]).readonly(),
+  'data': z.string().readonly(),
+  'name': z.string().readonly().optional(),
+})])).readonly(),
+  'clientTimeZone': z.string().readonly().optional(),
+})
+const _xneog_dsh_subagent_subagents_prompt_result$schema = z.object({
+  'messageId': z.intersection(z.string(), z.unknown()).readonly(),
+})
+
+export const TYPERT_REMOTE = {
+  package: '@xneog/dsh-subagent',
+  descriptors: [
+    {
+      id: '@xneog/dsh-subagent#subagents/interruptByParent',
+      service: 'subagents',
+      namespace: 'subagents',
+      method: 'interruptByParent',
+      invocation: { kind: 'direct' },
+      parameters: [
+        {
+          name: 'childSessionId',
+          wire: 'childSessionId',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: '@xneog/dsh-session/types#SessionId',
+            schema: _xneog_dsh_subagent_subagents_interruptByParent_parameter_0$schema,
+          },
+        },
+        {
+          name: 'parentSessionId',
+          wire: 'parentSessionId',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: '@xneog/dsh-session/types#SessionId',
+            schema: _xneog_dsh_subagent_subagents_interruptByParent_parameter_1$schema,
+          },
+        },
+        {
+          name: 'mode',
+          wire: 'mode',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: '@xneog/dsh-subagent#subagents/interruptByParent:mode',
+            schema: _xneog_dsh_subagent_subagents_interruptByParent_parameter_2$schema,
+          },
+        },
+      ],
+      result: {
+        mode: 'strict',
+        typeSymbol: '@xneog/dsh-subagent/client#SubagentInterruptReceipt',
+        schema: _xneog_dsh_subagent_subagents_interruptByParent_result$schema,
+      },
+      sourceLocation: {"file":"packages/subagent/subagent/src/index.ts","line":480,"column":3},
+    },
+    {
+      id: '@xneog/dsh-subagent#subagents/list',
+      service: 'subagents',
+      namespace: 'subagents',
+      method: 'list',
+      implementation: 'remoteExportList',
+      invocation: { kind: 'direct' },
+      parameters: [
+        {
+          name: 'parentSessionId',
+          wire: 'parentSessionId',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: '@xneog/dsh-session/types#SessionId',
+            schema: _xneog_dsh_subagent_subagents_list_parameter_0$schema,
+          },
+        },
+      ],
+      cancellation: { parameter: 'signal' },
+      result: {
+        mode: 'strict',
+        typeSymbol: '@xneog/dsh-subagent/client#SubagentCatalog',
+        schema: _xneog_dsh_subagent_subagents_list_result$schema,
+      },
+      sourceLocation: {"file":"packages/subagent/subagent/src/index.ts","line":387,"column":9},
+    },
+    {
+      id: '@xneog/dsh-subagent#subagents/prompt',
+      service: 'subagents',
+      namespace: 'subagents',
+      method: 'prompt',
+      invocation: { kind: 'direct' },
+      parameters: [
+        {
+          name: 'request',
+          wire: 'request',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: '@xneog/dsh-subagent/client#SubagentPromptRequest',
+            schema: _xneog_dsh_subagent_subagents_prompt_parameter_0$schema,
+          },
+        },
+      ],
+      cancellation: { parameter: 'signal' },
+      result: {
+        mode: 'strict',
+        typeSymbol: '@xneog/dsh-subagent/client#SubagentPromptReceipt',
+        schema: _xneog_dsh_subagent_subagents_prompt_result$schema,
+      },
+      sourceLocation: {"file":"packages/subagent/subagent/src/index.ts","line":413,"column":9},
+    },
+  ],
+}
+
+export default TYPERT_REMOTE

package/lib/types/assistant-output.d.ts

@@ -9,7 +9,7 @@
  *
  * @module @xneog/dsh-subagent/assistant-output
  */
-import type { ContentBlock } from '@xneog/dsh-llm';
+import { type ContentBlock } from '@xneog/dsh-llm';
 import type { SessionEvent } from '@xneog/dsh-session';
 /**
  * Incremental fold of the selection rule, for backends that observe a child's
@@ -22,8 +22,8 @@ export declare class AssistantOutputFold {
     private partial;
     /**
      * Fold one session event: a non-empty assistant message becomes the
-     * candidate final answer, and a `text-delta` chunk extends the streamed
-     * fallback; every other event contributes nothing.
+     * candidate final answer, while its embedded stream and any log-only attempt
+     * extend the streamed fallback; every other event contributes nothing.
      * @param event - the next observed session event.
      */
     push(event: SessionEvent): void;

package/lib/types/assistant-output.js

@@ -9,6 +9,7 @@
  *
  * @module @xneog/dsh-subagent/assistant-output
  */
+import { expandAssistantStream } from '@xneog/dsh-llm';
 /**
  * Incremental fold of the selection rule, for backends that observe a child's
  * output as it streams: session-event backends {@link push} each event, and
@@ -20,8 +21,8 @@ export class AssistantOutputFold {
     partial = [];
     /**
      * Fold one session event: a non-empty assistant message becomes the
-     * candidate final answer, and a `text-delta` chunk extends the streamed
-     * fallback; every other event contributes nothing.
+     * candidate final answer, while its embedded stream and any log-only attempt
+     * extend the streamed fallback; every other event contributes nothing.
      * @param event - the next observed session event.
      */
     push(event) {
@@ -30,8 +31,11 @@ export class AssistantOutputFold {
             if (content.length > 0)
                 this.message = content;
         }
-        else if (event.type === 'assistant/chunk' && event.data.chunk.type === 'text-delta') {
-            this.pushText(event.data.chunk.text);
+        if (event.type === 'assistant/message' || event.type === 'assistant/attempt') {
+            for (const { chunk } of expandAssistantStream(event.data.stream)) {
+                if (chunk.type === 'text-delta')
+                    this.pushText(chunk.text);
+            }
         }
     }
     /**

package/lib/types/child-agent.d.ts

@@ -30,9 +30,20 @@ export declare class SubagentDepthError extends Error {
  */
 export declare function resolveChildDepth(parent: Agent, maxDepth: number | undefined): number;
 /**
- * Resolve the child's `AgentOptions`: the parent's provider/model/maxTokens
- * route unless the request overrides it, stamped with the child's own
- * delegation depth.
+ * Resolve the parent values inherited by a child. The latest request header
+ * owns provider, model, and reasoning effort after request-time selection;
+ * creation options remain the fallback before the first request and retain
+ * the configured output-token limit.
+ * @param parent - delegating parent Agent.
+ * @returns detached Agent options for child-option merging.
+ */
+export declare function parentAgentOptionsForDelegation(parent: Agent): AgentOptions;
+/**
+ * Resolve the child's `AgentOptions`: the parent's provider/model,
+ * reasoning-effort, and maxTokens values unless the request overrides them,
+ * stamped with the child's own delegation depth. Changing the route without
+ * naming an effort clears the parent's route-owned effort so the selected
+ * model resolves its own default.
  * @param parent - the delegating parent whose route the child inherits.
  * @param requested - per-child overrides, if any.
  * @param childDepth - the resolved delegation depth to stamp.
@@ -53,10 +64,10 @@ export declare function resolveChildAgentOptions(parent: Agent, requested: Agent
  * child never had.
  * @param parent - the delegating parent agent.
  * @param childDepth - the resolved delegation depth to persist.
- * @param lineageSeedLength - how many leading events came from the parent's log.
+ * @param isSeeded - whether this child inherits a parent-log prefix, including an explicitly empty one.
  * @returns the `meta` for `ctx.agents.create()`.
  */
-export declare function childSessionMeta(parent: Agent, childDepth: number, lineageSeedLength: number): NonNullable<CreateAgentOptions['meta']>;
+export declare function childSessionMeta(parent: Agent, childDepth: number, isSeeded: boolean): NonNullable<CreateAgentOptions['meta']>;
 /** The scoped composition a child agent's creation window applies. */
 export interface ChildComposition {
     /** Per-child persona shadowing the deployment persona. */

package/lib/types/child-agent.js

@@ -40,25 +40,56 @@ export function resolveChildDepth(parent, maxDepth) {
     return childDepth;
 }
 /**
- * Resolve the child's `AgentOptions`: the parent's provider/model/maxTokens
- * route unless the request overrides it, stamped with the child's own
- * delegation depth.
+ * Resolve the parent values inherited by a child. The latest request header
+ * owns provider, model, and reasoning effort after request-time selection;
+ * creation options remain the fallback before the first request and retain
+ * the configured output-token limit.
+ * @param parent - delegating parent Agent.
+ * @returns detached Agent options for child-option merging.
+ */
+export function parentAgentOptionsForDelegation(parent) {
+    const requestConfig = parent.session.requestHeader()?.config;
+    if (requestConfig === undefined)
+        return { ...parent.options };
+    const { provider: _createdProvider, model: _createdModel, reasoningEffort: _createdReasoningEffort, ...createdOptions } = parent.options;
+    return {
+        ...createdOptions,
+        provider: requestConfig.provider,
+        model: requestConfig.model,
+        ...requestConfig.reasoningEffort === undefined
+            ? {}
+            : { reasoningEffort: requestConfig.reasoningEffort },
+    };
+}
+/**
+ * Resolve the child's `AgentOptions`: the parent's provider/model,
+ * reasoning-effort, and maxTokens values unless the request overrides them,
+ * stamped with the child's own delegation depth. Changing the route without
+ * naming an effort clears the parent's route-owned effort so the selected
+ * model resolves its own default.
  * @param parent - the delegating parent whose route the child inherits.
  * @param requested - per-child overrides, if any.
  * @param childDepth - the resolved delegation depth to stamp.
  * @returns the resolved options for `ctx.agents.create()`.
  */
 export function resolveChildAgentOptions(parent, requested, childDepth) {
-    const parentProvider = parent.options.provider;
-    const parentModel = parent.options.model;
-    const parentMaxTokens = parent.options.maxTokens;
-    return {
+    const parentOptions = parentAgentOptionsForDelegation(parent);
+    const parentProvider = parentOptions.provider;
+    const parentModel = parentOptions.model;
+    const parentReasoningEffort = parentOptions.reasoningEffort;
+    const parentMaxTokens = parentOptions.maxTokens;
+    const resolved = {
         ...parentProvider !== undefined ? { provider: parentProvider } : {},
         ...parentModel !== undefined ? { model: parentModel } : {},
+        ...parentReasoningEffort !== undefined ? { reasoningEffort: parentReasoningEffort } : {},
         ...parentMaxTokens !== undefined ? { maxTokens: parentMaxTokens } : {},
         ...requested,
         subagentDepth: childDepth,
     };
+    const routeChanged = resolved.provider !== parentProvider || resolved.model !== parentModel;
+    if (routeChanged && requested?.reasoningEffort === undefined)
+        delete resolved.reasoningEffort;
+    return resolved;
 }
 /**
  * Build the child session's durable creation metadata: the parent's workspace,
@@ -74,22 +105,22 @@ export function resolveChildAgentOptions(parent, requested, childDepth) {
  * child never had.
  * @param parent - the delegating parent agent.
  * @param childDepth - the resolved delegation depth to persist.
- * @param lineageSeedLength - how many leading events came from the parent's log.
+ * @param isSeeded - whether this child inherits a parent-log prefix, including an explicitly empty one.
  * @returns the `meta` for `ctx.agents.create()`.
  */
-export function childSessionMeta(parent, childDepth, lineageSeedLength) {
+export function childSessionMeta(parent, childDepth, isSeeded) {
     const parentHeader = parent.session.header;
     const agentPreset = parent.ctx.get('agentPresets')?.composedPreset(parent.ctx);
     return {
         ...parentHeader.cwd !== undefined ? { cwd: parentHeader.cwd } : {},
         ...agentPreset === undefined ? {} : { agentPreset },
         parentSession: parentHeader.id,
+        isSeeded,
         // Navigation classification only; the descriptor remains the authority
         // for mode and continuation capability.
         origin: 'subagent',
         // Durable: the recursion budget must survive persistence and resume.
         delegationDepth: childDepth,
-        ...lineageSeedLength > 0 ? { seedLength: lineageSeedLength } : {},
     };
 }
 /**
@@ -125,10 +156,17 @@ export const SUBAGENT_DELEGATION_CONTEXT = 'You are a delegated subagent: your p
  */
 export function applyChildComposition(childCtx, parent, composition) {
     childCtx.get('agentPresets')?.composeFrom(childCtx, parent.ctx);
-    // Order 120: after the sandbox:policy (110) and approval:policy (115) sentences.
-    childCtx.systemPrompt.context({ name: 'subagent:delegation', order: 120, text: SUBAGENT_DELEGATION_CONTEXT });
+    childCtx.systemPrompt.context({
+        name: 'subagent:delegation',
+        order: childCtx.systemPrompt.getContextOrder('SUBAGENT_DELEGATION'),
+        text: SUBAGENT_DELEGATION_CONTEXT,
+    });
     if (composition.persona !== undefined) {
-        childCtx.systemPrompt.section({ name: 'deployment:persona', order: 0, text: composition.persona });
+        childCtx.systemPrompt.section({
+            name: 'deployment:persona',
+            order: childCtx.systemPrompt.getSectionOrder('DEPLOYMENT_PERSONA'),
+            text: composition.persona,
+        });
     }
     if (composition.toolFilter !== undefined)
         childCtx.tools.restrict(composition.toolFilter);

package/lib/types/client.d.ts

@@ -1,7 +1,8 @@
 /**
- * Browser-safe subagent projection vocabulary.
+ * Browser-safe subagent projection and control vocabulary.
  *
  * @module @xneog/dsh-subagent/client
  */
+export type * from './control-types.ts';
 export type { SubagentIdentityProjection, SubagentTimingProjection } from './projection-types.ts';
 //# sourceMappingURL=client.d.ts.map

package/lib/types/client.js

@@ -1,5 +1,5 @@
 /**
- * Browser-safe subagent projection vocabulary.
+ * Browser-safe subagent projection and control vocabulary.
  *
  * @module @xneog/dsh-subagent/client
  */