@akanjs/cli 3.0.0-beta.16 → 3.0.0-beta.17

package/.build-stamp

@@ -1 +1 @@
-6491b2d0e0e0215fa142863a77651ee2089f845be399582cd40b8149669b2a6f
+8adda265985140249a01af8a9966dd10b8dd38c2c3dd887ea8919e4aeff4a70e

package/{CodeAgent-zgccwajm.js → CodeAgent-gjqnc2mg.js}

@@ -1,8 +1,8 @@
 // @bun
 import {
   CodeAgent2
-} from "./index-5405kc0x.js";
-import"./index-jgrnpt6y.js";
+} from "./index-2sq06vv0.js";
+import"./index-qt8dqgnf.js";
 import"./index-7md2g9vw.js";
 export {
   CodeAgent2 as CodeAgent

package/{CodeTui-993tx7gf.js → CodeTui-nd9hqvrw.js}

@@ -1,16 +1,18 @@
 // @bun
 import {
-  SubagentPool2
-} from "./index-jgrnpt6y.js";
+  SubagentPool2,
+  McpServerConfig
+} from "./index-qt8dqgnf.js";
 import {
+  CodeTuiLines2,
+  CodeTuiAgents2,
   CodeTuiClipboard2,
   CodeTuiCommands2,
-  CodeTuiLines2,
   CodeTuiEditor2,
   CodeTuiFiles2,
   CodeTuiMarkdown2,
   CodeTuiParts2
-} from "./index-sxg87a8f.js";
+} from "./index-bzakk0c2.js";
 
 // pkgs/@akanjs/cli/code/CodeTui.tsx
 import {
@@ -22,6 +24,41 @@ import { render } from "ink";
 // pkgs/@akanjs/cli/ui/CodeTuiApp.tsx
 import { Box, Text, useCursor, useInput } from "ink";
 import { useEffect, useRef, useState } from "react";
+
+// pkgs/@akanjs/cli/code/CodeTuiMouse.ts
+class CodeTuiMouse {
+  static on = "\x1B[?1000h\x1B[?1006h";
+  static off = "\x1B[?1006l\x1B[?1000l";
+  static step = 3;
+  #pending = 0;
+  read(input) {
+    if (this.#pending) {
+      const button = (input.codePointAt(0) ?? 32) - 32;
+      const rest = input.slice(this.#pending);
+      this.#pending = 0;
+      return { rows: CodeTuiMouse.rowsOf(button), rest };
+    }
+    const sgr = /^\[<(\d+);\d+;\d+[Mm]$/.exec(input);
+    if (sgr)
+      return { rows: CodeTuiMouse.rowsOf(Number(sgr[1])), rest: "" };
+    if (input !== "[M")
+      return;
+    this.#pending = 3;
+    return { rows: 0, rest: "" };
+  }
+  static rowsOf(button) {
+    if (!(button & 64))
+      return 0;
+    const direction = button & 3;
+    if (direction === 0)
+      return -CodeTuiMouse.step;
+    if (direction === 1)
+      return CodeTuiMouse.step;
+    return 0;
+  }
+}
+
+// pkgs/@akanjs/cli/ui/CodeTuiApp.tsx
 import { jsxDEV } from "react/jsx-dev-runtime";
 var promptMarkWidth = 2;
 var pasteOpen = "[200~";
@@ -113,6 +150,7 @@ var Menu = ({ options, selected, marker, checked }) => /* @__PURE__ */ jsxDEV(Bo
 var CodeTuiApp = ({ actions }) => {
   const [snapshot, setSnapshot] = useState(actions.snapshot);
   const pasting = useRef(null);
+  const mouse = useRef(new CodeTuiMouse);
   const { setCursorPosition } = useCursor();
   useEffect(() => {
     const unsubscribe = actions.subscribe(() => setSnapshot(actions.snapshot()));
@@ -136,6 +174,14 @@ var CodeTuiApp = ({ actions }) => {
 ` : key.tab ? "\t" : input);
       return;
     }
+    const wheel = mouse.current.read(input);
+    if (wheel) {
+      if (wheel.rows)
+        actions.scroll(wheel.rows);
+      if (wheel.rest)
+        actions.type(wheel.rest);
+      return;
+    }
     if (key.ctrl && input === "c")
       return actions.interrupt();
     if (key.pageUp)
@@ -267,6 +313,12 @@ var CodeTuiApp = ({ actions }) => {
           }, undefined, false, undefined, this) : null
         ]
       }, undefined, true, undefined, this),
+      snapshot.subagents.length ? /* @__PURE__ */ jsxDEV(Box, {
+        flexDirection: "column",
+        children: snapshot.subagents.map((line) => /* @__PURE__ */ jsxDEV(Line, {
+          line
+        }, line.key, false, undefined, this))
+      }, undefined, false, undefined, this) : null,
       /* @__PURE__ */ jsxDEV(Rule, {
         spans: snapshot.bottomRule
       }, undefined, false, undefined, this),
@@ -283,6 +335,79 @@ var CodeTuiApp = ({ actions }) => {
   }, undefined, true, undefined, this);
 };
 
+// pkgs/@akanjs/cli/code/CodeTuiMcp.ts
+class CodeTuiMcp {
+  static namePattern = /^[a-zA-Z0-9_-]+$/;
+  static usage = [
+    "/mcp add <name> <command> [args\u2026]   declare a server this session starts",
+    "/mcp add <name> <https://\u2026>         declare one it reaches over http",
+    "/mcp remove <name>                  undeclare it",
+    "/mcp reload                         reopen this session so the file takes effect"
+  ];
+  static list(view) {
+    const lines = view.problem ? [view.problem, ""] : [];
+    const rows = CodeTuiMcp.#rows(view);
+    if (!rows.length)
+      return [
+        ...lines,
+        "No MCP server is declared.",
+        "",
+        `Declare one here, or paste an editor's \`mcpServers\` block into ${view.file}.`,
+        "",
+        ...CodeTuiMcp.usage
+      ].join(`
+`);
+    const width = (at) => Math.max(...rows.map((row) => (row[at] ?? "").length)) + 2;
+    const [name, transport, target] = [width(0), width(1), width(2)];
+    return [
+      ...lines,
+      `${rows.length} server${rows.length === 1 ? "" : "s"} \xB7 ${view.file}`,
+      "",
+      ...rows.map(([a, b, c, d]) => `${(a ?? "").padEnd(name)}${(b ?? "").padEnd(transport)}${(c ?? "").padEnd(target)}${d ?? ""}`),
+      "",
+      ...CodeTuiMcp.usage
+    ].join(`
+`);
+  }
+  static #rows(view) {
+    const byName = new Map;
+    for (const entry of view.declared)
+      byName.set(entry.ref.name, { ref: entry.ref, disabled: entry.disabled });
+    for (const live of view.status)
+      byName.set(live.name, { ...byName.get(live.name), live });
+    return [...byName].sort(([a], [b]) => a.localeCompare(b)).map(([name, entry]) => {
+      const transport = entry.live?.transport ?? entry.ref?.transport ?? "";
+      const target = entry.live?.target ?? CodeTuiMcp.targetOf(entry.ref);
+      return [name, transport, target, CodeTuiMcp.#stateOf(entry)];
+    });
+  }
+  static #stateOf(entry) {
+    if (entry.disabled)
+      return "disabled in the file";
+    if (!entry.live)
+      return "declared \xB7 /mcp reload to connect";
+    if (entry.live.error)
+      return `unreachable \u2014 ${entry.live.error}`;
+    if (!entry.ref)
+      return `${entry.live.tools.length} tools \xB7 removed from the file`;
+    return `${entry.live.tools.length} tool${entry.live.tools.length === 1 ? "" : "s"}`;
+  }
+  static targetOf(ref) {
+    if (!ref)
+      return "";
+    return ref.url ?? [ref.command, ...ref.args ?? []].filter(Boolean).join(" ");
+  }
+  static tools(status) {
+    if (status.error)
+      return `${status.name} is unreachable \u2014 ${status.error}`;
+    if (!status.tools.length)
+      return `${status.name} connected and published no tools.`;
+    return [`${status.name} \xB7 ${status.target}`, "", status.tools.join(`
+`)].join(`
+`);
+  }
+}
+
 // pkgs/@akanjs/cli/code/CodeTui.tsx
 import { jsxDEV as jsxDEV2 } from "react/jsx-dev-runtime";
 
@@ -360,7 +485,7 @@ class CodeTui {
     });
   }
   async run(seed) {
-    this.#stdout.write(CodeTui.pasteOn);
+    this.#stdout.write(`${CodeTui.pasteOn}${CodeTuiMouse.on}`);
     if (this.#opening)
       this.#say(this.#opening);
     this.#unsubscribe = this.#agent.on((event) => {
@@ -433,10 +558,10 @@ class CodeTui {
     for (const listener of this.#listeners)
       listener();
   }
-  static layout(frameRows, askRows) {
-    const room = Math.max(1, frameRows - CodeTui.minBodyRows - CodeTui.chromeRows);
+  static layout(frameRows, askRows, railRows = 0) {
+    const room = Math.max(1, frameRows - CodeTui.minBodyRows - CodeTui.chromeRows - railRows);
     const ask = Math.max(1, Math.min(askRows, room));
-    return { ask, bodyHeight: Math.max(CodeTui.minBodyRows, frameRows - ask - CodeTui.chromeRows) };
+    return { ask, bodyHeight: Math.max(CodeTui.minBodyRows, frameRows - ask - CodeTui.chromeRows - railRows) };
   }
   static frameRowsOf(terminalRows) {
     return Math.max(CodeTui.minBodyRows + CodeTui.chromeRows + 1, terminalRows - 1);
@@ -449,8 +574,9 @@ class CodeTui {
     const question = this.#transcript.question;
     const approval = this.#transcript.approval;
     const mode = CodeTui.#modeOf(question, approval);
-    const ask = mode === "input" ? this.#inputBlock(columns, frameRows) : this.#askBlock(question, frameRows);
-    const { bodyHeight } = CodeTui.layout(frameRows, ask.rows);
+    const subagents = this.#railRows(columns);
+    const ask = mode === "input" ? this.#inputBlock(columns, frameRows - subagents.length) : this.#askBlock(question, frameRows - subagents.length);
+    const { bodyHeight } = CodeTui.layout(frameRows, ask.rows, subagents.length);
     const width = columns - 2;
     const lines = this.#lines(width);
     const end = this.#anchor === null ? lines.length : Math.min(lines.length, Math.max(bodyHeight, this.#anchor));
@@ -466,6 +592,7 @@ class CodeTui {
       following: this.#anchor === null,
       overlay: this.#overlayBlock(width, bodyHeight),
       status: this.#status(),
+      subagents,
       mode,
       placeholder: this.#transcript.streaming ? "type to steer, esc to interrupt" : "ask for something, / for commands",
       offered: this.#offered,
@@ -489,6 +616,14 @@ class CodeTui {
       ...CodeTuiParts2.lines(this.#transcript.parts, width, { thinking: this.#thinking })
     ];
   }
+  #railRows(columns) {
+    const agents = this.#transcript.subagents;
+    if (!agents.length)
+      return [];
+    const rows = CodeTuiAgents2.rows(agents, this.#transcript.info?.name ?? "main", columns);
+    const room = CodeTui.frameRowsOf(Math.max(10, this.#stdout.rows || 24)) - CodeTui.minBodyRows - CodeTui.chromeRows - 2 * CodeTui.promptRuleRows - 1;
+    return rows.length <= room ? rows : [];
+  }
   #banner() {
     const cwd = this.#transcript.info?.cwd;
     return [
@@ -848,7 +983,7 @@ class CodeTui {
     if (this.#exiting)
       return;
     this.#exiting = true;
-    this.#stdout.write(CodeTui.pasteOff);
+    this.#stdout.write(`${CodeTuiMouse.off}${CodeTui.pasteOff}`);
     this.#instance.clear();
     this.#instance.unmount();
   }
@@ -995,6 +1130,8 @@ ${tools.join(" \xB7 ")}`);
         return this.#fork(argument);
       case "agents":
         return this.#open("agents", this.#agentList());
+      case "mcp":
+        return this.#mcp(argument);
       case "name":
         if (!argument)
           return this.#open("name", "Usage: /name <what this session is about>");
@@ -1021,6 +1158,54 @@ ${CodeTuiCommands2.help()}`);
     ].join(`
 `);
   }
+  #mcp(argument) {
+    const [verb, name, ...rest] = argument.split(" ").filter(Boolean);
+    const root = this.#agent.workspaceRoot;
+    if (!verb)
+      return this.#open("mcp", CodeTuiMcp.list(this.#mcpView()));
+    if (verb === "reload")
+      return this.#reload("reconnected the MCP servers");
+    if (verb !== "add" && verb !== "remove") {
+      const status = this.#agent.mcpServers().find((entry) => entry.name === verb);
+      if (status)
+        return this.#open(`mcp \xB7 ${verb}`, CodeTuiMcp.tools(status));
+      return this.#open("mcp", [`There is no /mcp ${verb}.`, "", ...CodeTuiMcp.usage].join(`
+`));
+    }
+    if (!name)
+      return this.#open("mcp", [`Usage:`, "", ...CodeTuiMcp.usage].join(`
+`));
+    if (!CodeTuiMcp.namePattern.test(name))
+      return this.#open("mcp", `"${name}" cannot name a server: letters, digits, dash and underscore only.`);
+    try {
+      if (verb === "remove") {
+        if (!McpServerConfig.remove(root, name))
+          return this.#open("mcp", `No server named "${name}" is declared.`);
+        return this.#reload(`removed ${name}`);
+      }
+      const ref = McpServerConfig.add(root, name, rest);
+      return this.#reload(`added ${name} \xB7 ${McpServerConfig.targetOf(ref)}`);
+    } catch (error) {
+      this.#fail(error);
+    }
+  }
+  #mcpView() {
+    const root = this.#agent.workspaceRoot;
+    const problem = McpServerConfig.problem(root);
+    return {
+      status: this.#agent.mcpServers(),
+      declared: McpServerConfig.declared(root),
+      file: McpServerConfig.file(root),
+      ...problem ? { problem } : {}
+    };
+  }
+  #reload(notice) {
+    const id = this.#transcript.info?.sessionId;
+    if (!id || !this.#agent.sessions().some((entry) => entry.id === id))
+      return this.#open("mcp", "This session is not on disk yet, so there is nothing to reopen. Say something first, or start a new `akan code`.");
+    this.#switchTo = { id, notice };
+    this.#quit();
+  }
   static #peerList(peers) {
     if (!peers.length)
       return "No other akan code session is running in this workspace.";

package/akanCode.js

@@ -11,14 +11,12 @@ import {
   VerifyFeedback2,
   AkanToolPack2,
   MailToolPack2,
-  akanCodePaths2,
   McpClient2,
   McpToolPack2,
   SessionToolPack2,
   WebToolPack2,
   AkanCodePlugins2,
   AkanEnvKeys2,
-  AkanAuthStorageBackend2,
   akanSystemPrompt2,
   CodeSessionIndex2,
   AkanCodeServices2,
@@ -29,32 +27,33 @@ import {
   CodeMailbox2,
   CodeSessionFork2,
   CodeAgent2
-} from "./index-5405kc0x.js";
+} from "./index-2sq06vv0.js";
 import {
   akanCodeDefaultModel2,
   akanCodeModel2,
   akanCodeModelSupportsImages2,
   akanCodeModelWarnings2,
   CodeAgentStreamPrinter2
-} from "./index-wfwknnje.js";
+} from "./index-jwrpsrg3.js";
 import {
-  SubagentPool2
-} from "./index-jgrnpt6y.js";
+  SubagentPool2,
+  akanCodePaths2
+} from "./index-qt8dqgnf.js";
 import"./index-7md2g9vw.js";
 import {
   CodeAgentRpcHost2
 } from "./index-8k16atqy.js";
 import {
+  CodeTuiLines2,
+  CodeTuiAgents2,
   CodeTuiClipboard2,
   CodeTuiCommands2,
-  CodeTuiLines2,
   CodeTuiEditor2,
   CodeTuiFiles2,
   CodeTuiMarkdown2,
   CodeTuiParts2
-} from "./index-sxg87a8f.js";
+} from "./index-bzakk0c2.js";
 export {
-  AkanAuthStorageBackend2 as AkanAuthStorageBackend,
   AkanCli2 as AkanCli,
   AkanCodePlugins2 as AkanCodePlugins,
   AkanCodeServices2 as AkanCodeServices,
@@ -72,6 +71,7 @@ export {
   CodeMailbox2 as CodeMailbox,
   CodeSessionFork2 as CodeSessionFork,
   CodeSessionIndex2 as CodeSessionIndex,
+  CodeTuiAgents2 as CodeTuiAgents,
   CodeTuiClipboard2 as CodeTuiClipboard,
   CodeTuiCommands2 as CodeTuiCommands,
   CodeTuiEditor2 as CodeTuiEditor,

package/{cloud.command-4x35k1z6.js → cloud.command-dk5tj39k.js}

@@ -14,11 +14,11 @@ import"./index-3mg4h788.js";
 import"./index-hwkygn9s.js";
 import"./index-7md2g9vw.js";
 import"./index-kcxmv48c.js";
-import"./index-018dszb3.js";
+import"./index-p0tew3fq.js";
 import"./index-57p9p179.js";
 import {
   CloudScript2
-} from "./index-zg0v1zte.js";
+} from "./index-n8kt2wh6.js";
 import"./index-sn7dnzq4.js";
 
 // pkgs/@akanjs/cli/cloud/cloud.command.ts

package/{cloud.script-3k8nbbpn.js → cloud.script-ch3xrw3s.js}

@@ -1,12 +1,12 @@
 // @bun
 import {
   CloudScript2
-} from "./index-zg0v1zte.js";
+} from "./index-n8kt2wh6.js";
 import"./index-57p9p179.js";
 import"./index-ns128c4q.js";
 import"./index-sn7dnzq4.js";
 import"./index-3mg4h788.js";
-import"./index-018dszb3.js";
+import"./index-p0tew3fq.js";
 import"./index-myj01w9r.js";
 import"./index-6na0sd2b.js";
 import"./index-7md2g9vw.js";

package/{code.command-mrfb7a1g.js → code.command-88sebgnn.js}

@@ -11,7 +11,7 @@ import"./index-6wwzs1bc.js";
 import {
   akanCodeDefaultModel2,
   CodeAgentStreamPrinter2
-} from "./index-wfwknnje.js";
+} from "./index-jwrpsrg3.js";
 
 // pkgs/@akanjs/cli/code/code.runner.ts
 import { codeAgentPresets, isCodeAgentPresetName } from "akanjs/common";
@@ -20,7 +20,7 @@ class CodeRunner extends runner("code") {
   async serve(options) {
     await import("./consoleToStderr-h5bryj94.js");
     const [{ CodeAgent }, { CodeAgentRpcHost }] = await Promise.all([
-      import("./CodeAgent-zgccwajm.js"),
+      import("./CodeAgent-gjqnc2mg.js"),
       import("./CodeAgentRpcHost-qvwfv0n9.js")
     ]);
     const profile = CodeRunner.profileOf(options);
@@ -36,8 +36,8 @@ class CodeRunner extends runner("code") {
   }
   async tui(options, seed) {
     const [{ CodeAgent }, { CodeTui }] = await Promise.all([
-      import("./CodeAgent-zgccwajm.js"),
-      import("./CodeTui-993tx7gf.js")
+      import("./CodeAgent-gjqnc2mg.js"),
+      import("./CodeTui-nd9hqvrw.js")
     ]);
     const profile = CodeRunner.profileOf(options);
     const apps = options.app ? [options.app] : await options.workspace.getApps();
@@ -71,7 +71,7 @@ class CodeRunner extends runner("code") {
     }
   }
   async run(prompt, options) {
-    const { CodeAgent } = await import("./CodeAgent-zgccwajm.js");
+    const { CodeAgent } = await import("./CodeAgent-gjqnc2mg.js");
     const profile = CodeRunner.profileOf(options);
     const agent = await CodeAgent.create({
       workspace: options.workspace,