thinyai 0.1.1 → 0.1.2

package/dist/bin.js

@@ -2,7 +2,7 @@
 
 // src/main.ts
 import { createInterface } from "readline/promises";
-import { clearLine, cursorTo } from "readline";
+import { clearLine, cursorTo, emitKeypressEvents } from "readline";
 import { stdin, stdout } from "process";
 import { mkdirSync } from "fs";
 import { homedir } from "os";
@@ -452,9 +452,9 @@ async function createAgent(config) {
     const seed = config.systemPrompt && !history.some((m) => m.role === "system") ? [systemMessage(config.systemPrompt), ...history] : history;
     const generate = composeModel(extensions.middleware.model, async (req) => {
       if (opts.onToken && config.model.stream) {
-        return assembleStream(config.model.stream(req.messages, req.tools), opts.onToken);
+        return assembleStream(config.model.stream(req.messages, req.tools, opts.signal), opts.onToken);
       }
-      return config.model.generate(req.messages, req.tools);
+      return config.model.generate(req.messages, req.tools, opts.signal);
     });
     const runComposedTool = composeTool(
       extensions.middleware.tool,
@@ -829,44 +829,38 @@ function buildToolOptions(tools) {
   if (tools.length === 0) return { tools: void 0, toolChoice: void 0 };
   return { tools: toAiTools(tools), toolChoice: "auto" };
 }
+var KNOWN_PROVIDERS = /* @__PURE__ */ new Set(["openai", "openai-compat", "anthropic"]);
 function resolveModel(model, opts) {
   if (typeof model !== "string") return model;
   const colonIdx = model.indexOf(":");
-  if (colonIdx === -1) {
-    if (opts.anthropic?.baseURL) {
-      return createAnthropic({ baseURL: opts.anthropic.baseURL, apiKey: opts.anthropic.apiKey })(
-        model
+  const prefix = colonIdx === -1 ? "" : model.slice(0, colonIdx);
+  if (KNOWN_PROVIDERS.has(prefix)) {
+    const modelId = model.slice(colonIdx + 1);
+    if (prefix === "anthropic") {
+      return createAnthropic({ baseURL: opts.anthropic?.baseURL, apiKey: opts.anthropic?.apiKey })(
+        modelId
       );
     }
-    return createOpenAI({ baseURL: opts.openai?.baseURL, apiKey: opts.openai?.apiKey })(model);
-  }
-  const provider = model.slice(0, colonIdx);
-  const modelId = model.slice(colonIdx + 1);
-  if (provider === "openai" || provider === "openai-compat") {
     return createOpenAI({ baseURL: opts.openai?.baseURL, apiKey: opts.openai?.apiKey })(modelId);
   }
-  if (provider === "anthropic") {
-    return createAnthropic({ baseURL: opts.anthropic?.baseURL, apiKey: opts.anthropic?.apiKey })(
-      modelId
+  if (opts.anthropic?.baseURL) {
+    return createAnthropic({ baseURL: opts.anthropic.baseURL, apiKey: opts.anthropic.apiKey })(
+      model
     );
   }
-  throw new Error(
-    `unknown provider "${provider}" in model string "${model}"
-Supported prefixes: "openai:<id>", "openai-compat:<id>", "anthropic:<id>"
-Or omit the prefix and set THINY_OPENAI_BASE_URL / THINY_ANTHROPIC_BASE_URL instead.
-Or pass a LanguageModel instance directly.`
-  );
+  return createOpenAI({ baseURL: opts.openai?.baseURL, apiKey: opts.openai?.apiKey })(model);
 }
 function aiSdkModel(opts) {
   const model = resolveModel(opts.model, opts);
   const maxRetries = opts.maxRetries ?? 2;
   return {
-    async generate(messages, tools) {
+    async generate(messages, tools, signal) {
       const result = await generateText({
         model,
         messages: toCoreMessages(messages),
         ...buildToolOptions(tools),
-        maxRetries
+        maxRetries,
+        abortSignal: signal
       });
       return {
         text: result.text || void 0,
@@ -880,12 +874,13 @@ function aiSdkModel(opts) {
         usage: normalizeUsage(result.usage)
       };
     },
-    async *stream(messages, tools) {
+    async *stream(messages, tools, signal) {
       const result = streamText({
         model,
         messages: toCoreMessages(messages),
         ...buildToolOptions(tools),
-        maxRetries
+        maxRetries,
+        abortSignal: signal
       });
       for await (const part of result.fullStream) {
         if (part.type === "text-delta") {
@@ -956,7 +951,7 @@ function pinoLogger(opts = {}) {
     );
   }
   if (opts.file) {
-    const destination = pino2.destination({ dest: opts.file, sync: false });
+    const destination = pino2.destination({ dest: opts.file, sync: true });
     return adaptPinoLogger(pino2(pinoConfig(level), destination));
   }
   const usePretty = opts.pretty ?? (opts.file === void 0 && process.env.NODE_ENV !== "production");
@@ -1827,7 +1822,9 @@ async function runCli() {
     namespace: process.env.MEMWAL_NAMESPACE ?? userId
   }) : walrusMemoryPlugin({
     client: walrus,
-    pointers: filePointerStore(process.env.WALRUS_POINTERS ?? "thiny-pointers.json"),
+    // Stable per-user location (~/.thiny) so cross-session memory works no matter which
+    // directory `thiny` is launched from — a cwd-relative file would fragment per folder.
+    pointers: filePointerStore(process.env.WALRUS_POINTERS ?? join(thinyDir, "thiny-pointers.json")),
     userId,
     onStoreStart: () => pendingWrites += 1,
     onStore: (ref) => {
@@ -1899,6 +1896,7 @@ async function runCli() {
   if (walrusAudit)
     renderInfo(`Walrus audit: ON (${network}) \u2014 each turn's action log is stored + verifiable`);
   const rl = createInterface({ input: stdin, output: stdout });
+  emitKeypressEvents(stdin);
   const spinner = new Spinner();
   const flushMemory = memoryPlugin.flush;
   const PROMPT = "\x1B[36mYou\x1B[0m \x1B[2m\u203A\x1B[0m ";
@@ -2011,10 +2009,15 @@ Audit trail ${blobId}
         continue;
       }
       renderAgentLabel(personaName);
-      spinner.start("thinking\u2026");
+      spinner.start("thinking\u2026  (esc to cancel)");
       budget.reset();
       resetTurn(turn);
       const startedAt = Date.now();
+      const ac = new AbortController();
+      const onKey = (_s, key) => {
+        if (key?.name === "escape") ac.abort();
+      };
+      stdin.on("keypress", onKey);
       try {
         let firstToken = true;
         const stream = createMarkdownWriter((s) => stdout.write(s));
@@ -2026,15 +2029,28 @@ Audit trail ${blobId}
           spinner.start("running\u2026");
         };
         agent.events.on("beforeToolCall", toolHandler);
-        const reply = await agent.run(trimmed, {
-          sessionId: currentSessionId,
-          onToken: (delta) => {
+        let reply;
+        try {
+          reply = await agent.run(trimmed, {
+            sessionId: currentSessionId,
+            signal: ac.signal,
+            onToken: (delta) => {
+              spinner.stop();
+              firstToken = false;
+              stream.push(delta);
+            }
+          });
+        } catch (err) {
+          if (ac.signal.aborted) {
             spinner.stop();
-            firstToken = false;
-            stream.push(delta);
+            stream.end();
+            stdout.write("\n  \x1B[2m\u2298 cancelled (Esc)\x1B[0m\n");
+            continue;
           }
-        });
-        agent.events.off("beforeToolCall", toolHandler);
+          throw err;
+        } finally {
+          agent.events.off("beforeToolCall", toolHandler);
+        }
         spinner.stop();
         if (firstToken) {
           stream.push(reply.length > 0 ? reply : "\x1B[2m(model returned empty response)\x1B[0m");
@@ -2079,6 +2095,8 @@ Audit trail ${blobId}
           looksLikeModelError ? `${msg}
   \u21B3 Check your model, base URL, and API key (run \`thiny init\`, or edit ~/.thiny/config.json / .env).` : msg
         );
+      } finally {
+        stdin.off("keypress", onKey);
       }
     }
   } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinyai",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Thiny AI — a beautiful terminal agent: interactive chat, tools, Walrus memory, and Sui execution.",
   "type": "module",
   "license": "MIT",
@@ -36,14 +36,14 @@
   "devDependencies": {
     "tsup": "^8.5.1",
     "typescript": "^5.5.0",
-    "@thiny/mcp": "0.1.0",
-    "@thiny/core": "0.1.0",
+    "@thiny/logger-pino": "0.1.0",
     "@thiny/model-aisdk": "0.1.0",
+    "@thiny/core": "0.1.0",
     "@thiny/memory-memwal": "0.1.0",
-    "@thiny/logger-pino": "0.1.0",
-    "@thiny/walrus": "0.1.0",
+    "@thiny/mcp": "0.1.0",
     "@thiny/plugin-agents": "0.1.0",
-    "@thiny/skills": "0.1.0"
+    "@thiny/skills": "0.1.0",
+    "@thiny/walrus": "0.1.0"
   },
   "author": "Thiny AI",
   "engines": {