@entelligentsia/forgecli 1.1.0 → 1.1.3

package/dist/extensions/forgecli/mcp-bridge/json-rpc-stdio.js

@@ -66,32 +66,64 @@ export class JsonRpcStdioClient {
             }
         });
     }
-    /** Send a request and await its result. Rejects on error / timeout / exit. */
-    request(method, params) {
+    /**
+     * Send a request and await its result. Rejects on error / timeout / exit.
+     * `onProgress`, if given, fires for each `notifications/progress` the server
+     * emits for this request (and each one also resets the inactivity timer).
+     */
+    request(method, params, onProgress) {
         if (!this.child)
             return Promise.reject(new Error("client not started"));
         if (this.exited) {
             return Promise.reject(this.exitError ?? new Error("client closed"));
         }
         const id = this.nextId++;
-        const payload = JSON.stringify({ jsonrpc: "2.0", id, method, params }) + "\n";
+        // Opt into MCP progress: servers emit `notifications/progress` keyed off
+        // this token. We use the request id itself so a progress notification maps
+        // straight back to its pending entry. Without a token grove never emits
+        // progress and a long delegated call dies at the flat deadline.
+        const withMeta = this.withProgressToken(params, id);
+        const payload = JSON.stringify({ jsonrpc: "2.0", id, method, params: withMeta }) + "\n";
         return new Promise((resolve, reject) => {
-            const timer = setTimeout(() => {
-                this.pending.delete(id);
-                reject(new Error(`request "${method}" timed out after ${this.timeoutMs}ms`));
-            }, this.timeoutMs);
-            // Don't let a pending timer hold the process open.
-            timer.unref?.();
-            this.pending.set(id, { resolve, reject, timer });
+            const pending = {
+                resolve,
+                reject,
+                method,
+                onProgress,
+                timer: undefined,
+                reset: () => {
+                    clearTimeout(pending.timer);
+                    pending.timer = setTimeout(() => {
+                        this.pending.delete(id);
+                        reject(new Error(`request "${method}" timed out after ${this.timeoutMs}ms without activity`));
+                    }, this.timeoutMs);
+                    // Don't let a pending timer hold the process open.
+                    pending.timer.unref?.();
+                },
+            };
+            pending.reset();
+            this.pending.set(id, pending);
             this.child.stdin.write(payload, (err) => {
                 if (err) {
                     this.pending.delete(id);
-                    clearTimeout(timer);
+                    clearTimeout(pending.timer);
                     reject(err);
                 }
             });
         });
     }
+    /**
+     * Return a shallow copy of `params` with `_meta.progressToken` set to `token`,
+     * without mutating the caller's object. MCP reserves `params._meta` for this;
+     * servers that don't emit progress simply ignore it.
+     */
+    withProgressToken(params, token) {
+        const base = params && typeof params === "object" ? params : {};
+        const meta = base._meta && typeof base._meta === "object"
+            ? base._meta
+            : {};
+        return { ...base, _meta: { ...meta, progressToken: token } };
+    }
     /** Fire-and-forget notification (no id, no response expected). */
     notify(method, params) {
         if (!this.child || this.exited)
@@ -141,9 +173,12 @@ export class JsonRpcStdioClient {
             // Non-JSON line (a server log to stdout); ignore.
             return;
         }
-        // Notifications / server-initiated messages carry no id we issued.
-        if (msg.id === undefined || msg.id === null)
+        // Notifications / server-initiated messages carry no id we issued — a
+        // progress notification refreshes its request's inactivity timer.
+        if (msg.id === undefined || msg.id === null) {
+            this.onNotification(msg);
             return;
+        }
         if (typeof msg.id !== "number")
             return;
         const pending = this.pending.get(msg.id);
@@ -157,6 +192,26 @@ export class JsonRpcStdioClient {
         }
         pending.resolve(msg.result);
     }
+    /**
+     * Handle a server-initiated notification. Only `notifications/progress` is
+     * actioned: it restarts the inactivity timer of the request whose
+     * `progressToken` it carries (the request id we assigned), turning the flat
+     * request deadline into an idle timeout that survives long, live operations.
+     */
+    onNotification(msg) {
+        if (msg.method !== "notifications/progress")
+            return;
+        const params = msg.params;
+        const token = params?.progressToken;
+        if (typeof token !== "number")
+            return;
+        const pending = this.pending.get(token);
+        if (!pending)
+            return;
+        pending.reset();
+        if (params)
+            pending.onProgress?.(params);
+    }
     fail(err) {
         if (!this.exitError)
             this.exitError = err;

package/dist/extensions/forgecli/mcp-bridge/json-rpc-stdio.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-rpc-stdio.js","sourceRoot":"","sources":["../../../../src/extensions/forgecli/mcp-bridge/json-rpc-stdio.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json-rpc-stdio.js","sourceRoot":"","sources":["../../../../src/extensions/forgecli/mcp-bridge/json-rpc-stdio.ts"],"names":[],"mappings":"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"}

package/dist/extensions/forgecli/mcp-bridge/mcp-bridge.js

@@ -33,9 +33,20 @@ export function buildToolDefinition(session, descriptor, opts) {
         // Pass the MCP JSON Schema straight through — see header note.
         parameters: (descriptor.inputSchema ?? { type: "object", properties: {} }),
         promptGuidelines: opts.promptGuidelines,
-        async execute(_toolCallId, params, signal) {
+        async execute(_toolCallId, params, signal, onUpdate) {
             try {
-                const result = await session.callTool(descriptor.name, (params ?? {}), signal);
+                // Surface the server's progress notifications as live tool updates so
+                // the user sees liveness during a long call (e.g. grove's delegated
+                // explore, which reports "turn 2/7 · …" per inner-loop turn) instead
+                // of a silent wait. Partial updates carry text only; the final result
+                // still comes from the resolved call below.
+                const onProgress = onUpdate
+                    ? (p) => {
+                        const text = p.message ?? `working (${p.progress ?? "?"}/${p.total ?? "?"})`;
+                        onUpdate({ content: [{ type: "text", text }], details: {} });
+                    }
+                    : undefined;
+                const result = await session.callTool(descriptor.name, (params ?? {}), signal, onProgress);
                 return {
                     content: toToolContent(result.content, result.isError ? "tool error" : "OK"),
                     details: {},

package/dist/extensions/forgecli/mcp-bridge/mcp-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-bridge.js","sourceRoot":"","sources":["../../../../src/extensions/forgecli/mcp-bridge/mcp-bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-bridge.js","sourceRoot":"","sources":["../../../../src/extensions/forgecli/mcp-bridge/mcp-bridge.ts"],"names":[],"mappings":"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"}

package/dist/extensions/forgecli/mcp-bridge/mcp-session.d.ts

@@ -1,4 +1,4 @@
-import { type JsonRpcStdioOptions } from "./json-rpc-stdio.js";
+import { type JsonRpcStdioOptions, type ProgressNotification } from "./json-rpc-stdio.js";
 /** One tool as advertised by an MCP server's tools/list. */
 export interface McpToolDescriptor {
     name: string;
@@ -32,7 +32,7 @@ export interface McpSession {
     readonly serverInfo?: McpServerInfo;
     initialize(): Promise<void>;
     listTools(): Promise<McpToolDescriptor[]>;
-    callTool(name: string, args: Record<string, unknown>, signal?: AbortSignal): Promise<McpCallResult>;
+    callTool(name: string, args: Record<string, unknown>, signal?: AbortSignal, onProgress?: (p: ProgressNotification) => void): Promise<McpCallResult>;
     close(): Promise<void>;
 }
 /** McpSession backed by a spawned stdio child (e.g. `grove serve`). */
@@ -43,6 +43,6 @@ export declare class StdioMcpSession implements McpSession {
     constructor(opts: JsonRpcStdioOptions);
     initialize(): Promise<void>;
     listTools(): Promise<McpToolDescriptor[]>;
-    callTool(name: string, args: Record<string, unknown>, signal?: AbortSignal): Promise<McpCallResult>;
+    callTool(name: string, args: Record<string, unknown>, signal?: AbortSignal, onProgress?: (p: ProgressNotification) => void): Promise<McpCallResult>;
     close(): Promise<void>;
 }

package/dist/extensions/forgecli/mcp-bridge/mcp-session.js

@@ -5,7 +5,7 @@
 // framing grove's `serve` mode speaks. Deliberately tiny: discovery + call,
 // nothing else. The `McpSession` interface is what synthesizeTools() depends on,
 // so tests can inject a fake without spawning a process.
-import { JsonRpcStdioClient } from "./json-rpc-stdio.js";
+import { JsonRpcStdioClient, } from "./json-rpc-stdio.js";
 const MCP_PROTOCOL_VERSION = "2024-11-05";
 /** McpSession backed by a spawned stdio child (e.g. `grove serve`). */
 export class StdioMcpSession {
@@ -33,13 +33,10 @@ export class StdioMcpSession {
         const result = (await this.client.request("tools/list", {}));
         return Array.isArray(result?.tools) ? result.tools : [];
     }
-    async callTool(name, args, signal) {
+    async callTool(name, args, signal, onProgress) {
         if (signal?.aborted)
             throw new Error("aborted");
-        const result = (await this.client.request("tools/call", {
-            name,
-            arguments: args ?? {},
-        }));
+        const result = (await this.client.request("tools/call", { name, arguments: args ?? {} }, onProgress));
         return {
             content: Array.isArray(result?.content) ? result.content : [],
             isError: result?.isError === true,

package/dist/extensions/forgecli/mcp-bridge/mcp-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-session.js","sourceRoot":"","sources":["../../../../src/extensions/forgecli/mcp-bridge/mcp-session.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,EAAE;AACF,0EAA0E;AAC1E,6EAA6E;AAC7E,4EAA4E;AAC5E,iFAAiF;AACjF,yDAAyD;AAEzD,OAAO,EAAE,kBAAkB,EAA4B,MAAM,qBAAqB,CAAC;AAEnF,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAsC1C,uEAAuE;AACvE,MAAM,OAAO,eAAe;IACV,MAAM,CAAqB;IACpC,WAAW,GAAG,KAAK,CAAC;IAC5B,UAAU,CAAiB;IAE3B,YAAY,IAAyB;QACpC,IAAI,CAAC,MAAM,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,UAAU;QACf,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;YACrD,eAAe,EAAE,oBAAoB;YACrC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE;SAC/C,CAAC,CAAmC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,IAAI,EAAE,UAAU,CAAC;QACnC,gEAAgE;QAChE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,SAAS;QACd,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAE1D,CAAC;QACF,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,QAAQ,CACb,IAAY,EACZ,IAA6B,EAC7B,MAAoB;QAEpB,IAAI,MAAM,EAAE,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;YACvD,IAAI;YACJ,SAAS,EAAE,IAAI,IAAI,EAAE;SACrB,CAAC,CAAkB,CAAC;QACrB,OAAO;YACN,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC7D,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI;SACjC,CAAC;IACH,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACD"}
+{"version":3,"file":"mcp-session.js","sourceRoot":"","sources":["../../../../src/extensions/forgecli/mcp-bridge/mcp-session.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,EAAE;AACF,0EAA0E;AAC1E,6EAA6E;AAC7E,4EAA4E;AAC5E,iFAAiF;AACjF,yDAAyD;AAEzD,OAAO,EACN,kBAAkB,GAGlB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAuC1C,uEAAuE;AACvE,MAAM,OAAO,eAAe;IACV,MAAM,CAAqB;IACpC,WAAW,GAAG,KAAK,CAAC;IAC5B,UAAU,CAAiB;IAE3B,YAAY,IAAyB;QACpC,IAAI,CAAC,MAAM,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,UAAU;QACf,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;YACrD,eAAe,EAAE,oBAAoB;YACrC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE;SAC/C,CAAC,CAAmC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,IAAI,EAAE,UAAU,CAAC;QACnC,gEAAgE;QAChE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,SAAS;QACd,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAE1D,CAAC;QACF,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,QAAQ,CACb,IAAY,EACZ,IAA6B,EAC7B,MAAoB,EACpB,UAA8C;QAE9C,IAAI,MAAM,EAAE,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CACxC,YAAY,EACZ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,EAC/B,UAAU,CACV,CAAkB,CAAC;QACpB,OAAO;YACN,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC7D,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI;SACjC,CAAC;IACH,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACD"}

package/dist/extensions/forgecli/orchestrators/init/init-phase-dispatch.d.ts

@@ -1,31 +1,20 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import type { PhaseRole } from "../../subagent/caller-context.js";
 import type { MergedConfig } from "../../config/config-layer.js";
 import { type SubagentResult } from "../../forge-subagent.js";
 import { getSubagentTools } from "../../forge-tools.js";
-import type { InitPhaseDescriptor } from "./init-phases.js";
+import { resolveModelForPhase } from "../../config/model-resolver.js";
 import type { RunInitOptions } from "./run-init-types.js";
-/** Structured result returned by the /forge:init pipeline on early-exit. */
-export interface InitPipelineResult {
-    status: "ok" | "failed" | "cancelled";
-    /** Last phase index that ran (0-based into INIT_PHASES). */
-    lastPhase: number;
-    /** Failure reason when status="failed". */
-    failure?: string;
-}
-/** Inputs required by dispatchInitPhase. */
-export interface InitPhaseDispatchParams {
+/**
+ * Inputs required by dispatchSingleAgent. Carries only what one subagent
+ * dispatch needs — no phase descriptor (the step table owns routing).
+ */
+export interface InitDispatchParams {
     opts: RunInitOptions;
-    phase: InitPhaseDescriptor;
-    /** 0-based index of this phase in INIT_PHASES. */
-    phaseIndex: number;
     cwd: string;
     ctx: ExtensionCommandContext;
-    /** Absolute path to the vendored bundle root (contains init/phases/). */
+    /** Absolute path to the vendored bundle root (contains init/phases/ + base-pack). */
     bundleRoot: string;
-    /** KB folder name (e.g. "engineering"). */
-    kbFolder: string;
-    /** ISO 8601 timestamp passed down to each subagent prompt. */
-    isoTimestamp: string;
     /** Merged model-routing config from layered config. */
     modelRoutingConfig: MergedConfig;
     /** Raw forge tool definitions (optional — carries forge_ask_user). */
@@ -33,32 +22,52 @@ export interface InitPhaseDispatchParams {
     /**
      * Per-dispatch attempt counter keyed by sub-role label, for OrchestratorTree
      * node identity (`<INIT_SESSION_ID>:<role>:<attempt>`). Mutated by
-     * dispatchSingleAgent. The orchestrator passes a fresh `{}` per phase; within
-     * a phase it keeps re-dispatches (e.g. config-writer retry) on distinct nodes.
+     * dispatchSingleAgent so re-dispatches (retries) land on distinct nodes.
      */
     dispatchCounts: Record<string, number>;
+    /** Ordering hint (wave index) for SessionRegistry.startPhase. */
+    orderHint: number;
 }
 /**
- * Discriminated return union from dispatchInitPhase.
- *
- *  kind="skip"   — deterministic phase; orchestrator handles it directly.
- *  kind="return" — early-exit (failure or cancellation); carry result up.
- *  kind="ok"     — LLM phase completed successfully; last SubagentResult attached.
+ * Read the phase prompt from the bundled init/phases/ directory.
+ * Throws on missing file — caller catches and returns failure.
+ */
+export declare function readInitPhasePrompt(bundleRoot: string, phaseNum: 1 | 2): string;
+/**
+ * Read the shared Phase-2 KB-doc generation procedure (Slice 2 / FORGE-S35-T03).
+ * This is `init/generation/generate-kb-doc.md` — the write path, confidence
+ * header, verify-back, and not-applicable stub format shared by EVERY Phase-2
+ * subagent. It forms the base of every kb-doc / index / context prompt; the
+ * per-step substance fragment and the AGENT PARAMS block are appended by the
+ * pipeline. Throws on missing file — caller catches and returns failure (IL7).
+ */
+export declare function readInitSharedProcedure(bundleRoot: string): string;
+/**
+ * Read one per-step substance fragment from `init/phases/phase-2/<name>.md`
+ * (Slice 2 / FORGE-S35-T03). `name` is a KB_DOC_ID basename (e.g. "stack",
+ * "domain-model") or one of "index" / "context". Each fragment carries only its
+ * own docId's topic focus, discovery input, required output, and not-applicable
+ * stub — so a subagent never sees a sibling's work. Throws a descriptive error
+ * on missing file (naming the fragment) — caller catches and returns failure.
+ */
+export declare function readInitPhase2Fragment(bundleRoot: string, name: string): string;
+/**
+ * Resolve model for a sub-role within the init pipeline. Reads the intended
+ * tier from ROLE_TIER[modelRole] ("sonnet" / "haiku") and resolves the concrete
+ * {provider, model} via resolveModelForPhase, using modelRole as the phase key
+ * and the given personaNoun (matching task-phase-dispatch, which passes the
+ * role — never a display label — as the phase key). The tier is returned
+ * alongside the resolution so callers can surface it via notify. Concrete model
+ * still comes from config; resolution is "inherit" (undefined model) when config
+ * specifies nothing for the role.
  */
-export type InitPhaseDispatchOutcome = {
-    kind: "skip";
-} | {
-    kind: "return";
-    result: InitPipelineResult;
-} | {
-    kind: "ok";
-    result: SubagentResult;
+export declare function resolveInitModel(modelRole: string, personaNoun: string, modelRoutingConfig: MergedConfig): ReturnType<typeof resolveModelForPhase> & {
+    tier: "sonnet" | "haiku" | undefined;
 };
 /**
- * Dispatch a single /forge:init phase. Returns a discriminated outcome:
- *
- * - `{ kind: "skip" }` for deterministic phases (orchestrator handles them).
- * - `{ kind: "return", result }` for failures / early-exit.
- * - `{ kind: "ok", result }` carrying the last SubagentResult on success.
+ * Dispatch a single subagent for the init pipeline and return its SubagentResult.
+ * All runForgeSubagent calls are wrapped in CallerContextStore.asSubagent +
+ * AskBroker.withUI (IL10 / FORGE-BUG-040 parity). This is the sole subagent
+ * runner invoked by the step machine's subagent steps.
  */
-export declare function dispatchInitPhase(p: InitPhaseDispatchParams): Promise<InitPhaseDispatchOutcome>;
+export declare function dispatchSingleAgent(subLabel: string, subRole: PhaseRole, modelRole: string, prompt: string, _schema: object | undefined, personaNoun: string, p: InitDispatchParams): Promise<SubagentResult>;