@yeaft/webchat-agent 1.0.525 → 1.0.527

package/service/linux.js

@@ -12,17 +12,30 @@ export function getSystemdServicePath(instanceId = DEFAULT_INSTANCE_ID) {
   return join(homedir(), '.config', 'systemd', 'user', `${getServiceName(instanceId)}.service`);
 }
 
+// systemd unit values use C-style quoting and percent specifier expansion.
+function quoteUnit(value, { executable = false } = {}) {
+  let escaped = String(value).replace(/%/g, '%%');
+  if (executable) escaped = escaped.replace(/\$/g, '$$$$');
+  return JSON.stringify(escaped);
+}
+
+function unitPath(value) {
+  const path = String(value);
+  if (/[\r\n\0]/.test(path)) throw new Error('Service paths cannot contain line breaks or NUL');
+  return path.replace(/%/g, '%%');
+}
+
 export function generateSystemdUnit(config) {
   const nodePath = getNodePath();
   const cliPath = getCliPath();
   const logDir = getLogDir(config.instanceId);
   const envLines = [];
-  if (config.instanceId) envLines.push(`Environment=YEAFT_AGENT_INSTANCE=${config.instanceId}`);
-  if (config.serverUrl) envLines.push(`Environment=SERVER_URL=${config.serverUrl}`);
-  if (config.agentName) envLines.push(`Environment=AGENT_NAME=${config.agentName}`);
-  if (config.agentSecret) envLines.push(`Environment=AGENT_SECRET=${config.agentSecret}`);
-  if (config.workDir) envLines.push(`Environment=WORK_DIR=${config.workDir}`);
-  if (config.yeaftDir) envLines.push(`Environment=YEAFT_DIR=${config.yeaftDir}`);
+  if (config.instanceId) envLines.push(`Environment=${quoteUnit(`YEAFT_AGENT_INSTANCE=${config.instanceId}`)}`);
+  if (config.serverUrl) envLines.push(`Environment=${quoteUnit(`SERVER_URL=${config.serverUrl}`)}`);
+  if (config.agentName) envLines.push(`Environment=${quoteUnit(`AGENT_NAME=${config.agentName}`)}`);
+  if (config.agentSecret) envLines.push(`Environment=${quoteUnit(`AGENT_SECRET=${config.agentSecret}`)}`);
+  if (config.workDir) envLines.push(`Environment=${quoteUnit(`WORK_DIR=${config.workDir}`)}`);
+  if (config.yeaftDir) envLines.push(`Environment=${quoteUnit(`YEAFT_DIR=${config.yeaftDir}`)}`);
 
   // Include node's bin dir in PATH for claude CLI access
   const nodeBinDir = dirname(nodePath);
@@ -34,17 +47,17 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart=${nodePath} ${cliPath}
-WorkingDirectory=${config.workDir || homedir()}
+ExecStart=${quoteUnit(nodePath, { executable: true })} ${quoteUnit(cliPath, { executable: true })}
+WorkingDirectory=${unitPath(config.workDir || homedir())}
 Restart=on-failure
 RestartSec=10
 KillMode=mixed
 TimeoutStopSec=15
 ${envLines.join('\n')}
-Environment=PATH=${nodeBinDir}:${homedir()}/.local/bin:${homedir()}/.npm-global/bin:/usr/local/bin:/usr/bin:/bin
+Environment=${quoteUnit(`PATH=${nodeBinDir}:${homedir()}/.local/bin:${homedir()}/.npm-global/bin:/usr/local/bin:/usr/bin:/bin`)}
 
-StandardOutput=append:${logDir}/out.log
-StandardError=append:${logDir}/error.log
+StandardOutput=append:${unitPath(`${logDir}/out.log`)}
+StandardError=append:${unitPath(`${logDir}/error.log`)}
 
 [Install]
 WantedBy=default.target

package/service/macos.js

@@ -1,7 +1,7 @@
 /*
  * Service — macOS (launchd) platform implementation
  */
-import { execSync } from 'child_process';
+import { execFileSync, execSync } from 'child_process';
 import { existsSync, writeFileSync, unlinkSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
@@ -12,33 +12,37 @@ export function getLaunchdPlistPath(instanceId = DEFAULT_INSTANCE_ID) {
   return join(homedir(), 'Library', 'LaunchAgents', `${getLaunchdLabel(instanceId)}.plist`);
 }
 
-function generateLaunchdPlist(config) {
+const xmlText = value => String(value).replace(/[&<>"']/g, char => ({
+  '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&apos;',
+})[char]);
+
+export function generateLaunchdPlist(config) {
   const nodePath = getNodePath();
   const cliPath = getCliPath();
   const logDir = getLogDir(config.instanceId);
   const label = getLaunchdLabel(config.instanceId);
 
   const envDict = [];
-  if (config.instanceId) envDict.push(`      <key>YEAFT_AGENT_INSTANCE</key>\n      <string>${config.instanceId}</string>`);
-  if (config.serverUrl) envDict.push(`      <key>SERVER_URL</key>\n      <string>${config.serverUrl}</string>`);
-  if (config.agentName) envDict.push(`      <key>AGENT_NAME</key>\n      <string>${config.agentName}</string>`);
-  if (config.agentSecret) envDict.push(`      <key>AGENT_SECRET</key>\n      <string>${config.agentSecret}</string>`);
-  if (config.workDir) envDict.push(`      <key>WORK_DIR</key>\n      <string>${config.workDir}</string>`);
-  if (config.yeaftDir) envDict.push(`      <key>YEAFT_DIR</key>\n      <string>${config.yeaftDir}</string>`);
+  if (config.instanceId) envDict.push(`      <key>YEAFT_AGENT_INSTANCE</key>\n      <string>${xmlText(config.instanceId)}</string>`);
+  if (config.serverUrl) envDict.push(`      <key>SERVER_URL</key>\n      <string>${xmlText(config.serverUrl)}</string>`);
+  if (config.agentName) envDict.push(`      <key>AGENT_NAME</key>\n      <string>${xmlText(config.agentName)}</string>`);
+  if (config.agentSecret) envDict.push(`      <key>AGENT_SECRET</key>\n      <string>${xmlText(config.agentSecret)}</string>`);
+  if (config.workDir) envDict.push(`      <key>WORK_DIR</key>\n      <string>${xmlText(config.workDir)}</string>`);
+  if (config.yeaftDir) envDict.push(`      <key>YEAFT_DIR</key>\n      <string>${xmlText(config.yeaftDir)}</string>`);
 
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
     <key>Label</key>
-    <string>${label}</string>
+    <string>${xmlText(label)}</string>
     <key>ProgramArguments</key>
     <array>
-        <string>${nodePath}</string>
-        <string>${cliPath}</string>
+        <string>${xmlText(nodePath)}</string>
+        <string>${xmlText(cliPath)}</string>
     </array>
     <key>WorkingDirectory</key>
-    <string>${config.workDir || homedir()}</string>
+    <string>${xmlText(config.workDir || homedir())}</string>
     <key>EnvironmentVariables</key>
     <dict>
 ${envDict.join('\n')}
@@ -53,9 +57,9 @@ ${envDict.join('\n')}
     <key>ThrottleInterval</key>
     <integer>10</integer>
     <key>StandardOutPath</key>
-    <string>${logDir}/out.log</string>
+    <string>${xmlText(`${logDir}/out.log`)}</string>
     <key>StandardErrorPath</key>
-    <string>${logDir}/error.log</string>
+    <string>${xmlText(`${logDir}/error.log`)}</string>
 </dict>
 </plist>
 `;
@@ -68,10 +72,10 @@ export function macInstall(config) {
   mkdirSync(getLogDir(config.instanceId), { recursive: true });
   // Unload first if exists
   if (existsSync(plistPath)) {
-    try { execSync(`launchctl unload ${plistPath} 2>/dev/null`); } catch {}
+    try { execFileSync('launchctl', ['unload', plistPath], { stdio: 'pipe' }); } catch {}
   }
   writeFileSync(plistPath, generateLaunchdPlist(config));
-  execSync(`launchctl load ${plistPath}`);
+  execFileSync('launchctl', ['load', plistPath]);
   console.log(`Service installed and started: ${getLaunchdLabel(config.instanceId)}`);
   console.log(`\nManage with:`);
   console.log(`  yeaft-agent status --name ${config.instanceId}`);
@@ -83,7 +87,7 @@ export function macInstall(config) {
 export function macUninstall(instanceId = DEFAULT_INSTANCE_ID) {
   const plistPath = getLaunchdPlistPath(instanceId);
   if (existsSync(plistPath)) {
-    try { execSync(`launchctl unload ${plistPath}`); } catch {}
+    try { execFileSync('launchctl', ['unload', plistPath]); } catch {}
     unlinkSync(plistPath);
   }
   console.log(`Service uninstalled: ${getLaunchdLabel(instanceId)}`);
@@ -95,14 +99,14 @@ export function macStart(instanceId = DEFAULT_INSTANCE_ID) {
     console.error('Service not installed. Run "yeaft-agent install" first.');
     process.exit(1);
   }
-  execSync(`launchctl load ${plistPath}`);
+  execFileSync('launchctl', ['load', plistPath]);
   console.log(`Service started: ${getLaunchdLabel(instanceId)}`);
 }
 
 export function macStop(instanceId = DEFAULT_INSTANCE_ID) {
   const plistPath = getLaunchdPlistPath(instanceId);
   if (existsSync(plistPath)) {
-    execSync(`launchctl unload ${plistPath}`);
+    execFileSync('launchctl', ['unload', plistPath]);
   }
   console.log(`Service stopped: ${getLaunchdLabel(instanceId)}`);
 }

package/service/windows.js

@@ -26,7 +26,7 @@ export function getEcosystemPath(instanceId = DEFAULT_INSTANCE_ID) {
   return join(getConfigDir(instanceId), 'ecosystem.config.cjs');
 }
 
-function generateEcosystem(config) {
+export function generateEcosystem(config) {
   const nodePath = getNodePath();
   const cliPath = getCliPath();
   const cliDir = dirname(cliPath);
@@ -43,18 +43,18 @@ function generateEcosystem(config) {
 
   return `module.exports = {
   apps: [{
-    name: '${pm2AppName}',
-    script: '${cliPath.replace(/\\/g, '\\\\')}',
-    interpreter: '${nodePath.replace(/\\/g, '\\\\')}',
-    cwd: '${cliDir.replace(/\\/g, '\\\\')}',
+    name: ${JSON.stringify(pm2AppName)},
+    script: ${JSON.stringify(cliPath)},
+    interpreter: ${JSON.stringify(nodePath)},
+    cwd: ${JSON.stringify(cliDir)},
     env: ${JSON.stringify(env, null, 6)},
     autorestart: true,
     watch: false,
     max_restarts: 10,
     restart_delay: 5000,
     log_date_format: 'YYYY-MM-DD HH:mm:ss',
-    error_file: '${join(logDir, 'error.log').replace(/\\/g, '\\\\')}',
-    out_file: '${join(logDir, 'out.log').replace(/\\/g, '\\\\')}',
+    error_file: ${JSON.stringify(join(logDir, 'error.log'))},
+    out_file: ${JSON.stringify(join(logDir, 'out.log'))},
     merge_logs: true,
     max_memory_restart: '500M',
   }]
@@ -105,6 +105,7 @@ export function winInstall(config) {
   // pm2-startup doesn't work well on Windows, use Startup folder approach
   const trayScript = join(dirname(getCliPath()), 'scripts', 'agent-tray.ps1');
   const startupDir = join(process.env.APPDATA, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Startup');
+  mkdirSync(startupDir, { recursive: true });
   const startupBat = join(startupDir, `${pm2AppName}.bat`);
   // Resurrect pm2 processes + launch tray icon
   let batContent = `@echo off\r\npm2 resurrect\r\n`;

package/yeaft/routing/router.js

@@ -28,122 +28,6 @@
 import { resolveMemberId } from '../sessions/roster.js';
 import { createLoopGuard, extendCausedBy } from './loop-guard.js';
 
-const repoApprovals = new WeakMap();
-const REPO_APPROVAL_ISSUER_IDS = new Set(['martin']);
-export const REPO_APPROVAL_TTL_MS = 2 * 60 * 1000;
-
-function normalizeId(value) {
-  return typeof value === 'string' ? value.trim() : '';
-}
-
-function normalizeSha(value) {
-  const sha = normalizeId(value).toLowerCase();
-  return /^[0-9a-f]{40}$/.test(sha) ? sha : '';
-}
-
-function normalizeApprovalRepository(value) {
-  const repository = normalizeId(value).replace(/\.git$/i, '');
-  const segments = repository.split('/');
-  if (segments.length === 2) segments.unshift('github.com');
-  if (segments.length !== 3) return '';
-  const [host, owner, name] = segments;
-  const safePart = part => /^[a-z0-9_.-]+$/i.test(part) && part !== '.' && part !== '..';
-  if (!safePart(host) || !safePart(owner) || !safePart(name) || !host.includes('.')) return '';
-  return `${host}/${owner}/${name}`.toLowerCase();
-}
-
-function isRepoApprovalIssuer(vpId) {
-  return REPO_APPROVAL_ISSUER_IDS.has(normalizeId(vpId));
-}
-
-/**
- * Mint authority only inside the canonical Router path after roster identity
- * resolution. Keeping this function module-private prevents callers from
- * turning a claimed issuer string into landing authority.
- */
-function issueRepoApprovalCapability(input = {}, { now = Date.now } = {}) {
-  const sessionId = normalizeId(input.sessionId);
-  const issuerVpId = normalizeId(input.issuerVpId);
-  const recipientVpId = normalizeId(input.recipientVpId);
-  const repository = normalizeApprovalRepository(input.repository);
-  const pr = Number(input.pr);
-  const baseBranch = normalizeId(input.baseBranch);
-  const baseSha = normalizeSha(input.baseSha);
-  const reviewedHead = normalizeSha(input.reviewedHead);
-  const reviewedSnapshot = normalizeSha(input.reviewedSnapshot);
-  const issuedAt = Number(now());
-  if (!sessionId || !isRepoApprovalIssuer(issuerVpId) || !recipientVpId || issuerVpId === recipientVpId
-    || !repository || !Number.isSafeInteger(pr) || pr <= 0 || !baseBranch || !baseSha
-    || !reviewedHead || !reviewedSnapshot || !Number.isFinite(issuedAt)) {
-    return null;
-  }
-  const capability = Object.freeze(Object.create(null));
-  repoApprovals.set(capability, {
-    sessionId,
-    issuerVpId,
-    recipientVpId,
-    repository,
-    pr,
-    baseBranch,
-    baseSha,
-    reviewedHead,
-    reviewedSnapshot,
-    issuedAt,
-    expiresAt: issuedAt + REPO_APPROVAL_TTL_MS,
-    turnId: null,
-  });
-  return capability;
-}
-
-export function isRepoApprovalCapability(capability) {
-  return Boolean(capability && typeof capability === 'object' && repoApprovals.has(capability));
-}
-
-/** Bind a freshly issued capability to the exact Web execution that received it. */
-export function bindRepoApprovalCapability(capability, expected = {}, { now = Date.now } = {}) {
-  if (!capability || typeof capability !== 'object') return false;
-  const grant = repoApprovals.get(capability);
-  const turnId = normalizeId(expected.turnId);
-  const currentTime = Number(now());
-  if (!grant || !turnId || !Number.isFinite(currentTime)) return false;
-  if (currentTime > grant.expiresAt
-    || grant.turnId
-    || grant.sessionId !== normalizeId(expected.sessionId)
-    || grant.recipientVpId !== normalizeId(expected.recipientVpId)) {
-    repoApprovals.delete(capability);
-    return false;
-  }
-  grant.turnId = turnId;
-  return true;
-}
-
-export function revokeRepoApprovalCapability(capability) {
-  if (!capability || typeof capability !== 'object') return false;
-  return repoApprovals.delete(capability);
-}
-
-/** Consume a capability exactly once and verify its complete landing tuple. */
-export function consumeRepoApprovalCapability(capability, expected = {}, { now = Date.now } = {}) {
-  if (!capability || typeof capability !== 'object') return null;
-  const grant = repoApprovals.get(capability);
-  repoApprovals.delete(capability);
-  if (!grant) return null;
-  const currentTime = Number(now());
-  const matches = Number.isFinite(currentTime)
-    && currentTime <= grant.expiresAt
-    && grant.turnId
-    && grant.turnId === normalizeId(expected.turnId)
-    && grant.sessionId === normalizeId(expected.sessionId)
-    && grant.recipientVpId === normalizeId(expected.recipientVpId)
-    && grant.repository === normalizeApprovalRepository(expected.repository)
-    && grant.pr === Number(expected.pr)
-    && grant.baseBranch === normalizeId(expected.baseBranch)
-    && grant.baseSha === normalizeSha(expected.baseSha)
-    && grant.reviewedHead === normalizeSha(expected.reviewedHead)
-    && grant.reviewedSnapshot === normalizeSha(expected.reviewedSnapshot);
-  return matches ? Object.freeze({ ...grant }) : null;
-}
-
 function routeForwardParentFromEnvelope(envelope) {
   const msg = envelope?.msg;
   const meta = msg?.meta;
@@ -265,24 +149,6 @@ export function createRouter(deps = {}) {
     // spec's intent ("depth of forwards already taken").
     const chain = extendCausedBy(args.inboundEnvelope || null, null);
     const routeForwardParent = routeForwardParentFromEnvelope(args.inboundEnvelope);
-    let repoApproval = null;
-    if (args.repoApproval !== undefined) {
-      if (targetVpId === 'all') {
-        return { ok: false, error: 'repo_approval_requires_single_target' };
-      }
-      if (!isRepoApprovalIssuer(senderVpId)) {
-        return { ok: false, error: 'repo_approval_issuer_forbidden' };
-      }
-      repoApproval = issueRepoApprovalCapability({
-        ...args.repoApproval,
-        sessionId: meta.id,
-        issuerVpId: senderVpId,
-        recipientVpId: targetVpId,
-      }, { now });
-      if (!repoApproval) {
-        return { ok: false, error: 'invalid_repo_approval' };
-      }
-    }
 
     // Loop guard: for broadcast, use 'all' as the target key so one VP
     // spamming @all still gets throttled even if each cycle hits different
@@ -319,7 +185,6 @@ export function createRouter(deps = {}) {
         // of UI replay and future visible history so it doesn't render as a
         // second assistant/user block after the target VP answers.
         internal: true,
-        ...(repoApproval ? { _repoApproval: repoApproval } : {}),
         meta: {
           synthetic: true,
           injectedBy: 'route_forward',

package/yeaft/tools/activation.js

@@ -55,7 +55,6 @@ export const CONDITIONAL_BUILTIN_TOOL_NAMES = new Set([
   'JsRepl',
   'NotebookEdit',
   'ImageGeneration',
-  'RepoWorkflow',
 ]);
 
 const HISTORY_INTENT_RE = /(?:\bhistory\b|\b(?:prior|previous) (?:chat|conversation|discussion)\b|\bprevious(?:ly)? discussed\b|\bwhat did we (?:decide|discuss|say|agree)\b|\b(?:our|the) (?:earlier|last) decision\b|历史|之前(?:的)?(?:对话|讨论|会话|决定)|过去(?:的)?会话|我们(?:之前|上次)(?:决定|讨论|说)了什么)/iu;
@@ -67,7 +66,6 @@ const WORK_ITEM_INTENT_RE = /(?:\bwork ?center\b|\bwork ?item\b|\bdurable tracki
 const REPL_INTENT_RE = /(?:\bjs ?repl\b|\bjavascript (?:calculation|experiment|evaluation)\b|\bcalculate\b|\bdata transform\b|JavaScript (?:计算|实验|求值)|数据转换|快速计算)/iu;
 const NOTEBOOK_INTENT_RE = /(?:\.ipynb\b|\bjupyter\b|\bnotebook (?:cell|file)\b|Jupyter|笔记本单元格)/iu;
 const IMAGE_GENERATION_INTENT_RE = /(?:\b(?:generate|make|design|draw) (?:me |us )?(?:an? |the )?(?:image|picture|logo|icon|illustration|graphic)\b|\bcreate (?:me |us )?(?:an? |the )?(?:illustration|image|picture|logo|icon|graphic)\b|生成(?:一张)?(?:图片|图像|标志|图标|插图)|创建(?:一张)?(?:插图|图片|图像|标志|图标)|画(?:一张)?(?:图|图片|图标))/iu;
-const REPO_WORKFLOW_INTENT_RE = /(?:\b(?:git |github )?(?:worktree|pull request|pr) (?:workflow|review|merge|landing|prepare)\b|\b(?:review|merge|land|prepare) (?:a |the )?(?:github )?(?:pull request|pr)\b|\bhead[- ]match(?:ed)? merge\b|\bmerge (?:and|\+) tag\b|\breview[- ]prep\b|\bye?aft-repo\b|仓库(?:工作流|流程)|准备(?:开发|审查|review) worktree|(?:审查|评审|合并|准备) ?(?:github )?(?:pr|pull request|拉取请求)|合并(?:并|和)?打 tag|精确 head 合并)/iu;
 const MCP_INTENT_RE = /(?:\bmcp\b|model context protocol|模型上下文协议)/iu;
 
 function messageText(message) {
@@ -159,7 +157,6 @@ export function resolveActiveToolNames({
   if (REPL_INTENT_RE.test(intentText)) active.add('JsRepl');
   if (NOTEBOOK_INTENT_RE.test(intentText)) active.add('NotebookEdit');
   if (imageGenerationConfigured && IMAGE_GENERATION_INTENT_RE.test(intentText)) active.add('ImageGeneration');
-  if (REPO_WORKFLOW_INTENT_RE.test(intentText)) active.add('RepoWorkflow');
 
   for (const name of matchedMcpTools(intentText, toolNames)) active.add(name);
 

package/yeaft/tools/index.js

@@ -22,7 +22,6 @@ import { ToolRegistry } from './registry.js';
 import skillTool from './skill.js';
 import enterWorktree from './enter-worktree.js';
 import exitWorktree from './exit-worktree.js';
-import repoWorkflow from './repo-workflow.js';
 
 // --- P0 Core tools ---
 import askUser from './ask-user.js';
@@ -89,7 +88,6 @@ export const allTools = [
   skillTool,
   enterWorktree,
   exitWorktree,
-  repoWorkflow,
 
   // P0 Core
   askUser,

package/yeaft/tools/route-forward.js

@@ -99,23 +99,6 @@ Returns JSON: { ok, dispatched?, error?, detail? }.`,
           zh: '可选：转交的简短原因',
         },
       },
-      repoApproval: {
-        type: 'object',
-        description: {
-          en: 'Optional structured repository landing approval. The host binds it to the authenticated sender VP, target VP, and current Session, then issues a non-serializable one-time capability.',
-          zh: '可选的结构化仓库落地批准。宿主会将其绑定到真实发送 VP、目标 VP 和当前 Session，并签发不可序列化的一次性 capability。',
-        },
-        properties: {
-          repository: { type: 'string', description: 'GitHub owner/repository identity' },
-          pr: { type: 'integer', minimum: 1 },
-          baseBranch: { type: 'string', description: 'Exact approved destination branch' },
-          baseSha: { type: 'string', description: 'Exact approved 40-character base SHA' },
-          reviewedHead: { type: 'string', description: 'Exact approved 40-character PR head SHA' },
-          reviewedSnapshot: { type: 'string', description: 'Exact approved 40-character merge snapshot SHA' },
-        },
-        required: ['repository', 'pr', 'baseBranch', 'baseSha', 'reviewedHead', 'reviewedSnapshot'],
-        additionalProperties: false,
-      },
     },
     required: ['to', 'text'],
   },
@@ -126,7 +109,7 @@ Returns JSON: { ok, dispatched?, error?, detail? }.`,
   // dispatch is rejected; the cost is one fresh read, not stale workspace data.
   mayMutateWorkspaceAfterReturn: () => true,
   async execute(input, ctx = {}) {
-    const { to, text, reason, repoApproval } = input || {};
+    const { to, text, reason } = input || {};
     if (!to || typeof to !== 'string') {
       return JSON.stringify({ ok: false, error: 'to_required' });
     }
@@ -151,7 +134,6 @@ Returns JSON: { ok, dispatched?, error?, detail? }.`,
         taskId: ctx.taskId ?? null,
         inboundEnvelope: ctx.inboundEnvelope ?? null,
         sourceThreadId: ctx.threadId ?? null,
-        repoApproval,
       },
       { taskMembers: ctx.taskMembers },
     );

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();