u-foo 2.3.32 → 2.4.0

package/src/agents/launch/agyConversation.js

@@ -0,0 +1,159 @@
+"use strict";
+
+/**
+ * Agy (Antigravity CLI) conversation-id capture and reuse.
+ *
+ * Agy ends every TUI session by printing a single line to stdout:
+ *
+ *   Resume: agy --conversation=<UUID> (or -c)
+ *
+ * We grep this line out of the PTY output ring buffer and persist the UUID
+ * onto the agent meta as `provider_session_id`, so the next launch of agy
+ * on the same tty/tmux pane can pass `--conversation=<UUID>` to pick up
+ * exactly that conversation.
+ *
+ * The launcher writes the id; bin/uagy.js reads it back before spawning.
+ */
+
+const fs = require("fs");
+const path = require("path");
+
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { isAgentPidAlive } = require("../../coordination/bus/utils");
+
+// Capture group is a UUID v4-ish; agy uses standard 8-4-4-4-12 hex form.
+// Allow trailing whitespace and anything after the close paren on the line.
+const RESUME_LINE_RE =
+  /Resume:\s+agy\s+--conversation=([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})/;
+
+function extractResumeConversationId(text = "") {
+  const str = String(text || "");
+  if (!str) return "";
+  const match = str.match(RESUME_LINE_RE);
+  return match ? match[1] : "";
+}
+
+function readAgentsRegistry(projectRoot) {
+  try {
+    const file = getUfooPaths(projectRoot).agentsFile;
+    if (!fs.existsSync(file)) return { file, data: null };
+    const data = JSON.parse(fs.readFileSync(file, "utf8"));
+    return { file, data };
+  } catch {
+    return { file: "", data: null };
+  }
+}
+
+/**
+ * Look up the most recent agy conversation id for the given tty/tmux pane.
+ *
+ * Mirrors src/agents/launch/launcher.js#findPreviousSession but only inspects
+ * `meta.provider_session_id`. Returns "" when none found.
+ *
+ * Selection rules (in this order):
+ *   1. Only `agy:` subscribers
+ *   2. tmux_pane match (when supplied) or tty match (fallback)
+ *   3. Skip entries whose pid is still alive — that session is still
+ *      running, stealing its id would resume into the live process
+ *   4. Among remaining candidates, pick the one with the most recent
+ *      `provider_session_updated_at` (insertion-order fallback when no
+ *      timestamp is present)
+ */
+function readPreviousConversationId(projectRoot, { tty = "", tmuxPane = "" } = {}) {
+  if (!projectRoot) return "";
+  if (!tty && !tmuxPane) return "";
+  const { data } = readAgentsRegistry(projectRoot);
+  if (!data || !data.agents) return "";
+
+  const candidates = [];
+  for (const [subscriberId, meta] of Object.entries(data.agents)) {
+    if (!subscriberId.startsWith("agy:")) continue;
+    if (!meta || typeof meta !== "object") continue;
+    if (tmuxPane) {
+      if (meta.tmux_pane !== tmuxPane) continue;
+    } else if (tty) {
+      if (meta.tty !== tty) continue;
+    } else {
+      continue;
+    }
+    const id = String(meta.provider_session_id || "").trim();
+    if (!id) continue;
+
+    // Skip sessions whose owning process is still alive — their
+    // conversation id belongs to a running TUI, not a closed one.
+    const pid = Number.parseInt(meta.pid, 10);
+    if (Number.isFinite(pid) && pid > 0 && isAgentPidAlive(pid)) continue;
+
+    const updatedAt = Date.parse(String(meta.provider_session_updated_at || "")) || 0;
+    candidates.push({ id, updatedAt });
+  }
+  if (candidates.length === 0) return "";
+  candidates.sort((a, b) => b.updatedAt - a.updatedAt);
+  return candidates[0].id;
+}
+
+function persistConversationId(projectRoot, subscriberId, conversationId) {
+  const id = String(conversationId || "").trim();
+  if (!projectRoot || !subscriberId || !id) return false;
+  try {
+    const file = getUfooPaths(projectRoot).agentsFile;
+    if (!fs.existsSync(file)) return false;
+    const data = JSON.parse(fs.readFileSync(file, "utf8"));
+    if (!data || !data.agents || !data.agents[subscriberId]) return false;
+    if (data.agents[subscriberId].provider_session_id === id) return false;
+    data.agents[subscriberId].provider_session_id = id;
+    data.agents[subscriberId].provider_session_updated_at = new Date().toISOString();
+    const tmp = `${file}.tmp`;
+    fs.writeFileSync(tmp, JSON.stringify(data, null, 2));
+    fs.renameSync(tmp, file);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Build the agy command-line args for a fresh launch:
+ *   - prepend --conversation=<uuid> if previousConversationId is set
+ *     (unless the user already passed --continue / -c / --conversation)
+ *   - prepend --dangerously-skip-permissions in internal/auto-approve mode
+ *   - return the args caller hands to AgentLauncher.launch()
+ *
+ * Bootstrap merging (i.e. `-i <text>`) is handled by defaultBootstrap.js;
+ * this helper only deals with the resume + permission flags.
+ */
+function buildAgyLaunchArgs({
+  userArgs = [],
+  previousConversationId = "",
+  skipPermissions = false,
+} = {}) {
+  const args = Array.isArray(userArgs) ? userArgs.slice() : [];
+  const flat = args.map((item) => String(item || "").trim()).filter(Boolean);
+
+  const userHasResume = flat.some((item) =>
+    item === "-c"
+    || item === "--continue"
+    || item === "--conversation"
+    || item.startsWith("--conversation=")
+  );
+  const userHasSkipPerms = flat.includes("--dangerously-skip-permissions");
+
+  const out = [];
+  if (skipPermissions && !userHasSkipPerms) {
+    out.push("--dangerously-skip-permissions");
+  }
+  const resumeId = String(previousConversationId || "").trim();
+  if (resumeId && !userHasResume) {
+    out.push(`--conversation=${resumeId}`);
+  }
+  out.push(...args);
+  return out;
+}
+
+module.exports = {
+  RESUME_LINE_RE,
+  extractResumeConversationId,
+  readPreviousConversationId,
+  persistConversationId,
+  buildAgyLaunchArgs,
+};

package/src/agents/launch/index.js

@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = {
+  AgentLauncher: require("./launcher"),
+  AgentNotifier: require("./notifier"),
+  PtyWrapper: require("./ptyWrapper"),
+  ReadyDetector: require("./readyDetector"),
+  ...require("./agyConversation"),
+  ...require("./launchEnvironment"),
+  ...require("./ptyRunner"),
+  ...require("./publisherRouting"),
+};

package/src/{agent → agents/launch}/launchEnvironment.js

@@ -18,8 +18,8 @@
  * Host is detected by env var alone here; callers that want to override host
  * with native-terminal evidence (e.g. daemon ops auto-resolution) layer that
  * on top of the detector's output.
- * Internal / internal-pty modes are always set explicitly by the daemon when
- * spawning worker processes (see ptyRunner / daemon ops), so they fall through
+ * Internal modes are always set explicitly by the daemon when
+ * spawning worker processes (see daemon ops), so they fall through
  * the explicit short-circuit and never need to be auto-detected here.
  */
 
@@ -28,7 +28,6 @@ const CANONICAL_LAUNCH_MODES = Object.freeze([
   "tmux",
   "host",
   "internal",
-  "internal-pty",
 ]);
 
 const CANONICAL_LAUNCH_MODE_SET = new Set(CANONICAL_LAUNCH_MODES);

package/src/{agent → agents/launch}/launcher.js

@@ -1,21 +1,25 @@
-const { IPC_REQUEST_TYPES } = require("../shared/eventContract");
-const { PTY_SOCKET_MESSAGE_TYPES } = require("../shared/ptySocketContract");
+const { IPC_REQUEST_TYPES } = require("../../runtime/contracts/eventContract");
+const { PTY_SOCKET_MESSAGE_TYPES } = require("../../runtime/contracts/ptySocketContract");
 const { spawn, spawnSync } = require("child_process");
 const fs = require("fs");
 const net = require("net");
 const path = require("path");
-const EventBus = require("../bus");
-const { isAgentPidAlive } = require("../bus/utils");
-const { showBanner } = require("../utils/banner");
+const EventBus = require("../../coordination/bus");
+const { isAgentPidAlive } = require("../../coordination/bus/utils");
+const { showBanner } = require("../../ui/format/banner");
 const AgentNotifier = require("./notifier");
-const { ActivityDetector } = require("./activityDetector");
-const { createActivityStatePublisher } = require("./activityStatePublisher");
+const { ActivityDetector } = require("../activity/activityDetector");
+const { createActivityStatePublisher } = require("../activity/activityStatePublisher");
 const { detectLaunchEnvironment } = require("./launchEnvironment");
-const { getUfooPaths } = require("../ufoo/paths");
-const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
-const { probeHostCapabilities } = require("../terminal/adapters/hostAdapter");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { createTerminalAdapterRouter } = require("../../runtime/terminal/adapterRouter");
+const { probeHostCapabilities } = require("../../runtime/terminal/adapters/hostAdapter");
 const PtyWrapper = require("./ptyWrapper");
 const ReadyDetector = require("./readyDetector");
+const {
+  extractResumeConversationId,
+  persistConversationId,
+} = require("./agyConversation");
 
 function connectSocket(sockPath) {
   return new Promise((resolve, reject) => {
@@ -204,9 +208,12 @@ function shouldShowLaunchBanner(agentType = "") {
 function computeInjectedSubmitDelayMs(agentType, text) {
   const normalizedAgent = String(agentType || "").trim().toLowerCase();
   const input = typeof text === "string" ? text : "";
-  let delayMs = normalizedAgent === "claude-code" ? 350 : 200;
+  // Agy uses an ink-style TUI like claude-code, so it needs a similar grace
+  // window before the input handler picks up injected text.
+  const isInkStyle = normalizedAgent === "claude-code" || normalizedAgent === "agy";
+  let delayMs = isInkStyle ? 350 : 200;
   if (input.includes("\n")) {
-    delayMs += normalizedAgent === "claude-code" ? 250 : 120;
+    delayMs += isInkStyle ? 250 : 120;
   }
   if (input.length > 512) {
     delayMs += Math.min(1200, Math.ceil(input.length / 512) * 90);
@@ -237,7 +244,11 @@ async function injectPtyCommand(wrapper, agentType, commandText, source = "injec
   const normalizedAgentType = String(agentType || "").trim().toLowerCase();
   const submitDelayMs = computeInjectedSubmitDelayMs(agentType, text);
   wrapper.write(text);
-  if (normalizedAgentType === "claude-code") {
+  // claude-code and agy both run ink-style TUIs that accept a bare CR to
+  // submit. codex needs the Esc-prefix trick to flush its multi-byte input
+  // handler before the CR.
+  const isInkStyle = normalizedAgentType === "claude-code" || normalizedAgentType === "agy";
+  if (isInkStyle) {
     await sleep(submitDelayMs);
     wrapper.write("\r");
   } else {
@@ -465,7 +476,7 @@ class AgentLauncher {
       hostName,
       hostSessionId,
       hostCapabilities,
-      skipProbe: process.env.UFOO_SKIP_SESSION_PROBE === "1",
+      skipSessionResolve: process.env.UFOO_SKIP_SESSION_RESOLVE === "1",
       // 传递旧 session 信息用于复用（仅 terminal/tmux 模式）
       reuseSession: previousSession ? {
         sessionId: previousSession.sessionId,
@@ -694,10 +705,20 @@ class AgentLauncher {
               detail: snap.detail,
             });
           });
+          // Tail buffer for agy: when the TUI exits, agy prints a single line
+          // `Resume: agy --conversation=<UUID> (or -c)` to stdout. We keep
+          // the trailing ~4KB of post-frame output around and grep it on exit
+          // to capture the conversation id, then persist it as the agent's
+          // provider_session_id so the next launch can pass `--conversation`.
+          const agyTailBuffer = { text: "" };
+          const AGY_TAIL_MAX = 4096;
           wrapper.enableMonitoring((data) => {
             readyDetector.processOutput(data);
             const text = typeof data === "string" ? data : Buffer.from(data).toString("utf8");
             launcherActivityDetector.processOutput(text);
+            if (this.agentType === "agy") {
+              agyTailBuffer.text = (agyTailBuffer.text + text).slice(-AGY_TAIL_MAX);
+            }
           });
           readyDetector.onReady(async () => {
             launcherActivityDetector.markReady();
@@ -708,17 +729,19 @@ class AgentLauncher {
             // Claude Code's Ink TUI renders ❯ prompt before the input handler
             // is fully mounted. Wait a short period for the TUI to be ready to
             // accept injected text, otherwise only the trailing CR is processed
-            // and the probe command is lost.
-            if (this.agentType === "claude-code") {
+            // and the injected slash command is lost. Agy uses the same ink-style TUI
+            // so it gets the same grace window.
+            if (this.agentType === "claude-code" || this.agentType === "agy") {
               await new Promise((r) => setTimeout(r, 800));
             }
 
-            // Claude Code: inject /rename 设置 session 标签（在 AGENT_READY/bootstrap 之前）
-            // /rename 是 slash 命令，瞬间完成，不调 LLM
-            // 仅在有显式 nickname 时注入（UFOO_NICKNAME 由 group launch 或用户指定）
-            // 使用启动前保存的原始值，避免复用 nickname 污染
+            // Inject /rename to set the session label (before AGENT_READY/bootstrap).
+            // /rename is a slash command, completes instantly, doesn't hit the LLM.
+            // Only when an explicit nickname was supplied (UFOO_NICKNAME from group
+            // launch or user). Both claude-code and agy support /rename.
             const explicitNickname = this._originalNickname || "";
-            if (this.agentType === "claude-code" && explicitNickname && wrapper.pty) {
+            const supportsRenameSlash = this.agentType === "claude-code" || this.agentType === "agy";
+            if (supportsRenameSlash && explicitNickname && wrapper.pty) {
               try {
                 const safeNick = AgentLauncher._sanitizeNickname(explicitNickname);
                 if (safeNick) {
@@ -750,6 +773,21 @@ class AgentLauncher {
             clearTimeout(forceReadyTimer);
             launcherActivityDetector.destroy();
 
+            // Agy: harvest conversation id from the trailing `Resume: agy
+            // --conversation=<UUID>` line that agy prints right before exit,
+            // and persist it onto the agent meta so the next launch can
+            // pass `--conversation=<UUID>`.
+            if (this.agentType === "agy") {
+              const conversationId = extractResumeConversationId(agyTailBuffer.text);
+              if (conversationId) {
+                try {
+                  persistConversationId(this.cwd, subscriberId, conversationId);
+                } catch {
+                  // ignore — best-effort capture only
+                }
+              }
+            }
+
             // 清理 bus 状态
             try {
               const bus = new EventBus(this.cwd);
@@ -956,5 +994,10 @@ AgentLauncher._sanitizeNickname = (nick) => nick.replace(/[^a-zA-Z0-9_-]/g, "");
 AgentLauncher._findPreviousSession = findPreviousSession;
 AgentLauncher._notifyDaemonAgentReady = notifyDaemonAgentReady;
 AgentLauncher._injectPtyCommand = injectPtyCommand;
+// Exposed for bin/uagy.js so it can read the same tty value the launcher
+// will later record on the agent meta — keeps autoResume lookups in sync
+// with the launcher's own tty/tmux detection.
+AgentLauncher._detectTtyOnce = detectTtyOnce;
+AgentLauncher._getEnvTtyOverride = getEnvTtyOverride;
 
 module.exports = AgentLauncher;

package/src/{agent → agents/launch}/notifier.js

@@ -1,15 +1,16 @@
 const fs = require("fs");
 const path = require("path");
-const EventBus = require("../bus");
-const { readJSON, writeJSON } = require("../bus/utils");
-const Injector = require("../bus/inject");
-const { getUfooPaths } = require("../ufoo/paths");
-const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
-const { shakeTerminalByTty } = require("../bus/shake");
-const { isITerm2 } = require("../terminal/detect");
-const iterm2 = require("../terminal/iterm2");
-const { createActivityStatePublisher } = require("./activityStatePublisher");
-const { INJECTION_MODES, getInjectionModeFromEvent } = require("../bus/messageMeta");
+const EventBus = require("../../coordination/bus");
+const { readJSON, writeJSON } = require("../../coordination/bus/utils");
+const Injector = require("../../coordination/bus/inject");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { appendAgentRegistryDiagnostic } = require("../../coordination/state/agentRegistryDiagnostics");
+const { shakeTerminalByTty } = require("../../coordination/bus/shake");
+const { isITerm2 } = require("../../runtime/terminal/detect");
+const iterm2 = require("../../runtime/terminal/iterm2");
+const { createActivityStatePublisher } = require("../activity/activityStatePublisher");
+const { INJECTION_MODES, getInjectionModeFromEvent } = require("../../coordination/bus/messageMeta");
+const { buildPromptInjectionText } = require("../../coordination/bus/promptEnvelope");
 
 /**
  * Agent 消息通知监听器
@@ -153,6 +154,16 @@ class AgentNotifier {
     }
   }
 
+  getAgentsMap() {
+    try {
+      if (!this.agentsFile || !fs.existsSync(this.agentsFile)) return {};
+      const data = readJSON(this.agentsFile, null);
+      return data && data.agents && typeof data.agents === "object" ? data.agents : {};
+    } catch {
+      return {};
+    }
+  }
+
   isBusyState(state = "") {
     const value = String(state || "").trim().toLowerCase();
     return value === "working"
@@ -280,9 +291,9 @@ class AgentNotifier {
         requeue.push(evt);
         continue;
       }
-      const message = String(evt.data.message);
+      const message = buildPromptInjectionText(evt, this.subscriber, this.getAgentsMap());
       try {
-        // Inject the actual message text into the terminal/tmux agent
+        // Inject the prompt-facing text into the terminal/tmux agent
         // (Bus is the source of truth; inject is the delivery adapter.)
         // eslint-disable-next-line no-await-in-loop
         await this.injector.inject(this.subscriber, message);

package/src/{agent → agents/launch}/ptyRunner.js

@@ -2,11 +2,11 @@ const fs = require("fs");
 const path = require("path");
 const net = require("net");
 const { spawnSync } = require("child_process");
-const EventBus = require("../bus");
-const { PTY_SOCKET_MESSAGE_TYPES, PTY_SOCKET_SUBSCRIBE_MODES } = require("../shared/ptySocketContract");
-const { getUfooPaths } = require("../ufoo/paths");
-const { ActivityDetector } = require("./activityDetector");
-const { createActivityStatePublisher } = require("./activityStatePublisher");
+const EventBus = require("../../coordination/bus");
+const { PTY_SOCKET_MESSAGE_TYPES, PTY_SOCKET_SUBSCRIBE_MODES } = require("../../runtime/contracts/ptySocketContract");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { ActivityDetector } = require("../activity/activityDetector");
+const { createActivityStatePublisher } = require("../activity/activityStatePublisher");
 const {
   parseStreamEnvelope,
   shouldAutoReplyFromPtyToPublisher,
@@ -15,7 +15,8 @@ const {
 const {
   isValueForCodexOption,
   resolveDefaultManualBootstrap,
-} = require("./defaultBootstrap");
+} = require("../prompts/defaultBootstrap");
+const { buildPromptInjectionText } = require("../../coordination/bus/promptEnvelope");
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -97,6 +98,32 @@ function parseInputMessage(message) {
   return { raw: false, text: message };
 }
 
+function readAgentsMap(agentsFilePath) {
+  try {
+    if (!agentsFilePath || !fs.existsSync(agentsFilePath)) return {};
+    const data = JSON.parse(fs.readFileSync(agentsFilePath, "utf8"));
+    return data && data.agents && typeof data.agents === "object" ? data.agents : {};
+  } catch {
+    return {};
+  }
+}
+
+function buildPtyInputFromEvent(evt = {}, subscriber = "", agents = {}) {
+  if (!evt || !evt.data || typeof evt.data.message !== "string") return null;
+  const input = parseInputMessage(evt.data.message);
+  if (!input) return null;
+  if (input.raw) return input;
+
+  return {
+    raw: false,
+    text: buildPromptInjectionText(
+      { ...evt, data: { ...evt.data, message: input.text } },
+      subscriber,
+      agents
+    ),
+  };
+}
+
 function getOuterTerminalSize() {
   const cols = Number.isInteger(process.stdout && process.stdout.columns) && process.stdout.columns > 0
     ? process.stdout.columns
@@ -197,10 +224,14 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
   let Terminal = null;
   let SerializeAddon = null;
   try {
-    const xterm = await import("xterm-headless");
-    const serialize = await import("xterm-addon-serialize");
-    Terminal = xterm.Terminal || (xterm.default && xterm.default.Terminal);
-    SerializeAddon = serialize.SerializeAddon || (serialize.default && serialize.default.SerializeAddon);
+    const xterm = await import("@xterm/headless");
+    const serialize = await import("@xterm/addon-serialize");
+    Terminal = xterm.Terminal
+      || (xterm.default && xterm.default.Terminal)
+      || (xterm["module.exports"] && xterm["module.exports"].Terminal);
+    SerializeAddon = serialize.SerializeAddon
+      || (serialize.default && serialize.default.SerializeAddon)
+      || (serialize["module.exports"] && serialize["module.exports"].SerializeAddon);
   } catch {
     Terminal = null;
     SerializeAddon = null;
@@ -1015,6 +1046,7 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
 
     const lines = drainQueue(queueFile);
     if (lines.length > 0) {
+      const agents = readAgentsMap(agentsFilePath);
       const events = [];
       for (const line of lines) {
         try {
@@ -1024,8 +1056,7 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
         }
       }
       for (const evt of events) {
-        if (!evt || !evt.data || typeof evt.data.message !== "string") continue;
-        const input = parseInputMessage(evt.data.message);
+        const input = buildPtyInputFromEvent(evt, subscriber, agents);
         if (!input) continue;
         const { raw, text } = input;
         if (messageQueue.length >= maxQueue) {
@@ -1045,6 +1076,7 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
 
 module.exports = {
   appendStartupBootstrapArg,
+  buildPtyInputFromEvent,
   parseInputMessage,
   resolvePtyBootstrapArgs,
   resolveCommand,

package/src/{agent → agents/launch}/ptyWrapper.js

@@ -1,6 +1,6 @@
 const pty = require("node-pty");
 const fs = require("fs");
-const { isITerm2 } = require("../terminal/detect");
+const { isITerm2 } = require("../../runtime/terminal/detect");
 
 /**
  * PTY Wrapper - 包装原始agent命令，提供IO控制和监控
@@ -12,7 +12,7 @@ const { isITerm2 } = require("../terminal/detect");
  * - 完善的资源清理（防止泄漏）
  *
  * 参考：
- * - ptyRunner.js - PTY实现参考
+ * - launcher.js - PTY实现参考
  * - codex-44 review反馈 (2026-02-05)
  */
 class PtyWrapper {

package/src/{agent → agents/launch}/publisherRouting.js

@@ -1,5 +1,5 @@
 const fs = require("fs");
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../../coordination/state/paths");
 
 function normalizePublisher(publisher) {
   if (typeof publisher === "string") return publisher.trim();

package/src/{agent → agents/launch}/readyDetector.js

@@ -87,6 +87,27 @@ class ReadyDetector {
     return false;
   }
 
+  /**
+   * Detect agy (Antigravity CLI) ready markers.
+   *
+   * agy renders an ink-style TUI with:
+   *   - A status footer "? for shortcuts" that appears once the prompt box
+   *     is mounted (most reliable signal — only present post-boot).
+   *   - A bordered input row with a lone blue ">" prefix. We can't grep
+   *     for just ">" without misfiring (codex/ucode use the same), so we
+   *     anchor on the statusline phrase instead.
+   *
+   * If the account is blocked ("Eligibility check failed"), the TUI still
+   * mounts and "? for shortcuts" still appears — we let ready fire so the
+   * user sees the error. activityDetector handles the BLOCKED state.
+   */
+  _detectAgyReady(text) {
+    if (text.includes("? for shortcuts")) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * 检测ufoo-code/ucode的ready标记
    */
@@ -135,6 +156,8 @@ class ReadyDetector {
       isReady = this._detectClaudeCodeReady(this.buffer);
     } else if (this.agentType === "codex") {
       isReady = this._detectCodexReady(this.buffer);
+    } else if (this.agentType === "agy") {
+      isReady = this._detectAgyReady(this.buffer);
     } else if (this.agentType === "ufoo" || this.agentType === "ucode" || this.agentType === "ufoo-code") {
       isReady = this._detectUfooCodeReady(this.buffer);
     }