@satori-sh/cli 0.0.15 → 0.0.17

package/dist/index.js

@@ -3,9 +3,10 @@
 // src/index.ts
 import { Command } from "commander";
 import { readFileSync, realpathSync } from "fs";
-import { execFile } from "child_process";
-import { dirname as dirname2, join as join3 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { homedir as homedir2 } from "os";
+import { execFile, spawn, spawnSync } from "child_process";
+import { dirname, join as join2 } from "path";
+import { fileURLToPath } from "url";
 import chalk from "chalk";
 
 // src/config.ts
@@ -227,258 +228,40 @@ ${memoryText}`
   return [systemMessage, ...messages];
 }
 
-// src/ui.tsx
-import { render, useRenderer, useTerminalDimensions } from "@opentui/solid";
-import { For, Show, createSignal, onMount, onCleanup } from "solid-js";
-import cliSpinners from "cli-spinners";
-
-// src/logo.ts
-import { dirname, join as join2 } from "path";
-import { fileURLToPath } from "url";
-async function loadLogo() {
-  const { default: fs } = await import("fs");
-  const __dirname = dirname(fileURLToPath(import.meta.url));
-  const logoPath = join2(__dirname, "..", "logos", "satori.ans");
-  return fs.readFileSync(logoPath, "utf8");
-}
-
-// src/ui.tsx
-async function runInteractiveApp({
-  initialPrompt,
-  options,
-  processUserInput,
-  infoLine,
-  infoDisplay
-}) {
-  const logo = await loadLogo();
-  console.log(` ${logo}`);
-  const rows = process.stdout.rows ?? 24;
-  const logoHeight = logo.endsWith("\n") ? logo.slice(0, -1).split("\n").length : logo.split("\n").length;
-  const splitHeight = Math.max(1, rows - logoHeight - 1);
-  render(
-    () => /* @__PURE__ */ React.createElement(
-      App,
-      {
-        initialPrompt,
-        options,
-        processUserInput,
-        infoLine,
-        infoDisplay
-      }
-    ),
-    {
-      useAlternateScreen: false,
-      exitOnCtrlC: true,
-      useMouse: true,
-      enableMouseMovement: true,
-      experimental_splitHeight: splitHeight
-    }
-  );
-}
-function App({ initialPrompt, options, processUserInput, infoLine, infoDisplay }) {
-  const renderer = useRenderer();
-  const dimensions = useTerminalDimensions();
-  const [messages, setMessages] = createSignal([]);
-  const [inputValue, setInputValue] = createSignal("");
-  const [showIntro, setShowIntro] = createSignal(true);
-  const [isFullScreen, setIsFullScreen] = createSignal(false);
-  const [spinnerFrame, setSpinnerFrame] = createSignal(0);
-  const [isLoading, setIsLoading] = createSignal(false);
-  const promptFg = "#00ffff";
-  const responseFg = "#ffffff";
-  const promptBg = "#2b2b2b";
-  let inputRef;
-  let currentMemoryId = options.memoryId;
-  let messageId = 0;
-  const usageText = infoDisplay?.usageLine ?? infoLine ?? "";
-  const versionText = infoDisplay?.versionLine ?? "";
-  const modelText = infoDisplay?.modelLine ?? "";
-  const appendMessage = (role, text) => {
-    setMessages((prev) => [...prev, { id: messageId++, role, text }]);
-  };
-  const exitApp = () => {
-    renderer.destroy();
-    process.exit(0);
-  };
-  const submitPrompt = async (raw) => {
-    const trimmed = raw.trim();
-    if (!trimmed) return;
-    if (trimmed.toLowerCase() === "exit" || trimmed.toLowerCase() === "quit") {
-      exitApp();
-      return;
-    }
-    if (showIntro()) {
-      setShowIntro(false);
-    }
-    if (!isFullScreen()) {
-      setIsFullScreen(true);
-    }
-    setInputValue("");
-    if (inputRef) {
-      inputRef.value = "";
-    }
-    appendMessage("prompt", trimmed);
-    try {
-      setIsLoading(true);
-      const result = await processUserInput(trimmed, { ...options, memoryId: currentMemoryId }, "tui");
-      currentMemoryId = result.memoryId;
-      appendMessage("response", result.response);
-      if (result.instruction) {
-        appendMessage("response", result.instruction);
-      }
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      appendMessage("response", `Error: ${message}`);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-  onMount(async () => {
-    const spinner = cliSpinners.dots;
-    const timer = setInterval(() => {
-      if (isLoading()) {
-        setSpinnerFrame((prev) => (prev + 1) % spinner.frames.length);
-      }
-    }, spinner.interval);
-    onCleanup(() => clearInterval(timer));
-    if (initialPrompt) {
-      await submitPrompt(initialPrompt);
-    }
-    if (inputRef) {
-      inputRef.focus();
-    }
-  });
-  const inputBoxWidth = () => Math.max(1, Math.round(dimensions().width * 0.6));
-  const inputBoxLeft = () => Math.max(0, Math.round(dimensions().width * 0.15));
-  const inputBoxHeight = () => isFullScreen() ? 7 : 14;
-  const inputBoxTop = () => isFullScreen() ? Math.max(1, dimensions().height - inputBoxHeight() - 2) : Math.max(1, Math.round(dimensions().height * 0.666));
-  const messagesTop = () => 1;
-  const messagesHeight = () => Math.max(1, inputBoxTop() - messagesTop() - 1);
-  const messagesWidth = () => Math.min(dimensions().width - 2, inputBoxWidth() + 10);
-  const messagesLeft = () => Math.max(1, inputBoxLeft() - 5);
-  return /* @__PURE__ */ React.createElement("box", { width: "100%", height: "100%", flexDirection: "column" }, /* @__PURE__ */ React.createElement(
-    "scrollbox",
-    {
-      id: "messages",
-      width: messagesWidth(),
-      height: messagesHeight(),
-      position: "absolute",
-      left: messagesLeft(),
-      top: messagesTop(),
-      paddingLeft: 1,
-      paddingRight: 1,
-      focused: true,
-      stickyScroll: true,
-      stickyStart: "bottom"
-    },
-    /* @__PURE__ */ React.createElement("box", { width: "100%", flexDirection: "column" }, /* @__PURE__ */ React.createElement(For, { each: messages() }, (message) => /* @__PURE__ */ React.createElement(
-      "box",
-      {
-        width: "100%",
-        flexDirection: "row",
-        justifyContent: message.role === "prompt" ? "flex-start" : "flex-end",
-        marginBottom: 1
-      },
-      /* @__PURE__ */ React.createElement(
-        "box",
-        {
-          paddingLeft: 1,
-          paddingRight: 1,
-          paddingTop: 1,
-          paddingBottom: 1,
-          backgroundColor: message.role === "prompt" ? promptBg : void 0
-        },
-        /* @__PURE__ */ React.createElement(
-          "text",
-          {
-            fg: message.role === "prompt" ? promptFg : responseFg,
-            width: "100%",
-            wrapMode: "word",
-            selectable: false
-          },
-          message.text
-        )
-      )
-    )))
-  ), /* @__PURE__ */ React.createElement(
-    "box",
-    {
-      id: "input-box",
-      width: inputBoxWidth(),
-      height: inputBoxHeight(),
-      position: "absolute",
-      left: inputBoxLeft(),
-      top: inputBoxTop(),
-      paddingLeft: 1,
-      paddingRight: 1,
-      paddingTop: 1,
-      flexDirection: "column"
-    },
-    /* @__PURE__ */ React.createElement(For, { each: !isFullScreen() && showIntro() ? [
-      "Use Satori just like you would use ChatGPT.",
-      "Except, it stores your conversations in a long term memory.",
-      "The memories you store here can be accessed through the SDK."
-    ] : [] }, (line) => /* @__PURE__ */ React.createElement("text", { fg: "cyan" }, line)),
-    /* @__PURE__ */ React.createElement(
-      "box",
-      {
-        id: "input-box",
-        width: inputBoxWidth(),
-        height: 5,
-        backgroundColor: "#1a1a1a",
-        flexDirection: "column",
-        justifyContent: "center"
-      },
-      /* @__PURE__ */ React.createElement(
-        "input",
-        {
-          id: "input",
-          width: "100%",
-          height: 1,
-          placeholder: "Type a message and press Enter...",
-          focusedBackgroundColor: "#1a1a1a",
-          onInput: (value) => setInputValue(value),
-          onSubmit: () => submitPrompt(inputValue()),
-          ref: (r) => {
-            inputRef = r;
-          }
-        }
-      ),
-      /* @__PURE__ */ React.createElement("box", { flexDirection: "row", flexShrink: 0, paddingTop: 1 }, /* @__PURE__ */ React.createElement("text", { fg: "#ffffff" }, modelText))
-    )
-  ), /* @__PURE__ */ React.createElement(Show, { when: isLoading() }, /* @__PURE__ */ React.createElement(
-    "box",
-    {
-      id: "spinner",
-      position: "absolute",
-      left: inputBoxLeft(),
-      top: inputBoxTop() + inputBoxHeight(),
-      paddingLeft: 1
-    },
-    /* @__PURE__ */ React.createElement("text", { fg: "#00ffff" }, cliSpinners.dots.frames[spinnerFrame()])
-  )), /* @__PURE__ */ React.createElement(
-    "box",
-    {
-      id: "footer",
-      width: dimensions().width,
-      height: 1,
-      position: "absolute",
-      bottom: 0,
-      left: 0,
-      backgroundColor: "#000000",
-      paddingLeft: 1,
-      paddingRight: 1,
-      flexDirection: "row",
-      justifyContent: "space-between",
-      alignItems: "center"
-    },
-    /* @__PURE__ */ React.createElement("text", { fg: "#00ffff", wrapMode: "none", width: "100%" }, usageText),
-    /* @__PURE__ */ React.createElement("box", { flexShrink: 0, paddingLeft: 1 }, /* @__PURE__ */ React.createElement("text", { fg: "#00ffff" }, versionText))
-  ));
-}
-
 // src/index.ts
 async function main() {
+  const modulePath2 = realpathSync(fileURLToPath(import.meta.url));
+  const isInteractive = process.stdin.isTTY && process.stdout.isTTY;
+  if (isInteractive && !globalThis.Bun && !process.env.SATORI_BUN_REEXEC) {
+    const bunBinDir = join2(homedir2(), ".bun", "bin");
+    const bunPath = join2(bunBinDir, "bun");
+    const baseEnv = { ...process.env, PATH: `${bunBinDir}:${process.env.PATH ?? ""}` };
+    const bunCheck = spawnSync("bun", ["--version"], { stdio: "ignore", env: baseEnv });
+    if (bunCheck.status !== 0) {
+      const installResult = spawnSync(
+        "bash",
+        ["-lc", "curl -fsSL https://bun.sh/install | bash"],
+        { stdio: "inherit" }
+      );
+      if (installResult.status !== 0) {
+        console.error("Failed to install Bun. Please install manually and retry.");
+        process.exit(1);
+      }
+    }
+    const bunProcess = spawn(
+      bunPath,
+      [modulePath2, ...process.argv.slice(2)],
+      { env: { ...baseEnv, SATORI_BUN_REEXEC: "1" }, stdio: "inherit" }
+    );
+    bunProcess.on("error", (error) => {
+      console.error("Failed to launch Bun:", error.message);
+      process.exit(1);
+    });
+    bunProcess.on("exit", (code) => {
+      process.exit(code ?? 0);
+    });
+    return;
+  }
   const argv = process.argv.slice(2);
   const isGetApiKey = argv[0] === "get" && argv[1] === "api-key";
   if (!isGetApiKey) {
@@ -494,8 +277,8 @@ async function main() {
   program.option("--memory-id <id>", "Memory ID for scoping");
   const DEFAULT_LLM_MODEL = "gpt-4o";
   const getCliVersion = () => {
-    const __dirname = dirname2(fileURLToPath2(import.meta.url));
-    const packagePath = join3(__dirname, "..", "package.json");
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+    const packagePath = join2(__dirname, "..", "package.json");
     const raw = readFileSync(packagePath, "utf8");
     const data = JSON.parse(raw);
     return data.version ?? "unknown";
@@ -583,6 +366,7 @@ ${instruction}`);
         return;
       }
       const info = await getInfoDisplay();
+      const { runInteractiveApp } = await import("./ui-AFMM6JTQ.js");
       await runInteractiveApp({
         initialPrompt,
         options,
@@ -649,7 +433,7 @@ ${instruction}`);
   program.parse();
 }
 var entryPath = process.argv[1] ? realpathSync(process.argv[1]) : "";
-var modulePath = realpathSync(fileURLToPath2(import.meta.url));
+var modulePath = realpathSync(fileURLToPath(import.meta.url));
 if (entryPath === modulePath) {
   main();
 }

package/dist/ui-AFMM6JTQ.js

@@ -0,0 +1,252 @@
+// src/ui.tsx
+import { render, useRenderer, useTerminalDimensions } from "@opentui/solid";
+import { For, Show, createSignal, onMount, onCleanup } from "solid-js";
+import cliSpinners from "cli-spinners";
+
+// src/logo.ts
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+async function loadLogo() {
+  const { default: fs } = await import("fs");
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+  const logoPath = join(__dirname, "..", "logos", "satori.ans");
+  return fs.readFileSync(logoPath, "utf8");
+}
+
+// src/ui.tsx
+async function runInteractiveApp({
+  initialPrompt,
+  options,
+  processUserInput,
+  infoLine,
+  infoDisplay
+}) {
+  const logo = await loadLogo();
+  console.log(` ${logo}`);
+  const rows = process.stdout.rows ?? 24;
+  const logoHeight = logo.endsWith("\n") ? logo.slice(0, -1).split("\n").length : logo.split("\n").length;
+  const splitHeight = Math.max(1, rows - logoHeight - 1);
+  render(
+    () => /* @__PURE__ */ React.createElement(
+      App,
+      {
+        initialPrompt,
+        options,
+        processUserInput,
+        infoLine,
+        infoDisplay
+      }
+    ),
+    {
+      useAlternateScreen: false,
+      exitOnCtrlC: true,
+      useMouse: true,
+      enableMouseMovement: true,
+      experimental_splitHeight: splitHeight
+    }
+  );
+}
+function App({ initialPrompt, options, processUserInput, infoLine, infoDisplay }) {
+  const renderer = useRenderer();
+  const dimensions = useTerminalDimensions();
+  const [messages, setMessages] = createSignal([]);
+  const [inputValue, setInputValue] = createSignal("");
+  const [showIntro, setShowIntro] = createSignal(true);
+  const [isFullScreen, setIsFullScreen] = createSignal(false);
+  const [spinnerFrame, setSpinnerFrame] = createSignal(0);
+  const [isLoading, setIsLoading] = createSignal(false);
+  const promptFg = "#00ffff";
+  const responseFg = "#ffffff";
+  const promptBg = "#2b2b2b";
+  let inputRef;
+  let currentMemoryId = options.memoryId;
+  let messageId = 0;
+  const usageText = infoDisplay?.usageLine ?? infoLine ?? "";
+  const versionText = infoDisplay?.versionLine ?? "";
+  const modelText = infoDisplay?.modelLine ?? "";
+  const appendMessage = (role, text) => {
+    setMessages((prev) => [...prev, { id: messageId++, role, text }]);
+  };
+  const exitApp = () => {
+    renderer.destroy();
+    process.exit(0);
+  };
+  const submitPrompt = async (raw) => {
+    const trimmed = raw.trim();
+    if (!trimmed) return;
+    if (trimmed.toLowerCase() === "exit" || trimmed.toLowerCase() === "quit") {
+      exitApp();
+      return;
+    }
+    if (showIntro()) {
+      setShowIntro(false);
+    }
+    if (!isFullScreen()) {
+      setIsFullScreen(true);
+    }
+    setInputValue("");
+    if (inputRef) {
+      inputRef.value = "";
+    }
+    appendMessage("prompt", trimmed);
+    try {
+      setIsLoading(true);
+      const result = await processUserInput(trimmed, { ...options, memoryId: currentMemoryId }, "tui");
+      currentMemoryId = result.memoryId;
+      appendMessage("response", result.response);
+      if (result.instruction) {
+        appendMessage("response", result.instruction);
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      appendMessage("response", `Error: ${message}`);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+  onMount(async () => {
+    const spinner = cliSpinners.dots;
+    const timer = setInterval(() => {
+      if (isLoading()) {
+        setSpinnerFrame((prev) => (prev + 1) % spinner.frames.length);
+      }
+    }, spinner.interval);
+    onCleanup(() => clearInterval(timer));
+    if (initialPrompt) {
+      await submitPrompt(initialPrompt);
+    }
+    if (inputRef) {
+      inputRef.focus();
+    }
+  });
+  const inputBoxWidth = () => Math.max(1, Math.round(dimensions().width * 0.6));
+  const inputBoxLeft = () => Math.max(0, Math.round(dimensions().width * 0.15));
+  const inputBoxHeight = () => isFullScreen() ? 7 : 14;
+  const inputBoxTop = () => isFullScreen() ? Math.max(1, dimensions().height - inputBoxHeight() - 2) : Math.max(1, Math.round(dimensions().height * 0.666));
+  const messagesTop = () => 1;
+  const messagesHeight = () => Math.max(1, inputBoxTop() - messagesTop() - 1);
+  const messagesWidth = () => Math.min(dimensions().width - 2, inputBoxWidth() + 10);
+  const messagesLeft = () => Math.max(1, inputBoxLeft() - 5);
+  return /* @__PURE__ */ React.createElement("box", { width: "100%", height: "100%", flexDirection: "column" }, /* @__PURE__ */ React.createElement(
+    "scrollbox",
+    {
+      id: "messages",
+      width: messagesWidth(),
+      height: messagesHeight(),
+      position: "absolute",
+      left: messagesLeft(),
+      top: messagesTop(),
+      paddingLeft: 1,
+      paddingRight: 1,
+      focused: true,
+      stickyScroll: true,
+      stickyStart: "bottom"
+    },
+    /* @__PURE__ */ React.createElement("box", { width: "100%", flexDirection: "column" }, /* @__PURE__ */ React.createElement(For, { each: messages() }, (message) => /* @__PURE__ */ React.createElement(
+      "box",
+      {
+        width: "100%",
+        flexDirection: "row",
+        justifyContent: message.role === "prompt" ? "flex-start" : "flex-end",
+        marginBottom: 1
+      },
+      /* @__PURE__ */ React.createElement(
+        "box",
+        {
+          paddingLeft: 1,
+          paddingRight: 1,
+          paddingTop: 1,
+          paddingBottom: 1,
+          backgroundColor: message.role === "prompt" ? promptBg : void 0
+        },
+        /* @__PURE__ */ React.createElement(
+          "text",
+          {
+            fg: message.role === "prompt" ? promptFg : responseFg,
+            width: "100%",
+            wrapMode: "word",
+            selectable: false
+          },
+          message.text
+        )
+      )
+    )))
+  ), /* @__PURE__ */ React.createElement(
+    "box",
+    {
+      id: "input-box",
+      width: inputBoxWidth(),
+      height: inputBoxHeight(),
+      position: "absolute",
+      left: inputBoxLeft(),
+      top: inputBoxTop(),
+      paddingLeft: 1,
+      paddingRight: 1,
+      paddingTop: 1,
+      flexDirection: "column"
+    },
+    /* @__PURE__ */ React.createElement(For, { each: !isFullScreen() && showIntro() ? [
+      "Use Satori just like you would use ChatGPT.",
+      "Except, it stores your conversations in a long term memory.",
+      "The memories you store here can be accessed through the SDK."
+    ] : [] }, (line) => /* @__PURE__ */ React.createElement("text", { fg: "cyan" }, line)),
+    /* @__PURE__ */ React.createElement(
+      "box",
+      {
+        id: "input-box",
+        width: inputBoxWidth(),
+        height: 5,
+        backgroundColor: "#1a1a1a",
+        flexDirection: "column",
+        justifyContent: "center"
+      },
+      /* @__PURE__ */ React.createElement(
+        "input",
+        {
+          id: "input",
+          width: "100%",
+          height: 1,
+          placeholder: "Type a message and press Enter...",
+          focusedBackgroundColor: "#1a1a1a",
+          onInput: (value) => setInputValue(value),
+          onSubmit: () => submitPrompt(inputValue()),
+          ref: (r) => {
+            inputRef = r;
+          }
+        }
+      ),
+      /* @__PURE__ */ React.createElement("box", { flexDirection: "row", flexShrink: 0, paddingTop: 1 }, /* @__PURE__ */ React.createElement("text", { fg: "#ffffff" }, modelText))
+    )
+  ), /* @__PURE__ */ React.createElement(Show, { when: isLoading() }, /* @__PURE__ */ React.createElement(
+    "box",
+    {
+      id: "spinner",
+      position: "absolute",
+      left: inputBoxLeft(),
+      top: inputBoxTop() + inputBoxHeight(),
+      paddingLeft: 1
+    },
+    /* @__PURE__ */ React.createElement("text", { fg: "#00ffff" }, cliSpinners.dots.frames[spinnerFrame()])
+  )), /* @__PURE__ */ React.createElement(
+    "box",
+    {
+      id: "footer",
+      width: dimensions().width,
+      height: 1,
+      position: "absolute",
+      bottom: 0,
+      left: 0,
+      backgroundColor: "#000000",
+      paddingLeft: 1,
+      paddingRight: 1,
+      flexDirection: "row",
+      justifyContent: "space-between",
+      alignItems: "center"
+    },
+    /* @__PURE__ */ React.createElement("text", { fg: "#00ffff", wrapMode: "none", width: "100%" }, usageText),
+    /* @__PURE__ */ React.createElement("box", { flexShrink: 0, paddingLeft: 1 }, /* @__PURE__ */ React.createElement("text", { fg: "#00ffff" }, versionText))
+  ));
+}
+export {
+  runInteractiveApp
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@satori-sh/cli",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "CLI tool for Satori memory server",
   "type": "module",
   "main": "./dist/index.js",