reasonix 0.4.3 → 0.4.6

package/dist/index.d.ts

@@ -366,7 +366,7 @@ declare class ToolCallRepair {
     private readonly storm;
     private readonly opts;
     constructor(opts: ToolCallRepairOptions);
-    process(declaredCalls: ToolCall[], reasoningContent: string | null): {
+    process(declaredCalls: ToolCall[], reasoningContent: string | null, content?: string | null): {
         calls: ToolCall[];
         report: RepairReport;
     };
@@ -901,8 +901,9 @@ declare function renderMarkdown(report: DiffReport): string;
  *     insulated as long as we keep up with the spec itself.
  *
  * Spec reference: https://spec.modelcontextprotocol.io/ (2024-11-05 draft
- * at time of writing). Only the subset Reasonix consumes is modeled here —
- * tools list/call + init handshake. Resources and prompts are deferred.
+ * at time of writing). Reasonix models the subset it consumes: tools
+ * list/call, resources list/read, prompts list/get, plus the init
+ * handshake. Sampling and progress notifications remain deferred.
  *
  * Transport note: the wire format for stdio MCP is **newline-delimited
  * JSON** (NDJSON), not the LSP-style Content-Length header framing that
@@ -989,6 +990,78 @@ interface CallToolResult {
     /** True = tool raised an error; the content describes it. */
     isError?: boolean;
 }
+/**
+ * A resource the server can expose — think "file the model can read."
+ * The URI is opaque to the client: servers may use `file://`, custom
+ * schemes, or bare strings. Reasonix doesn't interpret them.
+ */
+interface McpResource {
+    uri: string;
+    name: string;
+    description?: string;
+    /** Hint for the content type (e.g. "text/markdown"). Purely informational. */
+    mimeType?: string;
+}
+interface ListResourcesResult {
+    resources: McpResource[];
+    nextCursor?: string;
+}
+/**
+ * One resource can return multiple content blobs (e.g. the file + a
+ * side-car). `text` is the common case for UTF-8 content; `blob` is
+ * base64-encoded bytes for binary content. Servers populate exactly
+ * one of the two for each entry.
+ */
+interface McpResourceContentsText {
+    uri: string;
+    mimeType?: string;
+    text: string;
+}
+interface McpResourceContentsBlob {
+    uri: string;
+    mimeType?: string;
+    blob: string;
+}
+type McpResourceContents = McpResourceContentsText | McpResourceContentsBlob;
+interface ReadResourceResult {
+    contents: McpResourceContents[];
+}
+/**
+ * A parameterizable prompt template the server exposes. Clients fetch
+ * it with `prompts/get` and pass the result to the model as-is.
+ */
+interface McpPromptArgument {
+    name: string;
+    description?: string;
+    required?: boolean;
+}
+interface McpPrompt {
+    name: string;
+    description?: string;
+    arguments?: McpPromptArgument[];
+}
+interface ListPromptsResult {
+    prompts: McpPrompt[];
+    nextCursor?: string;
+}
+/**
+ * MCP prompt messages are modeled after chat completions: role + content.
+ * Content can be a text block OR (per the spec) a resource/image block;
+ * Reasonix cares about text in v1, but surfaces the raw array so callers
+ * can render other kinds if they need to.
+ */
+interface McpPromptMessage {
+    role: "user" | "assistant";
+    content: McpContentBlock | McpPromptResourceBlock;
+}
+interface McpPromptResourceBlock {
+    type: "resource";
+    resource: McpResourceContents;
+}
+interface GetPromptResult {
+    description?: string;
+    messages: McpPromptMessage[];
+}
 /** Current MCP protocol version Reasonix is coded against. */
 declare const MCP_PROTOCOL_VERSION = "2024-11-05";
 /** Type guard — success vs error response. */
@@ -1079,9 +1152,18 @@ declare class McpClient {
     private readerStarted;
     private initialized;
     private _serverCapabilities;
+    private _serverInfo;
+    private _protocolVersion;
+    private _instructions;
     constructor(opts: McpClientOptions);
     /** Server's advertised capabilities, available after initialize(). */
     get serverCapabilities(): InitializeResult["capabilities"];
+    /** Server's self-reported name + version, available after initialize(). */
+    get serverInfo(): InitializeResult["serverInfo"];
+    /** Protocol version the server agreed to during the handshake. */
+    get protocolVersion(): string;
+    /** Optional free-form instructions the server provides at handshake. */
+    get serverInstructions(): string | undefined;
     /**
      * Complete the initialize → initialized handshake. Must be called
      * before any other method (otherwise compliant servers reject).
@@ -1091,6 +1173,24 @@ declare class McpClient {
     listTools(): Promise<ListToolsResult>;
     /** Invoke a tool by name. Returns the raw MCP result (caller unwraps content). */
     callTool(name: string, args?: Record<string, unknown>): Promise<CallToolResult>;
+    /**
+     * List resources the server exposes. Supports a pagination cursor;
+     * callers interested in the full set should loop on `nextCursor`.
+     * Servers that don't support resources respond with method-not-found
+     * (−32601) — we surface that as a thrown Error so callers can gate
+     * on the `serverCapabilities.resources` field first.
+     */
+    listResources(cursor?: string): Promise<ListResourcesResult>;
+    /** Read the contents of a resource by URI. */
+    readResource(uri: string): Promise<ReadResourceResult>;
+    /** List prompt templates the server exposes. */
+    listPrompts(cursor?: string): Promise<ListPromptsResult>;
+    /**
+     * Fetch a rendered prompt by name. `args` supplies values for any
+     * required template arguments; the server validates. Returns messages
+     * ready to prepend to the model's input.
+     */
+    getPrompt(name: string, args?: Record<string, string>): Promise<GetPromptResult>;
     /** Close the transport and reject any outstanding requests. */
     close(): Promise<void>;
     private assertInitialized;
@@ -1279,6 +1379,44 @@ interface SseMcpSpec {
 type McpSpec = StdioMcpSpec | SseMcpSpec;
 declare function parseMcpSpec(input: string): McpSpec;
 
+/**
+ * Gather a full inspection report from an initialized MCP client:
+ * server info, capabilities, tools, resources, prompts. Methods the
+ * server doesn't support come back as `{ supported: false }` instead
+ * of throwing, so a CLI or UI can render a consistent "what this
+ * server exposes" summary even against minimal implementations.
+ *
+ * Pure with respect to I/O beyond the passed-in client — the CLI
+ * layer owns argument parsing, connection setup, and printing.
+ */
+
+interface InspectionReport {
+    protocolVersion: string;
+    serverInfo: {
+        name: string;
+        version: string;
+    };
+    capabilities: Record<string, unknown>;
+    instructions?: string;
+    tools: SectionResult<McpTool>;
+    resources: SectionResult<McpResource>;
+    prompts: SectionResult<McpPrompt>;
+}
+type SectionResult<T> = {
+    supported: true;
+    items: T[];
+} | {
+    supported: false;
+    reason: string;
+};
+/**
+ * Run an inspection against a **already-initialized** client. Caller
+ * is responsible for `initialize()` before this and `close()` after.
+ * We keep this pure so unit tests can feed in a FakeMcpTransport and
+ * verify the aggregate shape without spinning up a real process.
+ */
+declare function inspectMcpServer(client: McpClient): Promise<InspectionReport>;
+
 /**
  * Aider-style SEARCH/REPLACE edit blocks.
  *
@@ -1441,4 +1579,4 @@ declare function redactKey(key: string): string;
 
 declare const VERSION = "0.4.3";
 
-export { AppendOnlyLog, type ApplyResult, type ApplyStatus, type BranchOptions, type BranchProgress, type BranchResult, type BranchSample, type BranchSelector, type BranchSummary, type BridgeOptions, type BridgeResult, CODE_SYSTEM_PROMPT, CacheFirstLoop, type CacheFirstLoopOptions, type CallToolResult, type ChatMessage, type ChatResponse, DEFAULT_MAX_RESULT_CHARS, DeepSeekClient, type DeepSeekClientOptions, type RenderOptions as DiffRenderOptions, type DiffReport, type DiffSide, type EditBlock, type EditSnapshot, type EventRole, type FlattenDecision, type FlattenOptions, type HarvestOptions, ImmutablePrefix, type ImmutablePrefixOptions, type InitializeResult, type JSONSchema, type JsonRpcMessage, type JsonRpcRequest, type JsonRpcResponse, type ListToolsResult, type LoopEvent, MCP_PROTOCOL_VERSION, McpClient, type McpClientOptions, type McpContentBlock, type McpSpec, type McpTool, type McpToolSchema, type McpTransport, type ReadTranscriptResult, type ReasonixConfig, type ReconfigurableOptions, type RepairReport, type ReplayStats, type RetryInfo, type RetryOptions, type Role, type ScavengeOptions, type ScavengeResult, type SessionInfo, SessionStats, type SessionSummary, type SseMcpSpec, SseTransport, type SseTransportOptions, type StdioMcpSpec, StdioTransport, type StdioTransportOptions, StormBreaker, type StreamChunk, type ToolCall, ToolCallRepair, type ToolCallRepairOptions, type ToolDefinition, type ToolFunctionSpec, ToolRegistry, type ToolSpec, type TranscriptMeta, type TranscriptRecord, type TruncationRepairResult, type TurnPair, type TurnStats, type TypedPlanState, Usage, VERSION, VolatileScratch, aggregateBranchUsage, analyzeSchema, appendSessionMessage, applyEditBlock, applyEditBlocks, bridgeMcpTools, claudeEquivalentCost, codeSystemPrompt, computeReplayStats, costUsd, defaultConfigPath, defaultSelector, deleteSession, diffTranscripts, emptyPlanState, fetchWithRetry, flattenMcpResult, flattenSchema, formatLoopError, harvest, healLoadedMessages, isJsonRpcError, isPlanStateEmpty, isPlausibleKey, listSessions, loadApiKey, loadDotenv, loadSessionMessages, nestArguments, openTranscriptFile, parseEditBlocks, parseMcpSpec, parseTranscript, readConfig, readTranscript, recordFromLoopEvent, redactKey, renderMarkdown as renderDiffMarkdown, renderSummaryTable as renderDiffSummary, repairTruncatedJson, replayFromFile, restoreSnapshots, runBranches, sanitizeName as sanitizeSessionName, saveApiKey, scavengeToolCalls, sessionPath, sessionsDir, similarity, snapshotBeforeEdits, stripHallucinatedToolMarkup, truncateForModel, writeConfig, writeMeta, writeRecord };
+export { AppendOnlyLog, type ApplyResult, type ApplyStatus, type BranchOptions, type BranchProgress, type BranchResult, type BranchSample, type BranchSelector, type BranchSummary, type BridgeOptions, type BridgeResult, CODE_SYSTEM_PROMPT, CacheFirstLoop, type CacheFirstLoopOptions, type CallToolResult, type ChatMessage, type ChatResponse, DEFAULT_MAX_RESULT_CHARS, DeepSeekClient, type DeepSeekClientOptions, type RenderOptions as DiffRenderOptions, type DiffReport, type DiffSide, type EditBlock, type EditSnapshot, type EventRole, type FlattenDecision, type FlattenOptions, type GetPromptResult, type HarvestOptions, ImmutablePrefix, type ImmutablePrefixOptions, type InitializeResult, type InspectionReport, type JSONSchema, type JsonRpcMessage, type JsonRpcRequest, type JsonRpcResponse, type ListPromptsResult, type ListResourcesResult, type ListToolsResult, type LoopEvent, MCP_PROTOCOL_VERSION, McpClient, type McpClientOptions, type McpContentBlock, type McpPrompt, type McpPromptArgument, type McpPromptMessage, type McpPromptResourceBlock, type McpResource, type McpResourceContents, type McpResourceContentsBlob, type McpResourceContentsText, type McpSpec, type McpTool, type McpToolSchema, type McpTransport, type ReadResourceResult, type ReadTranscriptResult, type ReasonixConfig, type ReconfigurableOptions, type RepairReport, type ReplayStats, type RetryInfo, type RetryOptions, type Role, type ScavengeOptions, type ScavengeResult, type SectionResult, type SessionInfo, SessionStats, type SessionSummary, type SseMcpSpec, SseTransport, type SseTransportOptions, type StdioMcpSpec, StdioTransport, type StdioTransportOptions, StormBreaker, type StreamChunk, type ToolCall, ToolCallRepair, type ToolCallRepairOptions, type ToolDefinition, type ToolFunctionSpec, ToolRegistry, type ToolSpec, type TranscriptMeta, type TranscriptRecord, type TruncationRepairResult, type TurnPair, type TurnStats, type TypedPlanState, Usage, VERSION, VolatileScratch, aggregateBranchUsage, analyzeSchema, appendSessionMessage, applyEditBlock, applyEditBlocks, bridgeMcpTools, claudeEquivalentCost, codeSystemPrompt, computeReplayStats, costUsd, defaultConfigPath, defaultSelector, deleteSession, diffTranscripts, emptyPlanState, fetchWithRetry, flattenMcpResult, flattenSchema, formatLoopError, harvest, healLoadedMessages, inspectMcpServer, isJsonRpcError, isPlanStateEmpty, isPlausibleKey, listSessions, loadApiKey, loadDotenv, loadSessionMessages, nestArguments, openTranscriptFile, parseEditBlocks, parseMcpSpec, parseTranscript, readConfig, readTranscript, recordFromLoopEvent, redactKey, renderMarkdown as renderDiffMarkdown, renderSummaryTable as renderDiffSummary, repairTruncatedJson, replayFromFile, restoreSnapshots, runBranches, sanitizeName as sanitizeSessionName, saveApiKey, scavengeToolCalls, sessionPath, sessionsDir, similarity, snapshotBeforeEdits, stripHallucinatedToolMarkup, truncateForModel, writeConfig, writeMeta, writeRecord };

package/dist/index.js

@@ -673,7 +673,19 @@ function scavengeToolCalls(reasoningContent, opts) {
   const max = opts.maxCalls ?? 4;
   const notes = [];
   const out = [];
-  for (const candidate of iterateJsonObjects(reasoningContent)) {
+  for (const invoke of iterateDsmlInvokes(reasoningContent)) {
+    if (out.length >= max) break;
+    if (!opts.allowedNames.has(invoke.name)) continue;
+    out.push({
+      function: {
+        name: invoke.name,
+        arguments: JSON.stringify(invoke.args)
+      }
+    });
+    notes.push(`scavenged DSML call: ${invoke.name}`);
+  }
+  const nonDsml = stripDsmlBlocks(reasoningContent);
+  for (const candidate of iterateJsonObjects(nonDsml)) {
     if (out.length >= max) break;
     const call = coerceToToolCall(candidate, opts.allowedNames);
     if (call) {
@@ -683,6 +695,40 @@ function scavengeToolCalls(reasoningContent, opts) {
   }
   return { calls: out, notes };
 }
+function stripDsmlBlocks(text) {
+  let out = text;
+  out = out.replace(/<[｜|]DSML[｜|]function_calls>[\s\S]*?<\/?[｜|]DSML[｜|]function_calls>/g, "");
+  out = out.replace(/<[｜|]DSML[｜|]invoke\s+[^>]*>[\s\S]*?<\/[｜|]DSML[｜|]invoke>/g, "");
+  return out;
+}
+function* iterateDsmlInvokes(text) {
+  const INVOKE_RE = /<[｜|]DSML[｜|]invoke\s+name="([^"]+)">([\s\S]*?)<\/[｜|]DSML[｜|]invoke>/g;
+  for (const match of text.matchAll(INVOKE_RE)) {
+    const name = match[1];
+    const body = match[2];
+    if (!name || body === void 0) continue;
+    yield { name, args: parseDsmlParameters(body) };
+  }
+}
+function parseDsmlParameters(body) {
+  const PARAM_RE = /<[｜|]DSML[｜|]parameter\s+name="([^"]+)"(?:\s+string="(true|false)")?\s*>([\s\S]*?)<\/[｜|]DSML[｜|]parameter>/g;
+  const args = {};
+  for (const m of body.matchAll(PARAM_RE)) {
+    const key = m[1];
+    const stringFlag = m[2];
+    const raw = (m[3] ?? "").trim();
+    if (!key) continue;
+    if (stringFlag === "false") {
+      try {
+        args[key] = JSON.parse(raw);
+        continue;
+      } catch {
+      }
+    }
+    args[key] = raw;
+  }
+  return args;
+}
 function* iterateJsonObjects(text) {
   for (let i = 0; i < text.length; i++) {
     if (text[i] !== "{") continue;
@@ -868,14 +914,15 @@ var ToolCallRepair = class {
     this.opts = opts;
     this.storm = new StormBreaker(opts.stormWindow ?? 6, opts.stormThreshold ?? 3);
   }
-  process(declaredCalls, reasoningContent) {
+  process(declaredCalls, reasoningContent, content = null) {
     const report = {
       scavenged: 0,
       truncationsFixed: 0,
       stormsBroken: 0,
       notes: []
     };
-    const scavenged = scavengeToolCalls(reasoningContent, {
+    const combined = [reasoningContent ?? "", content ?? ""].filter(Boolean).join("\n");
+    const scavenged = scavengeToolCalls(combined || null, {
       allowedNames: this.opts.allowedToolNames,
       maxCalls: this.opts.maxScavenge ?? 4
     });
@@ -1453,7 +1500,8 @@ var CacheFirstLoop = class {
       const planState = preHarvestedPlanState ? preHarvestedPlanState : this.harvestEnabled ? await harvest(reasoningContent || null, this.client, this.harvestOptions) : emptyPlanState();
       const { calls: repairedCalls, report } = this.repair.process(
         toolCalls,
-        reasoningContent || null
+        reasoningContent || null,
+        assistantContent || null
       );
       this.appendAndPersist(this.assistantMessage(assistantContent, repairedCalls));
       yield {
@@ -2148,6 +2196,9 @@ var McpClient = class {
   readerStarted = false;
   initialized = false;
   _serverCapabilities = {};
+  _serverInfo = { name: "", version: "" };
+  _protocolVersion = "";
+  _instructions;
   constructor(opts) {
     this.transport = opts.transport;
     this.clientInfo = opts.clientInfo ?? { name: "reasonix", version: "0.3.0-dev" };
@@ -2157,6 +2208,18 @@ var McpClient = class {
   get serverCapabilities() {
     return this._serverCapabilities;
   }
+  /** Server's self-reported name + version, available after initialize(). */
+  get serverInfo() {
+    return this._serverInfo;
+  }
+  /** Protocol version the server agreed to during the handshake. */
+  get protocolVersion() {
+    return this._protocolVersion;
+  }
+  /** Optional free-form instructions the server provides at handshake. */
+  get serverInstructions() {
+    return this._instructions;
+  }
   /**
    * Complete the initialize → initialized handshake. Must be called
    * before any other method (otherwise compliant servers reject).
@@ -2166,10 +2229,18 @@ var McpClient = class {
     this.startReaderIfNeeded();
     const result = await this.request("initialize", {
       protocolVersion: MCP_PROTOCOL_VERSION,
-      capabilities: { tools: {} },
+      // Advertise every method the client can consume so servers know
+      // they can send listChanged notifications etc. Sub-feature flags
+      // (e.g. `resources.subscribe`) are omitted — we don't implement
+      // those yet and the empty object means "method-level support, no
+      // sub-features."
+      capabilities: { tools: {}, resources: {}, prompts: {} },
       clientInfo: this.clientInfo
     });
     this._serverCapabilities = result.capabilities ?? {};
+    this._serverInfo = result.serverInfo ?? { name: "", version: "" };
+    this._protocolVersion = result.protocolVersion ?? "";
+    this._instructions = result.instructions;
     await this.transport.send({
       jsonrpc: "2.0",
       method: "notifications/initialized"
@@ -2190,6 +2261,45 @@ var McpClient = class {
       arguments: args ?? {}
     });
   }
+  /**
+   * List resources the server exposes. Supports a pagination cursor;
+   * callers interested in the full set should loop on `nextCursor`.
+   * Servers that don't support resources respond with method-not-found
+   * (−32601) — we surface that as a thrown Error so callers can gate
+   * on the `serverCapabilities.resources` field first.
+   */
+  async listResources(cursor) {
+    this.assertInitialized();
+    return this.request("resources/list", {
+      ...cursor ? { cursor } : {}
+    });
+  }
+  /** Read the contents of a resource by URI. */
+  async readResource(uri) {
+    this.assertInitialized();
+    return this.request("resources/read", {
+      uri
+    });
+  }
+  /** List prompt templates the server exposes. */
+  async listPrompts(cursor) {
+    this.assertInitialized();
+    return this.request("prompts/list", {
+      ...cursor ? { cursor } : {}
+    });
+  }
+  /**
+   * Fetch a rendered prompt by name. `args` supplies values for any
+   * required template arguments; the server validates. Returns messages
+   * ready to prepend to the model's input.
+   */
+  async getPrompt(name, args) {
+    this.assertInitialized();
+    return this.request("prompts/get", {
+      name,
+      ...args ? { arguments: args } : {}
+    });
+  }
   /** Close the transport and reject any outstanding requests. */
   async close() {
     for (const [, pending] of this.pending) {
@@ -2578,6 +2688,36 @@ function parseMcpSpec(input) {
   return { transport: "stdio", name, command, args };
 }
 
+// src/mcp/inspect.ts
+async function inspectMcpServer(client) {
+  const tools = await trySection(() => client.listTools().then((r) => r.tools));
+  const resources = await trySection(
+    () => client.listResources().then((r) => r.resources)
+  );
+  const prompts = await trySection(() => client.listPrompts().then((r) => r.prompts));
+  return {
+    protocolVersion: client.protocolVersion || "(unknown)",
+    serverInfo: client.serverInfo,
+    capabilities: client.serverCapabilities ?? {},
+    instructions: client.serverInstructions,
+    tools,
+    resources,
+    prompts
+  };
+}
+async function trySection(load) {
+  try {
+    const items = await load();
+    return { supported: true, items };
+  } catch (err) {
+    const msg = err.message ?? String(err);
+    if (/-32601/.test(msg) || /method not found/i.test(msg)) {
+      return { supported: false, reason: "method not found (-32601)" };
+    }
+    return { supported: false, reason: msg };
+  }
+}
+
 // src/code/edit-blocks.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync4, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "fs";
 import { dirname as dirname2, resolve as resolve2 } from "path";
@@ -2861,6 +3001,7 @@ export {
   formatLoopError,
   harvest,
   healLoadedMessages,
+  inspectMcpServer,
   isJsonRpcError,
   isPlanStateEmpty,
   isPlausibleKey,