@keyou007/agent-bot 0.1.15-alpha.0 → 0.1.15-alpha.2

package/dist/utils/executeShellCommand.js

@@ -18,8 +18,17 @@ export function executeShellCommand(command, cwd, options = {}) {
             timedOut = true;
             child.kill();
         }, timeoutMs);
-        child.stdout.on("data", (chunk) => output.append("stdout", chunk));
-        child.stderr.on("data", (chunk) => output.append("stderr", chunk));
+        const appendOutput = (stream, chunk) => {
+            output.append(stream, chunk);
+            try {
+                options.onOutput?.(output.result());
+            }
+            catch {
+                // Output presentation must never interrupt the child process.
+            }
+        };
+        child.stdout.on("data", (chunk) => appendOutput("stdout", chunk));
+        child.stderr.on("data", (chunk) => appendOutput("stderr", chunk));
         child.once("error", (error) => {
             clearTimeout(timeout);
             reject(error);
@@ -45,32 +54,90 @@ function prepareShellCommand(command, platform) {
     };
 }
 class BoundedOutput {
-    maxBytes;
-    stdout = [];
-    stderr = [];
-    retainedBytes = 0;
+    retained = [];
+    seenBytes = { stdout: 0, stderr: 0 };
+    headBytes;
+    tailBytes;
     truncated = false;
     constructor(maxBytes) {
-        this.maxBytes = maxBytes;
+        const normalizedMaxBytes = Math.max(1, Math.floor(maxBytes));
+        this.headBytes = Math.ceil(normalizedMaxBytes / 3);
+        this.tailBytes = normalizedMaxBytes - this.headBytes;
     }
     append(stream, chunk) {
-        const remaining = Math.max(0, this.maxBytes - this.retainedBytes);
-        if (remaining === 0) {
+        if (chunk.length === 0)
+            return;
+        this.seenBytes[stream] += chunk.length;
+        if (!this.truncated) {
+            const next = [...this.retained, { stream, data: chunk }];
+            if (outputChunksLength(next) <= this.headBytes + this.tailBytes) {
+                this.retained = next;
+                return;
+            }
             this.truncated = true;
+            this.retained = [
+                ...takeOutputChunkHead(next, this.headBytes),
+                ...takeOutputChunkTail(next, this.tailBytes),
+            ];
             return;
         }
-        const retained = chunk.length <= remaining ? chunk : chunk.subarray(0, remaining);
-        this[stream].push(retained);
-        this.retainedBytes += retained.length;
-        if (retained.length < chunk.length)
-            this.truncated = true;
+        const head = takeOutputChunkHead(this.retained, this.headBytes);
+        const previousTail = takeOutputChunkTail(this.retained, this.tailBytes);
+        const tail = takeOutputChunkTail([...previousTail, { stream, data: chunk }], this.tailBytes);
+        this.retained = [...head, ...tail];
     }
     result() {
         return {
-            stdout: Buffer.concat(this.stdout).toString("utf8"),
-            stderr: Buffer.concat(this.stderr).toString("utf8"),
+            stdout: this.streamResult("stdout"),
+            stderr: this.streamResult("stderr"),
             outputTruncated: this.truncated,
         };
     }
+    streamResult(stream) {
+        if (!this.truncated) {
+            return Buffer.concat(this.retained.filter((chunk) => chunk.stream === stream).map((chunk) => chunk.data)).toString("utf8");
+        }
+        const head = takeOutputChunkHead(this.retained, this.headBytes)
+            .filter((chunk) => chunk.stream === stream);
+        const tail = takeOutputChunkTail(this.retained, this.tailBytes)
+            .filter((chunk) => chunk.stream === stream);
+        const retainedBytes = outputChunksLength([...head, ...tail]);
+        const marker = this.seenBytes[stream] > retainedBytes
+            ? Buffer.from("\n... output truncated ...\n", "utf8")
+            : Buffer.alloc(0);
+        return Buffer.concat([
+            ...head.map((chunk) => chunk.data),
+            marker,
+            ...tail.map((chunk) => chunk.data),
+        ]).toString("utf8");
+    }
+}
+function outputChunksLength(chunks) {
+    return chunks.reduce((total, chunk) => total + chunk.data.length, 0);
+}
+function takeOutputChunkHead(chunks, maxBytes) {
+    const retained = [];
+    let remaining = maxBytes;
+    for (const chunk of chunks) {
+        if (remaining <= 0)
+            break;
+        const data = chunk.data.length <= remaining ? chunk.data : chunk.data.subarray(0, remaining);
+        retained.push({ stream: chunk.stream, data });
+        remaining -= data.length;
+    }
+    return retained;
+}
+function takeOutputChunkTail(chunks, maxBytes) {
+    const retained = [];
+    let remaining = maxBytes;
+    for (let index = chunks.length - 1; index >= 0 && remaining > 0; index -= 1) {
+        const chunk = chunks[index];
+        const data = chunk.data.length <= remaining
+            ? chunk.data
+            : chunk.data.subarray(chunk.data.length - remaining);
+        retained.unshift({ stream: chunk.stream, data });
+        remaining -= data.length;
+    }
+    return retained;
 }
 //# sourceMappingURL=executeShellCommand.js.map

package/dist/utils/executeShellCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeShellCommand.js","sourceRoot":"","sources":["../../src/utils/executeShellCommand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executeShellCommand.js","sourceRoot":"","sources":["../../src/utils/executeShellCommand.ts"],"names":[],"mappings":"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"}

package/docs/technical-reference.md

@@ -43,7 +43,7 @@ The CLI reads the system locale through Node.js internationalization support. Lo
 | `~/.agent-bot/.env`                  | Feishu credentials                 |
 | `~/.agent-bot/data/agent-bot.sqlite` | Persistent task and delivery state |
 | `~/.agent-bot/data/inbound-images/`  | Cached incoming images             |
-| `~/.agent-bot/logs/agent-bot.log`    | Structured runtime logs            |
+| `~/.agent-bot/logs/agent-bot.YYYY-MM-DD.log` | Daily structured runtime logs      |
 
 Configuration path precedence:
 
@@ -84,18 +84,19 @@ Initialization holds `~/.agent-bot/init.lock` so concurrent commands cannot crea
 
 When complete credentials are absent, initialization uses Feishu one-click registration and reports its verification URL as text and a QR code. In-progress registration codes are not resumed: if the process exits before the complete credential pair is persisted, the next run starts a new app registration. After credentials are persisted, initialization audits the currently published app version and can safely resume that audit after interruption.
 
-Missing app configuration is handled in two stages:
+Missing app configuration is handled in three stages:
 
-1. Core configuration is requested and polled until it becomes available. When all-group-message mode was selected, the manually configured `im:message.group_msg` scope is included and may be explicitly skipped with `Y`; mention-only mode excludes it entirely.
+1. Core configuration is requested and polled until basic messaging becomes available.
 2. Remaining optional configuration is requested. The CLI prints its QR code followed by the authorization URL, then immediately polls for up to five minutes. An interactive terminal offers only `Y` to skip optional authorization and continue; otherwise the user completes authorization in the browser while polling continues.
+3. Only in all-group-message mode, the manually configured and published `im:message.group_msg` scope is requested last. Entering `Y` skips this step, and a timeout returns a partial result instead of failing initialization. Mention-only mode excludes the permission entirely.
 
-Configuration supported by the one-click launcher is encoded in its `addons` manifest. When all-group-message mode is selected, the core `im:message.group_msg` scope is excluded from that manifest because Feishu does not add it through one-click configuration. Instead, the CLI prints a QR code and this app-specific, pre-filtered Developer Console URL:
+Configuration supported by the one-click launcher is encoded in its `addons` manifest. When all-group-message mode is selected, the manual `im:message.group_msg` scope is excluded from that manifest because Feishu does not add it through one-click configuration. Instead, the CLI prints a QR code and this app-specific, pre-filtered Developer Console URL during the final stage:
 
 ```text
 https://open.feishu.cn/app/<appId>/auth?q=im%3Amessage.group_msg&op_from=openapi&token_type=tenant
 ```
 
-The user must add the permission, publish the app version, and complete tenant approval when required. Core polling then detects the permission in the published version before initialization continues. In an interactive terminal, entering `Y` skips only this manual permission wait; other missing core scopes and the message event remain blocking. Initialization returns a partial configuration result and warns that ordinary group messages which do not mention the bot are unavailable.
+The user must add the permission, publish the app version, and complete tenant approval when required. The final stage waits for up to five minutes for the permission to appear in the published version. Entering `Y`, reaching the timeout, or leaving the version unpublished returns a partial configuration result and warns that ordinary group messages which do not mention the bot are unavailable.
 
 Optional polling failures and timeouts return a partial configuration result instead of failing initialization. When stdin is not an interactive terminal, no skip input is available and polling continues until configuration becomes active or times out. Verification URLs and prompts use stderr, so `--json` keeps its final stdout machine-readable.
 
@@ -223,7 +224,7 @@ The message route determines the current task:
 
 Commands, card callbacks, progress cards, and final responses stay on the originating route.
 
-Starting a Feishu thread from a mapped user message, progress card, or final response forks from the associated completed App Server turn. If no reliable completed source turn exists, the operation fails instead of selecting an arbitrary point.
+Starting a Feishu thread from a mapped user message, progress card, or final response does not immediately create a task. Slash commands execute while the thread remains unbound; commands that require a current task return binding guidance instead of targeting the parent conversation. The first ordinary Prompt lazily forks from the associated completed App Server turn. If no reliable source turn exists, it starts a fresh task. `/new` also starts a fresh task directly, and `/sessions` or `/switch` can bind an existing task without creating an intermediate fork.
 
 `/forkgroup` has thread-aware source selection. An unbound thread, or a bound thread task with no completed turn of its own, forks directly from the thread's original anchor turn without creating an intermediate thread task. Once the thread task has completed a turn, `/forkgroup` uses its latest locally persisted completed turn. A newer active turn does not block the command and is excluded from the fork point.
 
@@ -303,8 +304,8 @@ On Windows, the CLI refreshes Machine and User environment variables before the
 
 Supervisor crash diagnostics are isolated to the selected profile:
 
-- `logs/supervisor.log` permanently records worker PIDs, exit codes, uptime, restart delays, and diagnostic artifact paths.
-- `logs/worker.stderr.log` captures Node/V8 fatal output that would otherwise be lost by the detached process. Both diagnostic logs rotate at 10 MiB with three backups.
+- `logs/supervisor.YYYY-MM-DD.log` permanently records worker PIDs, exit codes, uptime, restart delays, and diagnostic artifact paths.
+- `logs/worker.stderr.YYYY-MM-DD.log` captures Node/V8 fatal output that would otherwise be lost by the detached process. Both diagnostic logs are split by local calendar day and retain the existing 10 MiB backup rotation within a day.
 - `data/last-crash.json` points to the latest unexpected worker exit, while timestamped `data/crash-reports/crash-*.json` files preserve the history.
 - `data/crash-reports/report.*.json` contains Node diagnostic reports when Node can generate one.
 

package/docs/technical-reference.zh.md

@@ -43,7 +43,7 @@ CLI 通过 Node.js 国际化能力读取系统 Locale。以 `zh` 开头的 Local
 | `~/.agent-bot/.env`                  | 飞书凭据             |
 | `~/.agent-bot/data/agent-bot.sqlite` | 任务和投递持久化状态 |
 | `~/.agent-bot/data/inbound-images/`  | 接收图片缓存         |
-| `~/.agent-bot/logs/agent-bot.log`    | 结构化运行日志       |
+| `~/.agent-bot/logs/agent-bot.YYYY-MM-DD.log` | 按天切分的结构化运行日志 |
 
 配置文件优先级：
 
@@ -84,18 +84,19 @@ CLI 通过 Node.js 国际化能力读取系统 Locale。以 `zh` 开头的 Local
 
 没有完整凭据时，初始化会启动飞书一键创建流程，并以文本和二维码显示验证链接。注册中的设备码不会恢复：如果进程在完整凭据持久化前退出，下次会重新创建应用。凭据持久化后会检查应用当前已发布版本；这一权限审计阶段中断后可以安全继续。
 
-缺失配置分两阶段处理：
+缺失配置分三阶段处理：
 
-1. 请求核心配置并轮询，直到基础能力生效。选择接收所有群消息时会包含需要手动配置的 `im:message.group_msg`，并允许输入 `Y` 显式跳过；仅 @ 响应模式会完全排除该权限
+1. 请求核心配置并轮询，直到基础消息能力生效
 2. 请求其余可选配置。CLI 会先显示二维码，随后显示授权链接，然后立即开始最多 5 分钟的轮询。交互式终端只提供 `Y` 选项，用于跳过可选授权并继续；否则用户直接在浏览器中完成授权，轮询会持续进行
+3. 仅在选择接收所有群消息时，最后请求需要手动配置并发布的 `im:message.group_msg`。这一步可输入 `Y` 跳过，等待超时也只返回部分配置结果，不会让初始化失败；仅 @ 响应模式会完全排除该权限
 
-一键配置支持的内容会编码到 launcher 的 `addons` 清单中。选择接收所有群消息时，核心权限 `im:message.group_msg` 不会放入该清单，因为飞书无法通过一键配置新增它。CLI 会改为显示二维码，以及当前应用已筛选该权限的开发者后台直达链接：
+一键配置支持的内容会编码到 launcher 的 `addons` 清单中。选择接收所有群消息时，手动权限 `im:message.group_msg` 不会放入该清单，因为飞书无法通过一键配置新增它。CLI 会在最后阶段显示二维码，以及当前应用已筛选该权限的开发者后台直达链接：
 
 ```text
 https://open.feishu.cn/app/<appId>/auth?q=im%3Amessage.group_msg&op_from=openapi&token_type=tenant
 ```
 
-用户需要手动新增权限、发布应用版本，并在需要时完成租户管理员审批。核心轮询会在已发布版本中检测到该权限后继续初始化。交互式终端中输入 `Y` 只会跳过这个手动权限的等待，其他缺失的核心权限和消息事件仍会阻塞。初始化会返回部分配置结果，并提示机器人无法响应未 @ 它的普通群消息。
+用户需要手动新增权限、发布应用版本，并在需要时完成租户管理员审批。最后阶段会等待最多 5 分钟，在已发布版本中检测到该权限后完成；输入 `Y`、等待超时或没有完成发布都会返回部分配置结果，并提示机器人无法响应未 @ 它的普通群消息。
 
 可选配置轮询失败或超时会返回部分配置结果，不会导致初始化失败。stdin 不是交互式终端时无法输入跳过指令，轮询会持续到配置生效或超时。验证链接和提示写入 stderr，因此 `--json` 的最终 stdout 仍可直接供程序读取。
 
@@ -223,7 +224,7 @@ AGENT_BOT_LARK_USER_OPEN_ID=<已保存的授权用户 open_id，可用时提供>
 
 命令、卡片回调、进度卡和最终回答都保留在来源路由。
 
-从已映射的用户消息、进度卡或最终回答创建飞书话题时，会从其关联的已完成 App Server turn 创建分支。无法可靠确定已完成来源 turn 时会直接失败，不会选择任意分支点。
+从已映射的用户消息、进度卡或最终回答创建飞书话题时，不会立即创建任务。斜杠命令可以在话题保持未绑定状态时执行；依赖当前任务的命令会返回绑定指引，不会操作父会话任务。收到第一条普通 Prompt 后，才会从关联的已完成 App Server turn 延迟创建分支；无法可靠确定来源 turn 时则创建全新任务。`/new` 也会直接创建全新任务，`/sessions` 或 `/switch` 可以绑定现有任务，均不会产生中间分支。
 
 `/forkgroup` 会根据话题状态选择来源。话题尚未绑定任务，或者已绑定任务但尚未完成过自己的 turn 时，直接从话题原始锚点 turn fork，不创建中间话题任务。话题任务完成过 turn 后，使用本地持久化的最近完成 turn；更晚的执行中 turn 不会阻塞命令，也不会成为 fork 点。
 
@@ -303,8 +304,8 @@ Windows 下，CLI 在首次启动 Supervisor 前、Worker 在启动替换 Superv
 
 Supervisor 的崩溃诊断文件按当前 Profile 隔离：
 
-- `logs/supervisor.log` 持久记录 Worker PID、退出码、运行时长、重启延迟和诊断文件路径
-- `logs/worker.stderr.log` 保存后台进程原本会丢失的 Node/V8 fatal 输出；两类诊断日志达到 10 MiB 时轮转，保留三个备份
+- `logs/supervisor.YYYY-MM-DD.log` 持久记录 Worker PID、退出码、运行时长、重启延迟和诊断文件路径
+- `logs/worker.stderr.YYYY-MM-DD.log` 保存后台进程原本会丢失的 Node/V8 fatal 输出；两类诊断日志会按本地自然日切分，并在单日文件达到 10 MiB 时继续使用原有备份轮转
 - `data/last-crash.json` 指向最近一次 Worker 异常退出，带时间戳的 `data/crash-reports/crash-*.json` 保留历史记录
 - Node 能生成报告时，写入 `data/crash-reports/report.*.json`
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@keyou007/agent-bot",
-  "version": "0.1.15-alpha.0",
+  "version": "0.1.15-alpha.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@keyou007/agent-bot",
-      "version": "0.1.15-alpha.0",
+      "version": "0.1.15-alpha.2",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@agentclientprotocol/sdk": "1.2.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keyou007/agent-bot",
-  "version": "0.1.15-alpha.0",
+  "version": "0.1.15-alpha.2",
   "type": "module",
   "description": "Use Codex, TraeX, and compatible coding agents from Lark/Feishu.",
   "license": "GPL-3.0-only",

package/src/cli/FeishuAppConfiguration.ts

@@ -71,7 +71,6 @@ export const REQUIRED_FEISHU_CALLBACKS = ["card.action.trigger"] as const;
 
 const CORE_FEISHU_SCOPES = new Set([
   "application:application:self_manage",
-  "im:message.group_msg",
   "im:message.p2p_msg:readonly",
   "im:message:send_as_bot",
 ]);
@@ -287,7 +286,8 @@ async function completeOptionalFeishuConfiguration(
 ): Promise<EnsureFeishuAppConfigurationResult> {
   let configuration = initialConfiguration;
   let remaining = withoutIgnoredScopes(missingFeishuAppConfiguration(configuration), excludedScopes);
-  const requested = withoutIgnoredScopes(remaining, ignoredScopes);
+  const launcherIgnoredScopes = new Set([...ignoredScopes, ...MANUAL_FEISHU_SCOPES]);
+  const requested = withoutIgnoredScopes(remaining, launcherIgnoredScopes);
   if (hasMissingConfiguration(requested)) {
     await requestMissingFeishuConfiguration(
       credentials.appId,
@@ -305,7 +305,32 @@ async function completeOptionalFeishuConfiguration(
         timeoutMs,
         options.signal,
         options.optionalSkipSignal,
-        ignoredScopes,
+        launcherIgnoredScopes,
+        excludedScopes,
+      );
+      configuration = completed.configuration;
+      remaining = completed.remaining;
+    }
+  }
+
+  const manualMissing = manualMissingFeishuAppConfiguration(remaining);
+  if (hasMissingConfiguration(manualMissing)) {
+    await requestMissingFeishuConfiguration(
+      credentials.appId,
+      manualMissing,
+      true,
+      options.onVerification,
+    );
+    if (!options.manualPermissionSkipSignal?.aborted) {
+      const completed = await waitForManualFeishuConfiguration(
+        credentials,
+        configuration,
+        fetchImpl,
+        sleep,
+        pollIntervalMs,
+        timeoutMs,
+        options.signal,
+        options.manualPermissionSkipSignal,
         excludedScopes,
       );
       configuration = completed.configuration;
@@ -320,6 +345,44 @@ async function completeOptionalFeishuConfiguration(
   };
 }
 
+async function waitForManualFeishuConfiguration(
+  credentials: FeishuAppCredentials,
+  initialConfiguration: FeishuAppConfiguration,
+  fetchImpl: typeof globalThis.fetch,
+  sleep: (milliseconds: number) => Promise<void>,
+  pollIntervalMs: number,
+  timeoutMs: number,
+  signal?: AbortSignal,
+  manualPermissionSkipSignal?: AbortSignal,
+  excludedScopes: ReadonlySet<string> = new Set(),
+): Promise<{
+  configuration: FeishuAppConfiguration;
+  remaining: MissingFeishuAppConfiguration;
+}> {
+  let configuration = initialConfiguration;
+  let remaining = withoutIgnoredScopes(missingFeishuAppConfiguration(configuration), excludedScopes);
+  let remainingMs = timeoutMs;
+  while (remainingMs > 0 && hasMissingConfiguration(manualMissingFeishuAppConfiguration(remaining))) {
+    if (manualPermissionSkipSignal?.aborted) break;
+    const waitMs = Math.min(pollIntervalMs, remainingMs);
+    const waitResult = await sleepWithOptionalSkip(
+      sleep,
+      waitMs,
+      signal,
+      manualPermissionSkipSignal,
+    );
+    if (waitResult === "skipped") break;
+    remainingMs -= waitMs;
+    try {
+      configuration = await readFeishuAppConfiguration(credentials, fetchImpl, signal);
+      remaining = withoutIgnoredScopes(missingFeishuAppConfiguration(configuration), excludedScopes);
+    } catch (error) {
+      if (signal?.aborted) throw abortError(signal);
+    }
+  }
+  return { configuration, remaining };
+}
+
 async function waitForOptionalFeishuConfiguration(
   credentials: FeishuAppCredentials,
   initialConfiguration: FeishuAppConfiguration,
@@ -621,6 +684,16 @@ function coreMissingFeishuAppConfiguration(missing: MissingFeishuAppConfiguratio
   };
 }
 
+function manualMissingFeishuAppConfiguration(
+  missing: MissingFeishuAppConfiguration,
+): MissingFeishuAppConfiguration {
+  return {
+    scopes: missing.scopes.filter((scope) => MANUAL_FEISHU_SCOPES.has(scope)),
+    events: [],
+    callbacks: [],
+  };
+}
+
 function resolvedMissingConfiguration(
   initial: MissingFeishuAppConfiguration,
   remaining: MissingFeishuAppConfiguration,

package/src/cli.ts

@@ -2044,7 +2044,12 @@ function printFeishuConfigurationVerification(
       "请添加已筛选的权限、发布应用版本，并在需要时完成租户管理员审批。\n",
     ));
   }
-  if (challenge.blocking) {
+  if (challenge.kind === "manual_scope") {
+    process.stderr.write(cliText(
+      "Waiting up to 5 minutes for this permission to appear in the published app version...\n",
+      "将等待最多 5 分钟，直到该权限出现在已发布的应用版本中...\n",
+    ));
+  } else if (challenge.blocking) {
     process.stderr.write(cliText(
       "Waiting for the core scopes and message event to become active...\n",
       "正在等待核心权限和消息事件生效...\n",