feat: PR 审核流程 + 自动合并 + macOS 通知 + 订阅额度透传 + 归档详情

PR 流程（开发→提PR→CodeReview→安全审计→审核→通过即合并）：
- reviewer 拆分为 code review 与安全审计两个独立 CC run（kind=reviewer/security），
  TaskResult 四字段(summary/verdict + securitySummary/securityVerdict)，闸上两节报告两枚结论徽章
- executor/merge.ts: 通过即合并——临时 worktree 内 merge --no-ff，绝不碰用户工作区/不 push；
  冲突安全拒绝(报冲突文件)；重复合并幂等；合并后回收执行 worktree + 删分支
- decide 路由 merge:false 逃生口 + 看板「仅通过」按钮(目标分支被工作区检出时用)

通知（daemon/notify.ts）：
- macOS 原生通知: 进审核闸(复审建议拒绝标⚠)/连续失败需人工/合并完成
- 同任务同类型 60s 抑制、osascript 转义截断、MAESTRO_NOTIFY=0 关闭

订阅额度透传（daemon/usage.ts）：
- OAuth usage API(与 Claude Code/claude-hud 同源)，凭证 keychain→内存零泄漏
- 60s 成败双缓存+并发去重+5s 超时，失败降级 null
- GET /api/agents 顶层 usage 字段；Agent 面板显示 5h/周用量条+重置倒计时(>80%琥珀/>95%红)

看板与生命周期：
- 归档区: 深度1整树完成沉底，时间倒序分页(尺寸 chip 10/20/50/100 置底)
- 归档详情对话框: 全属性/执行历史与时长/审批记录/状态流转时间线(GET /api/tasks/:id/events)
- 容器收口: 已拆解 Hard 子任务全 done 自动 done(afterDone 逐级向上)
- 同步按钮收进配置面板；执行白名单扩测试命令(npm/go/shellcheck/make/pytest)
- Agent 面板显示调度模式与各复杂度模型；被依赖阻塞→被阻塞

测试: 74/74(新增 merge 6/notify 10/usage 7/容器收口/双复审适配)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

src/daemon/orchestrator.ts

@@ -4,7 +4,7 @@ import { rankByScore } from '../model/scoring.js';
 import { createWorktree, worktreeDiff, type WorktreeDiff, type WorktreeInfo } from '../executor/worktree.js';
 import { runTask, type RunnerFn } from '../executor/runner.js';
 import { runVerify, type VerifyFn } from '../executor/verify.js';
-import { reviewTask, type ReviewerFn } from '../executor/reviewer.js';
+import { reviewCode, reviewSecurity, type ReviewerFn } from '../executor/reviewer.js';
 import { pickModel } from '../executor/models.js';
 
 /** 失败后最多自动重试次数（重试 2 次 = 最多 3 次执行），之后 → needs_attention */
@@ -18,7 +18,8 @@ export interface OrchestratorLogger {
 /** 依赖注入点：测试传 mock，生产用真实现 */
 export interface OrchestratorDeps {
   runner: RunnerFn;
-  reviewer: ReviewerFn;
+  reviewCode: ReviewerFn;        // code review（kind=reviewer 的 run）
+  reviewSecurity: ReviewerFn;    // 安全审计（kind=security 的 run）
   verify: VerifyFn;
   createWorktree: (repoPath: string, taskId: string, baseBranch: string) => Promise<WorktreeInfo>;
   worktreeDiff: (repoPath: string, dir: string, branch: string, baseBranch: string) => Promise<WorktreeDiff>;
@@ -40,7 +41,7 @@ export interface Orchestrator {
  * 成功 → setResult + exec_review；失败 → failed → 重试 ≤MAX_RETRIES 次 → needs_attention。
  */
 export function createOrchestrator(store: Store, log: OrchestratorLogger, deps: Partial<OrchestratorDeps> = {}): Orchestrator {
-  const d: OrchestratorDeps = { runner: runTask, reviewer: reviewTask, verify: runVerify, createWorktree, worktreeDiff, ...deps };
+  const d: OrchestratorDeps = { runner: runTask, reviewCode, reviewSecurity, verify: runVerify, createWorktree, worktreeDiff, ...deps };
   const inflight = new Map<string, string>();       // taskId → projectId
   const pending = new Set<Promise<void>>();
 
@@ -63,7 +64,39 @@ export function createOrchestrator(store: Store, log: OrchestratorLogger, deps:
     return rankByScore(candidates, tasks);
   }
 
-  /** 单任务全流程：executing → worktree → run → verify → reviewer(复审，失败不挡) → setResult(summary/verdict) → exec_review / failed(重试) */
+  /** 跑一个独立复审 run（kind=reviewer/security）。任何失败折叠为 summary=失败原因、verdict=null，不抛错、不挡任务。 */
+  async function runOneReview(
+    kind: 'reviewer' | 'security',
+    fn: ReviewerFn,
+    task: Task,
+    project: Project,
+    wt: WorktreeInfo,
+    executorReport: string,
+  ): Promise<{ summary: string | null; verdict: ReviewVerdict | null }> {
+    const label = kind === 'reviewer' ? 'code review' : '安全审计';
+    let reviewRunId: string | null = null;
+    try {
+      const review = store.startRun(task.id, kind, { worktree: wt.dir, branch: wt.branch });
+      reviewRunId = review.id;
+      log.info(`${label} 任务 ${task.id} run=${review.id} model=${pickModel(task, project, 'reviewer')}`);
+      const rv = await fn(task, project, wt, review.id, executorReport);
+      store.finishRun(review.id, 'succeeded', {
+        transcriptRef: rv.transcriptRef ?? undefined,
+        claudeSessionId: rv.sessionId ?? undefined,
+      });
+      log.info(`任务 ${task.id} ${label} 完成 verdict=${rv.verdict ?? '（未解析到）'}`);
+      return { summary: rv.summary, verdict: rv.verdict };
+    } catch (e) {
+      const reMsg = (e as Error).message;
+      if (reviewRunId) {
+        try { store.finishRun(reviewRunId, 'failed', { error: reMsg }); } catch { /* 收尾失败不影响主流程 */ }
+      }
+      log.error(`任务 ${task.id} ${label} 失败（不挡任务，照常进 exec_review）：${reMsg}`);
+      return { summary: `自动复审失败：${reMsg}`, verdict: null };
+    }
+  }
+
+  /** 单任务全流程：executing → worktree → run → verify → code review run → 安全审计 run（均失败不挡）→ setResult(四字段) → exec_review / failed(重试) */
   async function executeTask(project: Project, task: Task): Promise<void> {
     let runId: string | null = null;
     let runClosed = false;
@@ -98,36 +131,15 @@ export function createOrchestrator(store: Store, log: OrchestratorLogger, deps:
 
       const diff = await d.worktreeDiff(project.repoPath, wt.dir, wt.branch, project.defaultBranch);
 
-      // 自动复审（kind=reviewer 的新 run）：失败不挡任务，summary 记失败原因、verdict=null
-      let summary: string | null = null;
-      let verdict: ReviewVerdict | null = null;
-      let reviewRunId: string | null = null;
-      try {
-        const review = store.startRun(task.id, 'reviewer', { worktree: wt.dir, branch: wt.branch });
-        reviewRunId = review.id;
-        log.info(`复审任务 ${task.id} run=${review.id} model=${pickModel(task, project, 'reviewer')}`);
-        const rv = await d.reviewer(task, project, wt, review.id, rr.finalText ?? '');
-        summary = rv.summary;
-        verdict = rv.verdict;
-        store.finishRun(review.id, 'succeeded', {
-          transcriptRef: rv.transcriptRef ?? undefined,
-          claudeSessionId: rv.sessionId ?? undefined,
-        });
-        log.info(`任务 ${task.id} 复审完成 verdict=${verdict ?? '（未解析到）'}`);
-      } catch (e) {
-        const reMsg = (e as Error).message;
-        summary = `自动复审失败：${reMsg}`;
-        verdict = null;
-        if (reviewRunId) {
-          try { store.finishRun(reviewRunId, 'failed', { error: reMsg }); } catch { /* 收尾失败不影响主流程 */ }
-        }
-        log.error(`任务 ${task.id} 复审失败（不挡任务，照常进 exec_review）：${reMsg}`);
-      }
+      // 双复审（顺序）：code review run（kind=reviewer）→ 安全审计 run（kind=security）。任一失败不挡任务。
+      const code = await runOneReview('reviewer', d.reviewCode, task, project, wt, rr.finalText ?? '');
+      const sec = await runOneReview('security', d.reviewSecurity, task, project, wt, rr.finalText ?? '');
 
       store.setResult(task.id, {
         branch: wt.branch, worktree: wt.dir,
         diffSummary: diff.diffSummary, commits: diff.commits, prUrl: null,
-        summary, verdict,
+        summary: code.summary, verdict: code.verdict,
+        securitySummary: sec.summary, securityVerdict: sec.verdict,
       });
       store.transition(task.id, 'exec_review', { by: 'orchestrator', runId: run.id });
       store.finishRun(run.id, 'succeeded', {