@three333/termbuddy 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@three333/termbuddy",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": false,
   "type": "module",
   "bin": {

package/src/components/AiConsole.tsx

@@ -10,6 +10,11 @@ import type {
 export function AiConsole(props: {
   onClose: () => void;
   onStartCountdown: (minutes: number) => void;
+  onShowBubble?: (args: {
+    text: string;
+    target: "local" | "buddy";
+    durationMs: number;
+  }) => void;
   onThrowProjectile: (
     kind: ProjectileKind,
     direction: ProjectileDirection
@@ -20,6 +25,7 @@ export function AiConsole(props: {
   const [input, setInput] = useState("");
   const [apiKey, setApiKey] = useState<string | null>(null);
   const [keyDraft, setKeyDraft] = useState("");
+  const [cursorOn, setCursorOn] = useState(true);
   const [keyStatus, setKeyStatus] = useState<
     "loading" | "missing" | "ready" | "saving"
   >("loading");
@@ -41,14 +47,27 @@ export function AiConsole(props: {
     };
   }, []);
 
+  useEffect(() => {
+    const handle = setInterval(() => setCursorOn((v) => !v), 500);
+    return () => clearInterval(handle);
+  }, []);
+
   const agent = useAiAgent({
     localName: props.localName,
     peerName: props.peerName,
     onStartCountdown: props.onStartCountdown,
+    onShowBubble: props.onShowBubble,
     onThrowProjectile: props.onThrowProjectile,
     apiKey: apiKey ?? undefined,
   });
 
+  const resetApiKey = () => {
+    setApiKey(null);
+    setKeyDraft("");
+    setKeyStatus("missing");
+    agent.resetApiKeyError();
+  };
+
   const helpLine = useMemo(
     () => "示例：倒计时20分钟 / 聊会天 / 和别人互动一下",
     []
@@ -61,6 +80,11 @@ export function AiConsole(props: {
         return;
       }
 
+      if (agent.apiKeyError && (ch === "r" || ch === "R")) {
+        resetApiKey();
+        return;
+      }
+
       if (keyStatus !== "ready") {
         if (key.return) {
           const draft = keyDraft.trim();
@@ -113,6 +137,8 @@ export function AiConsole(props: {
         <Text color="gray">
           {keyStatus === "saving"
             ? "Saving…"
+            : agent.apiKeyError
+            ? "Press R to reset API"
             : agent.busy
             ? "Thinking…"
             : "Esc Close"}
@@ -161,12 +187,16 @@ export function AiConsole(props: {
       >
         <Text color="green">{">"} </Text>
         {keyStatus === "ready" ? (
-          <Text>{input}</Text>
+          <>
+            <Text>{input}</Text>
+            {cursorOn ? <Text inverse> </Text> : <Text> </Text>}
+          </>
         ) : (
           <Text>
             {keyDraft.length === 0
               ? ""
               : "*".repeat(Math.min(64, keyDraft.length))}
+            {cursorOn ? <Text inverse> </Text> : <Text> </Text>}
           </Text>
         )}
       </Box>

package/src/components/StatusHeader.tsx

@@ -20,12 +20,16 @@ export function StatusHeader(props: {
   status: ConnectionStatus;
   hostIp?: string;
   tcpPort?: number;
+  peerCount?: number;
 }) {
   const st = statusText(props.status);
   return (
     <Box>
       <Box>
         <Text color={st.color}>{st.label}</Text>
+        {props.peerCount !== undefined && props.peerCount > 0 && (
+          <Text color="cyan"> ({props.peerCount} online)</Text>
+        )}
         {props.role === "host" ? (
           <Text color="gray">
             {props.tcpPort ? ` — TCP :${props.tcpPort}` : ""}

package/src/components/sprite/BubbleSprite.tsx

@@ -0,0 +1,60 @@
+import React, { useMemo } from "react";
+import { Box, Text } from "ink";
+
+function wrapText(text: string, maxWidth: number) {
+  const chars = Array.from(text);
+  const lines: string[] = [];
+  for (let i = 0; i < chars.length; i += maxWidth) {
+    lines.push(chars.slice(i, i + maxWidth).join(""));
+  }
+  return lines.length ? lines : [""];
+}
+
+function renderBubbleLines(text: string, maxInnerWidth: number) {
+  const contentLines = wrapText(text, maxInnerWidth);
+  const innerWidth = Math.min(
+    maxInnerWidth,
+    Math.max(...contentLines.map((l) => Array.from(l).length), 1)
+  );
+
+  const top = `╭${"─".repeat(innerWidth + 2)}╮`;
+  
+  // Create a bottom line with a little tail "v" in the middle
+  const tailPos = Math.floor((innerWidth + 2) / 2);
+  const bottomChars = Array.from(`╰${"─".repeat(innerWidth + 2)}╯`);
+  if (bottomChars[tailPos]) bottomChars[tailPos] = "v"; // Simple tail
+  const bottom = bottomChars.join("");
+
+  const middle = contentLines.map((l) => {
+    const pad = innerWidth - Array.from(l).length;
+    return `│ ${l}${" ".repeat(Math.max(0, pad))} │`;
+  });
+  return [top, ...middle, bottom];
+}
+
+export function BubbleSprite(props: {
+  text: string;
+  maxInnerWidth?: number;
+  color?: string;
+}) {
+  const trimmed = props.text.trim();
+  const maxInnerWidth = props.maxInnerWidth ?? 18;
+
+  const lines = useMemo(() => {
+    if (!trimmed) return null;
+    return renderBubbleLines(trimmed, maxInnerWidth);
+  }, [maxInnerWidth, trimmed]);
+
+  if (!lines) return null;
+
+  return (
+    <Box flexDirection="column" alignItems="center">
+      {lines.map((line, i) => (
+        <Text key={`bubble:${i}`} color={props.color ?? "gray"}>
+          {line}
+        </Text>
+      ))}
+    </Box>
+  );
+}
+

package/src/components/sprite/BuddyAvatar.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { Box, Text } from "ink";
 import type { ActivityState } from "../../protocol.js";
+import { BubbleSprite } from "./BubbleSprite.js";
 
 const SPRITES: Record<
   ActivityState,
@@ -26,19 +27,30 @@ const SPRITES: Record<
 export function BuddyAvatar(props: {
   state: ActivityState;
   variant?: "frames" | "compact";
+  bubbleText?: string | null;
   marginTop?: number;
 }) {
   const sprite = SPRITES[props.state];
   if (props.variant === "compact") {
     return (
-      <Box marginTop={props.marginTop ?? 1}>
+      <Box
+        flexDirection="column"
+        alignItems="center"
+        marginTop={props.marginTop ?? 1}
+      >
+        {props.bubbleText ? <BubbleSprite text={props.bubbleText} /> : null}
         <Text color={sprite.color}>{sprite.compact}</Text>
       </Box>
     );
   }
 
   return (
-    <Box flexDirection="column" marginTop={props.marginTop ?? 1}>
+    <Box
+      flexDirection="column"
+      alignItems="center"
+      marginTop={props.marginTop ?? 1}
+    >
+      {props.bubbleText ? <BubbleSprite text={props.bubbleText} /> : null}
       {sprite.frames.map((line, i) => (
         <Text key={`${props.state}:${i}`} color={sprite.color}>
           {line}

package/src/components/tool/createBubbleTool.ts

@@ -0,0 +1,61 @@
+import { tool } from "langchain";
+
+export type BubbleTarget = "local" | "buddy";
+
+export function createBubbleTool(options: {
+  onShowBubble?: (args: {
+    text: string;
+    target: BubbleTarget;
+    durationMs: number;
+  }) => void;
+}) {
+  return tool(
+    async (input: { text?: string; target?: BubbleTarget; durationMs?: number }) => {
+      const text = String(input.text ?? "").trim();
+      if (!text) return "气泡内容为空。";
+
+      const target: BubbleTarget =
+        input.target === "buddy" || input.target === "local"
+          ? input.target
+          : "local";
+
+      const durationRaw = Number(input.durationMs ?? 2500);
+      const durationMs =
+        Number.isFinite(durationRaw) && durationRaw > 0
+          ? Math.min(15_000, Math.max(300, Math.floor(durationRaw)))
+          : 2500;
+
+      options.onShowBubble?.({ text, target, durationMs });
+      return `已显示气泡：${text}`;
+    },
+    {
+      name: "show_bubble",
+      description: "在小猫头像上显示一个气泡（短消息提示）。",
+      schema: {
+        type: "object",
+        properties: {
+          text: {
+            type: "string",
+            minLength: 1,
+            maxLength: 120,
+            description: "气泡里的文字",
+          },
+          target: {
+            type: "string",
+            enum: ["local", "buddy"],
+            description: "显示在哪一侧的小猫上（local=我，buddy=同桌）",
+          },
+          durationMs: {
+            type: "integer",
+            minimum: 300,
+            maximum: 15000,
+            description: "显示时长（毫秒，可选）",
+          },
+        },
+        required: ["text"],
+        additionalProperties: false,
+      },
+    }
+  );
+}
+

package/src/components/tool/createInteractionTool.ts

@@ -64,4 +64,3 @@ export function createInteractionTool(options: {
     }
   );
 }
-

package/src/components/tool/index.ts

@@ -1,4 +1,4 @@
 export { createCountdownTool } from "./createCountdownTool.js";
+export { createBubbleTool } from "./createBubbleTool.js";
 export { createInteractionTool } from "./createInteractionTool.js";
 export { createSessionInfoTool } from "./createSessionInfoTool.js";
-

package/src/hooks/useAiAgent.ts

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { createAgent } from "langchain";
 import { ChatOpenAI } from "@langchain/openai";
 import {
+  createBubbleTool,
   createCountdownTool,
   createInteractionTool,
   createSessionInfoTool,
@@ -54,7 +55,9 @@ function createSystemPrompt(context: { localName: string; peerName: string }) {
     "默认隐形；被 / 唤醒时出现。风格：极简、干练、少废话。",
     "你可以使用工具来操控应用功能（例如倒计时）。",
     "如果用户提到“倒计时/专注/计时/countdown”，优先调用 start_countdown。",
+    "如果用户提到“气泡/泡泡/提示/说一句”，优先调用 show_bubble。",
     "如果用户提到“互动/扔/投掷/throw”，优先调用 throw_projectile。",
+    "当用户明确要求投掷 N 次且 1<=N<=100 时，必须按 N 执行：重复调用 throw_projectile 共 N 次，不要改成“示意/少量几次”。超过 100 则分批多次调用。",
     `当前上下文：我叫 ${context.localName}；同桌叫 ${context.peerName}。`,
   ].join("\n");
 }
@@ -63,11 +66,17 @@ export function useAiAgent(options: {
   localName: string;
   peerName: string;
   onStartCountdown?: (minutes: number) => void;
+  onShowBubble?: (args: {
+    text: string;
+    target: "local" | "buddy";
+    durationMs: number;
+  }) => void;
   onThrowProjectile?: (kind: ProjectileKind, direction: ProjectileDirection) => void;
   apiKey?: string;
 }) {
   const [lines, setLines] = useState<AiLine[]>([]);
   const [busy, setBusy] = useState(false);
+  const [apiKeyError, setApiKeyError] = useState(false);
 
   const agentRef = useRef<Awaited<ReturnType<typeof createAgent>> | null>(null);
   const agentInitRef = useRef<Promise<
@@ -108,6 +117,10 @@ export function useAiAgent(options: {
         onStartCountdown: options.onStartCountdown,
       });
 
+      const showBubble = createBubbleTool({
+        onShowBubble: options.onShowBubble,
+      });
+
       const sessionInfo = createSessionInfoTool({
         localName: options.localName,
         peerName: options.peerName,
@@ -129,7 +142,7 @@ export function useAiAgent(options: {
       });
       return createAgent({
         model: llm,
-        tools: [startCountdown, interaction, sessionInfo],
+        tools: [startCountdown, showBubble, interaction, sessionInfo],
         systemPrompt: createSystemPrompt({
           localName: options.localName,
           peerName: options.peerName,
@@ -144,6 +157,7 @@ export function useAiAgent(options: {
     options.apiKey,
     options.localName,
     options.onStartCountdown,
+    options.onShowBubble,
     options.onThrowProjectile,
     options.peerName,
   ]);
@@ -194,9 +208,19 @@ export function useAiAgent(options: {
         }
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
-        if (msg === "missing_api_key")
-          updateLine(aiAt, "请先在 AI Console 输入 DeepSeek API Key。");
-        else updateLine(aiAt, `（AI 出错）${msg}`);
+        const isApiKeyError =
+          msg === "missing_api_key" ||
+          msg.includes("401") ||
+          msg.includes("403") ||
+          msg.includes("Unauthorized") ||
+          msg.includes("Invalid API");
+
+        if (isApiKeyError) {
+          setApiKeyError(true);
+          updateLine(aiAt, "API Key 错误或失效，请重新输入（按 R 键）");
+        } else {
+          updateLine(aiAt, `（AI 出错）${msg}`);
+        }
       } finally {
         setBusy(false);
       }
@@ -204,9 +228,13 @@ export function useAiAgent(options: {
     [append, ensureAgent, updateLine]
   );
 
+  const resetApiKeyError = useCallback(() => {
+    setApiKeyError(false);
+  }, []);
+
   useEffect(() => {
     return () => abortRef.current?.abort();
   }, []);
 
-  return { lines, ask, busy };
+  return { lines, ask, busy, apiKeyError, resetApiKeyError };
 }