ikie-cli 0.1.33 → 0.1.34

package/README.md

@@ -79,7 +79,7 @@ Ikie has 28 built-in tools, grouped by purpose:
 - **Memory** — `memory_write` (persist notes across sessions, project- or global-scoped)
 - **Delegation** — `spawn_agent` (hand isolated/parallel work to a focused sub-agent), `ask_user`
 - **Skills** — `use_skill`, `install_skill`, `remove_skill`
-- **MCP** — `mcp_list`, `mcp_add`, `mcp_install`, `mcp_start`, `mcp_stop`, `mcp_call`, `mcp_uninstall`
+- **MCP** — `mcp_list`, `mcp_add` (configured servers expose tools as `mcp__server__tool`)
 - **Mode** — `switch_mode`
 
 ---
@@ -102,21 +102,37 @@ You can also manage them with `/skills`.
 
 ## MCP (Model Context Protocol)
 
-Extend Ikie with external MCP servers. Paste a Claude/Cline-style config and Ikie
-will wire it up:
+Extend Ikie with external MCP servers. When a server is configured, each of its
+tools appears as a first-class tool named `mcp__<server>__<tool>` — call them
+directly, no meta-tool dance.
+
+Paste a Claude/Cline-style config and Ikie will wire it up:
 
 ```
 claude mcp add magic --scope user --env API_KEY="…" -- npx -y @21st-dev/magic@latest
 ```
 
-Then start it and its tools become available:
-
-```
-/  (use the slash menu) → mcp_start magic
+Or create a `.mcp.json` file in the project root (or `.mcp.local.json` for
+machine-local overrides, or `~/.ikie/mcp.json` for global ones):
+
+```json
+{
+  "mcpServers": {
+    "magic": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["-y", "@21st-dev/magic@latest"],
+      "env": { "API_KEY": "…" },
+      "enabled": true,
+      "autoStart": true
+    }
+  }
+}
 ```
 
-Built-in MCPs include **filesystem**, **github**, **database** (SQLite/Postgres),
-and **puppeteer** (browser automation).
+In the REPL, use `/mcp` to list servers and their tools, `/mcp add <line>` to
+add one from a `claude mcp add …` line, `/mcp remove <name>`, and `/mcp reconnect
+<name>`.
 
 ---
 
@@ -136,6 +152,7 @@ Type `/` to open the command menu. Highlights:
 | `/model <name>` · `/models` | Switch or list models |
 | `/settings [show\|model\|reset]` | View/change persisted settings |
 | `/skills` | List, show, install, or remove skills |
+| `/mcp` · `/mcp add` · `/mcp remove` · `/mcp reconnect` | MCP server status and management |
 | `/theme [name]` | Change the color theme |
 | `/usage` · `/tokens` | Account usage/credit and token estimate |
 | `/rpm <n>` | Set the model request-per-minute limit |

package/dist/agent.d.ts

@@ -6,7 +6,13 @@ export interface AgentOptions {
     autoApprove?: boolean;
     signal?: AbortSignal;
     startedAt?: number;
+    /** Max model→tool round-trips in a single turn before forcing a graceful stop. */
+    maxSteps?: number;
 }
+/** Default per-turn step budget — guards against runaway tool loops. */
+export declare const DEFAULT_MAX_STEPS = 60;
+/** Result synthesized for a tool call that never produced one (cancel/crash). */
+export declare const INTERRUPTED_TOOL_RESULT = "Interrupted: this tool did not run to completion (the turn was cancelled).";
 /** Plan = read-only research + propose; Agent = full execution. */
 export type AgentMode = 'agent' | 'plan';
 export interface AgentTurnStats {
@@ -20,6 +26,32 @@ export declare function estimateTokens(chars: number): number;
  * The SDK wraps provider responses; we prefer the nested error.message if it exists.
  */
 export declare function extractUpstreamError(err: unknown): string;
+/**
+ * Guarantee the OpenAI invariant: every `assistant` message that carries
+ * `tool_calls` is followed by a `tool` message for each call id. A turn that is
+ * cancelled (ESC/Ctrl-C), throws mid-stream, or is restored from a session saved
+ * mid-flight can leave "dangling" tool calls with no result — and the provider
+ * then rejects the *next* request ("an assistant message with 'tool_calls' must
+ * be followed by tool messages"). This splices a synthetic result for any
+ * unanswered call so history is always replayable. Pure and idempotent.
+ */
+export declare function repairDanglingToolCalls(messages: ChatCompletionMessageParam[]): ChatCompletionMessageParam[];
+/**
+ * Whether the agent loop should make another model call. We continue purely on
+ * "there were tool calls to answer" — NOT on `finishReason`, because some
+ * providers send `finish_reason: 'stop'` (or null) alongside tool calls, which
+ * would otherwise silently drop the calls. `maxSteps` caps runaway loops.
+ */
+export declare function shouldContinue(toolCallCount: number, _finishReason: string, step: number, maxSteps: number): boolean;
+/**
+ * Drop malformed tool calls (no function name) accumulated from a stream. An
+ * unnamed call can't be dispatched or answered, so keeping it would create an
+ * un-satisfiable `tool_calls` entry. Applied to both the dispatch list and the
+ * assistant message so they stay in lockstep.
+ */
+export declare function normalizeToolCalls<T extends {
+    name: string;
+}>(calls: T[]): T[];
 /**
  * Safely restore previously-saved stdin listeners after a raw-mode interaction
  * (permission prompt, ask_user, theme picker, agent turn).
@@ -62,16 +94,28 @@ export declare class Agent {
     private groupToolCalls;
     private formatGroupSummary;
     private runLoop;
+    /**
+     * Final wrap-up when the per-turn step budget is exhausted. One model call with
+     * tools disabled, so it produces a plain summary and can never leave a dangling
+     * tool call. Best-effort: failures here don't throw out of the turn.
+     */
+    private summarizeAndStop;
     private callModel;
     private buildParams;
     private throttleModelRequest;
     private callModelStreaming;
     private callModelNonStreaming;
     private handleToolCall;
+    private handleUseSkill;
     private handleSwitchMode;
     private requestModeSwitch;
     private askUser;
     private runSubagent;
+    /**
+     * Best-effort: one tool-less model call asking for a concise, self-contained
+     * summary of the work so far. Used to guarantee a non-empty subagent result.
+     */
+    requestFinalSummary(signal?: AbortSignal): Promise<string>;
     getLastAssistantText(): string;
     private checkPermission;
 }