@keyou007/agent-bot 0.1.15-alpha.3 → 0.1.15-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keyou007/agent-bot",
-  "version": "0.1.15-alpha.3",
+  "version": "0.1.15-alpha.5",
   "type": "module",
   "description": "Use Codex, TraeX, and compatible coding agents from Lark/Feishu.",
   "license": "GPL-3.0-only",
@@ -70,14 +70,12 @@
     "better-sqlite3": "12.11.1",
     "dotenv": "17.4.2",
     "pino": "10.3.1",
-    "qrcode-terminal": "0.12.0",
     "yaml": "2.9.0",
     "zod": "4.4.3"
   },
   "devDependencies": {
     "@types/better-sqlite3": "7.6.13",
     "@types/node": "22.18.11",
-    "@types/qrcode-terminal": "0.12.2",
     "eslint": "10.6.0",
     "prettier": "3.9.5",
     "tsx": "4.23.0",

package/src/cli/VerificationOutput.ts

@@ -1,25 +1,14 @@
-import qrcode from "qrcode-terminal";
 import { cliText, type CliLanguage } from "./i18n.js";
 
 export interface VerificationOutputOptions {
   verificationUrl: string;
-  json: boolean;
-  qrInstruction: string;
   linkLabel?: string;
   language?: CliLanguage;
 }
 
-export function printVerificationQrAndLink(
+export function printVerificationLink(
   options: VerificationOutputOptions,
   write: (value: string) => void = (value) => process.stderr.write(value),
-  renderQr: (
-    value: string,
-    callback: (output: string) => void,
-  ) => void = (value, callback) => qrcode.generate(value, { small: true }, callback),
 ): void {
-  if (!options.json) {
-    write(`\n${options.qrInstruction}\n\n`);
-    renderQr(options.verificationUrl, (output) => write(`${output}\n`));
-  }
   write(`${options.linkLabel ?? cliText("Authorization link", "授权链接", options.language)}${cliText(":", "：", options.language)}\n${options.verificationUrl}\n\n`);
 }

package/src/cli.ts

@@ -79,7 +79,7 @@ import {
   type InitializationWelcomeResult,
 } from "./cli/InitializationWelcome.js";
 import { applyExplicitProfile, parseGlobalOptions } from "./cli/profile.js";
-import { printVerificationQrAndLink } from "./cli/VerificationOutput.js";
+import { printVerificationLink } from "./cli/VerificationOutput.js";
 import {
   startInitializedServer,
   startServer,
@@ -818,7 +818,7 @@ async function initializeFeishu(
       }
       credentials = await registerFeishuApp({
         signal: controller.signal,
-        onVerification: (challenge) => printFeishuVerification(challenge, options.json),
+        onVerification: (challenge) => printFeishuVerification(challenge),
       });
       writeFeishuCredentials(paths.env.path, credentials);
       status = "created";
@@ -839,7 +839,7 @@ async function initializeFeishu(
       manualPermissionSkipSignal: manualPermissionSkip.signal,
       optionalSkipSignal: optionalSkip.signal,
       onVerification: (challenge) => {
-        printFeishuConfigurationVerification(challenge, options.json);
+        printFeishuConfigurationVerification(challenge);
         if (challenge.kind === "manual_scope" && challenge.blocking) {
           skipListener?.close();
           skipListener = listenForManualPermissionSkip(() => manualPermissionSkip.abort());
@@ -1981,15 +1981,10 @@ function printServerStartResult(result: ServerStartResult): void {
   );
 }
 
-function printFeishuVerification(challenge: FeishuAppRegistrationChallenge, json: boolean): void {
-  printVerificationQrAndLink(
+function printFeishuVerification(challenge: FeishuAppRegistrationChallenge): void {
+  printVerificationLink(
     {
       verificationUrl: challenge.verificationUrl,
-      json,
-      qrInstruction: cliText(
-        "Scan this QR code with Lark to create the bot app:",
-        "使用飞书扫描此二维码以创建机器人应用：",
-      ),
     },
   );
   process.stderr.write(cliText(
@@ -2000,7 +1995,6 @@ function printFeishuVerification(challenge: FeishuAppRegistrationChallenge, json
 
 function printFeishuConfigurationVerification(
   challenge: FeishuConfigurationChallenge,
-  json: boolean,
 ): void {
   process.stderr.write(challenge.kind === "manual_scope"
     ? cliText(
@@ -2020,19 +2014,9 @@ function printFeishuConfigurationVerification(
   if (challenge.missing.callbacks.length > 0) {
     process.stderr.write(`${cliText("Callbacks: ", "回调：")}${challenge.missing.callbacks.join(", ")}\n`);
   }
-  printVerificationQrAndLink(
+  printVerificationLink(
     {
       verificationUrl: challenge.verificationUrl,
-      json,
-      qrInstruction: challenge.kind === "manual_scope"
-        ? cliText(
-            "Scan this QR code with Lark to open the filtered permission page:",
-            "使用飞书扫描此二维码以打开已筛选的权限页面：",
-          )
-        : cliText(
-            "Scan this QR code with Lark to complete the configuration:",
-            "使用飞书扫描此二维码以完成配置：",
-          ),
       linkLabel: challenge.kind === "manual_scope"
         ? cliText("Permission page", "权限页面")
         : undefined,

package/src/commands/CommandRouter.ts

@@ -5,6 +5,7 @@ export const COMMAND_NAMES = [
   "archive",
   "dir",
   "dismiss",
+  "file",
   "fork",
   "forkgroup",
   "goal",
@@ -56,6 +57,11 @@ export class CommandRouter {
     switch (command) {
       case "dir":
         return { type: "dir", directory: args.join(" ").trim() || undefined };
+      case "file": {
+        const filePath = args.join(" ").trim();
+        if (!filePath) throw new Error("请输入文件路径，例如：/file ./report.pdf。");
+        return { type: "file", filePath };
+      }
       case "new":
         return parseNewCommand(args);
       case "newgroup":

package/src/commands/commandTypes.ts

@@ -3,6 +3,7 @@ export type Command =
   | { type: "new"; title?: string; cwd?: string; projectless?: boolean }
   | { type: "newgroup"; title?: string; cwd?: string; projectless?: boolean }
   | { type: "dir"; directory?: string }
+  | { type: "file"; filePath: string }
   | { type: "forkgroup"; title?: string }
   | { type: "fork"; sessionId?: string }
   | { type: "title"; title: string }

package/src/feishu/CardRenderer.ts

@@ -240,11 +240,12 @@ export interface DismissGroupCardView {
 }
 
 export interface ShellCommandCardView {
+  jobId?: string;
+  contextKey?: string;
   command: string;
   cwd: string;
-  stdout: string;
-  stderr: string;
-  status: "running" | "completed" | "failed" | "timed_out";
+  output: string;
+  status: "running" | "cancelling" | "completed" | "failed" | "cancelled" | "timed_out";
   exitCode?: number | null;
   elapsedMs: number;
   outputTruncated: boolean;
@@ -258,12 +259,7 @@ export class CardRenderer {
   }
 
   renderShellCommandCard(view: ShellCommandCardView): Record<string, unknown> {
-    const stdout = normalizeTerminalOutput(view.stdout).trimEnd();
-    const stderr = normalizeTerminalOutput(view.stderr).trimEnd();
-    const rawOutput = [
-      stdout,
-      stderr ? `[stderr]\n${stderr}` : "",
-    ].filter(Boolean).join("\n");
+    const rawOutput = normalizeTerminalOutput(view.output).trimEnd();
     const displayOutput = truncateMiddle(
       rawOutput,
       6_000,
@@ -273,15 +269,32 @@ export class CardRenderer {
     const output = displayOutput || (view.status === "running" ? "等待输出..." : "（无输出）");
     const status = shellCommandStatus(view);
     const outputWasTruncated = view.outputTruncated || rawOutput.length > 6_000;
+    const elements = [
+      markdown(codeBlock(`$  ${command}\n${output}`, 6_700)),
+      markdown([
+        `${inlineCode(view.cwd)} · ${status.label} · ${formatTurnDuration(view.elapsedMs)}`,
+        ...(outputWasTruncated ? ["输出过长，已保留开头和结尾并截断中间内容。"] : []),
+      ].join("\n")),
+    ];
+    if (view.status === "running" && view.jobId && view.contextKey) {
+      elements.push({
+        tag: "button",
+        text: { tag: "plain_text", content: "Cancel" },
+        type: "danger",
+        size: "small",
+        behaviors: [{
+          type: "callback",
+          value: {
+            action: "shell_command_cancel",
+            jobId: view.jobId,
+            contextKey: view.contextKey,
+          },
+        }],
+      });
+    }
     return sectionCard(
       status.title,
-      [
-        markdown(codeBlock(`$  ${command}\n${output}`, 6_700)),
-        markdown([
-          `${inlineCode(view.cwd)} · ${status.label} · ${formatTurnDuration(view.elapsedMs)}`,
-          ...(outputWasTruncated ? ["输出过长，已保留开头和结尾并截断中间内容。"] : []),
-        ].join("\n")),
-      ],
+      elements,
       status.template,
     );
   }
@@ -2052,11 +2065,66 @@ function renderToolDetails(tool: ToolState, projectCwd?: string): string {
   const displayCommand = tool.kind === "command"
     ? unwrapShellCommand(normalizedCommand) ?? normalizedCommand
     : normalizedCommand;
-  const commandText = truncateText(displayCommand, 600);
+  const commandText = truncateText(
+    tool.kind === "command" ? formatShellCommandForDisplay(displayCommand) : displayCommand,
+    600,
+  );
   const resultText = result ? truncateToolResult(normalizeTerminalOutput(result).trim()) : undefined;
   return codeBlock([`$ ${commandText}`, resultText].filter((part): part is string => part !== undefined).join("\n"), 2_003);
 }
 
+function formatShellCommandForDisplay(command: string): string {
+  const normalized = command.replace(/\r\n/g, "\n");
+  let result = "";
+  let quote: "'" | "\"" | undefined;
+
+  for (let index = 0; index < normalized.length; index += 1) {
+    const character = normalized[index] ?? "";
+
+    if (quote) {
+      result += character;
+      if ((character === "\\" || character === "`") && quote === "\"") {
+        if (index + 1 < normalized.length) result += normalized[++index];
+      } else if (character === quote) {
+        quote = undefined;
+      }
+      continue;
+    }
+
+    if (character === "'" || character === "\"") {
+      quote = character;
+      result += character;
+      continue;
+    }
+
+    if (character === "\\" || character === "`" || character === "^") {
+      result += character;
+      if (index + 1 < normalized.length) result += normalized[++index];
+      continue;
+    }
+
+    const operator = readShellDisplayOperator(normalized, index);
+    if (!operator) {
+      result += character;
+      continue;
+    }
+
+    result += operator;
+    index += operator.length - 1;
+    while (index + 1 < normalized.length && /\s/.test(normalized[index + 1] ?? "")) index += 1;
+    if (index + 1 < normalized.length) result += " \\\n  ";
+  }
+
+  return result;
+}
+
+function readShellDisplayOperator(command: string, index: number): string | undefined {
+  for (const operator of ["&&", "||", "|&", ";", "|"]) {
+    if (command.startsWith(operator, index)) return operator;
+  }
+  return undefined;
+}
+
 function normalizeTerminalOutput(value: string): string {
   const clean = stripAnsi(value).replace(/\r\n/g, "\n");
   return clean
@@ -2167,6 +2235,12 @@ function shellCommandStatus(view: ShellCommandCardView): {
   if (view.status === "running") {
     return { title: "正在执行命令", label: "运行中", template: "blue" };
   }
+  if (view.status === "cancelling") {
+    return { title: "正在取消命令", label: "正在取消", template: "orange" };
+  }
+  if (view.status === "cancelled") {
+    return { title: "命令已取消", label: "已取消", template: "grey" };
+  }
   if (view.status === "timed_out") {
     return { title: "命令执行超时", label: "已超时（120s）", template: "orange" };
   }

package/src/feishu/FinalResponseBranding.ts

@@ -1,4 +1,5 @@
-export const FINAL_RESPONSE_BRANDING = "> Powered by [AgentBot](https://github.com/keyou/agent-bot)";
+export const FINAL_RESPONSE_BRANDING =
+  "> Powered by [AgentBot](https://bytedance.larkoffice.com/docx/UTukdYBopojSivxRVeUcCXTtnid)";
 export const FINAL_RESPONSE_BRANDING_BLOCK = `----\n\n${FINAL_RESPONSE_BRANDING}`;
 
 export function splitFinalResponseBranding(markdown: string): {