@addai/node 0.26.0 → 0.27.1

package/dist/kimi-spawn.d.ts

@@ -11,7 +11,9 @@ export interface KimiInput {
     model?: string;
     /** Resume an existing session (mapped to `--session <id>`). */
     resumeSessionId?: string;
-    /** Skip approval prompts. Maps to --yolo. */
+    /** Accepted for interface parity with the other adapters and deliberately
+     *  ignored: prompt mode always runs in "auto" permission mode, and passing
+     *  --yolo alongside --prompt is a hard error in the CLI. */
     bypassPermissions?: boolean;
     /** When set, kimi runs against a sandboxed mcp config that contains
      *  ONLY these MCP servers (host's ~/.kimi/mcp.json suppressed). */
@@ -20,12 +22,12 @@ export interface KimiInput {
      *  --system-prompt flag, so we prepend it to the user prompt with a
      *  separator the model can recognise. */
     appendSystemPrompt?: string;
-    /** Per-run reasoning effort. The kimi CLI has no verified reasoning-effort
-     *  flag (unlike claude `--effort` / codex `reasoning.effort`), so by
-     *  default this is NOT forwarded — emitting an unsupported flag would make
-     *  every effort-tagged kimi run fail to spawn. The level IS exported as an
-     *  env var (KIMI_REASONING_EFFORT) so a kimi wrapper/config that opts in
-     *  can read it without us guessing at a CLI flag that might not exist. */
+    /** Per-run reasoning effort. kimi has no effort FLAG, but it does read
+     *  KIMI_MODEL_THINKING_EFFORT from the environment, which bypasses the
+     *  model's declared support_efforts list. (The old code set
+     *  KIMI_REASONING_EFFORT, a name that appears nowhere in the CLI, so effort
+     *  was simply ignored.) 'max' is migrated to 'high' by kimi itself; we send
+     *  'high' rather than rely on that. */
     effortLevel?: RuntimeEffortLevel;
 }
 export interface KimiHandle {
@@ -39,16 +41,58 @@ export interface KimiHandle {
     onActivity(cb: () => void): void;
     done: Promise<number>;
 }
-/** Write a sandbox $HOME with an empty .kimi dir so kimi's default
- *  `~/.kimi/mcp.json` resolves to nothing. Caller is responsible for
- *  cleanup (we drop it under os.tmpdir() so the OS reaps it). */
-export declare function writeKimiSandboxHome(servers: KimiMcpServer[]): {
-    homeDir: string;
-    mcpConfigPath: string;
-};
-/** Parse one stream-json line into 0+ RuntimeEvents. Kimi's shapes are
- *  similar in spirit to claude's: assistant text deltas, tool calls,
- *  turn completion, and session metadata. Anything we don't recognise
- *  is forwarded as `kimi:<type>` opaque events. */
+/**
+ * Write the entity's MCP servers where kimi will actually read them:
+ * `<workDir>/.kimi-code/mcp.json`, the last and highest-precedence of the
+ * three files it merges (user `~/.kimi-code/mcp.json`, project-root
+ * `.mcp.json`, then this one).
+ *
+ * The two alternatives are both worse. `--mcp-config-file` — what this used
+ * to pass — is not a flag kimi has, so it took the whole run down at argument
+ * parsing. Pointing KIMI_CODE_HOME at a throwaway dir WOULD isolate the user
+ * file, but that dir also holds kimi's credentials, config.toml and session
+ * index: it would log the daemon out on every run. Same trap as the HOME
+ * override this file already backed away from.
+ *
+ * The cost is that a server configured on the host machine still merges in.
+ * Ours always win on key collision, and the file is rewritten on every spawn
+ * so a detached MCP disappears on the next run rather than lingering.
+ */
+export declare function writeKimiProjectMcpConfig(workingDirectory: string, servers: KimiMcpServer[]): string;
+/**
+ * Parse one stream-json line into 0+ RuntimeEvents.
+ *
+ * kimi's prompt-mode stream is OpenAI-CHAT shaped, not claude shaped: every
+ * content line is keyed by `role`, and only the three metadata lines carry a
+ * `type` at all (`system.version`, `session.resume_hint`,
+ * `turn.step.retrying`). The role branches therefore come first. Without them
+ * every real line fell through to the opaque passthrough at the bottom, which
+ * meant a kimi run that worked perfectly would still have delivered an empty
+ * reply — a second, independent bug hiding behind the argument-parsing one.
+ *
+ * Shapes, from PromptJsonWriter in the shipped bundle:
+ *   {role:"assistant", content?:string, tool_calls?:[{id,function:{name,arguments}}]}
+ *   {role:"tool", tool_call_id:string, content:string}
+ *   {role:"meta", type:"...", ...}
+ *
+ * Note there is no terminal line and no usage line: the runner keys
+ * completion off process exit, and kimi runs report no token counts.
+ *
+ * The `type`-keyed branches below are kept for older builds, and anything
+ * unrecognised is still forwarded as `kimi:<type>` rather than dropped.
+ */
 export declare function lineToEvents(line: Record<string, unknown>): RuntimeEvent[];
+/**
+ * The kimi command line for one prompt-mode run.
+ *
+ * Extracted so the flag set is testable without spawning anything — this is
+ * the surface where four invented flags shipped undetected, each one killing
+ * the run before a single token was generated. Every flag below is present in
+ * the CLI's own option table.
+ *
+ * Not here on purpose: --work-dir (kimi reads process.cwd(), which the spawn
+ * sets), --mcp-config-file (config comes from <cwd>/.kimi-code/mcp.json), and
+ * --yolo (prompt mode forces "auto" permissions and rejects the flag).
+ */
+export declare function buildKimiArgs(input: KimiInput): string[];
 export declare function spawnKimi(input: KimiInput): KimiHandle;

package/dist/kimi-spawn.js

@@ -1,11 +1,29 @@
 "use strict";
-// kimi --print --output-format stream-json adapter.
+// kimi --prompt --output-format stream-json adapter.
 //
-// Mirrors claude-print.ts: spawns `kimi` non-interactively with a
-// JSONL output stream, parses each line into our normalised RuntimeEvent
-// shape, and resolves on exit. Kimi's stream-json shape is documented
-// upstream but we passthrough unknown event types as `kimi:<type>` for
-// safe forward-compat.
+// Mirrors claude-print.ts: spawns `kimi` non-interactively with a JSONL
+// output stream, parses each line into our normalised RuntimeEvent shape,
+// and resolves on exit.
+//
+// Everything here is read out of the shipped bundle (@moonshot-ai/kimi-code
+// 0.36.0, dist/main.mjs), not the docs, because the previous version of this
+// file was written from the docs and got FOUR things wrong at once — every
+// one of them fatal:
+//
+//   --print              does not exist. `-p, --prompt <prompt>` IS prompt
+//                        mode and takes the prompt as its value. Every kimi
+//                        run died at argument parsing, silently laddering to
+//                        claude.
+//   --work-dir <dir>     does not exist. kimi takes its work dir from
+//                        process.cwd(), which spawn() already sets.
+//   --mcp-config-file    does not exist. kimi merges three files; the
+//                        highest-precedence one is <cwd>/.kimi-code/mcp.json.
+//   --yolo               is REJECTED alongside --prompt ("Cannot combine
+//                        --prompt with --yolo"). It is also unnecessary:
+//                        prompt mode calls forceAuto() and runs the whole
+//                        turn in "auto" permission mode by itself.
+//
+// The output format was wrong too — see lineToEvents.
 //
 // Reference: https://moonshotai.github.io/kimi-cli/en/reference/kimi-command.html
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
@@ -42,24 +60,66 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeKimiSandboxHome = writeKimiSandboxHome;
+exports.writeKimiProjectMcpConfig = writeKimiProjectMcpConfig;
 exports.lineToEvents = lineToEvents;
+exports.buildKimiArgs = buildKimiArgs;
 exports.spawnKimi = spawnKimi;
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
-const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const kimi_binary_1 = require("./kimi-binary");
+const harness_registry_1 = require("./harness-registry");
 const win_1 = require("./win");
 const events_1 = require("./events");
 const think_split_1 = require("./think-split");
 const mcp_headers_1 = require("./mcp-headers");
-/** Write a sandbox $HOME with an empty .kimi dir so kimi's default
- *  `~/.kimi/mcp.json` resolves to nothing. Caller is responsible for
- *  cleanup (we drop it under os.tmpdir() so the OS reaps it). */
-function writeKimiSandboxHome(servers) {
-    const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'entities-kimi-'));
-    fs.mkdirSync(path.join(homeDir, '.kimi'), { mode: 0o700 });
+/**
+ * The effort level to send kimi, or null to send nothing.
+ *
+ * KIMI_MODEL_THINKING_EFFORT is a real kimi env var, but it exists precisely to
+ * BYPASS the model's declared support_efforts — kimi forwards the string to the
+ * provider verbatim and lets the API judge it. Setting it unconditionally is
+ * therefore not a safe default: an entity on medium effort got
+ *
+ *   provider.api_error: 400 Invalid request Error
+ *
+ * four seconds into the run, every run, because the model behind kimi takes no
+ * thinking effort at all.
+ *
+ * The harness registry already records which levels a harness supports, and
+ * kimi's list is empty — so the registry decides, and an empty list means the
+ * variable is never set. If kimi gains effort support, updating the registry is
+ * enough; nothing here needs to change.
+ */
+function kimiEffort(level) {
+    const supported = (0, harness_registry_1.harness)('kimi')?.efforts ?? [];
+    if (supported.length === 0)
+        return null;
+    // 'max' was retired by kimi (it migrates a stored 'max' to 'high') and it
+    // never had our 'xhigh', so both collapse to the highest level it declares.
+    const wanted = level === 'max' || level === 'xhigh' ? 'high' : level;
+    return supported.includes(wanted) ? wanted : null;
+}
+/**
+ * Write the entity's MCP servers where kimi will actually read them:
+ * `<workDir>/.kimi-code/mcp.json`, the last and highest-precedence of the
+ * three files it merges (user `~/.kimi-code/mcp.json`, project-root
+ * `.mcp.json`, then this one).
+ *
+ * The two alternatives are both worse. `--mcp-config-file` — what this used
+ * to pass — is not a flag kimi has, so it took the whole run down at argument
+ * parsing. Pointing KIMI_CODE_HOME at a throwaway dir WOULD isolate the user
+ * file, but that dir also holds kimi's credentials, config.toml and session
+ * index: it would log the daemon out on every run. Same trap as the HOME
+ * override this file already backed away from.
+ *
+ * The cost is that a server configured on the host machine still merges in.
+ * Ours always win on key collision, and the file is rewritten on every spawn
+ * so a detached MCP disappears on the next run rather than lingering.
+ */
+function writeKimiProjectMcpConfig(workingDirectory, servers) {
+    const configDir = path.join(workingDirectory, '.kimi-code');
+    fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
     const mcpConfig = { mcpServers: {} };
     for (const s of servers) {
         if (!s.slug || !s.command)
@@ -90,15 +150,76 @@ function writeKimiSandboxHome(servers) {
             ...(s.env && Object.keys(s.env).length > 0 ? { env: s.env } : {}),
         };
     }
-    const mcpConfigPath = path.join(homeDir, '.kimi', 'mcp.json');
+    // 0600: stdio servers carry their credentials in `env` and remote ones in
+    // `headers`, and this file lives inside the entity's working directory.
+    const mcpConfigPath = path.join(configDir, 'mcp.json');
     fs.writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), { mode: 0o600 });
-    return { homeDir, mcpConfigPath };
+    return mcpConfigPath;
 }
-/** Parse one stream-json line into 0+ RuntimeEvents. Kimi's shapes are
- *  similar in spirit to claude's: assistant text deltas, tool calls,
- *  turn completion, and session metadata. Anything we don't recognise
- *  is forwarded as `kimi:<type>` opaque events. */
+/**
+ * Parse one stream-json line into 0+ RuntimeEvents.
+ *
+ * kimi's prompt-mode stream is OpenAI-CHAT shaped, not claude shaped: every
+ * content line is keyed by `role`, and only the three metadata lines carry a
+ * `type` at all (`system.version`, `session.resume_hint`,
+ * `turn.step.retrying`). The role branches therefore come first. Without them
+ * every real line fell through to the opaque passthrough at the bottom, which
+ * meant a kimi run that worked perfectly would still have delivered an empty
+ * reply — a second, independent bug hiding behind the argument-parsing one.
+ *
+ * Shapes, from PromptJsonWriter in the shipped bundle:
+ *   {role:"assistant", content?:string, tool_calls?:[{id,function:{name,arguments}}]}
+ *   {role:"tool", tool_call_id:string, content:string}
+ *   {role:"meta", type:"...", ...}
+ *
+ * Note there is no terminal line and no usage line: the runner keys
+ * completion off process exit, and kimi runs report no token counts.
+ *
+ * The `type`-keyed branches below are kept for older builds, and anything
+ * unrecognised is still forwarded as `kimi:<type>` rather than dropped.
+ */
 function lineToEvents(line) {
+    const role = typeof line.role === 'string' ? line.role : '';
+    if (role === 'assistant') {
+        const out = [];
+        if (typeof line.content === 'string' && line.content) {
+            out.push({ type: 'assistant_text', delta: line.content });
+        }
+        const calls = Array.isArray(line.tool_calls) ? line.tool_calls : [];
+        for (const c of calls) {
+            // Arguments arrive as a JSON string (streamed in parts, joined by the
+            // writer). Keep the raw string if it doesn't parse — a malformed
+            // argument list is worth showing, not worth losing the tool call over.
+            const rawArgs = c?.function?.arguments;
+            let input = rawArgs;
+            if (typeof rawArgs === 'string' && rawArgs.length > 0) {
+                try {
+                    input = JSON.parse(rawArgs);
+                }
+                catch {
+                    input = rawArgs;
+                }
+            }
+            out.push({
+                type: 'tool_use',
+                id: String(c?.id ?? ''),
+                name: String(c?.function?.name ?? ''),
+                input,
+            });
+        }
+        // An assistant line with neither content nor calls shouldn't happen (the
+        // writer skips empty flushes) — pass it through rather than swallow it.
+        return out.length > 0 ? out : [{ type: 'kimi:assistant', raw: line }];
+    }
+    if (role === 'tool') {
+        // kimi has no error channel on tool results; failures come back as text.
+        return [{
+                type: 'tool_result',
+                id: String(line.tool_call_id ?? ''),
+                content: line.content,
+                isError: false,
+            }];
+    }
     const type = typeof line.type === 'string' ? line.type : '';
     // Assistant text — kimi emits 'assistant_message' or 'assistant.delta'
     // depending on version.
@@ -179,6 +300,36 @@ function lineToEvents(line) {
     // Anything else — opaque passthrough
     return [{ type: `kimi:${type || 'unknown'}`, raw: line }];
 }
+/**
+ * The kimi command line for one prompt-mode run.
+ *
+ * Extracted so the flag set is testable without spawning anything — this is
+ * the surface where four invented flags shipped undetected, each one killing
+ * the run before a single token was generated. Every flag below is present in
+ * the CLI's own option table.
+ *
+ * Not here on purpose: --work-dir (kimi reads process.cwd(), which the spawn
+ * sets), --mcp-config-file (config comes from <cwd>/.kimi-code/mcp.json), and
+ * --yolo (prompt mode forces "auto" permissions and rejects the flag).
+ */
+function buildKimiArgs(input) {
+    // --output-format is only accepted in prompt mode, which --prompt turns on.
+    const args = ['--output-format', 'stream-json'];
+    // kimi refuses a bare --session in prompt mode, so only pass it with an id.
+    if (input.resumeSessionId)
+        args.push('--session', input.resumeSessionId);
+    if (input.model)
+        args.push('--model', input.model);
+    // kimi has no --append-system-prompt; prepend with a separator the model can
+    // recognise as a system-like instruction block.
+    let promptText = input.prompt;
+    if (input.appendSystemPrompt && input.appendSystemPrompt.trim().length > 0) {
+        promptText = `[system]\n${input.appendSystemPrompt.trim()}\n[/system]\n\n${input.prompt}`;
+    }
+    // Last, and always: --prompt takes the prompt as its VALUE.
+    args.push('--prompt', promptText);
+    return args;
+}
 function spawnKimi(input) {
     const bin = (0, kimi_binary_1.findKimiBinary)();
     if (!bin) {
@@ -201,49 +352,19 @@ function spawnKimi(input) {
             done: Promise.resolve(127),
         };
     }
-    // Sandbox the kimi config dir. HOME override means kimi's default
-    // We pass --mcp-config-file explicitly, so kimi reads OUR servers,
-    // not the host's ~/.kimi/mcp.json. The mcp config path can live in a
-    // throwaway temp dir; we no longer need to override HOME.
-    //
-    // The OLD approach (HOME=<tempdir>) was destructive: kimi shells out
-    // to git, pip, etc., and those tools read ~/.gitconfig, ~/.npmrc,
-    // ~/.netrc from HOME. Pointing HOME at an empty dir blew away every
-    // user-level tool config, causing silent tool-call failures
-    // (git push without creds, pip install without index URL).
-    const { homeDir: kimiSandboxDir, mcpConfigPath } = writeKimiSandboxHome(input.mcpServers ?? []);
-    const args = [
-        '--print',
-        '--output-format', 'stream-json',
-        '--work-dir', input.workingDirectory,
-        '--mcp-config-file', mcpConfigPath,
-    ];
-    if (input.resumeSessionId) {
-        args.push('--session', input.resumeSessionId);
-    }
-    if (input.model) {
-        args.push('--model', input.model);
-    }
-    if (input.bypassPermissions) {
-        args.push('--yolo');
-    }
-    // Kimi doesn't have --append-system-prompt; prepend with a separator
-    // the model can recognise as a system-like instruction block.
-    let promptText = input.prompt;
-    if (input.appendSystemPrompt && input.appendSystemPrompt.trim().length > 0) {
-        promptText = `[system]\n${input.appendSystemPrompt.trim()}\n[/system]\n\n${input.prompt}`;
-    }
-    args.push('--prompt', promptText);
+    // MCP servers reach kimi through a file in the working directory, not a
+    // flag. Written before spawn and rewritten every run — see above.
+    writeKimiProjectMcpConfig(input.workingDirectory, input.mcpServers ?? []);
+    const args = buildKimiArgs(input);
     // No HOME override: the real $HOME flows through so kimi's own auth +
     // shelled-out tools (git/pip/node) can find their config files. The
     // explicit --mcp-config-file already prevents host mcp.json leakage.
+    const effortValue = input.effortLevel ? kimiEffort(input.effortLevel) : null;
     const childEnv = {
         ...process.env,
         TERM: 'dumb',
-        // Surface the requested reasoning effort without betting on a CLI flag
-        // that may not exist. A kimi config / wrapper can pick this up; if kimi
-        // ignores it, behaviour is unchanged (no spawn failure).
-        ...(input.effortLevel ? { KIMI_REASONING_EFFORT: input.effortLevel } : {}),
+        // Effort, only when the registry says kimi can take one — see kimiEffort.
+        ...(effortValue ? { KIMI_MODEL_THINKING_EFFORT: effortValue } : {}),
     };
     const listeners = [];
     const emit = (e) => { for (const l of listeners)
@@ -273,10 +394,6 @@ function spawnKimi(input) {
     }
     catch (err) {
         const msg = err.message || String(err);
-        try {
-            fs.rmSync(kimiSandboxDir, { recursive: true, force: true });
-        }
-        catch { }
         const events = (0, events_1.bufferedEvents)([
             { type: 'error', code: 'kimi_spawn_failed', message: msg },
             { type: 'turn_complete', stopReason: 'failed' },
@@ -328,11 +445,6 @@ function spawnKimi(input) {
             // Release anything the splitter is still holding — a run that ends
             // mid-tag must not lose the tail of its answer.
             emitSplit.flush();
-            // Best-effort cleanup of sandbox tmp dir
-            try {
-                fs.rmSync(kimiSandboxDir, { recursive: true, force: true });
-            }
-            catch { }
             resolve(code ?? -1);
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addai/node",
-  "version": "0.26.0",
+  "version": "0.27.1",
   "description": "Daemon that pairs a machine with your +Ai account and runs Claude / Codex / Kimi / Gemini agents on its behalf. Reachable via Supabase from Vault, Entity Studio, or any other +Ai surface.",
   "license": "MIT",
   "keywords": [