agent-bober 0.11.6 → 0.15.0

package/dist/orchestrator/generator-agent.js

@@ -2,9 +2,12 @@ import { serializeHandoff } from "./context-handoff.js";
 import { createClient } from "../providers/factory.js";
 import { logger } from "../utils/logger.js";
 import { resolveModel } from "./model-resolver.js";
-import { loadAgentDefinition } from "./agent-loader.js";
-import { buildToolSet } from "./tools/index.js";
+import { assembleSystemPrompt } from "./agent-loader.js";
+import { resolveRoleTools, getGraphState, getGraphDeps } from "./tools/index.js";
 import { runAgenticLoop } from "./agentic-loop.js";
+import { PreflightContextInjector } from "../graph/preflight-injector.js";
+import { graphPipelineLifecycle } from "../graph/pipeline-lifecycle.js";
+import { emit } from "../telemetry/emit.js";
 // ── Main ───────────────────────────────────────────────────────────
 /**
  * Run the generator agent to implement changes for a sprint.
@@ -16,15 +19,20 @@ import { runAgenticLoop } from "./agentic-loop.js";
  * The system prompt is loaded from `agents/bober-generator.md`.
  */
 export async function runGenerator(handoff, projectRoot, config) {
-    const contractId = handoff.currentContract?.id ?? "unknown";
-    const feature = handoff.currentContract?.feature ?? "unknown";
-    logger.sprint(contractId, `Generating: ${feature}`);
-    // Load agent definition (system prompt from .md file)
-    const agentDef = await loadAgentDefinition("bober-generator", projectRoot);
+    const contractId = handoff.currentContract?.contractId ?? "unknown";
+    const title = handoff.currentContract?.title ?? "unknown";
+    logger.sprint(contractId, `Generating: ${title}`);
+    // Sprint 28 — telemetry: emit agent-spawn at entry (fire-and-forget)
+    void emit(projectRoot, config, "agent-spawn", { agentName: "generator", contractId });
     const model = resolveModel(config.generator.model);
     const maxTurns = config.generator.maxTurnsPerSprint;
-    // Build tool set (generator gets full access)
-    const toolSet = buildToolSet("generator", projectRoot);
+    // Build tool set (generator gets full access — UNION mode when gated:
+    // all original tools retained AND graph_* tools added).
+    const graphState = getGraphState(config);
+    const graphDeps = graphState.engineHealth === "ready" ? getGraphDeps() : undefined;
+    const toolSet = resolveRoleTools("generator", projectRoot, graphState, graphDeps ?? undefined);
+    // Assemble system prompt with graph-prompt decoration (ADR-5, Sprint 7).
+    const systemPrompt = await assembleSystemPrompt("generator", "bober-generator", projectRoot, graphState);
     const client = createClient(config.generator.provider ?? null, config.generator.endpoint ?? null, config.generator.providerConfig, config.generator.model);
     const handoffJson = serializeHandoff(handoff);
     // Check if a Sprint Briefing exists for this contract
@@ -54,14 +62,19 @@ When you are done, your final response must contain ONLY a JSON object with this
   "blockers": ["<any unresolved issues>"],
   "notes": "<additional context for the evaluator>"
 }`;
+    // Pre-flight graph context injection (ADR-9): prepend graph context to userMessage.
+    // On failure or timeout, userMessage is returned unchanged (spawn not blocked).
+    const graphClient = graphPipelineLifecycle.getGraphClient();
+    const preflightInjector = new PreflightContextInjector(graphClient, config.graph);
+    const enhancedMessage = await preflightInjector.inject("generator", handoff.currentContract ?? null, userMessage);
     logger.info(`Calling generator model (${config.generator.model} → ${model})...`);
     // Track which files were written/edited via tools
     const filesWritten = new Set();
     const result = await runAgenticLoop({
         client,
         model,
-        systemPrompt: agentDef.systemPrompt,
-        userMessage,
+        systemPrompt,
+        userMessage: enhancedMessage,
         tools: toolSet.schemas,
         toolHandlers: toolSet.handlers,
         maxTurns,

package/dist/orchestrator/generator-agent.js.map

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

package/dist/orchestrator/model-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/orchestrator/model-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,aAAa;IAC5B,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAqBD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,gBAAgB,CAAC,EAAE,MAAM,GACxB,aAAa,CAwBf;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGnD"}
+{"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/orchestrator/model-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,aAAa;IAC5B,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAuBD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,gBAAgB,CAAC,EAAE,MAAM,GACxB,aAAa,CAwBf;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGnD"}

package/dist/orchestrator/model-resolver.js

@@ -11,9 +11,11 @@
  */
 const SHORTHAND_MAP = {
     // Anthropic
-    opus: { provider: "anthropic", modelId: "claude-opus-4-6" },
+    opus: { provider: "anthropic", modelId: "claude-opus-4-8" },
+    "opus-4-8": { provider: "anthropic", modelId: "claude-opus-4-8" }, // symmetry alias
+    "opus-4-7": { provider: "anthropic", modelId: "claude-opus-4-7" }, // pinned previous GA
     sonnet: { provider: "anthropic", modelId: "claude-sonnet-4-6" },
-    haiku: { provider: "anthropic", modelId: "claude-haiku-4-5-20251001" },
+    haiku: { provider: "anthropic", modelId: "claude-haiku-4-5" },
     // OpenAI
     "gpt-4.1": { provider: "openai", modelId: "gpt-4.1" },
     "gpt-4.1-mini": { provider: "openai", modelId: "gpt-4.1-mini" },

package/dist/orchestrator/model-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/orchestrator/model-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH;;;GAGG;AACH,MAAM,aAAa,GAA0D;IAC3E,YAAY;IACZ,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE;IAC3D,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,EAAE;IAC/D,KAAK,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,2BAA2B,EAAE;IACtE,SAAS;IACT,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE;IACrD,cAAc,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE;IAC/D,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;IACzC,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE;IACrD,SAAS;IACT,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE;IAC/D,cAAc,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE;CACpE,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAAa,EACb,gBAAyB;IAEzB,oEAAoE;IACpE,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IAED,qDAAqD;IACrD,IAAI,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9C,OAAO;YACL,QAAQ,EAAE,eAAe;YACzB,OAAO;YACP,QAAQ,EAAE,2BAA2B;SACtC,CAAC;IACJ,CAAC;IAED,qBAAqB;IACrB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IAChE,CAAC;IAED,+DAA+D;IAC/D,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,EAAE,OAAO,EAAE,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACjD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/orchestrator/model-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH;;;GAGG;AACH,MAAM,aAAa,GAA0D;IAC3E,YAAY;IACZ,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE;IAC3D,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,iBAAiB;IACpF,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,qBAAqB;IACxF,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,EAAE;IAC/D,KAAK,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,EAAE;IAC7D,SAAS;IACT,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE;IACrD,cAAc,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE;IAC/D,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;IACzC,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE;IACrD,SAAS;IACT,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE;IAC/D,cAAc,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE;CACpE,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAAa,EACb,gBAAyB;IAEzB,oEAAoE;IACpE,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IAED,qDAAqD;IACrD,IAAI,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9C,OAAO;YACL,QAAQ,EAAE,eAAe;YACzB,OAAO;YACP,QAAQ,EAAE,2BAA2B;SACtC,CAAC;IACJ,CAAC;IAED,qBAAqB;IACrB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IAChE,CAAC;IAED,+DAA+D;IAC/D,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,EAAE,OAAO,EAAE,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACjD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/orchestrator/observability/index.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Observability MCP plugin slot barrel (Sprint 16).
+ *
+ * Exports the public API for starting and merging observability MCP server
+ * tool lists into the diagnoser's tool set at spawn time.
+ *
+ * Sprint 24 (/bober-incident) will import these symbols at the diagnoser
+ * spawn site in src/incident/orchestrator.ts.
+ */
+export { mergeObsTools, stopAll, namespaceToolName, type ToolDescriptor, type NamespacedTool, type MergeResult, } from "./merge.js";
+export { ExternalMcpServer } from "../../mcp/external-client.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/orchestrator/observability/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/observability/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,aAAa,EACb,OAAO,EACP,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,WAAW,GACjB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/orchestrator/observability/index.js

@@ -0,0 +1,12 @@
+/**
+ * Observability MCP plugin slot barrel (Sprint 16).
+ *
+ * Exports the public API for starting and merging observability MCP server
+ * tool lists into the diagnoser's tool set at spawn time.
+ *
+ * Sprint 24 (/bober-incident) will import these symbols at the diagnoser
+ * spawn site in src/incident/orchestrator.ts.
+ */
+export { mergeObsTools, stopAll, namespaceToolName, } from "./merge.js";
+export { ExternalMcpServer } from "../../mcp/external-client.js";
+//# sourceMappingURL=index.js.map

package/dist/orchestrator/observability/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/orchestrator/observability/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,aAAa,EACb,OAAO,EACP,iBAAiB,GAIlB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/orchestrator/observability/merge.d.ts

@@ -0,0 +1,73 @@
+/**
+ * Tool merge helper for observability MCP plugin slots (Sprint 16).
+ *
+ * At diagnoser spawn time, the orchestrator calls mergeObsTools(providers) to:
+ * 1. Start every enabled provider in parallel (ExternalMcpServer.start()).
+ * 2. Enumerate each provider's tools (ExternalMcpServer.listTools()).
+ * 3. Namespace each tool as obs__<providerName>__<upstreamToolName>.
+ * 4. Return the merged list, running servers, and a failure map.
+ *
+ * Provider failures are isolated via Promise.allSettled — a single failure
+ * does NOT abort the whole merge. The diagnoser spawns with whatever providers
+ * succeeded; failed providers appear only in the `failures` record and a warning
+ * is written to stderr.
+ *
+ * SECURITY: error messages contain only the provider NAME and a sanitized error
+ * string. The provider's mcpEnv (which may contain API tokens) is NEVER logged
+ * or included in returned error values.
+ *
+ * Sprint 24 will import mergeObsTools and stopAll from this module at the
+ * /bober-incident spawn site. This module intentionally takes ONLY the providers
+ * array — not projectRoot or BoberConfig — so Sprint 24 can inject it freely.
+ *
+ * Downstream sprint notes:
+ * - Sprint 22 (SLO verification) uses obs__<provider>__query_metric — the
+ *   namespace convention obs__<providerName>__<upstreamToolName> is stable.
+ * - Sprint 28 (telemetry) must NOT include observability MCP response bodies in
+ *   telemetry events. The sanitizeError helper here sets the precedent: redact
+ *   env var patterns before any external logging boundary.
+ */
+import type { ObservabilityProvider } from "../../config/schema.js";
+import type { ToolDescriptor } from "../../mcp/external-client.js";
+import { ExternalMcpServer } from "../../mcp/external-client.js";
+export type { ToolDescriptor };
+/** A tool that has been namespaced for the diagnoser's tool list. */
+export interface NamespacedTool extends ToolDescriptor {
+    /** Original tool name as reported by the upstream server. */
+    upstreamName: string;
+    /** Provider name (alphanumeric/underscore). */
+    providerName: string;
+}
+export interface MergeResult {
+    /** Tools successfully merged in obs__<provider>__<tool> form. */
+    tools: NamespacedTool[];
+    /** Running servers (caller must call stopAll on diagnoser exit). */
+    servers: ExternalMcpServer[];
+    /** Provider name → sanitized error message for providers that failed to start/list. */
+    failures: Record<string, string>;
+}
+/** Produce the canonical `obs__<provider>__<tool>` namespaced name. */
+export declare function namespaceToolName(providerName: string, toolName: string): string;
+/**
+ * Start every enabled provider in parallel and merge their tool lists.
+ * Provider failures are isolated — a failure in one does NOT prevent others.
+ *
+ * Uses Promise.allSettled (NOT Promise.all) so partial failure never aborts
+ * the entire batch. See Pattern C in the Sprint 16 briefing.
+ *
+ * SECURITY: error messages contain only the provider NAME and a sanitized
+ * error string. The provider's mcpEnv (which may contain secrets) is
+ * never logged.
+ *
+ * @param providers - The observability.providers array from bober.config.json.
+ *                    Callers should pass `config.observability?.providers ?? []`.
+ */
+export declare function mergeObsTools(providers: readonly ObservabilityProvider[]): Promise<MergeResult>;
+/**
+ * Stop every server in parallel. Errors are isolated; each server implements
+ * SIGTERM → 5s → SIGKILL internally (s16-c3).
+ *
+ * Callers MUST invoke this when the diagnoser exits to prevent zombie processes.
+ */
+export declare function stopAll(servers: readonly ExternalMcpServer[]): Promise<void>;
+//# sourceMappingURL=merge.d.ts.map

package/dist/orchestrator/observability/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/observability/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B,qEAAqE;AACrE,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,6DAA6D;IAC7D,YAAY,EAAE,MAAM,CAAC;IACrB,+CAA+C;IAC/C,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,iEAAiE;IACjE,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,oEAAoE;IACpE,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,uFAAuF;IACvF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,uEAAuE;AACvE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,qBAAqB,EAAE,GAC1C,OAAO,CAAC,WAAW,CAAC,CA6CtB;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlF"}

package/dist/orchestrator/observability/merge.js

@@ -0,0 +1,110 @@
+/**
+ * Tool merge helper for observability MCP plugin slots (Sprint 16).
+ *
+ * At diagnoser spawn time, the orchestrator calls mergeObsTools(providers) to:
+ * 1. Start every enabled provider in parallel (ExternalMcpServer.start()).
+ * 2. Enumerate each provider's tools (ExternalMcpServer.listTools()).
+ * 3. Namespace each tool as obs__<providerName>__<upstreamToolName>.
+ * 4. Return the merged list, running servers, and a failure map.
+ *
+ * Provider failures are isolated via Promise.allSettled — a single failure
+ * does NOT abort the whole merge. The diagnoser spawns with whatever providers
+ * succeeded; failed providers appear only in the `failures` record and a warning
+ * is written to stderr.
+ *
+ * SECURITY: error messages contain only the provider NAME and a sanitized error
+ * string. The provider's mcpEnv (which may contain API tokens) is NEVER logged
+ * or included in returned error values.
+ *
+ * Sprint 24 will import mergeObsTools and stopAll from this module at the
+ * /bober-incident spawn site. This module intentionally takes ONLY the providers
+ * array — not projectRoot or BoberConfig — so Sprint 24 can inject it freely.
+ *
+ * Downstream sprint notes:
+ * - Sprint 22 (SLO verification) uses obs__<provider>__query_metric — the
+ *   namespace convention obs__<providerName>__<upstreamToolName> is stable.
+ * - Sprint 28 (telemetry) must NOT include observability MCP response bodies in
+ *   telemetry events. The sanitizeError helper here sets the precedent: redact
+ *   env var patterns before any external logging boundary.
+ */
+import { ExternalMcpServer } from "../../mcp/external-client.js";
+/** Produce the canonical `obs__<provider>__<tool>` namespaced name. */
+export function namespaceToolName(providerName, toolName) {
+    return `obs__${providerName}__${toolName}`;
+}
+/**
+ * Start every enabled provider in parallel and merge their tool lists.
+ * Provider failures are isolated — a failure in one does NOT prevent others.
+ *
+ * Uses Promise.allSettled (NOT Promise.all) so partial failure never aborts
+ * the entire batch. See Pattern C in the Sprint 16 briefing.
+ *
+ * SECURITY: error messages contain only the provider NAME and a sanitized
+ * error string. The provider's mcpEnv (which may contain secrets) is
+ * never logged.
+ *
+ * @param providers - The observability.providers array from bober.config.json.
+ *                    Callers should pass `config.observability?.providers ?? []`.
+ */
+export async function mergeObsTools(providers) {
+    const enabled = providers.filter((p) => p.enabled !== false);
+    const servers = enabled.map((p) => new ExternalMcpServer(p));
+    const failures = {};
+    const tools = [];
+    // Promise.allSettled: partial failure never aborts the batch (s16-c4).
+    const startResults = await Promise.allSettled(servers.map(async (s) => {
+        await s.start();
+        return s.listTools();
+    }));
+    // Collect surviving servers (only those that succeeded).
+    const survivingServers = [];
+    for (let i = 0; i < startResults.length; i++) {
+        const provider = enabled[i];
+        const server = servers[i];
+        const r = startResults[i];
+        if (r.status === "fulfilled") {
+            survivingServers.push(server);
+            for (const t of r.value) {
+                tools.push({
+                    ...t,
+                    upstreamName: t.name,
+                    providerName: provider.name,
+                    name: namespaceToolName(provider.name, t.name),
+                });
+            }
+        }
+        else {
+            // SECURITY: do NOT include provider.mcpEnv in this message.
+            const msg = sanitizeError(r.reason);
+            failures[provider.name] = msg;
+            process.stderr.write(`[bober obs] provider "${provider.name}" failed to start: ${msg}\n`);
+            // Best-effort stop of any half-started subprocess — ignore errors.
+            void server.stop().catch(() => { });
+        }
+    }
+    return { tools, servers: survivingServers, failures };
+}
+/**
+ * Stop every server in parallel. Errors are isolated; each server implements
+ * SIGTERM → 5s → SIGKILL internally (s16-c3).
+ *
+ * Callers MUST invoke this when the diagnoser exits to prevent zombie processes.
+ */
+export async function stopAll(servers) {
+    // Promise.allSettled: a failure in one stop() must not prevent others.
+    await Promise.allSettled(servers.map((s) => s.stop()));
+}
+/**
+ * Sanitize an error value for safe external logging.
+ * Strips anything that looks like an env var assignment (KEY=VALUE) — defensive
+ * redaction against accidental token leakage in error messages.
+ *
+ * SECURITY: used throughout this module before any process.stderr.write or
+ * stored failure message. Sprint 28 telemetry must apply the same discipline.
+ */
+function sanitizeError(err) {
+    const raw = err instanceof Error ? err.message : String(err);
+    // Strip KEY=VALUE patterns that may carry API tokens.
+    return raw.replace(/\b[A-Z_][A-Z0-9_]*=\S+/g, "[redacted]");
+}
+//# sourceMappingURL=merge.js.map

package/dist/orchestrator/observability/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/orchestrator/observability/merge.ts"],"names":[],"mappings":"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"}

package/dist/orchestrator/pipeline.d.ts

@@ -1,6 +1,21 @@
+/**
+ * Pre-flight context injection (Sprint 6, ADR-9):
+ * PreflightContextInjector.inject() is called inside each agent's
+ * runner before runAgenticLoop:
+ *  - src/orchestrator/research-agent.ts (researcher-phase2)
+ *  - src/orchestrator/architect-agent.ts
+ *  - src/orchestrator/curator-agent.ts (writes to .bober/briefings/<contractId>-briefing.md)
+ *  - src/orchestrator/generator-agent.ts
+ *  - src/orchestrator/evaluator-agent.ts
+ * Failure isolation: 5s timeout via Promise.race; preflight-failure
+ * incident logged; original firstMessage returned on error.
+ */
 import type { BoberConfig } from "../config/schema.js";
 import type { PlanSpec } from "../contracts/spec.js";
 import type { SprintContract } from "../contracts/sprint-contract.js";
+import type { EvaluationRunResult } from "../evaluators/registry.js";
+import type { ProjectContext } from "./context-handoff.js";
+import type { GeneratorResult } from "./generator-agent.js";
 export interface PipelineResult {
     success: boolean;
     spec: PlanSpec;
@@ -8,7 +23,20 @@ export interface PipelineResult {
     failedSprints: SprintContract[];
     totalCost?: number;
     duration: number;
+    /**
+     * When the planner refuses to fully decompose the request (ambiguityScore
+     * over threshold or open clarification questions), the pipeline stops
+     * before sprint execution and sets this flag. Callers should surface
+     * `spec.clarificationQuestions` to the user in this case.
+     */
+    needsClarification?: boolean;
+}
+export interface SprintCycleResult {
+    contract: SprintContract;
+    evaluation?: EvaluationRunResult;
+    generatorResult?: GeneratorResult;
 }
+export declare function runSprintCycle(contract: SprintContract, spec: PlanSpec, completedContracts: SprintContract[], projectRoot: string, config: BoberConfig, projectContext: ProjectContext, pipelineRunId?: string): Promise<SprintCycleResult>;
 /**
  * Run the complete orchestration pipeline:
  *

package/dist/orchestrator/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AA+BtE,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB,EAAE,cAAc,EAAE,CAAC;IACnC,aAAa,EAAE,cAAc,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAsUD;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,cAAc,CAAC,CA4NzB"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAKrE,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAO3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AA6B5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB,EAAE,cAAc,EAAE,CAAC;IACnC,aAAa,EAAE,cAAc,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAiDD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,QAAQ,EACd,kBAAkB,EAAE,cAAc,EAAE,EACpC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,EACnB,cAAc,EAAE,cAAc,EAC9B,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC,CA0W5B;AAID;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,cAAc,CAAC,CAmUzB"}