@duckmind/dm-linux-x64 0.65.5 → 0.65.6

package/extensions/dm-subagents/src/extension/rpc.js

@@ -15,13 +15,14 @@ import { sanitizeDisplayText, truncateDisplayText } from "../shared/display-text
 import { readStatus } from "../shared/utils.js";
 import { SubagentParams } from "./schemas.js";
 import { normalizePublicSubagentExecution } from "./public-execution.js";
+import { collectSubagentCost, SUBAGENT_COST_REPORT_VERSION } from "../slash/subagent-cost.js";
 import { ASYNC_STATUS_SNAPSHOT_KIND, ASYNC_STATUS_SNAPSHOT_VERSION, buildAsyncStatusSnapshotForState } from "../runs/background/async-status-snapshot.js";
-import { isStoppableAsyncStatusStep, resolveAsyncStatusChild } from "../runs/shared/child-identity.js";
+import { isStoppableAsyncStatusStep, resolveAsyncStatusChild, stopStoppableAsyncStatusChildren } from "../runs/shared/child-identity.js";
 export const SUBAGENT_RPC_PROTOCOL_VERSION = 1;
 export const SUBAGENT_RPC_REQUEST_EVENT = "subagents:rpc:v1:request";
 export const SUBAGENT_RPC_READY_EVENT = "subagents:rpc:v1:ready";
 export const SUBAGENT_RPC_REPLY_EVENT_PREFIX = "subagents:rpc:v1:reply:";
-export const SUBAGENT_RPC_METHODS = ["ping", "status", "manage", "spawn", "steer", "interrupt", "stop", "resume"];
+export const SUBAGENT_RPC_METHODS = ["ping", "status", "manage", "spawn", "steer", "interrupt", "stop", "resume", "cost"];
 export const SUBAGENT_RPC_MANAGEMENT_ACTIONS = [
   "schedule.list",
   "schedule.show",
@@ -307,7 +308,8 @@ function pingData(ctx) {
       resume: true,
       launchResolvedExtensions: { version: 1, source: "launch-resolved" },
       runtimeAcknowledgedExtensions: { version: 1, source: "child-runtime", event: "subagent:acknowledge-extension" },
-      processTerminalProof: { version: 1, lifecycleArtifactVersion: SUBAGENT_LIFECYCLE_ARTIFACT_VERSION }
+      processTerminalProof: { version: 1, lifecycleArtifactVersion: SUBAGENT_LIFECYCLE_ARTIFACT_VERSION },
+      cost: { version: SUBAGENT_COST_REPORT_VERSION }
     },
     events: {
       ready: SUBAGENT_RPC_READY_EVENT,
@@ -340,9 +342,13 @@ function manageParams(params) {
   if (requiresId && typeof input.id !== "string") {
     throw new SubagentRpcError("invalid_params", `RPC manage ${action} requires id.`);
   }
+  if (action === "schedule.run" && input.quiet !== undefined && typeof input.quiet !== "boolean") {
+    throw new SubagentRpcError("invalid_params", "RPC manage quiet must be a boolean.");
+  }
   const output = {
     action,
-    ...typeof input.id === "string" ? { id: input.id.trim() } : {}
+    ...typeof input.id === "string" ? { id: input.id.trim() } : {},
+    ...action === "schedule.run" && input.quiet === true ? { quiet: true } : {}
   };
   assertSubagentParams(output, "RPC manage params");
   return output;
@@ -453,8 +459,8 @@ function stopAsyncRun(params, options, ctx) {
     }
   }
   if (initialStatus.mode === "workflow" && initialStatus.state === "running") {
+    const stopChild = options.state?.workflowChildStops?.get(initialRunId);
     if (child) {
-      const stopChild = options.state?.workflowChildStops?.get(initialRunId);
       if (stopChild) {
         if (!stopChild(child.id, `Workflow child '${child.id}' stopped by RPC.`))
           throw new SubagentRpcError("invalid_state", `Child '${childId}' in workflow ${initialRunId} is not available to stop.`);
@@ -471,6 +477,7 @@ function stopAsyncRun(params, options, ctx) {
     }
     const workflowController = options.state?.workflowControllers?.get(initialRunId);
     if (workflowController && !child) {
+      stopStoppableAsyncStatusChildren(initialStatus, stopChild, "Workflow stopped by RPC.");
       workflowController.abort(new Error("Workflow stopped by RPC."));
       return {
         runId: initialRunId,
@@ -480,28 +487,7 @@ function stopAsyncRun(params, options, ctx) {
         message: `Stop requested for async run ${initialRunId}.`
       };
     }
-    try {
-      deliverStopRequest({
-        asyncDir: location.asyncDir,
-        pid: initialStatus.pid,
-        kill: options.kill,
-        now: options.now,
-        source: "rpc-stop",
-        ...child ? { targetIndex: child.index, childId: child.id } : {}
-      });
-    } catch (error) {
-      throw new SubagentRpcError("execution_failed", error instanceof Error ? error.message : String(error));
-    }
-    if (child)
-      emitChildStopping(initialRunId, location.asyncDir, child);
-    return {
-      runId: initialRunId,
-      asyncDir: location.asyncDir,
-      previousState: initialStatus.state,
-      state: "stopping",
-      ...child ? { childId: child.id } : {},
-      message: child ? `Stop requested for child ${child.id} in async run ${initialRunId}.` : `Stop requested for async run ${initialRunId}.`
-    };
+    throw new SubagentRpcError("invalid_state", child ? `Child '${child.id}' in workflow ${initialRunId} has no live stop callback available.` : `Workflow ${initialRunId} has no live run controller available to stop.`);
   }
   let status;
   try {
@@ -600,6 +586,11 @@ async function handleRequest(request, options, fleetKeys) {
   if (request.method === "resume") {
     return executeChecked(options, ctx, request.requestId, request.method, resumeParams(request.params));
   }
+  if (request.method === "cost") {
+    if (request.params !== undefined && !isRecord(request.params))
+      throw new SubagentRpcError("invalid_params", "RPC cost params must be an object when provided.");
+    return collectSubagentCost(ctx, options.state ?? { baseCwd: ctx.cwd });
+  }
   throw new SubagentRpcError("unsupported_method", `Unsupported subagent RPC method: ${String(request.method)}`);
 }
 function parseRequest(raw) {

package/extensions/dm-subagents/src/extension/schemas.js

@@ -29,7 +29,7 @@ const SkillOverride = Type.Unsafe({
     { type: "boolean" },
     { type: "string" }
   ],
-  description: "Skill name(s) to make available (comma-separated), array of strings, or boolean (false disables, true uses default)"
+  description: "Skills: names/CSV/array; false disables, true uses default."
 });
 const OutputOverride = Type.Unsafe({
   anyOf: [
@@ -40,7 +40,7 @@ const OutputOverride = Type.Unsafe({
 });
 const OutputModeOverride = Type.String({
   enum: ["inline", "file-only"],
-  description: "Return saved output inline (default) or only a concise file reference. file-only requires output to be a path."
+  description: "Default inline; file-only requires output path."
 });
 const ReadsOverride = Type.Unsafe({
   anyOf: [
@@ -52,19 +52,12 @@ const ReadsOverride = Type.Unsafe({
 const JsonSchemaObject = Type.Unsafe({
   type: "object",
   additionalProperties: true,
-  description: "JSON Schema object for strict structured output. Non-object roots are rejected."
+  description: "Strict structured output; object-root JSON Schema only."
+});
+const OutputSchemaOverride = Type.Unsafe({
+  anyOf: [JsonSchemaObject, { type: "boolean" }],
+  description: "Structured output schema override; false disables an agent default."
 });
-const AcceptanceEvidenceKinds = [
-  "changed-files",
-  "tests-added",
-  "commands-run",
-  "validation-output",
-  "residual-risks",
-  "no-staged-files",
-  "diff-summary",
-  "review-findings",
-  "manual-notes"
-];
 const AcceptanceOverride = Type.Unsafe({
   anyOf: [
     { type: "string", enum: ["auto", "attested", "checked"] },
@@ -74,10 +67,14 @@ const AcceptanceOverride = Type.Unsafe({
       deprecated: true,
       description: "Invalid as an explicit policy. Recognized only so preflight can explain that reviewed is an achieved status."
     },
-    { type: "boolean", enum: [false] },
+    {
+      type: "string",
+      pattern: "^\\s*\\{"
+    },
+    { type: "boolean" },
     { type: "object", additionalProperties: true }
   ],
-  description: `Optional acceptance policy. For reviewer/read-only calls, omit acceptance. Example: { level: "checked", evidence: ["commands-run", "changed-files"] }. Supported evidence kinds: ${AcceptanceEvidenceKinds.join(", ")}. Evidence levels end at verified; use acceptance.review.required for review. Omitted means auto-inferred unless agentContract compatibility behavior is enabled.`
+  description: "Evidence policy; omit for read-only/review. false disables; true invalid. Prefer object; see guide tool-reference for levels, evidence and review.required."
 });
 const AgentContractOverride = Type.Object({
   version: Type.Integer({ minimum: 1, maximum: 1, description: "Enable compatibility behavior for this run/child." })
@@ -93,7 +90,7 @@ const WorkflowLaneMetadata = Type.Object({
   sourceRef: Type.Optional(Type.String({ minLength: 1, maxLength: 128 })),
   claims: Type.Optional(Type.Array(Type.String({ minLength: 1, maxLength: 160 }), { maxItems: 20 })),
   outputPaths: Type.Optional(Type.Array(Type.String({ minLength: 1, maxLength: 256 }), { maxItems: 10 }))
-}, { additionalProperties: false, description: "Optional bounded child lane metadata. Display/triage only; sourceRef is opaque and never resolved during status rendering." });
+}, { additionalProperties: false, description: "Display/triage only; sourceRef is opaque, never resolved by status." });
 const ToolBudgetBlock = Type.Unsafe({
   anyOf: [
     { type: "array", minItems: 1, items: { type: "string", minLength: 1 } },
@@ -104,7 +101,7 @@ const ToolBudgetOverride = Type.Object({
   soft: Type.Optional(Type.Integer({ minimum: 1 })),
   hard: Type.Integer({ minimum: 1 }),
   block: Type.Optional(ToolBudgetBlock)
-}, { additionalProperties: false, description: "Optional child tool-call budget. soft nudges the child; after hard, block tools (default read/grep/find/ls, or '*' for all tools) are blocked so the child can finalize." });
+}, { additionalProperties: false, description: "soft <= hard; after hard block read/grep/find/ls or '*' for all." });
 const UsageBudgetLimitOverride = Type.Object({
   soft: Type.Optional(Type.Number({ exclusiveMinimum: 0 })),
   hard: Type.Number({ exclusiveMinimum: 0 })
@@ -112,7 +109,7 @@ const UsageBudgetLimitOverride = Type.Object({
 const UsageBudgetOverride = Type.Object({
   tokens: Type.Optional(UsageBudgetLimitOverride),
   costUsd: Type.Optional(UsageBudgetLimitOverride)
-}, { additionalProperties: false, description: "Optional root-only reported-usage budget. Hard limits prevent future child launches; running children are not stopped." });
+}, { additionalProperties: false, minProperties: 1, description: "tokens or costUsd; soft <= hard. Root-only reported usage; blocks launches. Running children are not stopped." });
 const WorkflowPreflightLane = Type.Object({
   key: Type.String({ minLength: 1, maxLength: 128 }),
   mode: Type.Optional(Type.String({ enum: ["mutation", "review", "scout", "gate"] })),
@@ -125,15 +122,16 @@ const WorkflowPreflightOverride = Type.Object({
   version: Type.Integer({ minimum: 1, maximum: 1 }),
   coverage: Type.Optional(Type.String({ enum: ["complete", "partial"] })),
   lanes: Type.Array(WorkflowPreflightLane, { maxItems: 64 })
-}, { additionalProperties: false, description: "Bounded display-only lane hints for workflow launch/status. V1 coverage mismatches warn but never change launch authority or execution." });
+}, { additionalProperties: false, description: "workflowScript/workflowScriptPath only; display-only hints; coverage warns." });
 export const ParallelTaskSchema = Type.Object({
   agent: Type.String(),
   task: Type.Optional(Type.String({ description: "Task template with {task}, {previous}, {chain_dir} variables. Defaults to {previous}." })),
   phase: Type.Optional(Type.String({ description: "Optional phase/group label for status and graph rendering." })),
   label: Type.Optional(Type.String({ description: "Optional user-facing label for this parallel task." })),
   as: Type.Optional(Type.String({ description: "Optional safe identifier used as {outputs.name} in later chain steps." })),
-  outputSchema: Type.Optional(JsonSchemaObject),
+  outputSchema: Type.Optional(OutputSchemaOverride),
   cwd: Type.Optional(Type.String()),
+  machine: Type.Optional(Type.String({ minLength: 1, maxLength: 128, description: "Herdr saved machine id or label." })),
   count: Type.Optional(Type.Integer({ minimum: 1, description: "Repeat this parallel task N times with the same settings." })),
   output: Type.Optional(OutputOverride),
   outputMode: Type.Optional(OutputModeOverride),
@@ -162,8 +160,9 @@ export const DynamicParallelTemplateSchema = Type.Object({
   task: Type.Optional(Type.String({ description: "Task template with {item}, {item.path}, {task}, {previous}, {chain_dir}, and {outputs.name} variables." })),
   phase: Type.Optional(Type.String({ description: "Optional phase/group label for status and graph rendering." })),
   label: Type.Optional(Type.String({ description: "Optional user-facing label; item templates are supported." })),
-  outputSchema: Type.Optional(JsonSchemaObject),
+  outputSchema: Type.Optional(OutputSchemaOverride),
   cwd: Type.Optional(Type.String()),
+  machine: Type.Optional(Type.String({ minLength: 1, maxLength: 128, description: "Herdr saved machine id or label." })),
   output: Type.Optional(OutputOverride),
   outputMode: Type.Optional(OutputModeOverride),
   reads: Type.Optional(ReadsOverride),
@@ -188,8 +187,9 @@ export const ChainItem = Type.Object({
   phase: Type.Optional(Type.String({ description: "Optional phase/group label for status and graph rendering." })),
   label: Type.Optional(Type.String({ description: "Optional user-facing label for this chain step." })),
   as: Type.Optional(Type.String({ description: "Optional safe identifier used as {outputs.name} in later chain steps." })),
-  outputSchema: Type.Optional(JsonSchemaObject),
+  outputSchema: Type.Optional(OutputSchemaOverride),
   cwd: Type.Optional(Type.String()),
+  machine: Type.Optional(Type.String({ minLength: 1, maxLength: 128, description: "Herdr saved machine id or label." })),
   output: Type.Optional(OutputOverride),
   outputMode: Type.Optional(OutputModeOverride),
   reads: Type.Optional(ReadsOverride),
@@ -222,7 +222,7 @@ export const ChainItem = Type.Object({
 const MissionLaunchOverride = Type.Unsafe({
   anyOf: [
     { type: "object", additionalProperties: true },
-    { type: "boolean", enum: [false] }
+    { type: "boolean" }
   ]
 });
 const MissionUpdateOverride = Type.Unsafe({ type: "object", additionalProperties: true });
@@ -241,57 +241,59 @@ const ControlOverrides = Type.Object({
   }))
 });
 const SubagentParamProperties = {
-  agent: Type.Optional(Type.String({ description: "Agent for one-child execution, or target for agent management actions." })),
-  task: Type.Optional(Type.String({ description: "Optional one-child task. Requires agent; cannot combine with action, workflowScript, or workflowScriptPath." })),
-  extensionBindings: Type.Optional(Type.Unsafe({ type: "object", maxProperties: 16, additionalProperties: true, description: "Namespaced, bounded plain-JSON metadata delivered only to the child runtime. Namespace keys use package.name/1 syntax." })),
+  agent: Type.Optional(Type.String({ description: "One-child agent or management target." })),
+  task: Type.Optional(Type.String({ description: "One-child task; requires agent." })),
+  extensionBindings: Type.Optional(Type.Unsafe({ type: "object", maxProperties: 16, additionalProperties: true, description: "Child-only plain JSON; package.name/1; depth 16, 256 props, 16 KiB." })),
   action: Type.Optional(Type.String({
     minLength: 1,
-    description: "Optional management/control action. Use action='validate' with workflowScript or workflowScriptPath for offline checks. Omit this field for structured single-child or workflow execution; otherwise, use it only for management/control actions."
+    description: "Management/control only; omit for execution. validate accepts either script input. Discover actions with guide topic tool-reference."
   })),
-  capabilities: Type.Optional(Type.Boolean({ description: "For action='list', return compact capability rows and structured details without system prompts." })),
-  name: Type.Optional(Type.String({ description: "Human-readable name for action='schedule.create'." })),
+  capabilities: Type.Optional(Type.Boolean({ description: "list: compact capability rows/details without system prompts." })),
+  name: Type.Optional(Type.String({ description: "schedule.create name." })),
   id: Type.Optional(Type.String({
-    description: "Run id/prefix for status/debug.run, interrupt, steer, or mission.attach-run."
+    description: "Run id/prefix for status/control."
   })),
   runId: Type.Optional(Type.String({
-    description: "Target run ID for debug.run, interrupt, steer, or mission.attach-run. Prefer id."
+    description: "Target run ID; prefer id."
   })),
   dir: Type.Optional(Type.String({
-    description: "Async run directory for status/debug.run, stop, resume, or steer."
+    description: "Async directory for status/control."
   })),
-  handoffPath: Type.Optional(Type.String({ description: "Existing parallel handoff manifest for worktree.discard, worktree.cleanup metadata, or lane evidence actions." })),
-  repo: Type.Optional(Type.String({ description: "Repository path for action='worktree.cleanup'; defaults to cwd." })),
-  planId: Type.Optional(Type.String({ description: "Cleanup plan id reserved for a future worktree.cleanup apply action." })),
-  laneId: Type.Optional(Type.String({ minLength: 1, maxLength: 128, description: "Exact manifest run id for lane.status, lane.recordMerge, or lane.recordSupersession." })),
-  merge: Type.Optional(Type.Unsafe({ type: "object", additionalProperties: true, description: "Attested merge evidence for lane.recordMerge: prNumber, reviewedHead, mergeCommit, treeEquivalent, postMergeChecks, attestedBy, and attestedAt." })),
-  supersession: Type.Optional(Type.Unsafe({ type: "object", additionalProperties: true, description: "Attested replacement-lane evidence for lane.recordSupersession: supersededBy, attestedBy, and attestedAt." })),
-  index: Type.Optional(Type.Integer({ minimum: 0, description: "Zero-based child index for actions that target a specific child or transcript." })),
-  childId: Type.Optional(Type.String({ minLength: 1, maxLength: 256, description: "Stable child identity for child-scoped stop requests." })),
+  handoffPath: Type.Optional(Type.String({ description: "Existing manifest for worktree/lane actions." })),
+  repo: Type.Optional(Type.String({ description: "worktree.cleanup repo; default cwd." })),
+  planId: Type.Optional(Type.String({ description: "Reserved; cleanup is plan-only." })),
+  laneId: Type.Optional(Type.String({ minLength: 1, maxLength: 128, description: "Exact manifest run id for lane actions." })),
+  merge: Type.Optional(Type.Unsafe({ type: "object", additionalProperties: true, description: "lane.recordMerge evidence; read guide tool-reference." })),
+  supersession: Type.Optional(Type.Unsafe({ type: "object", additionalProperties: true, description: "lane.recordSupersession evidence; read guide tool-reference." })),
+  index: Type.Optional(Type.Integer({ minimum: 0, description: "Zero-based child/transcript index." })),
+  childId: Type.Optional(Type.String({ minLength: 1, maxLength: 256, description: "Child-scoped stop identity." })),
   view: Type.Optional(Type.String({
     enum: ["fleet", "transcript"],
-    description: "Optional status view. Use view='fleet' for a read-only active foreground/async fleet surface, or view='transcript' with id/dir (and optional index) to tail a run transcript."
+    description: "status view: fleet overview or transcript tail with id/dir and optional index."
   })),
-  lines: Type.Optional(Type.Integer({ minimum: 1, maximum: 500, description: "Maximum transcript lines for action='status', view='transcript'. Defaults to 80." })),
+  lines: Type.Optional(Type.Integer({ minimum: 1, maximum: 500, description: "Transcript tail lines; default 80." })),
   topic: Type.Optional(Type.String()),
-  message: Type.Optional(Type.String({ description: "Follow-up message for resume, live guidance for steer, or optional startup prompt for project.open." })),
-  mode: Type.Optional(Type.String({ enum: ["steer", "follow_up", "auto", "plan", "apply"], description: "Delivery mode for action='steer', or plan/apply mode for worktree.cleanup. worktree.cleanup currently supports plan only; apply/removal is not available yet." })),
-  steeringRecovery: Type.Optional(Type.Boolean({ description: "For action='steer', allow pause-and-revive recovery after a missed acknowledgment. Defaults true for direct tool calls in steer mode; extension RPC steering forces false so callers retain exact child ownership." })),
-  additional: Type.Optional(Type.Integer({ minimum: 1, description: "Positive launches to add with action='grant-spawn-budget'. Root interactive parent with native user confirmation only; total grants cannot exceed the original configured cap." })),
-  scope: Type.Optional(Type.String({ enum: ["session", "user", "project"], description: "Scope for action='watchdog.configure'. Defaults to session to avoid persistent settings writes unless user/project is explicit." })),
-  target: Type.Optional(Type.String({ enum: ["main", "children", "child"], description: "Target for watchdog actions." })),
-  focus: Type.Optional(Type.Boolean({ description: "Focus the new Herdr pane for inspector.open or project.open." })),
-  thinking: Type.Optional(Type.Unsafe({ anyOf: [{ type: "string" }, { type: "boolean", enum: [false] }], description: "Thinking level for action='watchdog.configure' only (off/minimal/low/medium/high/xhigh/max, inherit, or false for off). Ignored on dispatch; set per-run child thinking with a suffix on the model string, e.g. model: 'provider/id:high'." })),
-  at: Type.Optional(Type.String({ description: "One-shot trigger for action='schedule.create': a relative delay such as '+10m' or an ISO timestamp with timezone." })),
-  every: Type.Optional(Type.String({ description: "Fixed recurring interval for action='schedule.create', such as '30m', '6h', '2d', or '2w'." })),
-  on: Type.Optional(Type.Unsafe({ anyOf: [{ type: "string" }, { type: "integer" }], description: "Calendar selector reserved for a later schedule slice." })),
-  timezone: Type.Optional(Type.String({ description: "IANA timezone reserved for a later calendar schedule slice." })),
-  overlap: Type.Optional(Type.String({ enum: ["skip"], description: "Overlap policy. This slice supports skip only." })),
-  catchUp: Type.Optional(Type.String({ enum: ["none", "latest"], description: "Missed occurrence policy for recurring schedules. Defaults to latest." })),
-  missionId: Type.Optional(Type.String({ description: "Mission id." })),
-  mission: Type.Optional(Type.Unsafe({ ...MissionLaunchOverride, description: "Mission object, or false for no mission. Set exactly one non-empty title or summary; objective and labels are optional. goal may only be true and then requires budget.tokens." })),
-  missionUpdate: Type.Optional(Type.Unsafe({ ...MissionUpdateOverride, description: "Mission update: objective, goal false or {paused:boolean}, budget, summary, labels, decisions, artifacts, or delivery receipts." })),
-  missionStatus: Type.Optional(Type.String({ description: "Mission status." })),
-  missionScope: Type.Optional(Type.String({ description: "Mission list scope: project (default) or global pointer index." })),
+  message: Type.Optional(Type.String({ description: "resume/steer guidance or project.open prompt." })),
+  mode: Type.Optional(Type.String({ enum: ["steer", "follow_up", "auto", "plan", "apply"], description: "steer delivery mode; worktree.cleanup supports plan only, no apply/removal." })),
+  steeringRecovery: Type.Optional(Type.Boolean({ description: "steer: pause/revive after missed acknowledgment; default true in direct steer mode, forced false by extension RPC for exact ownership." })),
+  additional: Type.Optional(Type.Integer({ minimum: 1, description: "grant-spawn-budget: root interactive parent + native user confirmation only; total grants capped at original configured cap." })),
+  scope: Type.Optional(Type.String({ enum: ["session", "user", "project"], description: "watchdog.configure scope; default session, persistent only if explicit." })),
+  target: Type.Optional(Type.String({ enum: ["main", "children", "child"], description: "Watchdog target." })),
+  focus: Type.Optional(Type.Boolean({ description: "Focus inspector.open/project.open pane." })),
+  thinking: Type.Optional(Type.Unsafe({ anyOf: [{ type: "string" }, { type: "boolean" }], description: "watchdog.configure only: off/minimal/low/medium/high/xhigh/max, inherit, false=off; true invalid. Dispatch ignores this; use model suffix." })),
+  at: Type.Optional(Type.String({ description: "schedule.create: delay (+10m) or zoned ISO timestamp." })),
+  every: Type.Optional(Type.String({ description: "schedule.create interval, e.g. 30m/6h/2d/2w." })),
+  sessionOnly: Type.Optional(Type.Boolean()),
+  quiet: Type.Optional(Type.Boolean()),
+  on: Type.Optional(Type.Unsafe({ anyOf: [{ type: "string" }, { type: "integer" }], description: "Reserved calendar selector." })),
+  timezone: Type.Optional(Type.String()),
+  overlap: Type.Optional(Type.String({ enum: ["skip"] })),
+  catchUp: Type.Optional(Type.String({ enum: ["none", "latest"], description: "Missed schedule occurrences; default latest." })),
+  missionId: Type.Optional(Type.String()),
+  mission: Type.Optional(Type.Unsafe({ ...MissionLaunchOverride, description: "false disables; true invalid. Object: exactly one non-empty title or summary; objective/labels optional; goal only true, requires budget.tokens." })),
+  missionUpdate: Type.Optional(Type.Unsafe({ ...MissionUpdateOverride, description: "Mission patch; read guide missions." })),
+  missionStatus: Type.Optional(Type.String()),
+  missionScope: Type.Optional(Type.String({ description: "project (default) or global pointer index." })),
   runMode: Type.Optional(Type.String({ description: "Attached run mode." })),
   runStatus: Type.Optional(Type.String({ description: "Attached run status." })),
   summary: Type.Optional(Type.String({ description: "Mission close summary." })),
@@ -300,47 +302,60 @@ const SubagentParamProperties = {
       { type: "object", additionalProperties: true },
       { type: "string" }
     ],
-    description: "Agent config for create/update. Object or JSON string."
+    description: "create/update agent config; object or JSON string."
   })),
-  workflowScript: Type.Optional(Type.String({ minLength: 1, description: "Trusted inline JavaScript statement body. Normally async unless asyncByDefault:false; set async:true when async matters. Use async:false only when the parent must block until completion, never for reviews or gates. Use explicit return for output. Use top-level await, plain helper functions, or explicit Promise chains; nested async function, arrow, and method helpers are rejected. Use await runs.run(key, {agent, task, worktree?, gate?}) or runs.run(key, {resume, task}), where resume is a retained run id or {workflowRunId,key,latest:true} from a durable async workflow receipt. Each workflow key identifies one result lane: use a new stable workflow key for every distinct retained resume pass; same-key calls are reused only when launch parameters are identical, and incompatible parameters are rejected. Use runs.all([...]), runs.host(key,{kind:'command',command,timeoutMs,output?,role?,provider?}), await runs.steer(key, message, {mode?, index?, ackTimeoutMs?}), runs.status(id), runs.ref(s), emit(value), console, and return. For bounded parallel sequential chains, use runs.lanes([{key,stages:[{key,agent,task},{key,resume:'previous',task},...]}]); first stages run together, later stages sequence per lane, and the bounded board reports lane-local failures. Only an explicit structuredOutput.verdict === 'blocked' blocks a successful stage; reviewer prose is not parsed. For ordinary parallel fanout, use await runs.all([{key, agent, task}, ...]); it resolves to an ordered array, not a key map, so use results[0], destructuring, or results.map(...), not results.<key>. Do not read .output from unawaited runs.run launches. Stored runs.run promises are only for advanced rolling fanout, and each must later be observed with direct await, Promise.race, or Promise.all. runs.steer targets a prior stable child key, never a raw run id, and must be awaited or returned. Mission workflows also have async state.get(key) and state.set(key, JSONValue). Compose sequential and parallel phases dynamically. Set worktree:true at workflow or child level for a separate managed worktree; child fields override workflow defaults. gate is one host-run command and cannot be combined with acceptance. runs.run accepts one child only. No filesystem, shell, DM tools, or host globals except through runs.host." })),
-  workflowScriptPath: Type.Optional(Type.String({ minLength: 1, description: "Path to a trusted JavaScript workflow file. Mutually exclusive with workflowScript. Relative paths resolve against the request cwd. The host reads the file before the filesystem-free workflow sandbox starts." })),
+  workflow: Type.Optional(Type.String({ minLength: 1, description: "Extension-owned workflow resource." })),
+  args: Type.Optional(Type.Unsafe({ type: "object", maxProperties: 16, additionalProperties: true, description: "Bounded plain-JSON args for named, inline, or file-backed workflows; raw-script args are exposed deeply frozen and persisted, so do not include secrets." })),
+  workflowScript: Type.Optional(Type.String({ minLength: 1, description: "Inline JavaScript statement body; raw/unknown provenance, no runs.host. Use explicit return and top-level await; see tool guidance/guide workflows." })),
+  workflowScriptPath: Type.Optional(Type.String({ minLength: 1, description: "Raw script file; host reads from request cwd before sandbox. Mutually exclusive with workflowScript and workflow." })),
+  globalConcurrencyLimit: Type.Optional(Type.Integer({ minimum: 1 })),
+  maxSubagentSpawnsPerRun: Type.Optional(Type.Integer({ minimum: 1 })),
   preflight: Type.Optional(WorkflowPreflightOverride),
-  chatProgress: Type.Optional(Type.String({ enum: ["auto", "off", "live-card"], description: "WorkflowScript chat progress projection. auto shows a live in-chat card only for watched foreground workflows in the same Git repository; it is off otherwise. Explicit live-card requires same-repository async:false; async workflows should omit chatProgress or use auto/off." })),
-  isolation: Type.Optional(Type.String({ enum: ["none", "worktree"], description: "Workflow child isolation. none runs in the shared cwd; worktree requires managed git worktree isolation." })),
-  worktree: Type.Optional(Type.Boolean({ description: "Managed child isolation. true gives each workflow child a separate git worktree; an individual runs.run/runs.all item can override a workflow default with worktree:false." })),
+  chatProgress: Type.Optional(Type.String({ enum: ["auto", "off", "live-card"], description: "auto: live card only for watched foreground in same Git repository. live-card requires same-repo async:false; async: omit or auto/off." })),
+  isolation: Type.Optional(Type.String({ enum: ["none", "worktree"], description: "Shared cwd or managed git worktrees." })),
+  worktree: Type.Optional(Type.Boolean({ description: "Isolate each workflow child in a managed git worktree; child worktree:false overrides default." })),
+  baseRef: Type.Optional(Type.String()),
   lane: Type.Optional(WorkflowLaneMetadata),
   context: Type.Optional(Type.String({
     enum: ["fresh", "fork", "profile"],
-    description: "'fresh' or 'fork' to branch from parent session, or 'profile' to require the selected agent's declared defaultContext. Explicit fresh/fork overrides every child; profile ignores config defaultSubagentContext and fails when an agent has no defaultContext. If omitted, config defaultSubagentContext wins over each agent defaultContext; implicit fork needs a persisted parent session and leaf, else fresh. Config forkContext may prune resolved forks before spawn without adding another context value."
+    description: "fresh/fork overrides every child; profile requires agent's declared defaultContext, ignoring config. Omitted: defaultSubagentContext wins over each agent defaultContext; implicit fork needs persisted parent + leaf, else fresh. forkContext may prune forks before spawn."
   })),
-  async: Type.Optional(Type.Boolean({ description: "Run in background unless asyncByDefault:false. Set false only when the parent must block until completion." })),
-  timeoutMs: Type.Optional(Type.Integer({ minimum: 1, description: "Timeout. Foreground and single async runs use config timeoutMs, else 30m; async composites have no default parent deadline. Alias maxRuntimeMs." })),
-  maxRuntimeMs: Type.Optional(Type.Integer({ minimum: 1, description: "Alias timeoutMs. Foreground and single async runs use config timeoutMs, else 30m; async composites have no default parent deadline." })),
-  toolTimeoutMs: Type.Optional(Type.Integer({ minimum: 1, description: "Optional hard per-tool-call timeout in milliseconds; known-fast built-in tools have a five-minute default." })),
+  async: Type.Optional(Type.Boolean({ description: "Background; default asyncByDefault. false only to block parent." })),
+  timeoutMs: Type.Optional(Type.Integer({ minimum: 1, description: "Foreground and single async runs use config timeoutMs, else 30m; async composites have no default parent deadline. Alias maxRuntimeMs; must agree." })),
+  maxRuntimeMs: Type.Optional(Type.Integer({ minimum: 1, description: "Alias timeoutMs (same defaults)." })),
+  checkpointBeforeDeadlineMs: Type.Optional(Type.Integer({ minimum: 1, maximum: 2147483647, description: "Async single-agent runs only: the runner requests that the child checkpoint and stop this many ms before the run deadline (best-effort; the deadline kill still applies)." })),
+  toolTimeoutMs: Type.Optional(Type.Integer({ minimum: 1, description: "Per-tool deadline (ms); fast builtins default 5m." })),
   toolBudget: Type.Optional(ToolBudgetOverride),
   usageBudget: Type.Optional(UsageBudgetOverride),
-  agentScope: Type.Optional(Type.String({ description: "Agent discovery scope: 'user', 'project', or 'both' (default: 'both'; project wins on name collisions)" })),
-  cwd: Type.Optional(Type.String({ description: "Execution cwd, or target project directory for project.open/status/close." })),
-  artifacts: Type.Optional(Type.Boolean({ description: "Write debug artifacts (default: true)" })),
-  includeProgress: Type.Optional(Type.Boolean({ description: "Include full progress in result (default: false)" })),
-  share: Type.Optional(Type.Boolean({ description: "Upload session to GitHub Gist for sharing (default: false)" })),
-  sessionDir: Type.Optional(Type.String({ description: "Directory to store session logs (default: temp; enables sessions even if share=false)" })),
+  agentScope: Type.Optional(Type.String({ description: "user/project/both (default); project wins collisions." })),
+  cwd: Type.Optional(Type.String({ description: "Execution/project-pane directory." })),
+  machine: Type.Optional(Type.String({ minLength: 1, maxLength: 128, description: "Herdr saved machine id or label; runs an external CLI agent there. cwd then means the directory on that machine." })),
+  artifacts: Type.Optional(Type.Boolean({ description: "Debug artifacts; default true." })),
+  includeProgress: Type.Optional(Type.Boolean({ description: "Full result progress; default false." })),
+  share: Type.Optional(Type.Boolean({ description: "Upload session to GitHub Gist; default false." })),
+  sessionDir: Type.Optional(Type.String({ description: "Session log directory; default temp, independent of share." })),
   control: Type.Optional(ControlOverrides),
   output: Type.Optional(Type.Unsafe({
     anyOf: [
       { type: "string" },
       { type: "boolean" }
     ],
-    description: "Default child output file (string), or false to disable. Relative workflow child paths use managed artifact routing. Task filename prose is not an output declaration; for durable workflow handoff, return the child's outputReference, outputPathMapping, or artifactPaths."
+    description: "Child output path or false; relative workflow paths use managed artifact routing. Bind durable output here, not task prose; return outputReference/outputPathMapping/artifactPaths."
   })),
   outputMode: Type.Optional(OutputModeOverride),
   skill: Type.Optional(SkillOverride),
-  model: Type.Optional(Type.String({ description: "Default child model override. Full provider/id values are accepted; bare ids resolve from the active registry. Append a thinking suffix (off/minimal/low/medium/high/xhigh/max, e.g. 'provider/id:low') to set the child's thinking level for the run; the suffix wins over the agent's thinking default." })),
-  fast: Type.Optional(Type.Boolean({ description: "Opt into priority service tier for supported native OpenAI-Codex child models. Default false. This can increase quota or cost." })),
-  outputSchema: Type.Optional(JsonSchemaObject),
+  model: Type.Optional(Type.String({ description: "Child model provider/id; bare id only if unique. Suffix :off/minimal/low/medium/high/xhigh/max overrides agent thinking default." })),
+  fast: Type.Optional(Type.Boolean({ description: "Native OpenAI-Codex priority tier; default false, may cost more/quota." })),
+  outputSchema: Type.Optional(OutputSchemaOverride),
   agentContract: Type.Optional(AgentContractOverride),
   acceptance: Type.Optional(AcceptanceOverride),
-  gate: Type.Optional(Type.String({ minLength: 1, description: "Host gate command. Cannot be combined with acceptance." }))
+  gate: Type.Optional(Type.Unsafe({
+    anyOf: [
+      { type: "string", minLength: 1 },
+      { type: "object", properties: { command: { type: "string", minLength: 1 }, output: { type: "string", enum: ["json"] }, schema: { type: "object" }, timeoutMs: { type: "integer", minimum: 1 } }, required: ["command"], additionalProperties: false }
+    ],
+    description: 'Host gate command run after the child finishes: a string, or { command, output: "json", schema?, timeoutMs? } whose passing stdout becomes structuredOutput (not with outputSchema). Cannot be combined with acceptance; an explicit acceptance of false is treated as omitted.'
+  }))
 };
 const SubagentParamsSchema = Type.Object(SubagentParamProperties);
 export const SubagentParams = keepTopLevelParameterDescriptions(SubagentParamsSchema);

package/extensions/dm-subagents/src/extension/subagent-guide.js

@@ -11,9 +11,15 @@ export const SUBAGENT_GUIDE_TOPICS = [
   "configuration",
   "models",
   "watchdog",
-  "extension-api"
+  "extension-api",
+  "council"
 ];
 const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
+const COUNCIL_FILES = [
+  "skills/council-mode/SKILL.md",
+  "skills/council-mode/references/pass-contracts.md",
+  "skills/dm-subagents/references/execution-controls.md"
+];
 function isGuideTopic(value) {
   return SUBAGENT_GUIDE_TOPICS.includes(value);
 }
@@ -21,9 +27,14 @@ export function readSubagentGuide(topic = "overview", root = packageRoot) {
   if (!isGuideTopic(topic)) {
     return `Unknown subagents guide topic '${topic}'. Valid topics: ${SUBAGENT_GUIDE_TOPICS.join(", ")}. No files were changed.`;
   }
-  const filePath = topic === "overview" ? path.join(root, "README.md") : path.join(root, "docs", `${topic}.md`);
+  const files = topic === "overview" ? ["README.md"] : topic === "council" ? COUNCIL_FILES : [path.join("docs", `${topic}.md`)];
   try {
-    return fs.readFileSync(filePath, "utf-8");
+    const contents = files.map((file) => fs.readFileSync(path.join(root, file), "utf-8"));
+    return files.length === 1 ? contents[0] : contents.map((content, index) => `<!-- ${files[index]} -->
+
+${content}`).join(`
+
+`);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Failed to read packaged subagents guide '${topic}': ${message}`, { cause: error instanceof Error ? error : undefined });