termdock 1.3.0 → 1.4.0

package/dist/server/routes/terminal.js

@@ -9,6 +9,8 @@ import { execFile, spawn } from 'child_process';
 import { randomUUID } from 'crypto';
 import { promisify } from 'util';
 import { caffeinateManager } from '../utils/caffeinate.js';
+import { gitStatusCache } from '../utils/gitStatus.js';
+import { getPtyHostManager } from '../ptyhost/manager.js';
 import { pathValidator } from '../utils/pathValidator.js';
 import { TERMINAL, TMUX } from '../config.js';
 import { localAccessManager } from '../utils/localAccess.js';
@@ -16,6 +18,9 @@ import { normalizeLocalAccessName } from '../utils/settings.js';
 import { getOnboardingServerUrl } from '../onboardingServer.js';
 import { getFocusSequence, removeClientFocusState, scanFocusTrackingMode, setClientFocusState, } from '../utils/tmuxFocus.js';
 import { extractProgramLabelFromArgs, normalizeProgramName, normalizeTmuxMetadataProgram, selectTmuxForegroundProgram, tmuxMetadataChanged, } from '../utils/tmuxProgramDetection.js';
+import { agentBySlug, buildResumeCommand, detectAgentFromCommand, } from '../agent/registry.js';
+import { applyAgentEvent, defaultAgentSessionState, parseAgentEvent, } from '../agent/session.js';
+import { installHooks, listHookAgents, refreshStaleHooksAtLaunch, uninstallHooks, } from '../agent/installers.js';
 const router = express.Router();
 const execFileAsync = promisify(execFile);
 const TERMDOCK_DIR = `${os.homedir()}/.termdock`;
@@ -97,6 +102,81 @@ let lastBroadcastClientStateSignature = null;
 const inventoryOpenLocks = new Map();
 const CONTROL_BROADCAST_COALESCE_MS = 50;
 const SESSION_INVENTORY_CACHE_TTL_MS = 1500;
+// 最近活跃优先排序：不是竞速榜，只分「最近活跃」和「非活跃」两组。
+// 活跃组整体在前，组内保持当前相对顺序，避免两个持续输出的 session
+// 按毫秒级 lastActivity 来回抢第一个位置。
+const RECENT_ACTIVITY_WINDOW_MS = 60_000;
+const ACTIVITY_REORDER_COOLDOWN_MS = 5_000;
+const ACTIVITY_REORDER_PERIODIC_MS = 30_000;
+let activityReorderTimer = null;
+let activityReorderPeriodicTimer = null;
+let activityReorderEnabled = true;
+function getEffectiveLastActivity(session) {
+    // 只用 PTY 输出时间判断「最近活跃」——resize / input / connect
+    // 不参与排序，避免拖窗口尺寸等非输出操作导致 session 跳到前面。
+    if (session.backendSessionId) {
+        const backend = terminalSessions.get(session.backendSessionId);
+        if (backend)
+            return backend.lastOutputAt;
+    }
+    return session.lastActivity;
+}
+function applyActivityBasedReorder() {
+    if (!activityReorderEnabled)
+        return;
+    const sessions = globalSessionState.sessions;
+    if (sessions.length <= 1)
+        return;
+    const now = Date.now();
+    const recentlyActive = [];
+    const inactive = [];
+    for (const session of sessions) {
+        const la = getEffectiveLastActivity(session);
+        if (now - la <= RECENT_ACTIVITY_WINDOW_MS) {
+            recentlyActive.push(session);
+        }
+        else {
+            inactive.push(session);
+        }
+    }
+    // 两个 bucket 内各自保持原有相对顺序，只是活跃组整体提前
+    const reordered = [...recentlyActive, ...inactive];
+    const orderChanged = sessions.map(s => s.sessionId).join('\x00') !== reordered.map(s => s.sessionId).join('\x00');
+    if (!orderChanged)
+        return;
+    globalSessionState = {
+        sessions: reordered,
+        updatedAt: Date.now(),
+    };
+    persistAndBroadcastGlobalState();
+}
+function scheduleActivityReorder() {
+    if (activityReorderTimer)
+        return;
+    activityReorderTimer = setTimeout(() => {
+        activityReorderTimer = null;
+        applyActivityBasedReorder();
+    }, ACTIVITY_REORDER_COOLDOWN_MS);
+    activityReorderTimer.unref?.();
+}
+function startActivityReorderPeriodic() {
+    if (activityReorderPeriodicTimer)
+        return;
+    activityReorderPeriodicTimer = setInterval(() => {
+        applyActivityBasedReorder();
+    }, ACTIVITY_REORDER_PERIODIC_MS);
+    activityReorderPeriodicTimer.unref?.();
+}
+function stopActivityReorderPeriodic() {
+    if (activityReorderPeriodicTimer) {
+        clearInterval(activityReorderPeriodicTimer);
+        activityReorderPeriodicTimer = null;
+    }
+    if (activityReorderTimer) {
+        clearTimeout(activityReorderTimer);
+        activityReorderTimer = null;
+    }
+}
 async function getSessionInventorySnapshot(options = {}) {
     const now = Date.now();
     if (!options.refresh && latestSessionInventory && now - latestSessionInventoryAt < SESSION_INVENTORY_CACHE_TTL_MS) {
@@ -378,14 +458,22 @@ function flushPersistAndExit() {
     }
     catch { /* best effort */ }
 }
-process.on('SIGTERM', () => { flushPersistAndExit(); void persistToolbarPresetsNow(); caffeinateManager.shutdown(); process.exit(0); });
-process.on('SIGINT', () => { flushPersistAndExit(); void persistToolbarPresetsNow(); caffeinateManager.shutdown(); process.exit(0); });
+process.on('SIGTERM', () => { stopActivityReorderPeriodic(); flushPersistAndExit(); void persistToolbarPresetsNow(); caffeinateManager.shutdown(); process.exit(0); });
+process.on('SIGINT', () => { stopActivityReorderPeriodic(); flushPersistAndExit(); void persistToolbarPresetsNow(); caffeinateManager.shutdown(); process.exit(0); });
 // 服务启动时从磁盘加载（带去重，防止历史累积的重复条目复活）
 void (async () => {
     await loadGlobalSessionStateFromDisk();
     await watchGlobalSessionStateFile();
+    // pty-host adoption runs after the state load (its record upserts must not
+    // be clobbered) and before pruning (surviving shell records' backends are
+    // live in the host, so they're not orphans).
+    await adoptPtyHostSessions().catch((error) => {
+        console.warn('[pty-host] adoption failed:', error.message);
+    });
     pruneOrphanSessions();
     await backfillPersistedTmuxMetadata();
+    startActivityReorderPeriodic();
+    applyActivityBasedReorder();
 })();
 caffeinateManager.startNetworkMonitor();
 // 清理磁盘恢复后后端已不存在的 session 引用。
@@ -448,15 +536,40 @@ async function backfillPersistedTmuxMetadata() {
                 '@termdock-version': TERMDOCK_VERSION,
                 '@termdock-host': TERMDOCK_HOST,
                 '@termdock-pid': TERMDOCK_PID,
+                // Agent-hook plumbing (see ensureManagedTmuxSessionReady): backfilled
+                // at startup so sessions created before this feature get it too.
+                'allow-passthrough': 'on',
             };
             const existingCreatedAt = await getTmuxOption(s.tmuxSessionName, '@termdock-created-at');
             if (!existingCreatedAt) {
                 baseOptions['@termdock-created-at'] = String(Date.now());
             }
             await setTmuxOptions(s.tmuxSessionName, baseOptions);
+            try {
+                await runTmux(['set-environment', '-t', s.tmuxSessionName, 'TERMDOCK', '1']);
+            }
+            catch { /* best effort */ }
             if (s.customName === true && typeof s.name === 'string' && s.name.trim().length > 0) {
                 await setTmuxOption(s.tmuxSessionName, '@termdock-friendly-name', s.name);
             }
+            // label/program/cwd 是动态值，正常由在线轮询维护；这里只在缺失时补——
+            // 用持久化记录里的 last-known 计算,保证 server 重启后、首个客户端连上前,
+            // CLI(td --tls / tmux show)已经能看到名字。已有值不覆盖(可能更新鲜)。
+            const existingLabel = await getTmuxOption(s.tmuxSessionName, '@termdock-label');
+            if (!existingLabel) {
+                const program = normalizeMetadataProgram(s.activeProgram ?? null);
+                const label = buildTermdockLabel({
+                    friendlyName: s.customName === true && s.name.trim().length > 0 ? s.name : null,
+                    program,
+                    cwd: s.cwd ?? null,
+                    sessionName: s.tmuxSessionName,
+                });
+                await setTmuxOptions(s.tmuxSessionName, {
+                    '@termdock-label': label,
+                    '@termdock-program': program ?? '',
+                    '@termdock-cwd': s.cwd ?? '',
+                });
+            }
         }
         catch (error) {
             console.warn(`[tmux] failed to backfill metadata on ${s.tmuxSessionName}: ${getErrorMessage(error)}`);
@@ -617,6 +730,9 @@ function normalizePersistedClientSession(input) {
         cwd: typeof candidate.cwd === 'string' && candidate.cwd.trim().length > 0
             ? candidate.cwd
             : null,
+        activeProgram: typeof candidate.activeProgram === 'string' && candidate.activeProgram.trim().length > 0
+            ? candidate.activeProgram
+            : null,
     };
 }
 function generateTmuxSessionName() {
@@ -682,7 +798,7 @@ function makeTerminalSessionPayload(backendSessionId, session, cols = 80, rows =
         rows,
         mode: session.mode,
         tmuxSessionName: session.tmuxSessionName,
-        activeProgram: session.activeProgram?.command ?? null,
+        activeProgram: session.activeProgram?.command ?? getPersistedActiveProgramForBackend(backendSessionId),
         activeProgramRaw: session.activeProgram?.rawArgs ?? null,
         activeProgramSource: session.activeProgram?.source ?? null,
         cwd: session.cwd ?? null,
@@ -907,6 +1023,24 @@ function updateGlobalBindingForBackendSession(backendSessionId, patch) {
     upsertGlobalSessionRecord(updated);
     return true;
 }
+// 把检测到的前台程序名写进持久化记录（last-known 语义）：
+// - 只在非空且与已存值不同才写,null 不覆盖（检测瞬时空窗不该抹掉上次结果）;
+// - 变化频率低（程序切换才触发）,debounce 落盘即可。
+function persistActiveProgramBinding(backendSessionId, command) {
+    if (!command)
+        return;
+    const record = globalSessionState.sessions.find((session) => session.backendSessionId === backendSessionId);
+    if (!record || record.activeProgram === command)
+        return;
+    upsertGlobalSessionRecord({ ...record, activeProgram: command });
+    schedulePersistGlobalState();
+}
+// connected / open 响应用的兜底:live 检测还没出结果时,回退到磁盘上的 last-known,
+// 前端首帧就能显示上次的程序名而不是裸 session 名。
+function getPersistedActiveProgramForBackend(backendSessionId) {
+    const record = globalSessionState.sessions.find((session) => session.backendSessionId === backendSessionId);
+    return record?.activeProgram ?? null;
+}
 async function openInventorySession(req, input) {
     const normalizedMode = normalizeMode(input.mode);
     const normalizedTmuxName = normalizedMode === 'tmux'
@@ -1526,29 +1660,38 @@ async function buildSessionInventory() {
         schedulePersistGlobalState();
     }
     const liveTmuxByName = new Map(refreshedTmuxSessions.map((session) => [session.name, session]));
-    let synchronizedTmuxFriendlyName = false;
+    let synchronizedPersistedFields = false;
     globalSessionState = {
         sessions: globalSessionState.sessions.map((session) => {
-            if (session.mode !== 'tmux' || !session.tmuxSessionName) {
-                return session;
+            let next = session;
+            // CLI 侧改了 @termdock-friendly-name → 反向同步进持久化记录（tmux 限定）。
+            if (next.mode === 'tmux' && next.tmuxSessionName) {
+                const friendlyName = liveTmuxByName.get(next.tmuxSessionName)?.friendlyName?.trim();
+                if (friendlyName && !(next.customName === true && next.name === friendlyName)) {
+                    next = { ...next, name: friendlyName, customName: true };
+                    synchronizedPersistedFields = true;
+                }
             }
-            const friendlyName = liveTmuxByName.get(session.tmuxSessionName)?.friendlyName?.trim();
-            if (!friendlyName) {
-                return session;
+            // 展示名数据（activeProgram / cwd）回写:last-known 持久化,server 重启 /
+            // backend 掉线后 inventory hint 仍能给出上次的程序名与目录。
+            // live 值只以非空覆盖——检测空窗(null)不抹掉已存结果。
+            const backend = next.backendSessionId ? terminalSessions.get(next.backendSessionId) : undefined;
+            const tmuxMeta = next.tmuxSessionName ? liveTmuxByName.get(next.tmuxSessionName) : undefined;
+            const liveProgram = backend?.activeProgram?.command ?? tmuxMeta?.program ?? null;
+            const liveCwd = backend?.cwd ?? tmuxMeta?.cwd ?? null;
+            if (liveProgram && liveProgram !== (next.activeProgram ?? null)) {
+                next = { ...next, activeProgram: liveProgram };
+                synchronizedPersistedFields = true;
             }
-            if (session.customName === true && session.name === friendlyName) {
-                return session;
+            if (liveCwd && liveCwd !== (next.cwd ?? null)) {
+                next = { ...next, cwd: liveCwd };
+                synchronizedPersistedFields = true;
             }
-            synchronizedTmuxFriendlyName = true;
-            return {
-                ...session,
-                name: friendlyName,
-                customName: true,
-            };
+            return next;
         }),
-        updatedAt: synchronizedTmuxFriendlyName ? Date.now() : globalSessionState.updatedAt,
+        updatedAt: synchronizedPersistedFields ? Date.now() : globalSessionState.updatedAt,
     };
-    if (synchronizedTmuxFriendlyName) {
+    if (synchronizedPersistedFields) {
         schedulePersistGlobalState();
     }
     const clientSessions = globalSessionState.sessions.map((session) => {
@@ -1557,11 +1700,12 @@ async function buildSessionInventory() {
         const live = session.mode === 'tmux' ? tmuxLive : backendLive;
         // 展示名提示（activeProgram / cwd）：优先取在线 backend session 的实时值，
         // 其次回退到 tmux 清单里的 program/cwd（tmux 模式即使 backend 未 attach，
-        // tmux 服务端仍能给出当前 pane 的程序与目录）。让前端 hydrate 即可显示。
+        // tmux 服务端仍能给出当前 pane 的程序与目录），最后回退到持久化记录里的
+        // last-known 值（server 重启 / tmux 已死也能显示上次的标题）。让前端 hydrate 即可显示。
         const backend = backendLive ? terminalSessions.get(session.backendSessionId) : undefined;
         const tmuxMeta = session.tmuxSessionName ? liveTmuxByName.get(session.tmuxSessionName) : undefined;
-        const activeProgram = backend?.activeProgram?.command ?? tmuxMeta?.program ?? null;
-        const cwd = backend?.cwd ?? tmuxMeta?.cwd ?? null;
+        const activeProgram = backend?.activeProgram?.command ?? tmuxMeta?.program ?? session.activeProgram ?? null;
+        const cwd = backend?.cwd ?? tmuxMeta?.cwd ?? session.cwd ?? null;
         return {
             ...session,
             frontendSessionId: session.sessionId,
@@ -1798,6 +1942,8 @@ function sniffOsc(buf, home) {
     let promptState = null;
     let exitCode = null;
     let tuiProgress = null;
+    const agentEvents = [];
+    let notification = null;
     let lastMatchEnd = 0;
     OSC_ANY_PATTERN.lastIndex = 0;
     while ((match = OSC_ANY_PATTERN.exec(buf)) !== null) {
@@ -1838,253 +1984,330 @@ function sniffOsc(buf, home) {
         }
         else if (oscNum === '9') {
             const progress = parseConEmuProgressReport(oscData);
-            if (progress)
+            if (progress) {
                 tuiProgress = progress;
+            }
+            else if (oscData.trim().length > 0) {
+                // Plain OSC 9 notification (iTerm2-style): an agent pinging the user.
+                notification = oscData;
+            }
+        }
+        else if (oscNum === '777') {
+            // OSC 777 notification: `notify;<title>;<body>`. termdock's agent hooks
+            // use the sentinel title carrying a JSON event; anything else is an
+            // opaque notification from an agent without hooks installed.
+            const event = parseAgentEvent(`777;${oscData}`);
+            if (event) {
+                agentEvents.push(event);
+            }
+            else {
+                const body = parseOsc777NotificationBody(oscData);
+                if (body)
+                    notification = body;
+            }
         }
     }
     const remaining = buf.slice(lastMatchEnd).slice(-128);
-    return { cwd: lastCwd, title: lastTitle, promptState, exitCode, tuiProgress, remaining };
-}
-const AGENT_INDICATORS = new Set(['spinner', 'pulse', 'dot', 'ring', 'badge', 'terminal', 'question']);
-const DEFAULT_AGENT_CLEAR_DELAY_MS = 450;
-const MIN_AGENT_CLEAR_DELAY_MS = 80;
-const MAX_AGENT_CLEAR_DELAY_MS = 10_000;
-const COCO_WAITING_RULE_PATTERN = '(?:Tab/Arrow keys to navigate[\\s\\S]{0,200}(?:select ·|Enter))|Coco\\s*等待态采样';
-// Built-in default rules
-const BUILTIN_AGENT_RULES = [
-    {
-        program: 'claude',
-        rules: [
-            // 雪花符号(spinner) + 1-25 个中英文字母 + 3 个点(英文 ... 或中文 …)
-            // 严格按"结构"匹配,不依赖具体词,排除 token 数字/输入回显
-            { pattern: '[✢✶✻✽][A-Za-z\\u4E00-\\u9FA5]{1,25}(?:\\.{3}|…)', status: 'running', color: '#4ade80', indicator: 'spinner', clearDelayMs: 700 },
-        ],
-    },
-    {
-        program: 'opencode',
-        rules: [
-            { pattern: 'thinking|working|generating', status: 'running', color: '#4ade80', indicator: 'pulse', clearDelayMs: 900 },
-            { pattern: '~ Asking questions', status: 'waiting', color: '#facc15', indicator: 'question', clearDelayMs: 10000 },
-        ],
-    },
-    {
-        program: 'coco',
-        rules: [
-            { pattern: COCO_WAITING_RULE_PATTERN, status: 'waiting', color: '#facc15', indicator: 'question', clearDelayMs: 10000 },
-            { pattern: '[·✢❋❇✽] (thinking|working|generating)', status: 'running', color: '#4ade80', indicator: 'spinner', clearDelayMs: 700 },
-        ],
-    },
-];
-function isSameAgentRule(a, b) {
-    return a.pattern === b.pattern &&
-        a.status === b.status &&
-        a.color === b.color &&
-        a.indicator === b.indicator &&
-        a.clearDelayMs === b.clearDelayMs;
-}
-function isSingleProgramConfig(config, program) {
-    const programs = Array.isArray(config.programs)
-        ? config.programs.filter((name) => typeof name === 'string' && name.trim().length > 0)
-        : (typeof config.program === 'string' && config.program.trim().length > 0 ? [config.program] : []);
-    return programs.length === 1 && programs[0]?.trim().toLowerCase() === program;
-}
-function migrateAgentRules(rules) {
-    let changed = false;
-    const deprecatedCocoConfirmRule = {
-        pattern: 'confirm|approve|permission|continue\\?',
-        status: 'waiting',
-        color: '#facc15',
-        indicator: 'question',
-        clearDelayMs: 10000,
-    };
-    const deprecatedCocoBroadWaitingRule = {
-        pattern: 'Tab/Arrow keys to navigate|Esc to|select ·|Coco 等待态采样|AskUserQuestion|User\'s answers',
-        status: 'waiting',
-        color: '#facc15',
-        indicator: 'question',
-        clearDelayMs: 10000,
-    };
-    const cocoWaitingRule = {
-        pattern: COCO_WAITING_RULE_PATTERN,
-        status: 'waiting',
-        color: '#facc15',
-        indicator: 'question',
-        clearDelayMs: 10000,
-    };
-    const nextRules = rules
-        .filter((config) => {
-        const shouldRemove = isSingleProgramConfig(config, 'aider') &&
-            config.rules.length === 1 &&
-            isSameAgentRule(config.rules[0], {
-                pattern: 'Thinking|Generating|Working',
-                status: 'running',
-                color: '#4ade80',
-                indicator: 'pulse',
-                clearDelayMs: 900,
-            });
-        if (shouldRemove)
-            changed = true;
-        return !shouldRemove;
-    })
-        .map((config) => {
-        if (!isSingleProgramConfig(config, 'coco'))
-            return config;
-        let nextRules = config.rules.filter((rule) => !isSameAgentRule(rule, deprecatedCocoConfirmRule));
-        nextRules = nextRules.map((rule) => isSameAgentRule(rule, deprecatedCocoBroadWaitingRule) ? cocoWaitingRule : rule);
-        if (nextRules.length === config.rules.length && nextRules.every((rule, index) => isSameAgentRule(rule, config.rules[index])))
-            return config;
-        changed = true;
-        return { ...config, rules: nextRules };
-    });
-    return { rules: nextRules, changed };
-}
-// Runtime cache: program → compiled rules
-let agentRulesCache = new Map();
-let agentRulesVersion = 0;
-function normalizeAgentIndicator(value) {
-    return typeof value === 'string' && AGENT_INDICATORS.has(value)
-        ? value
-        : 'pulse';
-}
-function normalizeAgentClearDelay(value) {
-    const n = typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : DEFAULT_AGENT_CLEAR_DELAY_MS;
-    return Math.min(MAX_AGENT_CLEAR_DELAY_MS, Math.max(MIN_AGENT_CLEAR_DELAY_MS, n));
-}
-function compileAgentRules(rules) {
-    const map = new Map();
-    for (const config of rules) {
-        const compiled = config.rules.map(r => ({
-            status: r.status,
-            color: r.color,
-            indicator: normalizeAgentIndicator(r.indicator),
-            clearDelayMs: normalizeAgentClearDelay(r.clearDelayMs),
-            regex: new RegExp(r.pattern, 'i'),
-        }));
-        const programNames = Array.isArray(config.programs)
-            ? config.programs
-            : (typeof config.program === 'string' ? [config.program] : []);
-        for (const name of programNames) {
-            const normalized = typeof name === 'string' ? name.trim().toLowerCase() : '';
-            if (!normalized)
-                continue;
-            map.set(normalized, compiled);
-        }
+    return { cwd: lastCwd, title: lastTitle, promptState, exitCode, tuiProgress, agentEvents, notification, remaining };
+}
+/** The body of a `notify;<title>;<body>` OSC 777 payload, or null. */
+function parseOsc777NotificationBody(data) {
+    if (!data.startsWith('notify;'))
+        return null;
+    const rest = data.slice('notify;'.length);
+    const sep = rest.indexOf(';');
+    const body = sep >= 0 ? rest.slice(sep + 1) : rest;
+    return body.trim().length > 0 ? body : null;
+}
+// ── Rich agent session tracking (identity registry + OSC 777 hook events) ──
+//
+// Two tiers, ported from tty7:
+// 1. Identity: the activeProgram poll's rawArgs matched against the agent
+//    registry answers "*which* agent runs here" (brand, accent, icon, resume).
+// 2. Rich status: agent-side hooks emit OSC 777 sentinel events that the
+//    sniffer collects; they drive a per-pane state machine
+//    (idle/working/waiting/done) pushed to clients as `agent-status`.
+// A plain OSC 9/777 notification is the no-hooks fallback: it only means
+// "the agent pinged you" and never overrides rich state.
+/** User-defined wrapper→agent rules from the program-detection config. */
+function agentCustomCommands() {
+    return agentCommandsMap;
+}
+/** Naive whitespace split of a captured command line into argv tokens. */
+function splitCommandToArgv(command) {
+    return command
+        .split(/\s+/)
+        .map((t) => t.replace(/^["']+|["']+$/g, ''))
+        .filter((t) => t.length > 0);
+}
+/** The coding agent running in this session's foreground, per activeProgram. */
+function detectSessionAgent(session) {
+    const ap = session.activeProgram;
+    if (!ap)
+        return null;
+    const custom = agentCustomCommands();
+    if (ap.rawArgs) {
+        const hit = detectAgentFromCommand(ap.rawArgs, custom);
+        if (hit)
+            return hit;
+    }
+    if (ap.command) {
+        return detectAgentFromCommand(ap.command, custom);
     }
-    agentRulesCache = map;
-    agentRulesVersion++;
-    return map;
+    return null;
 }
-const AGENT_RULES_FILE = `${TERMDOCK_DIR}/agent-rules.json`;
-async function loadAgentRulesFromDisk() {
-    try {
-        const parsed = await readJsonFileIfExists(AGENT_RULES_FILE);
-        if (Array.isArray(parsed) && parsed.length > 0) {
-            const migrated = migrateAgentRules(parsed);
-            if (migrated.changed) {
-                await writeJsonFile(AGENT_RULES_FILE, migrated.rules);
+/** Status → indicator glyph. Colors stay client-side (CSS theme vars) so
+ *  dark/light themes render correctly; the wire carries semantics only. */
+const AGENT_STATUS_INDICATOR = {
+    idle: null,
+    working: 'spinner',
+    waiting: 'question',
+    done: 'badge',
+};
+/** The pane sits at a shell prompt (no foreground program, or a shell). Only
+ *  then does an agent-resume offer make sense — pasting a resume command into
+ *  vim/htop would corrupt its input. */
+function isPaneAtShellPrompt(session) {
+    const command = session.activeProgram?.command;
+    if (!command)
+        return true;
+    return shellNamesBackend.has(command.toLowerCase());
+}
+function buildAgentStatusPayload(sessionId, session) {
+    const state = session.agentSession;
+    const status = state ? state.status : null;
+    const indicator = status ? AGENT_STATUS_INDICATOR[status] : null;
+    let agent = session.agent;
+    let nativeSessionId = state?.sessionId ?? null;
+    // The agent just exited: keep offering its last conversation for resume
+    // (brand + native id from the persisted last-known record) while the pane
+    // sits at a shell prompt.
+    if (!agent && !nativeSessionId && isPaneAtShellPrompt(session)) {
+        const record = globalSessionState.sessions.find((s) => s.backendSessionId === sessionId);
+        if (record?.agentResume?.sessionId) {
+            const persistedAgent = agentBySlug(record.agentResume.slug);
+            if (persistedAgent) {
+                agent = persistedAgent;
+                nativeSessionId = record.agentResume.sessionId;
             }
-            return migrated.rules;
         }
     }
-    catch { /* file doesn't exist or invalid, use builtins */ }
-    return BUILTIN_AGENT_RULES;
-}
-async function loadAgentRules() {
-    return compileAgentRules(await loadAgentRulesFromDisk());
-}
-async function saveAgentRulesToDisk(rules) {
-    await writeJsonFile(AGENT_RULES_FILE, rules);
-    compileAgentRules(rules);
+    return {
+        type: 'agent-status',
+        agentStatus: status,
+        agentIndicator: indicator ?? null,
+        agent: agent
+            ? { slug: agent.slug, displayName: agent.displayName, accentColor: agent.accentColor, icon: agent.icon }
+            : null,
+        agentMessage: state?.message ?? null,
+        agentNativeSessionId: nativeSessionId,
+        agentRich: state?.rich ?? false,
+        agentActivity: state?.activity ?? 0,
+        agentCwd: state?.agentCwd ?? null,
+    };
 }
-// Initialize on startup
-void loadAgentRules();
-function isAiToolProgram(command) {
-    if (!command)
-        return false;
-    return agentRulesCache.has(command.toLowerCase());
+let lastAgentStatusSnapshots = new Map();
+function broadcastAgentStatus(sessionId, session, force = false) {
+    const payload = buildAgentStatusPayload(sessionId, session);
+    const snapshot = JSON.stringify(payload);
+    if (!force && lastAgentStatusSnapshots.get(sessionId) === snapshot)
+        return;
+    lastAgentStatusSnapshots.set(sessionId, snapshot);
+    broadcastEvent(sessionId, payload);
+}
+/** Persist the info needed to resume this pane's agent conversation after the
+ *  agent exits / the server restarts (last-known semantics, debounced). */
+function persistAgentResumeBinding(backendSessionId, session) {
+    const record = globalSessionState.sessions.find((s) => s.backendSessionId === backendSessionId);
+    if (!record)
+        return;
+    const agent = session.agent;
+    const sess = session.agentSession;
+    if (!agent || !sess?.sessionId)
+        return;
+    const next = {
+        slug: agent.slug,
+        sessionId: sess.sessionId,
+        launchArgv: sess.launchArgv,
+        updatedAt: Date.now(),
+    };
+    if (JSON.stringify(record.agentResume ?? null) === JSON.stringify(next))
+        return;
+    upsertGlobalSessionRecord({ ...record, agentResume: next });
+    schedulePersistGlobalState();
 }
 /**
- * 去除 ANSI 转义序列，保留纯文本内容
- */
-function stripAnsi(data) {
-    return data
-        .replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '') // CSI sequences
-        .replace(/\x1b\][^\x07\x1b]*(\x07|\x1b\\)/g, '') // OSC sequences
-        .replace(/\x1b[()][AB0-2]/g, '') // Charset
-        .replace(/\x1b[^[\]()0-9]/g, '') // Other escapes
-        .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f]/g, ''); // Control chars
-}
-// Retained for potential future re-enablement of agent status detection.
-void stripAnsi;
-/**
- * 基于可配置规则匹配检测 AI 工具状态
- * 只看实际输出文本，不受 resize/布局变化影响
+ * React to activeProgram changes: detect agent identity, end the rich session
+ * when the agent leaves the foreground, and stamp the launch argv (for resume
+ * flag replay) while the agent is present. Called from every activeProgram
+ * assignment site.
  */
-function detectAgentStatus(command, buf) {
-    if (!buf || buf.length < 2)
-        return null;
-    const rules = agentRulesCache.get(command.toLowerCase());
-    if (!rules)
-        return null;
-    // 只看最后 1KB，这是最新的输出
-    const tail = buf.slice(-1024);
-    for (const rule of rules) {
-        if (rule.regex.test(tail)) {
-            return { status: rule.status, color: rule.color, indicator: rule.indicator, clearDelayMs: rule.clearDelayMs };
+function syncAgentIdentity(sessionId, session) {
+    const detected = detectSessionAgent(session);
+    if (detected !== session.agent) {
+        // The agent leaving the foreground ends its session: clear the rich state
+        // so a stale "waiting" dot can't outlive the process. The poll can blip
+        // momentarily (an agent-spawned subcommand takes the foreground group),
+        // but events re-establish state on the next signal.
+        if (session.agent && session.agentSession) {
+            persistAgentResumeBinding(sessionId, session);
+            session.agentSession = null;
+        }
+        session.agent = detected;
+        broadcastAgentStatus(sessionId, session);
+    }
+    // Stamp the launch argv the identity poll captured — resume gets the flags.
+    if (detected && session.activeProgram?.rawArgs) {
+        const argv = splitCommandToArgv(session.activeProgram.rawArgs);
+        if (argv.length > 0) {
+            const sess = session.agentSession;
+            if (sess && sess.launchArgv === null) {
+                sess.launchArgv = argv;
+                persistAgentResumeBinding(sessionId, session);
+                broadcastAgentStatus(sessionId, session);
+            }
+            else if (!sess) {
+                // No session state yet (no hook events seen): remember the argv on a
+                // pending field via the resume record so an exited agent can still be
+                // resumed with its flags even if hooks never fired.
+                const record = globalSessionState.sessions.find((s) => s.backendSessionId === sessionId);
+                if (record?.agentResume && record.agentResume.slug === detected.slug && !record.agentResume.launchArgv) {
+                    upsertGlobalSessionRecord({ ...record, agentResume: { ...record.agentResume, launchArgv: argv } });
+                    schedulePersistGlobalState();
+                }
+            }
         }
     }
-    return null;
 }
-function clearAgentStatusTimer(session) {
-    if (session.agentStatusTimer) {
-        clearTimeout(session.agentStatusTimer);
-        session.agentStatusTimer = null;
-    }
-}
-function evaluateAgentStatus(sessionId, session, latestChunk) {
-    const previousStatus = session.agentStatus;
-    const command = session.activeProgram?.command;
-    if (!command || !isAiToolProgram(command)) {
-        if (previousStatus !== null) {
-            clearAgentStatusTimer(session);
-            session.agentStatus = null;
-            session.agentColor = null;
-            session.agentIndicator = null;
-            session.agentStatusClearDelayMs = DEFAULT_AGENT_CLEAR_DELAY_MS;
-            broadcastEvent(sessionId, { type: 'agent-status', agentStatus: null, agentColor: null, agentIndicator: null });
-        }
+/**
+ * Fold the sniffer's agent signals into the pane's session state and push any
+ * resulting change. Called from the PTY data path.
+ */
+function applyAgentSignals(sessionId, session, events, notification) {
+    if (events.length === 0 && !notification)
         return;
-    }
-    const detected = detectAgentStatus(command, latestChunk || session.agentStatusBuf);
-    if (detected) {
-        clearAgentStatusTimer(session);
-        const newStatus = detected.status;
-        const newColor = detected.color ?? null;
-        const newIndicator = detected.indicator;
-        session.agentStatusClearDelayMs = detected.clearDelayMs;
-        if (newStatus !== previousStatus || newColor !== session.agentColor || newIndicator !== session.agentIndicator) {
-            session.agentStatus = newStatus;
-            session.agentColor = newColor;
-            session.agentIndicator = newIndicator;
-            broadcastEvent(sessionId, { type: 'agent-status', agentStatus: newStatus, agentColor: newColor, agentIndicator: newIndicator });
+    let identityChanged = false;
+    for (const event of events) {
+        // An event naming an agent brands the pane even when the process poll
+        // can't see through a wrapper: identity via protocol.
+        if (!session.agent && event.agent) {
+            session.agent = event.agent;
+            identityChanged = true;
+        }
+        const state = session.agentSession ?? defaultAgentSessionState();
+        session.agentSession = state;
+        applyAgentEvent(state, event);
+        if (event.kind === 'session-start' || event.kind === 'session-end' || event.kind === 'stop') {
+            persistAgentResumeBinding(sessionId, session);
+        }
+        // The agent's cwd claim: allow file APIs to follow it (worktree hops).
+        if (state.agentCwd) {
+            void pathValidator.allowSessionCwd(state.agentCwd);
+        }
+    }
+    // Opaque fallback: only meaningful when we know an agent runs here, and
+    // never on top of rich state (the hooks channel owns it then).
+    if (notification && session.agent && !session.agentSession?.rich) {
+        const state = session.agentSession ?? defaultAgentSessionState();
+        session.agentSession = state;
+        if (state.status !== 'waiting' || state.message !== notification) {
+            state.status = 'waiting';
+            state.message = notification;
+        }
+    }
+    // Seed the launch argv the identity poll captured, so resume gets the
+    // flags no matter which side observed the pane first.
+    if (session.agentSession && session.agentSession.launchArgv === null && session.activeProgram?.rawArgs) {
+        const argv = splitCommandToArgv(session.activeProgram.rawArgs);
+        if (argv.length > 0) {
+            session.agentSession.launchArgv = argv;
+            persistAgentResumeBinding(sessionId, session);
+        }
+    }
+    // Agent activity (a tool completed → the working tree may have changed) is
+    // one of the git probe's triggers.
+    maybeRefreshGitStatusForAgent(sessionId, session);
+    broadcastAgentStatus(sessionId, session, identityChanged);
+}
+// ── Git status (branch + diff size) ──
+//
+// Probes are cheap (two git shell-outs) and shared through the repo-root
+// cache; triggers are event-driven rather than a timer: cwd change, command
+// end (prompt-state running→idle), and agent tool activity mid-turn.
+const lastGitStatusSnapshots = new Map();
+function refreshGitStatus(sessionId, session, opts = {}) {
+    // The agent's own cwd claim (worktree hops) wins over the pane's proc cwd.
+    const key = session.agentSession?.agentCwd ?? session.cwd ?? null;
+    if (!key) {
+        if (session.gitStatus !== null) {
+            session.gitStatus = null;
+            session.gitStatusKey = null;
+            broadcastEvent(sessionId, { type: 'git-status', gitStatus: null });
         }
         return;
     }
-    if (previousStatus !== null && !session.agentStatusTimer) {
-        session.agentStatusTimer = setTimeout(() => {
-            session.agentStatusTimer = null;
-            const recheck = detectAgentStatus(command, session.agentStatusBuf.slice(-256));
-            if (!recheck) {
-                session.agentStatus = null;
-                session.agentColor = null;
-                session.agentIndicator = null;
-                session.agentStatusClearDelayMs = DEFAULT_AGENT_CLEAR_DELAY_MS;
-                broadcastEvent(sessionId, { type: 'agent-status', agentStatus: null, agentColor: null, agentIndicator: null });
-            }
-        }, session.agentStatusClearDelayMs);
-    }
+    session.gitStatusKey = key;
+    const probe = gitStatusCache.beginProbe(key, opts.minIntervalMs);
+    if (!probe)
+        return;
+    void probe.then((status) => {
+        // The pane may have moved on while the probe ran; publish only if the
+        // probe's key is still the pane's tree (or the session switched away —
+        // then the new cwd's own trigger will publish its own).
+        if (session.gitStatusKey !== key)
+            return;
+        const snapshot = JSON.stringify(status);
+        if (lastGitStatusSnapshots.get(sessionId) === snapshot)
+            return;
+        lastGitStatusSnapshots.set(sessionId, snapshot);
+        session.gitStatus = status;
+        broadcastEvent(sessionId, { type: 'git-status', gitStatus: status });
+    }).catch(() => { });
 }
-// ── end Agent status detection ──
+/**
+ * Git probe trigger: agent tool activity means the working tree may have
+ * changed mid-turn.
+ */
+function maybeRefreshGitStatusForAgent(sessionId, session) {
+    const activity = session.agentSession?.activity ?? 0;
+    if (activity === 0 || activity === session.gitAgentActivitySeen)
+        return;
+    session.gitAgentActivitySeen = activity;
+    refreshGitStatus(sessionId, session);
+}
+/**
+ * The command that resumes this pane's last agent conversation, or null.
+ * Live state wins; falls back to the persisted last-known record.
+ */
+function resolveAgentResumeCommand(sessionId, session) {
+    const liveAgent = session.agent;
+    const live = session.agentSession;
+    if (liveAgent && live?.sessionId) {
+        const cmd = buildResumeCommand(liveAgent, live.sessionId, live.launchArgv);
+        if (cmd)
+            return cmd;
+    }
+    if (!isPaneAtShellPrompt(session))
+        return null;
+    const record = globalSessionState.sessions.find((s) => s.backendSessionId === sessionId);
+    const persisted = record?.agentResume;
+    if (!persisted?.sessionId)
+        return null;
+    const agent = agentBySlug(persisted.slug);
+    if (!agent)
+        return null;
+    return buildResumeCommand(agent, persisted.sessionId, persisted.launchArgv);
+}
+/**
+ * Deliver a prompt into an agent's PTY: bracketed paste (so multi-line
+ * prompts insert as one block instead of submitting line by line — every
+ * recognized agent's TUI enables bracketed paste), followed by CR to submit.
+ * ESC bytes are stripped so embedded content can't fake the paste terminator.
+ */
+function buildBracketedSubmitBytes(prompt) {
+    return `\x1b[200~${prompt.replace(/\x1b/g, '')}\x1b[201~\r`;
+}
+// ── end Rich agent session tracking ──
 /**
  * Resolve the "real" program name for a tmux pane.
  *
@@ -2099,10 +2322,12 @@ const DEFAULT_PROGRAM_DETECTION = {
     genericProgramNames: ['node', 'python', 'python3', 'ruby', 'perl', 'java'],
     wrapperScriptNames: ['aiden', 'ttadk', 'npx', 'yarn', 'dlx'],
     shellNames: ['bash', 'zsh', 'fish', 'sh', 'dash', 'ksh', 'tcsh', 'csh', 'nu'],
+    agentCommands: {},
 };
 let genericProgramNames = new Set(DEFAULT_PROGRAM_DETECTION.genericProgramNames);
 let wrapperScriptNames = new Set(DEFAULT_PROGRAM_DETECTION.wrapperScriptNames);
 let shellNamesBackend = new Set(DEFAULT_PROGRAM_DETECTION.shellNames);
+let agentCommandsMap = { ...DEFAULT_PROGRAM_DETECTION.agentCommands };
 async function loadProgramDetectionFromDisk() {
     try {
         const parsed = await readJsonFileIfExists(PROGRAM_DETECTION_FILE);
@@ -2112,6 +2337,10 @@ async function loadProgramDetectionFromDisk() {
             genericProgramNames: Array.isArray(parsed.genericProgramNames) ? parsed.genericProgramNames : DEFAULT_PROGRAM_DETECTION.genericProgramNames,
             wrapperScriptNames: Array.isArray(parsed.wrapperScriptNames) ? parsed.wrapperScriptNames : DEFAULT_PROGRAM_DETECTION.wrapperScriptNames,
             shellNames: Array.isArray(parsed.shellNames) ? parsed.shellNames : DEFAULT_PROGRAM_DETECTION.shellNames,
+            agentCommands: parsed.agentCommands && typeof parsed.agentCommands === 'object' && !Array.isArray(parsed.agentCommands)
+                ? Object.fromEntries(Object.entries(parsed.agentCommands)
+                    .filter(([k, v]) => typeof k === 'string' && typeof v === 'string'))
+                : {},
         };
     }
     catch { /* file doesn't exist or invalid, use defaults */ }
@@ -2121,6 +2350,7 @@ function applyProgramDetectionConfig(config) {
     genericProgramNames = new Set(config.genericProgramNames);
     wrapperScriptNames = new Set(config.wrapperScriptNames);
     shellNamesBackend = new Set(config.shellNames);
+    agentCommandsMap = { ...(config.agentCommands ?? {}) };
 }
 async function saveProgramDetectionToDisk(config) {
     await writeJsonFile(PROGRAM_DETECTION_FILE, config);
@@ -2128,6 +2358,12 @@ async function saveProgramDetectionToDisk(config) {
 }
 // Initialize on startup
 void loadProgramDetectionFromDisk().then(applyProgramDetectionConfig);
+// Startup keeper: rewrite hook integrations that point at a stale termdock
+// (package moved/updated) so they keep firing into the right emitter.
+try {
+    refreshStaleHooksAtLaunch();
+}
+catch { /* hook refresh must never block startup */ }
 async function resolveTmuxPaneProgram(pane) {
     // If pane command is a known shell, try to find a child foreground process
     const command = normalizeProgramName(pane.command);
@@ -2528,6 +2764,18 @@ async function ensureManagedTmuxSessionReady(sessionName) {
     }
     await applyTmuxScrollbackProfile(sessionName);
     await stampTmuxMetadata(sessionName);
+    // Agent-hook plumbing for panes in this session: TERMDOCK marks panes
+    // spawned here as ours (the emitter's gate), and allow-passthrough lets
+    // hooks' DCS-wrapped sentinel OSC reach us through tmux. Set here (not in
+    // the shell-integration path, which early-returns) so every managed
+    // session gets them regardless of shell type.
+    try {
+        await runTmux(['set-environment', '-t', sessionName, 'TERMDOCK', '1']);
+        await runTmux(['set-option', '-t', sessionName, 'allow-passthrough', 'on']);
+    }
+    catch (error) {
+        console.warn(`Failed to enable agent-hook plumbing for ${sessionName}: ${getErrorMessage(error)}`);
+    }
 }
 async function prepareManagedTmuxSession(sessionName, cwd) {
     await ensureTmuxSessionExists(sessionName, cwd);
@@ -2742,12 +2990,10 @@ function cleanupSession(sessionId, options) {
     if (!session) {
         return;
     }
-    if (session.agentStatusTimer) {
-        clearTimeout(session.agentStatusTimer);
-        session.agentStatusTimer = null;
-    }
     session.dataDisposable?.dispose();
     session.exitDisposable?.dispose();
+    lastAgentStatusSnapshots.delete(sessionId);
+    lastGitStatusSnapshots.delete(sessionId);
     destroyTmuxControl(session.tmuxControl);
     session.tmuxControl = undefined;
     for (const timer of session.flowPausedClientTimers.values()) {
@@ -3000,73 +3246,88 @@ function updateFocusTrackingFromOutput(sessionId, session, data) {
         emitFocusSequenceIfNeeded(sessionId, session, true, 'focus-mode-enabled');
     }
 }
-function setupPtyHandlers(sessionId, session) {
+/**
+ * The PTY output pipeline: history append + OSC sniffing + push. Live output
+ * runs with broadcast on; pty-host *replay* (adoption after a server restart)
+ * runs with broadcast off — it rebuilds history and sniffed state (cwd,
+ * prompt-state, agent sessions) without re-sending stale output to clients.
+ */
+function processSessionOutput(sessionId, session, data, opts) {
     const home = (process.env.HOME || '/root').replace(/\/+$/, '') || '/';
-    session.dataDisposable = session.ptyProcess.onData((data) => {
+    if (opts.broadcast) {
         session.lastActivity = Date.now();
+        session.lastOutputAt = Date.now();
         session.hasWrittenData = true;
-        let seq;
-        if (session.mode === 'shell') {
-            seq = addToHistory(sessionId, data);
-        }
-        if (session.mode === 'tmux') {
-            updateFocusTrackingFromOutput(sessionId, session, data);
-        }
-        // Sniff OSC sequences for CWD tracking + prompt state + title
-        try {
-            const buf = session.oscSniffBuf + data;
-            if (buf.length > OSC_SNIFF_CAP) {
-                session.oscSniffBuf = buf.slice(-OSC_SNIFF_CAP / 4); // trim
-            }
-            const result = sniffOsc(buf, home);
-            session.oscSniffBuf = result.remaining;
-            // CWD change
-            if (result.cwd && result.cwd !== session.lastOscCwd) {
-                session.lastOscCwd = result.cwd;
-                session.cwd = result.cwd;
-                // 用户在终端里 cd 到白名单外目录（如 Windows 其它盘符）时，动态放行，
-                // 否则侧边栏目录树/文件 API 会报 "Access denied: path not allowed"。
-                void pathValidator.allowSessionCwd(result.cwd);
-                if (updateGlobalBindingForBackendSession(sessionId, { cwd: result.cwd, lastActivity: session.lastActivity })) {
-                    schedulePersistGlobalState();
-                }
-                broadcastEvent(sessionId, { type: 'cwd', cwd: result.cwd });
-            }
-            // Title change — broadcast so the frontend can update tab/sidebar
-            if (result.title !== null && result.title !== session.lastOscTitle) {
-                session.lastOscTitle = result.title;
-                broadcastJsonWs(sessionId, { type: 'shell-title', title: result.title });
-            }
-            // Prompt state change (OSC 133)
-            if (result.promptState !== null && result.promptState !== session.lastPromptState) {
-                session.lastPromptState = result.promptState;
-                broadcastJsonWs(sessionId, {
-                    type: 'prompt-state',
-                    state: result.promptState,
-                    exitCode: result.exitCode,
-                });
+        scheduleActivityReorder();
+    }
+    let seq;
+    if (session.mode === 'shell') {
+        seq = addToHistory(sessionId, data);
+    }
+    if (session.mode === 'tmux') {
+        updateFocusTrackingFromOutput(sessionId, session, data);
+    }
+    // Sniff OSC sequences for CWD tracking + prompt state + title
+    try {
+        const buf = session.oscSniffBuf + data;
+        if (buf.length > OSC_SNIFF_CAP) {
+            session.oscSniffBuf = buf.slice(-OSC_SNIFF_CAP / 4); // trim
+        }
+        const result = sniffOsc(buf, home);
+        session.oscSniffBuf = result.remaining;
+        // CWD change
+        if (result.cwd && result.cwd !== session.lastOscCwd) {
+            session.lastOscCwd = result.cwd;
+            session.cwd = result.cwd;
+            // 用户在终端里 cd 到白名单外目录（如 Windows 其它盘符）时，动态放行，
+            // 否则侧边栏目录树/文件 API 会报 "Access denied: path not allowed"。
+            void pathValidator.allowSessionCwd(result.cwd);
+            if (updateGlobalBindingForBackendSession(sessionId, { cwd: result.cwd, lastActivity: session.lastActivity })) {
+                schedulePersistGlobalState();
             }
-            if (result.tuiProgress !== null) {
-                session.tuiProgress = result.tuiProgress.state === 'remove' ? null : result.tuiProgress;
-                broadcastJsonWs(sessionId, {
-                    type: 'tui-progress',
-                    tuiProgress: session.tuiProgress,
-                });
+            broadcastEvent(sessionId, { type: 'cwd', cwd: result.cwd });
+            refreshGitStatus(sessionId, session, { minIntervalMs: 0 });
+        }
+        // Title change — broadcast so the frontend can update tab/sidebar
+        if (result.title !== null && result.title !== session.lastOscTitle) {
+            session.lastOscTitle = result.title;
+            broadcastJsonWs(sessionId, { type: 'shell-title', title: result.title });
+        }
+        // Prompt state change (OSC 133)
+        if (result.promptState !== null && result.promptState !== session.lastPromptState) {
+            const wasRunning = session.lastPromptState === 'running';
+            session.lastPromptState = result.promptState;
+            broadcastJsonWs(sessionId, {
+                type: 'prompt-state',
+                state: result.promptState,
+                exitCode: result.exitCode,
+            });
+            // A command just finished — the working tree may have changed.
+            if (wasRunning && result.promptState === 'idle') {
+                refreshGitStatus(sessionId, session);
             }
         }
-        catch { /* sniff failure should never block data */ }
-        // Agent status content-based detection — DISABLED.
-        // OSC 133 promptState now provides real-time running/idle state for all
-        // programs (not just AI tools). The content-based detection was inaccurate
-        // (false positives from spinner characters in normal output, false negatives
-        // when AI tools changed their output format). Keeping the code for potential
-        // future re-enablement but not calling it.
-        // try {
-        //   if (isAiToolProgram(session.activeProgram?.command)) {
-        //     ...evaluateAgentStatus...
-        //   }
-        // } catch {}
+        if (result.tuiProgress !== null) {
+            session.tuiProgress = result.tuiProgress.state === 'remove' ? null : result.tuiProgress;
+            broadcastJsonWs(sessionId, {
+                type: 'tui-progress',
+                tuiProgress: session.tuiProgress,
+            });
+        }
+        // Rich agent events (OSC 777 sentinel from installed hooks) + the
+        // opaque notification fallback drive the per-pane agent session state.
+        if (result.agentEvents.length > 0 || result.notification) {
+            applyAgentSignals(sessionId, session, result.agentEvents, result.notification);
+        }
+    }
+    catch { /* sniff failure should never block data */ }
+    if (opts.broadcast) {
         broadcastEvent(sessionId, seq !== undefined ? { type: 'data', data, seq } : { type: 'data', data });
+    }
+}
+function setupPtyHandlers(sessionId, session) {
+    session.dataDisposable = session.ptyProcess.onData((data) => {
+        processSessionOutput(sessionId, session, data, { broadcast: true });
     });
     session.exitDisposable = session.ptyProcess.onExit(({ exitCode, signal }) => {
         console.log(`Terminal session ${sessionId} exited with code ${exitCode}, signal ${signal}`);
@@ -3088,6 +3349,17 @@ function wrapPtySpawnError(error) {
     }
     return error;
 }
+/**
+ * Shell-mode persistence via the pty-host daemon: shells live in a detached
+ * host process and survive server restarts. Set TERMDOCK_PTY_HOST=off to
+ * fall back to in-process PTYs (Windows always uses the in-process path).
+ */
+function ptyHostShellModeEnabled() {
+    // The host daemon always uses node-pty; under a Bun runtime that's the
+    // backend with known issues, so keep the in-process path there.
+    const isBun = typeof globalThis.Bun !== 'undefined';
+    return process.platform !== 'win32' && !isBun && process.env.TERMDOCK_PTY_HOST !== 'off';
+}
 async function spawnTerminalSession(req, input) {
     const cwd = await resolveWorkingDirectory(req, input.cwd);
     const cols = input.cols || 80;
@@ -3115,12 +3387,20 @@ async function spawnTerminalSession(req, input) {
         : (process.platform === 'win32' ? buildPowerShellCwdHookArgs() : []);
     const envPath = buildAugmentedPath();
     const resolvedEnv = { ...process.env, PATH: envPath };
+    // The server itself may run under tmux; spawned shells are NOT tmux panes.
+    // Inheriting TMUX/TMUX_PANE makes tmux-aware programs (incl. our own
+    // agent-hook emitter's passthrough decision) misdetect their context.
+    delete resolvedEnv.TMUX;
+    delete resolvedEnv.TMUX_PANE;
     const pty = await getPtyProvider();
     const termValue = resolveTerminalTermType(input.termType);
     const baseEnv = {
         ...resolvedEnv,
         TERM: termValue,
         COLORTERM: 'truecolor',
+        // Gates the agent-hook emitter: hooks installed globally stay silent
+        // unless the agent runs inside a termdock-spawned shell.
+        TERMDOCK: '1',
     };
     let ptyProcess = null;
     if (mode === 'shell' && process.platform !== 'win32') {
@@ -3129,13 +3409,28 @@ async function spawnTerminalSession(req, input) {
         for (const shellCandidate of shellCandidates) {
             try {
                 const env = await injectShellIntegration(shellCandidate, baseEnv);
-                ptyProcess = pty.spawn(shellCandidate, [], {
-                    name: termValue,
-                    cols,
-                    rows,
-                    cwd,
-                    env,
-                });
+                if (ptyHostShellModeEnabled()) {
+                    // The PTY lives in the detached pty-host daemon: this session
+                    // survives server restarts and is re-adopted on launch.
+                    ptyProcess = await getPtyHostManager().spawnChannel(sessionId, {
+                        shell: shellCandidate,
+                        args: [],
+                        cwd,
+                        cols,
+                        rows,
+                        env,
+                        termName: termValue,
+                    });
+                }
+                else {
+                    ptyProcess = pty.spawn(shellCandidate, [], {
+                        name: termValue,
+                        cols,
+                        rows,
+                        cwd,
+                        env,
+                    });
+                }
                 break;
             }
             catch (error) {
@@ -3172,28 +3467,28 @@ async function spawnTerminalSession(req, input) {
     }
     const session = {
         ptyProcess,
-        ptyBackend: pty.backend,
+        ptyBackend: mode === 'shell' && ptyHostShellModeEnabled() ? 'pty-host' : pty.backend,
         cwd,
         mode,
         tmuxSessionName,
         cols,
         rows,
         lastActivity: Date.now(),
+        lastOutputAt: Date.now(),
         clients: new Map(),
         createdAt: Date.now(),
         hasWrittenData: false,
         activeProgram: null,
+        agent: null,
+        agentSession: null,
+        gitStatus: null,
+        gitStatusKey: null,
+        gitAgentActivitySeen: 0,
         oscSniffBuf: '',
         lastOscCwd: null,
         lastOscTitle: null,
         lastPromptState: null,
         tuiProgress: null,
-        agentStatus: null,
-        agentColor: null,
-        agentIndicator: null,
-        agentStatusBuf: '',
-        agentStatusTimer: null,
-        agentStatusClearDelayMs: DEFAULT_AGENT_CLEAR_DELAY_MS,
         focusTrackingRequested: false,
         focusModeSniffBuf: '',
         focusAggregation: {
@@ -3205,6 +3500,8 @@ async function spawnTerminalSession(req, input) {
         ptyPausedForFlowControl: false,
     };
     terminalSessions.set(sessionId, session);
+    // First git snapshot for the pane's spawn cwd (throttle-free).
+    refreshGitStatus(sessionId, session, { minIntervalMs: 0 });
     setupPtyHandlers(sessionId, session);
     if (mode === 'tmux' && tmuxSessionName) {
         // Session was prepared before attach so the first tmux client sees the
@@ -3229,6 +3526,88 @@ async function spawnTerminalSession(req, input) {
     }
     return { sessionId, session, cols, rows };
 }
+// ── pty-host adoption (shell-mode persistence across server restarts) ──
+/**
+ * Adopt every shell session that survived in the pty-host daemon. Rebuilds
+ * the TerminalSession around a PtyHostClient, feeds the host's replay ring
+ * through the output pipeline (history + OSC/agent state, no broadcast), and
+ * re-links — or creates — the persisted client record so the session shows
+ * up as a tab again.
+ */
+async function adoptPtyHostSessions() {
+    if (!ptyHostShellModeEnabled())
+        return;
+    const adopted = await getPtyHostManager().adoptChannels();
+    if (adopted.length === 0)
+        return;
+    let createdRecords = 0;
+    for (const { meta, client } of adopted) {
+        if (terminalSessions.has(meta.id))
+            continue;
+        const session = {
+            ptyProcess: client,
+            ptyBackend: 'pty-host',
+            cwd: meta.cwd,
+            mode: 'shell',
+            tmuxSessionName: null,
+            cols: meta.cols,
+            rows: meta.rows,
+            lastActivity: Date.now(),
+            lastOutputAt: Date.now(),
+            clients: new Map(),
+            createdAt: meta.startedAt,
+            hasWrittenData: true,
+            activeProgram: null,
+            agent: null,
+            agentSession: null,
+            gitStatus: null,
+            gitStatusKey: null,
+            gitAgentActivitySeen: 0,
+            oscSniffBuf: '',
+            lastOscCwd: null,
+            lastOscTitle: null,
+            lastPromptState: null,
+            tuiProgress: null,
+            focusTrackingRequested: false,
+            focusModeSniffBuf: '',
+            focusAggregation: {
+                focusedClients: new Map(),
+                effectiveFocused: false,
+            },
+            flowPausedClients: new Set(),
+            flowPausedClientTimers: new Map(),
+            ptyPausedForFlowControl: false,
+        };
+        terminalSessions.set(meta.id, session);
+        // The host's replay ring rebuilds this server's history + sniffed state
+        // (cwd / prompt-state / agent sessions) without re-broadcasting.
+        client.onReplay((data) => {
+            processSessionOutput(meta.id, session, data, { broadcast: false });
+        });
+        setupPtyHandlers(meta.id, session);
+        refreshGitStatus(meta.id, session, { minIntervalMs: 0 });
+        // Re-link or create the persisted record so the session appears as a tab.
+        const existing = globalSessionState.sessions.find((s) => s.backendSessionId === meta.id);
+        if (!existing) {
+            const now = Date.now();
+            upsertGlobalSessionRecord({
+                sessionId: randomUUID(),
+                name: `terminal-${now.toString(36)}`,
+                backendSessionId: meta.id,
+                mode: 'shell',
+                tmuxSessionName: null,
+                createdAt: meta.startedAt,
+                lastActivity: now,
+                cwd: meta.cwd,
+            });
+            createdRecords++;
+        }
+    }
+    console.log(`[pty-host] adopted ${adopted.length} surviving shell session(s)${createdRecords > 0 ? `, created ${createdRecords} record(s)` : ''}`);
+    if (createdRecords > 0) {
+        persistAndBroadcastGlobalState();
+    }
+}
 function detectShellType(shellPath) {
     const base = shellPath.split('/').pop()?.toLowerCase() || '';
     if (base.includes('bash'))
@@ -3547,6 +3926,7 @@ router.get('/client-state', async (_req, res) => {
 });
 router.get('/session-inventory', async (_req, res) => {
     try {
+        applyActivityBasedReorder();
         const inventory = await getSessionInventorySnapshot();
         res.json(inventory);
     }
@@ -3723,6 +4103,28 @@ async function getSettingsPayload() {
         },
     };
 }
+// ── Activity reorder preference ──────────────────────────────────────
+router.get('/settings/activity-reorder', (_req, res) => {
+    res.json({ enabled: activityReorderEnabled });
+});
+router.put('/settings/activity-reorder', (req, res) => {
+    const body = req.body ?? {};
+    if (typeof body.enabled === 'boolean') {
+        activityReorderEnabled = body.enabled;
+        // 关闭后立刻停掉还在队列里的 reorder timer
+        if (!activityReorderEnabled && activityReorderTimer) {
+            clearTimeout(activityReorderTimer);
+            activityReorderTimer = null;
+        }
+        // 如果重新开启,立刻执行一次排序
+        if (activityReorderEnabled) {
+            applyActivityBasedReorder();
+        }
+        res.json({ enabled: activityReorderEnabled });
+        return;
+    }
+    res.status(400).json({ error: '"enabled" must be a boolean' });
+});
 // ── Settings (prevent sleep) ──────────────────────────────────────────
 router.get('/settings', async (_req, res) => {
     res.json(await getSettingsPayload());
@@ -3752,69 +4154,31 @@ router.put('/settings', async (req, res) => {
     }
     res.json(await getSettingsPayload());
 });
-// ── Agent detection rules API ──
-router.get('/agent-rules', async (_req, res) => {
-    res.json(await loadAgentRulesFromDisk());
+// ── Agent hooks API (rich status channel installers) ──
+router.get('/agent-hooks', (_req, res) => {
+    res.json({ agents: listHookAgents() });
 });
-router.put('/agent-rules', async (req, res) => {
-    const rules = req.body;
-    if (!Array.isArray(rules)) {
-        res.status(400).json({ error: 'Expected array of program configs' });
-        return;
+router.post('/agent-hooks/:agent/install', async (req, res) => {
+    const agent = req.params.agent;
+    try {
+        const result = await installHooks(agent);
+        res.json({ agent, ...result, state: 'installed' });
     }
-    // Basic validation
-    for (const config of rules) {
-        const hasProgram = typeof config.program === 'string' && config.program.trim().length > 0;
-        const hasPrograms = Array.isArray(config.programs) && config.programs.some((name) => typeof name === 'string' && name.trim().length > 0);
-        if ((!hasProgram && !hasPrograms) || !Array.isArray(config.rules)) {
-            res.status(400).json({ error: 'Each config must have program/programs and rules' });
-            return;
-        }
-        for (const rule of config.rules) {
-            if (!rule.pattern || !rule.status) {
-                res.status(400).json({ error: 'Each rule must have pattern and status' });
-                return;
-            }
-            // Validate regex
-            try {
-                new RegExp(rule.pattern, 'i');
-            }
-            catch {
-                res.status(400).json({ error: `Invalid regex: ${rule.pattern}` });
-                return;
-            }
-            if (rule.indicator !== undefined && !AGENT_INDICATORS.has(rule.indicator)) {
-                res.status(400).json({ error: `Invalid indicator: ${rule.indicator}` });
-                return;
-            }
-            if (rule.clearDelayMs !== undefined) {
-                const delay = Number(rule.clearDelayMs);
-                if (!Number.isFinite(delay) || delay < MIN_AGENT_CLEAR_DELAY_MS || delay > MAX_AGENT_CLEAR_DELAY_MS) {
-                    res.status(400).json({ error: `clearDelayMs must be ${MIN_AGENT_CLEAR_DELAY_MS}-${MAX_AGENT_CLEAR_DELAY_MS}` });
-                    return;
-                }
-            }
-        }
+    catch (error) {
+        res.status(400).json({ error: error.message });
     }
-    await saveAgentRulesToDisk(rules);
-    broadcastControlEvent({
-        type: 'config-updated',
-        key: 'agent-rules',
-        updatedAt: Date.now(),
-    });
-    res.json(rules);
 });
-router.delete('/agent-rules', async (_req, res) => {
-    // Remove custom rules file so builtins take effect again
-    await fs.promises.unlink(AGENT_RULES_FILE).catch(() => undefined);
-    compileAgentRules(BUILTIN_AGENT_RULES);
-    broadcastControlEvent({
-        type: 'config-updated',
-        key: 'agent-rules',
-        updatedAt: Date.now(),
-    });
-    res.json(BUILTIN_AGENT_RULES);
+router.post('/agent-hooks/:agent/uninstall', async (req, res) => {
+    const agent = req.params.agent;
+    try {
+        const summary = await uninstallHooks(agent);
+        res.json({ agent, summary, state: 'not-installed' });
+    }
+    catch (error) {
+        res.status(400).json({ error: error.message });
+    }
 });
+// ── end Agent hooks API ──
 // ── Program detection config API ──
 router.get('/program-detection', async (_req, res) => {
     res.json(await loadProgramDetectionFromDisk());
@@ -3953,14 +4317,23 @@ router.get('/:sessionId/stream', async (req, res) => {
         mode: session.mode,
         tmuxSessionName: session.tmuxSessionName,
         cwd: session.cwd ?? null,
-        activeProgram: session.activeProgram?.command ?? null,
+        activeProgram: session.activeProgram?.command ?? getPersistedActiveProgramForBackend(sessionId),
         activeProgramRaw: session.activeProgram?.rawArgs ?? null,
         activeProgramSource: session.activeProgram?.source ?? null,
-        agentStatus: session.agentStatus,
-        agentColor: session.agentColor,
-        agentIndicator: session.agentIndicator,
         tuiProgress: session.tuiProgress,
+        // 标题/prompt 状态只在「变化」时广播，且去重基准在 server 端——刷新后的
+        // 新客户端不会收到重发。连接即推当前值，否则 tab 名塌回默认直到下次变化。
+        shellTitle: session.lastOscTitle,
+        promptState: session.lastPromptState,
     });
+    // Rich agent state rides its own message so the connected payload stays
+    // backward compatible; force past the dedupe snapshot.
+    if (session.agent || session.agentSession) {
+        writeSse(res, buildAgentStatusPayload(sessionId, session));
+    }
+    if (session.gitStatus) {
+        writeSse(res, { type: 'git-status', gitStatus: session.gitStatus });
+    }
     let tmuxInterval = null;
     let activeProgramInterval = null;
     let lastTmuxLayoutSnapshot = '';
@@ -3974,8 +4347,9 @@ router.get('/:sessionId/stream', async (req, res) => {
         }
         lastActiveProgramSnapshot = snapshot;
         session.activeProgram = activeProgram;
+        persistActiveProgramBinding(sessionId, activeProgram?.command);
         // Agent status: react to AI tool start/exit
-        evaluateAgentStatus(sessionId, session);
+        syncAgentIdentity(sessionId, session);
         console.log(`[active-program][shell-sse] session=${sessionId} client=${clientId} cmd=${activeProgram?.command ?? null} source=${activeProgram?.source ?? null}`);
         writeSse(res, {
             type: 'active-program',
@@ -4017,6 +4391,7 @@ router.get('/:sessionId/stream', async (req, res) => {
                     schedulePersistGlobalState();
                 }
                 writeSse(res, { type: 'cwd', cwd: newCwd });
+                refreshGitStatus(sessionId, session, { minIntervalMs: 0 });
             }
             // tmux 消费了 inner shell 发的 OSC 2/133，不透传到外层 PTY。
             // 从 tmux layout 提取 active pane 的 title 和 command 来推导。
@@ -4029,8 +4404,12 @@ router.get('/:sessionId/stream', async (req, res) => {
                 const paneCmd = activePane.command || '';
                 const inferredState = paneCmd && !shellNamesBackend.has(paneCmd) ? 'running' : 'idle';
                 if (inferredState !== session.lastPromptState) {
+                    const wasRunning = session.lastPromptState === 'running';
                     session.lastPromptState = inferredState;
                     writeSse(res, { type: 'prompt-state', state: inferredState });
+                    if (wasRunning && inferredState === 'idle') {
+                        refreshGitStatus(sessionId, session);
+                    }
                 }
             }
             // Mirror dynamic metadata onto tmux user options (cheap when nothing
@@ -4177,6 +4556,48 @@ router.post('/:sessionId/input', express.text({ type: '*/*' }), (req, res) => {
         res.status(500).json({ error: errorMessage || 'Failed to write to terminal' });
     }
 });
+/**
+ * Resume the pane's last agent conversation: rebuild the agent's native
+ * resume command (carrying the original launch flags) and deliver it via
+ * bracketed paste. Refused while an agent turn is in flight — pasting a
+ * resume into a busy TUI would corrupt its input.
+ */
+router.post('/:sessionId/agent-resume', (req, res) => {
+    const { sessionId } = req.params;
+    const session = terminalSessions.get(sessionId);
+    if (!session) {
+        return res.status(404).json({ error: 'Terminal session not found' });
+    }
+    const live = session.agentSession;
+    if (session.agent && live && (live.status === 'working' || live.status === 'waiting')) {
+        return res.status(409).json({ error: 'agent is busy; wait for the turn to finish' });
+    }
+    const command = resolveAgentResumeCommand(sessionId, session);
+    if (!command) {
+        return res.status(404).json({ error: 'no resumable agent session for this pane' });
+    }
+    try {
+        session.ptyProcess.write(buildBracketedSubmitBytes(command));
+        session.lastActivity = Date.now();
+        res.json({ success: true, command });
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ error: errorMessage || 'Failed to write to terminal' });
+    }
+});
+/** Whether this pane has a resumable agent conversation (for the UI affordance). */
+router.get('/:sessionId/agent-resume', (req, res) => {
+    const { sessionId } = req.params;
+    const session = terminalSessions.get(sessionId);
+    if (!session) {
+        return res.status(404).json({ error: 'Terminal session not found' });
+    }
+    const command = resolveAgentResumeCommand(sessionId, session);
+    const busy = !!(session.agent && session.agentSession
+        && (session.agentSession.status === 'working' || session.agentSession.status === 'waiting'));
+    res.json({ available: command !== null, command, busy });
+});
 router.post('/:sessionId/resize', (req, res) => {
     const { sessionId } = req.params;
     const session = terminalSessions.get(sessionId);
@@ -4566,13 +4987,12 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
             mode: session.mode,
             tmuxSessionName: session.tmuxSessionName,
             cwd: session.cwd ?? null,
-            activeProgram: session.activeProgram?.command ?? null,
+            activeProgram: session.activeProgram?.command ?? getPersistedActiveProgramForBackend(sessionId),
             activeProgramRaw: session.activeProgram?.rawArgs ?? null,
             activeProgramSource: session.activeProgram?.source ?? null,
-            agentStatus: session.agentStatus,
-            agentColor: session.agentColor,
-            agentIndicator: session.agentIndicator,
             tuiProgress: session.tuiProgress,
+            shellTitle: session.lastOscTitle,
+            promptState: session.lastPromptState,
             focusTrackingRequested: session.focusTrackingRequested,
             // 短线重连补帧：
             // replayChunks 为补发数据；replayLastSeq 是客户端应记录的新基线；
@@ -4581,6 +5001,13 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
             replayLastSeq,
             replayOutOfWindow,
         }));
+        // Rich agent state rides its own message (see the SSE path above).
+        if (session.agent || session.agentSession) {
+            ws.send(JSON.stringify(buildAgentStatusPayload(sessionId, session)));
+        }
+        if (session.gitStatus) {
+            ws.send(JSON.stringify({ type: 'git-status', gitStatus: session.gitStatus }));
+        }
     })();
     // Tmux layout polling (per-client, like the SSE stream does)
     let tmuxInterval = null;
@@ -4614,8 +5041,9 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
                 if (apSnapshot !== lastActiveProgramSnapshot) {
                     lastActiveProgramSnapshot = apSnapshot;
                     session.activeProgram = ap;
+                    persistActiveProgramBinding(sessionId, ap?.command);
                     // Agent status: react to AI tool start/exit
-                    evaluateAgentStatus(sessionId, session);
+                    syncAgentIdentity(sessionId, session);
                     console.log(`[active-program][ws] session=${sessionId} cmd=${ap?.command ?? null} source=${ap?.source ?? null}`);
                     ws.send(JSON.stringify({
                         type: 'active-program',
@@ -4633,6 +5061,7 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
                         schedulePersistGlobalState();
                     }
                     ws.send(JSON.stringify({ type: 'cwd', cwd: newCwd }));
+                    refreshGitStatus(sessionId, session, { minIntervalMs: 0 });
                 }
                 // tmux 消费了 inner shell 发的 OSC 2（存入 pane_title）和 OSC 133，
                 // 不透传到外层 PTY。因此从 tmux layout 提取 active pane 的 title
@@ -4647,8 +5076,12 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
                     const paneCmd = activePane.command || '';
                     const inferredState = paneCmd && !shellNamesBackend.has(paneCmd) ? 'running' : 'idle';
                     if (inferredState !== session.lastPromptState) {
+                        const wasRunning = session.lastPromptState === 'running';
                         session.lastPromptState = inferredState;
                         ws.send(JSON.stringify({ type: 'prompt-state', state: inferredState }));
+                        if (wasRunning && inferredState === 'idle') {
+                            refreshGitStatus(sessionId, session);
+                        }
                     }
                 }
                 // Mirror dynamic metadata onto tmux user options.
@@ -4684,8 +5117,9 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
                 if (snapshot !== lastApSnapshot) {
                     lastApSnapshot = snapshot;
                     session.activeProgram = ap;
+                    persistActiveProgramBinding(sessionId, ap?.command);
                     // Agent status: react to AI tool start/exit
-                    evaluateAgentStatus(sessionId, session);
+                    syncAgentIdentity(sessionId, session);
                     ws.send(JSON.stringify({
                         type: 'active-program',
                         activeProgram: ap?.command ?? null,