@yeaft/webchat-agent 1.0.526 → 1.0.528

package/yeaft/tools/wait-agent.js

@@ -24,7 +24,7 @@
  *              from every text_delta).
  *
  * Every envelope includes `outputFile` (durable per-agent JSONL log) and
- * `liveness` (toolUseCount, tokenCount, msSinceLastEvent, recentTools,
+ * `liveness` (toolUseCount, usageTokens, outputChars, msSinceLastEvent, recentTools,
  * lastEventType) so the model can distinguish "stuck" from "still
  * working" and can Read the log directly when it needs the full
  * timeline.
@@ -57,10 +57,10 @@ function nextStepsFor(status, opts = {}) {
   }
   if (opts.timedOut && opts.stale) {
     return (
-      'Sub-agent still has a running record but appears stalled. Do NOT keep ' +
-      'calling WaitAgent in a loop. Use ListAgents/outputFile to inspect it, ' +
-      'CloseAgent if you want to stop it, or report the stalled background ' +
-      'task and start a fresh agent if needed.'
+      'No observable event arrived within the diagnostic threshold. This does ' +
+      'not prove the provider or tool is dead. Do NOT keep calling WaitAgent ' +
+      'in a blind loop; inspect outputFile, then use CloseAgent only if you ' +
+      'actually intend to cancel, or report that the background task is quiet.'
     );
   }
   if (opts.timedOut && opts.mustCollectReply) {
@@ -197,7 +197,7 @@ export default defineTool({
     en: `Wait for a sub-agent's next state change (turn end, terminal, or wait-timeout) and retrieve a status envelope.
 
 Returns JSON with explicit \`status\`, latest \`result\` text, \`liveness\`
-counters (toolUseCount, tokenCount, msSinceLastEvent, recentTools), the
+counters (actual toolUseCount, provider usageTokens, outputChars, msSinceLastEvent, recentTools), the
 durable \`outputFile\` path you can Read at any time, and a status-specific
 \`next_steps\` directive telling you what to call next.
 
@@ -214,16 +214,16 @@ Status semantics:
 
 After WaitAgent returns, act on the status. A non-stale timeout after PromptAgent
 has 'mustCollectReply=true': call WaitAgent again with a larger bounded timeout in
-the same parent turn until idle/terminal. A stale/stalled agent breaks that loop:
-inspect/report/close it instead. For ordinary SpawnAgent background work, use
-ListAgents or later completion notifications instead of repeatedly re-waiting.
+the same parent turn until idle/terminal. A stale diagnostic breaks that blind
+wait loop but does not cancel or prove failure: inspect outputFile before deciding.
+For ordinary SpawnAgent background work, use ListAgents or later completion
+notifications instead of repeatedly re-waiting.
 
 The default wait is a bounded 5000ms poll; callers may request up to 300000ms
-(5 minutes). Never use an unbounded blind loop: every wait is capped, liveness is
-checked after each timeout, and stale/stalled is the explicit stop condition.`,
+(5 minutes). This caps one WaitAgent call only, not the sub-agent lifetime.`,
     zh: `等待子 Agent 的下一次状态变更（turn 结束、终止或等待超时）并获取状态信封。
 
-返回 JSON，含明确的 status、最新的 result 文本、liveness 计数器（toolUseCount、tokenCount、
+返回 JSON，含明确的 status、最新的 result 文本、liveness 计数器（实际 toolUseCount、provider usageTokens、outputChars、
 msSinceLastEvent、recentTools）、可随时 Read 的持久化 outputFile 路径，以及状态相关的 next_steps
 指令告诉你下一步该调用什么。
 
@@ -237,11 +237,11 @@ msSinceLastEvent、recentTools）、可随时 Read 的持久化 outputFile 路
 
 PromptAgent 后若非 stale/stalled 的有界等待超时，必须在同一父级 turn 使用更大的有界 timeout
 再次调用 WaitAgent，直到 idle/terminal；不要改用 ListAgents/notification 丢下未收集的回复。
-关键——如果信封显示 stale/stalled，子 Agent 可能卡死或空转。不要反复调用 WaitAgent——向用户
-报告情况，决定是 CloseAgent（带 close_reason）还是重试。
+若信封显示 stale/stalled，应停止盲目等待并检查 outputFile；它只是诊断，不会取消任务，也不能证明
+provider 或工具已经卡死。仅在确实要取消时使用 CloseAgent。
 
 普通 SpawnAgent 异步流程仍用 ListAgents 做非阻塞状态检查，并依赖后续 completion
-notification；不要对普通后台任务盲目循环等待。每次等待都有上限，stale/stalled 是停止条件。`
+notification；默认 5000ms、最大 300000ms 仅限制单次 WaitAgent 调用，不限制子 Agent 生命周期。`
   },
   parameters: {
     type: 'object',
@@ -258,8 +258,8 @@ notification；不要对普通后台任务盲目循环等待。每次等待都
         minimum: 0,
         maximum: 300000,
         description: {
-          en: 'Maximum time to wait in milliseconds (default: 5000 short poll, max: 300000 / 5 minutes)',
-          zh: '最长等待时间，单位毫秒（默认 5000 短轮询，最大 300000 / 5 分钟）',
+          en: 'Maximum duration of this wait call, not the sub-agent lifetime (default: 5000, max: 300000)',
+          zh: '本次等待调用的最长时间，不是子 Agent 生命周期（默认 5000，最大 300000）',
         },
       },
     },

package/yeaft/tools/web-fetch.js

@@ -9,7 +9,12 @@ import { defineTool } from './types.js';
 
 /** Strip HTML tags and normalize whitespace for readability. */
 function htmlToText(html) {
-  return html
+  // Remove common site chrome before applying the caller's length budget.
+  // Fall back for pages whose only content is navigation; raw/API is untouched.
+  const cleaned = html.replace(/<(script|style)\b[^>]*>[\s\S]*?<\/\1>/gi, '');
+  const withoutChrome = cleaned.replace(/<(nav|footer)\b[^>]*>[\s\S]*?<\/\1>/gi, '');
+  const source = withoutChrome.replace(/<[^>]+>/g, '').trim() ? withoutChrome : cleaned;
+  return source
     // Remove script/style blocks
     .replace(/<script[\s\S]*?<\/script>/gi, '')
     .replace(/<style[\s\S]*?<\/style>/gi, '')

package/yeaft/web-bridge.js

@@ -77,12 +77,7 @@ import { hydrateYeaftStatusFromSession } from './status-cache.js';
 import { handleVpSubscribe } from './vp/vp-bridge.js';
 import { createVp, updateVp, deleteVp, readVp, VpCrudError } from './vp/vp-crud.js';
 import { scanVpLibrary } from './vp/vp-store.js';
-import {
-  bindRepoApprovalCapability,
-  createRouter,
-  isRepoApprovalCapability,
-  revokeRepoApprovalCapability,
-} from './routing/router.js';
+import { createRouter } from './routing/router.js';
 import {
   SessionCrudError,
   createSessionFromSpec,
@@ -473,22 +468,6 @@ const turnAbortCtrls = new Map();
  * @type {Map<string, { sessionId: string, vpId: string, threadId: string, key: string }>}
  */
 const turnAbortMeta = new Map();
-/** @type {Map<string, { capability: object, sessionId: string, vpId: string }>} Exact-turn repo approvals, never persisted or projected. */
-const turnRepoApprovals = new Map();
-
-function revokeTurnRepoApproval(turnId) {
-  const grant = turnRepoApprovals.get(turnId);
-  turnRepoApprovals.delete(turnId);
-  return grant ? revokeRepoApprovalCapability(grant.capability) : false;
-}
-
-function revokeRepoApprovalsForRecipient(sessionId, vpId) {
-  for (const [turnId, grant] of turnRepoApprovals.entries()) {
-    if (grant.sessionId !== sessionId || grant.vpId !== vpId) continue;
-    revokeTurnRepoApproval(turnId);
-  }
-}
-
 /**
  * Per-VP status broker — the agent-side authority for VP timeline
  * status. Lazy-initialized on first use because `sendSessionEvent` is
@@ -1175,7 +1154,6 @@ function invalidateGroupContext(sessionId, { abortRuntime = false } = {}) {
   }
   for (const [turnId, meta] of Array.from(turnAbortMeta.entries())) {
     if (meta?.sessionId !== sessionId) continue;
-    revokeTurnRepoApproval(turnId);
     turnAbortCtrls.delete(turnId);
     turnAbortMeta.delete(turnId);
   }
@@ -2159,21 +2137,12 @@ async function routeEnvelopeToVpThread(sessionId, vpId, envelope) {
   let related = false;
 
   const meta = envelope?.msg?.meta || {};
-  const repoApproval = envelope?._repoApproval;
-  const hasRepoApproval = isRepoApprovalCapability(repoApproval);
-  if (envelope?.msg?.role === 'user' || envelope?.msg?.from === 'user') {
-    revokeRepoApprovalsForRecipient(sessionId, vpId);
-  }
   const isTaskResult = meta.injectedBy === 'task_result';
   const sourceThreadId = typeof meta.sourceThreadId === 'string' && meta.sourceThreadId.trim()
     ? meta.sourceThreadId.trim()
     : null;
 
-  if (hasRepoApproval) {
-    // Approval is an execution capability, not text. It must never collapse
-    // into a related thread's pendingQueries/rescue path.
-    thread = getOrCreateVpThread({ sessionId, vpId, title: fallbackTitle(text) });
-  } else if (isTaskResult && sourceThreadId) {
+  if (isTaskResult && sourceThreadId) {
     thread = getOrCreateVpThread({ sessionId, vpId, threadId: sourceThreadId, title: fallbackTitle(text) });
   } else if (runningThreads.length === 0) {
     thread = getOrCreateVpThread({ sessionId, vpId, title: fallbackTitle(text) });
@@ -2216,12 +2185,6 @@ async function routeEnvelopeToVpThread(sessionId, vpId, envelope) {
   if (!thread) return null;
   rememberThreadMessage(thread, envelope?.msg);
   const turnId = `${randomUUID().slice(0, 8)}:${vpId}`;
-  if (hasRepoApproval) {
-    if (!bindRepoApprovalCapability(repoApproval, { sessionId, recipientVpId: vpId, turnId })) {
-      return null;
-    }
-    turnRepoApprovals.set(turnId, { capability: repoApproval, sessionId, vpId });
-  }
   const perfTraceId = envelope?._perfTraceId || envelope?.perfTraceId || null;
   if (perfTraceId) {
     recordAgentPerfTrace(ctx.CONFIG, {
@@ -2397,7 +2360,6 @@ function ensureDriverRunning(sessionId, vpId, threadId = 'main') {
       } catch (err) {
         console.warn('[Yeaft] driveVp: runVpTurn failed', vpId, err?.message || err);
       } finally {
-        revokeTurnRepoApproval(turnId);
         turnAbortCtrls.delete(turnId);
         turnAbortMeta.delete(turnId);
         if (vpAborts.get(key) === vpAbort) vpAborts.delete(key);
@@ -2532,7 +2494,6 @@ export async function __testResetVpState() {
     if (Array.isArray(inbox)) inbox.length = 0;
   }
   vpThreads.clear();
-  for (const turnId of turnRepoApprovals.keys()) revokeTurnRepoApproval(turnId);
   turnAbortCtrls.clear();
   turnAbortMeta.clear();
   await __testDrainVpDrivers();
@@ -5442,7 +5403,6 @@ async function runVpTurnWithEscalation(args) {
     graceMs: ESCALATE_AFTER_ABORT_MS,
     onEscalate: () => {
       if (escalationState.escalated) return;
-      revokeTurnRepoApproval(turnId);
       escalationState.escalated = true;
       escalationState.terminalEmitted = true;
       console.error(
@@ -5661,7 +5621,6 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
       queryTimer = setTimeout(() => {
         if (!vpAbort.signal.aborted) {
           console.error(`[Yeaft] query timeout after ${queryTimeoutMs / 1000}s of silence — aborting VP ${vpId}`);
-          revokeTurnRepoApproval(turnId);
           try { vpAbort.abort(); } catch { /* best-effort */ }
         }
       }, queryTimeoutMs);
@@ -6346,10 +6305,6 @@ function emitQueuedTurnAbort(meta, turnId) {
 }
 
 function abortAllVpRuntime(aborted, sessionId = null) {
-  for (const [turnId, meta] of Array.from(turnAbortMeta.entries())) {
-    if (sessionId && meta?.sessionId !== sessionId) continue;
-    revokeTurnRepoApproval(turnId);
-  }
   for (const [key, ctrl] of vpAborts) {
     if (sessionId && !key.startsWith(`${sessionId}::`)) continue;
     try {
@@ -6392,7 +6347,6 @@ export function handleYeaftAbortThread(_msg = {}) {
       const meta = turnAbortMeta.get(turnId);
       if ((meta?.threadId || 'main') !== targetThreadId) continue;
       try { if (!ctrl.signal.aborted) { ctrl.abort(); aborted.push(turnId); } } catch { /* best-effort */ }
-      revokeTurnRepoApproval(turnId);
       turnAbortCtrls.delete(turnId);
       turnAbortMeta.delete(turnId);
     }
@@ -6411,7 +6365,6 @@ export function handleYeaftAbortThread(_msg = {}) {
   for (const [turnId, ctrl] of turnAbortCtrls) {
     try { if (!ctrl.signal.aborted) { ctrl.abort(); aborted.push(turnId); } } catch { /* best-effort */ }
   }
-  for (const turnId of turnAbortMeta.keys()) revokeTurnRepoApproval(turnId);
   turnAbortCtrls.clear();
   turnAbortMeta.clear();
   abortAllVpRuntime(aborted);
@@ -6438,12 +6391,10 @@ export function handleYeaftAbortAll(msg = {}) {
     const meta = turnAbortMeta.get(turnId);
     if (sessionId && meta?.sessionId !== sessionId) continue;
     try { if (!ctrl.signal.aborted) { ctrl.abort(); aborted.push(turnId); } } catch { /* best-effort */ }
-    revokeTurnRepoApproval(turnId);
     turnAbortCtrls.delete(turnId);
     turnAbortMeta.delete(turnId);
   }
   if (!sessionId) {
-    for (const turnId of turnAbortMeta.keys()) revokeTurnRepoApproval(turnId);
     turnAbortCtrls.clear();
     turnAbortMeta.clear();
   }
@@ -6490,7 +6441,6 @@ export function handleYeaftAbortTurn(msg = {}) {
       success = true;
       abortedTurnIds.push(turnId);
     }
-    revokeTurnRepoApproval(turnId);
     turnAbortCtrls.delete(turnId);
     turnAbortMeta.delete(turnId);
   }
@@ -7827,7 +7777,6 @@ export async function resetYeaftSession() {
     try { if (!ctrl.signal.aborted) ctrl.abort(); } catch { /* best-effort */ }
   }
   vpAborts.clear();
-  for (const turnId of turnAbortMeta.keys()) revokeTurnRepoApproval(turnId);
   turnAbortCtrls.clear();
   turnAbortMeta.clear();
   vpInboxes.clear();
@@ -8306,7 +8255,6 @@ export const __testHooks = {
     return loadAndBroadcastYeaftSkillSlashCommands();
   },
   resetAbortState() {
-    for (const turnId of turnRepoApprovals.keys()) revokeTurnRepoApproval(turnId);
     turnAbortCtrls.clear();
     turnAbortMeta.clear();
     vpAborts.clear();

package/skills/review-merge-tag/SKILL.md

@@ -1,78 +0,0 @@
----
-name: review-merge-tag
-description: 用 RepoWorkflow 在任意 GitHub 仓库执行开发 worktree、精确 PR review snapshot、base-ref CAS landing、数字 tag 与 workflow 验证；避免重复手工 git/gh 检查。
----
-
-# Repository Workflow
-
-不要逐条调用 `git fetch`、`git worktree list`、`gh pr view`、`git ls-remote` 和 `gh run watch` 来发现同一批事实。Session 内使用 `RepoWorkflow` 工具。非 Yeaft 环境可用 `yeaft-repo` CLI 执行 `prepare` 和 `review-prep`，这两个阶段返回与工具相同的紧凑 JSON；CLI 不能执行 `land`。
-
-## 三个边界
-
-### 1. 开发准备
-
-```json
-{
-  "phase": "prepare",
-  "name": "fix-short-description"
-}
-```
-
-它会在当前仓库中确定远端默认分支、拉取最新精确基线、检查 worktree/branch/path 冲突，并创建或安全复用 `yeaft-wt/<name>`。后续开发只使用返回的 `worktree.path`。
-
-### 2. 独立 review 准备
-
-Reviewer 调用：
-
-```json
-{
-  "phase": "review-prep",
-  "pr": 123
-}
-```
-
-它会一次冻结 GitHub PR 的 base branch/base SHA/head/merge snapshot、检查 draft/conflict/checks，并创建 detached exact-snapshot review worktree。Reviewer 必须审查返回的 `reviewWorktree.path`，并把明确结论、`pullRequest.baseBranch`、`pullRequest.baseSha`、`pullRequest.headSha` 和 `pullRequest.snapshotSha` 交回开发者。
-
-工具只冻结事实，不替代代码审查。
-
-### 3. Review 通过后的落地
-
-只有收到独立 reviewer 的明确批准后才能调用。Reviewer 必须用 `RouteForward` 把绑定仓库、PR、exact base branch/base SHA/head/merge snapshot 的结构化批准交回 landing VP；宿主会随该 handoff 铸造不可序列化、一次性的 approval capability。随后 landing VP 才能在处理该 handoff 的同一 turn 调用：
-
-```json
-{
-  "phase": "land",
-  "pr": 123,
-  "baseBranch": "main",
-  "baseSha": "<exact 40-char base SHA>",
-  "reviewedHead": "<exact 40-char head SHA>",
-  "reviewedSnapshot": "<exact 40-char merge snapshot SHA>",
-  "tagPrefix": "v1.0.",
-  "workflow": "Dev Release"
-}
-```
-
-`approvedBy` 等普通字符串没有授权语义。`land` 只接受宿主 capability，并重新冻结 PR；任何 repo、PR、recipient、base branch、base SHA、head 或 snapshot 不匹配都会停止。Reviewed snapshot 必须以批准的 base SHA/head 为两个父提交；landing 的目标 ref 只从批准的 base branch 推导，并在任何写入前拒绝 PR retarget。之后它通过单次 receive-pack 更新，用 `--force-with-lease=<base-ref>:<approved-base>` 将该 exact snapshot 安装到批准的远端 base。若 base 在最后冻结与 receive 之间前进，lease 会拒绝更新，并且不会创建 tag。若要求 tag，它只在 base CAS 成功后从远端 tags 数值计算下一版，用 create-only lease 推送并复核 base 与 tag。若要求 workflow，它等待匹配 tag 与 reviewed snapshot SHA 的 run 完成。
-
-Worktree cleanup 不属于 landing。`land` 会在任何仓库或远端副作用前拒绝 cleanup 请求，包括 active `repoRoot`；需要 cleanup 时必须在 landing 完成后走独立操作，cleanup 失败不能改变 landing 结果。
-
-## 通用性与边界
-
-- 适用于 Agent 可访问的任意本地 GitHub 仓库，不包含项目路径或固定 `main` 假设。
-- 需要 `git` 和已认证的 `gh` CLI；不依赖 Python，也不通过 shell 拼接命令。
-- 当前不支持 GitLab/Bitbucket；不要把 GitHub 成功误报为 forge-agnostic。
-- 自动化只消除重复事实核对，不消除独立 review、测试选择、代码判断或用户授权。
-- `land` 后若 workflow 失败，merge/tag 可能已经完成；读取错误 JSON 的 `details.remoteEffects`，不要盲目重试或重打 tag。
-
-## CLI
-
-Yeaft 外部或人工终端只可运行准备阶段：
-
-```bash
-yeaft-repo prepare --name fix-short-description
-yeaft-repo review-prep --pr 123
-```
-
-独立 CLI 不能执行 `land`。Landing 必须在 Session 中通过 `RepoWorkflow` 工具执行，并携带当前 handoff 由宿主签发、绑定 exact review 的 approval capability；普通参数或 `approvedBy` 字符串不能替代该 capability。
-
-每条可用命令 stdout 只输出一个成功 JSON；失败时 stderr 输出一个带稳定 `code` 和副作用状态的 JSON。

package/yeaft/tools/repo-workflow.js

@@ -1,80 +0,0 @@
-import { defineTool } from './types.js';
-import {
-  formatRepoWorkflowError,
-  landRepoWorkflow,
-  prepareRepoReview,
-  prepareRepoWorkflow,
-} from '../../repo-workflow.js';
-
-const repoWorkflow = defineTool({
-  name: 'RepoWorkflow',
-  description: {
-    en: `Run one deterministic GitHub repository workflow phase and return compact structured evidence.
-
-Use this instead of repeatedly issuing git/gh shell commands:
-- prepare: fetch the remote default branch and create/reuse an exact-base development worktree.
-- review-prep: freeze a PR's exact base/head/GitHub merge snapshot and create/reuse a clean detached review worktree.
-- land: re-freeze an independently approved exact base branch/base SHA/head/snapshot and atomically install that exact snapshot on the approved remote base with an expected-old lease, then optionally create the next numeric tag and wait for a workflow. Worktree cleanup is deliberately separate.
-
-This tool does not review code and never infers approval. The land phase requires the reviewer identity and exact SHAs returned by review-prep. Supports any local GitHub repository available to the Agent; git and authenticated gh CLIs are required.`,
-    zh: `执行一个确定性的 GitHub 仓库工作流阶段，并返回紧凑的结构化证据。
-
-应使用此工具代替反复执行 git/gh shell 命令：
-- prepare：拉取远端默认分支，并创建或复用精确基线的开发 worktree。
-- review-prep：冻结 PR 的精确 base/head/GitHub merge snapshot，并创建或复用干净的 detached review worktree。
-- land：重新冻结已经独立批准的 exact base branch/base SHA/head/snapshot，以 expected-old lease 在已批准的远端 base 上原子安装该 exact snapshot，随后可选创建下一个数字 tag 并等待 workflow。Worktree cleanup 刻意与 landing 分离。
-
-此工具不做代码审查，也不会推断 review 已通过。land 必须提供 reviewer 身份以及 review-prep 返回的精确 SHA。适用于 Agent 可访问的任意本地 GitHub 仓库；需要 git 和已认证的 gh CLI。`,
-  },
-  parameters: {
-    type: 'object',
-    properties: {
-      phase: { type: 'string', enum: ['prepare', 'review-prep', 'land'] },
-      cwd: { type: 'string', description: 'Repository or worktree path; defaults to the current engine cwd' },
-      remote: { type: 'string', description: 'Git remote name (default: origin)' },
-      baseBranch: { type: 'string', description: 'Explicit base branch for prepare, or exact approved destination branch for land' },
-      baseSha: { type: 'string', description: 'Exact independently approved base SHA for land' },
-      name: { type: 'string', description: 'Development or review worktree name' },
-      worktreePath: { type: 'string', description: 'Explicit worktree path' },
-      pr: { type: 'integer', description: 'GitHub pull request number' },
-      reviewedHead: { type: 'string', description: 'Exact independently approved PR head SHA' },
-      reviewedSnapshot: { type: 'string', description: 'Exact independently approved GitHub merge snapshot SHA' },
-      tagPrefix: { type: 'string', description: 'Optional numeric tag prefix, for example v1.0.' },
-      tagStart: { type: 'integer', minimum: 0 },
-      workflow: { type: 'string', description: 'Optional GitHub Actions workflow name to wait for' },
-      waitTimeoutMs: { type: 'integer', minimum: 1 },
-      pollIntervalMs: { type: 'integer', minimum: 1 },
-    },
-    required: ['phase'],
-  },
-  timeoutMs: 0,
-  isConcurrencySafe: () => false,
-  isReadOnly: () => false,
-  isDestructive: input => input?.phase === 'land',
-  async execute(input, ctx) {
-    const options = { ...input, cwd: input.cwd || ctx?.cwd || process.cwd() };
-    try {
-      const dependencies = input.phase === 'land'
-        ? {
-          signal: ctx?.signal,
-          approvalCapability: ctx?.inboundEnvelope?._repoApproval,
-          approvalContext: {
-            sessionId: ctx?.sessionId,
-            recipientVpId: ctx?.senderVpId,
-            turnId: ctx?.turnId,
-          },
-        }
-        : { signal: ctx?.signal };
-      const result = input.phase === 'prepare'
-        ? await prepareRepoWorkflow(options, dependencies)
-        : input.phase === 'review-prep'
-          ? await prepareRepoReview(options, dependencies)
-          : await landRepoWorkflow(options, dependencies);
-      return JSON.stringify(result);
-    } catch (error) {
-      return JSON.stringify(formatRepoWorkflowError(error));
-    }
-  },
-});
-
-export default repoWorkflow;