u-foo 2.3.31 → 2.4.0

package/src/{agent → agents/prompts}/defaultBootstrap.js

@@ -2,8 +2,8 @@
 
 const fs = require("fs");
 const path = require("path");
-const { SHARED_UFOO_PROTOCOL } = require("../group/bootstrap");
-const { getUfooPaths } = require("../ufoo/paths");
+const { SHARED_UFOO_PROTOCOL } = require("./groupBootstrap");
+const { getUfooPaths } = require("../../coordination/state/paths");
 
 function asTrimmedString(value) {
   return typeof value === "string" ? value.trim() : "";
@@ -43,7 +43,7 @@ function readOptionalFile(filePath) {
  */
 function loadTeamActivityContext(projectRoot) {
   try {
-    const { renderTimelineForPrompt } = require("../history/inputTimeline");
+    const { renderTimelineForPrompt } = require("../../coordination/history/inputTimeline");
     return renderTimelineForPrompt(projectRoot, 20) || "";
   } catch {
     return "";
@@ -54,7 +54,11 @@ function buildDefaultStartupBootstrapPrompt({ agentType = "", projectRoot = "" }
   const normalizedAgent = asTrimmedString(agentType).toLowerCase();
   const displayAgent = normalizedAgent === "claude-code"
     ? "Claude"
-    : (normalizedAgent === "codex" ? "Codex" : (normalizedAgent === "ufoo-code" ? "ucode" : "agent"));
+    : (normalizedAgent === "codex"
+      ? "Codex"
+      : (normalizedAgent === "ufoo-code"
+        ? "ucode"
+        : (normalizedAgent === "agy" ? "Agy" : "agent")));
 
   const segments = [
     `Session bootstrap for ${displayAgent}.`,
@@ -196,6 +200,35 @@ function mergeCodexPromptArgs({ args = [], bootstrapText = "" } = {}) {
   };
 }
 
+/**
+ * Merge bootstrap text into an existing `-i <text>` / `--prompt-interactive
+ * <text>` / `--prompt-interactive=<text>` argument. Returns null if no such
+ * argument exists (caller should then prepend a fresh `-i <bootstrap>`).
+ *
+ * Agy treats `-i` as a single initial prompt that drops the user into an
+ * interactive session — same intent as codex's positional prompt.
+ */
+function mergeAgyPromptArgs({ args = [], bootstrapText = "" } = {}) {
+  const currentArgs = Array.isArray(args) ? args.slice() : [];
+  for (let index = 0; index < currentArgs.length; index += 1) {
+    const item = asTrimmedString(currentArgs[index]);
+    if (!item) continue;
+    if (item === "-i" || item === "--prompt-interactive") {
+      const existing = String(currentArgs[index + 1] || "");
+      const merged = mergePromptSegments(bootstrapText, existing);
+      currentArgs[index + 1] = merged;
+      return { args: currentArgs, promptText: merged };
+    }
+    if (item.startsWith("--prompt-interactive=")) {
+      const existing = item.slice("--prompt-interactive=".length);
+      const merged = mergePromptSegments(bootstrapText, existing);
+      currentArgs[index] = `--prompt-interactive=${merged}`;
+      return { args: currentArgs, promptText: merged };
+    }
+  }
+  return null;
+}
+
 function resolveDefaultManualBootstrap({
   projectRoot,
   agentType = "",
@@ -280,6 +313,31 @@ function resolveDefaultManualBootstrap({
     };
   }
 
+  if (normalizedAgent === "agy") {
+    const promptText = buildDefaultStartupBootstrapPrompt({ agentType: normalizedAgent, projectRoot });
+    // If the user passed -i / --prompt-interactive, fold the bootstrap into
+    // their text. Otherwise prepend a fresh `-i <bootstrap>` pair so the
+    // session starts with our protocol message already delivered.
+    const merged = mergeAgyPromptArgs({
+      args: currentArgs,
+      bootstrapText: promptText,
+    });
+    if (merged) {
+      return {
+        args: merged.args,
+        env: {},
+        mode: "initial-prompt-arg",
+        promptText: merged.promptText,
+      };
+    }
+    return {
+      args: ["-i", promptText, ...currentArgs],
+      env: {},
+      mode: "initial-prompt-arg",
+      promptText,
+    };
+  }
+
   return { args: currentArgs, env: {}, mode: "skip" };
 }
 
@@ -291,4 +349,5 @@ module.exports = {
   defaultBootstrapFile,
   prepareDefaultBootstrapFile,
   resolveDefaultManualBootstrap,
+  mergeAgyPromptArgs,
 };

package/src/{group/bootstrap.js → agents/prompts/groupBootstrap.js}

@@ -3,12 +3,47 @@
 const crypto = require("crypto");
 
 const SHARED_UFOO_PROTOCOL = [
-  "ufoo protocol:",
-  "- At session start, sync shared context with `ufoo ctx decisions -l` and `ufoo ctx decisions -n 1`.",
-  "- Default to no new decision. Record one ONLY for important, plan-level knowledge: architectural choices, multi-option trade-off analysis, cross-agent coordination decisions, or plans that affect other agents. Do NOT record routine findings, simple bug fixes, trivial observations, or generic plan/evaluation/recommendation requests. Durable project facts belong in shared memory, not decisions. Use `ufoo ctx decisions new \"Title\"` BEFORE acting only when that bar is met.",
-  "- Use `ufoo bus send <target-nickname> \"<message>\"` for agent-to-agent handoffs.",
-  "- If you receive pending bus work, execute it immediately, reply to the sender, then `ufoo bus ack \"$UFOO_SUBSCRIBER_ID\"`.",
-  "- Use `ufoo report` for controller/runtime status updates, not as a substitute for direct handoffs.",
+  "Session harness: ufoo",
+  "",
+  "Use ufoo as an internal coordination layer. Do not mention it unless asked.",
+  "",
+  "START",
+  "If shell and ufoo are available, sync decisions:",
+  "- `ufoo ctx decisions -l`",
+  "- `ufoo ctx decisions -n 1`",
+  "",
+  "If sync fails, continue normally.",
+  "",
+  "DECISIONS",
+  "Default: write nothing.",
+  "",
+  "Create a decision only when it is stable and affects future agents:",
+  "architecture, major trade-off, cross-agent contract, or future-impacting plan.",
+  "",
+  "Do not record routine fixes, local findings, facts, or temporary details.",
+  "Facts belong in shared context, not decisions.",
+  "",
+  "Use: `ufoo ctx decisions new \"<short title>\"`",
+  "",
+  "BUS  (peer ↔ peer)",
+  "Send bus messages only for handoff, blocker, dependency, or explicit",
+  "coordination — never for greetings, acknowledgments, or emoji alone.",
+  "Those create reply loops between agents.",
+  "",
+  "`ufoo bus send <target> \"<message>\"`",
+  "",
+  "On received bus work: execute it, then `ufoo bus ack \"$UFOO_SUBSCRIBER_ID\"`.",
+  "Reply only if you have a concrete result, answer, or follow-up the sender",
+  "needs. Default is ack-only; silence is a valid response.",
+  "",
+  "REPORT",
+  "You MUST report after handling work that arrived from chat",
+  "(`[manual]<to:...>`) or bus (`[ufoo]<from:...>`). The controller handles",
+  "dedup, so don't worry about report loops.",
+  "",
+  "`ufoo report start|progress|done|error \"<short summary>\"`",
+  "",
+  "Then continue the active task.",
 ].join("\n");
 
 const SHARED_GROUP_PREFIX = [

package/src/agents/prompts/index.js

@@ -0,0 +1,8 @@
+"use strict";
+
+module.exports = {
+  ...require("./defaultBootstrap"),
+  ...require("./groupBootstrap"),
+  ...require("./promptProfiles"),
+  native: require("./native"),
+};

package/src/{code/prompts → agents/prompts/native}/index.js

@@ -11,7 +11,7 @@ const { getEnvironmentSection } = require("./environment");
 const {
   listUcodeSkills,
   renderSkillsSection,
-} = require("../skills");
+} = require("../../../code/skills");
 const {
   systemPromptSection,
   uncachedSection,

package/src/{agent → agents/providers}/claudeThreadProvider.js

@@ -6,7 +6,7 @@ const {
   normalizeClaudeMessage,
   normalizeClaudeUsage,
 } = require("./claudeEventTranslator");
-const { redactUfooEvent } = require("../providerapi/redactor");
+const { redactUfooEvent } = require("../../runtime/privacy/redactor");
 
 const CACHE_CONTROL = Object.freeze({ type: "ephemeral" });
 

package/src/{agent → agents/providers}/codexThreadProvider.js

@@ -1,5 +1,5 @@
 const { normalizeCodexEvent } = require("./codexEventTranslator");
-const { redactUfooEvent } = require("../providerapi/redactor");
+const { redactUfooEvent } = require("../../runtime/privacy/redactor");
 
 async function resolveCodexSdk() {
   try {

package/src/{agent → agents/providers}/directAuthStatus.js

@@ -1,6 +1,9 @@
 "use strict";
 
-const { loadConfig } = require("../config");
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const { loadConfig } = require("../../config");
 const {
   resolveCodexAuthPaths,
   resolveCodexUpstreamCredentials,
@@ -23,6 +26,7 @@ function normalizeErrorCode(err, fallback = "DIRECT_AUTH_STATUS_FAILED") {
 function normalizeDirectAuthProvider(value = "") {
   const text = String(value || "").trim().toLowerCase();
   if (text === "claude" || text === "claude-cli" || text === "claude-code" || text === "anthropic") return "claude";
+  if (text === "agy" || text === "agy-cli" || text === "antigravity") return "agy";
   return "codex";
 }
 
@@ -136,6 +140,138 @@ async function inspectClaudeDirectAuth({
   }
 }
 
+/**
+ * Default agy log directory: ~/.gemini/antigravity-cli/log
+ * Agy doesn't expose an API for auth status, so we tail its own structured
+ * server-side log and grep for the markers it prints during the OAuth
+ * handshake. This is best-effort observability, not a real credential
+ * check — agy owns the keyring, not us.
+ */
+function resolveAgyLogDir(env = process.env) {
+  const home = String(env.HOME || os.homedir() || "").trim();
+  if (!home) return "";
+  return path.join(home, ".gemini", "antigravity-cli", "log");
+}
+
+function findMostRecentAgyLog(logDir = "") {
+  try {
+    if (!logDir || !fs.existsSync(logDir)) return "";
+    const entries = fs.readdirSync(logDir)
+      .filter((name) => name.startsWith("cli-") && name.endsWith(".log"));
+    if (entries.length === 0) return "";
+    // Filenames are cli-YYYYMMDD_HHMMSS.log — lexicographic sort matches mtime.
+    entries.sort();
+    return path.join(logDir, entries[entries.length - 1]);
+  } catch {
+    return "";
+  }
+}
+
+function readAgyLogTail(file = "", maxBytes = 32 * 1024) {
+  try {
+    if (!file || !fs.existsSync(file)) return "";
+    const stat = fs.statSync(file);
+    const offset = Math.max(0, stat.size - maxBytes);
+    const fd = fs.openSync(file, "r");
+    try {
+      const length = stat.size - offset;
+      const buffer = Buffer.alloc(length);
+      fs.readSync(fd, buffer, 0, length, offset);
+      return buffer.toString("utf8");
+    } finally {
+      fs.closeSync(fd);
+    }
+  } catch {
+    return "";
+  }
+}
+
+function classifyAgyLogTail(text = "") {
+  const str = String(text || "");
+  if (!str) {
+    return {
+      ok: false,
+      state: "unknown",
+      errorCode: "AGY_AUTH_NO_LOG",
+      message: "no agy log file found yet — launch agy at least once to produce one",
+    };
+  }
+  if (/Eligibility check failed/i.test(str) || /Account ineligible/i.test(str)) {
+    const emailMatch = str.match(/authenticated successfully as ([^\s]+)/);
+    return {
+      ok: false,
+      state: "ineligible",
+      errorCode: "AGY_ACCOUNT_INELIGIBLE",
+      message: "agy account is signed in but not eligible (18+ / supported region required)",
+      accountEmail: emailMatch ? emailMatch[1] : "",
+    };
+  }
+  if (/User location is not supported/i.test(str)) {
+    const emailMatch = str.match(/authenticated successfully as ([^\s]+)/);
+    return {
+      ok: false,
+      state: "region_blocked",
+      errorCode: "AGY_REGION_BLOCKED",
+      message: "agy backend rejected this region (FAILED_PRECONDITION)",
+      accountEmail: emailMatch ? emailMatch[1] : "",
+    };
+  }
+  const authMatch = str.match(/OAuth: authenticated successfully as ([^\s]+)/);
+  if (authMatch) {
+    return {
+      ok: true,
+      state: "fresh",
+      accountEmail: authMatch[1],
+    };
+  }
+  return {
+    ok: false,
+    state: "unknown",
+    errorCode: "AGY_AUTH_UNVERIFIED",
+    message: "no successful OAuth handshake found in recent agy log",
+  };
+}
+
+async function inspectAgyDirectAuth({
+  env = process.env,
+  readLogTailImpl = readAgyLogTail,
+  findLogImpl = findMostRecentAgyLog,
+  resolveLogDirImpl = resolveAgyLogDir,
+} = {}) {
+  const logDir = resolveLogDirImpl(env);
+  const file = findLogImpl(logDir);
+  const tail = file ? readLogTailImpl(file) : "";
+  const classification = classifyAgyLogTail(tail);
+  const base = {
+    provider: "agy",
+    transport: "antigravity-tui",  // No API mode — TUI is the only path.
+    credentialKind: "oauth",
+    source: "google-keyring",
+    credentialPath: file || logDir || "",
+  };
+  if (classification.ok) {
+    return {
+      ...base,
+      ok: true,
+      state: classification.state,
+      accountEmail: classification.accountEmail || "",
+      account: classification.accountEmail || "",
+    };
+  }
+  return {
+    ...base,
+    ok: false,
+    state: classification.state,
+    errorCode: classification.errorCode,
+    error: classification.message,
+    accountEmail: classification.accountEmail || "",
+    hint: classification.errorCode === "AGY_ACCOUNT_INELIGIBLE"
+      || classification.errorCode === "AGY_REGION_BLOCKED"
+      ? "Antigravity requires an 18+ Google account in a supported region. Try a different account or wait for broader rollout."
+      : "Run `agy` once to produce an authentication handshake log.",
+  };
+}
+
 async function inspectDirectAuthStatus(options = {}) {
   const { projectRoot, loadConfigImpl = loadConfig, provider = "" } = options;
   const config = loadConfigImpl(projectRoot) || {};
@@ -147,6 +283,9 @@ async function inspectDirectAuthStatus(options = {}) {
   if (selected === "claude") {
     return inspectClaudeDirectAuth(nextOptions);
   }
+  if (selected === "agy") {
+    return inspectAgyDirectAuth(nextOptions);
+  }
   return inspectCodexDirectAuth(nextOptions);
 }
 
@@ -246,10 +385,51 @@ function formatClaudeDirectAuthStatus(status = {}, options = {}) {
   return lines;
 }
 
+function formatAgyDirectAuthStatus(status = {}, options = {}) {
+  if (options.compact === true) {
+    if (status.ok) {
+      const details = [
+        status.accountEmail ? status.accountEmail : "",
+        status.source || "google-keyring",
+      ].filter(Boolean);
+      const lines = [`Agy: OK · keyring · ${status.state || "fresh"}`];
+      if (details.length > 0) lines.push(`  ${details.join(" · ")}`);
+      return lines;
+    }
+    const hint = String(status.hint || "Run `agy` once to verify the OAuth handshake.").replace(/;.*$/, ".");
+    return [
+      `Agy: FAIL · ${status.errorCode || "AGY_AUTH_STATUS_FAILED"}`,
+      `  ${status.error || "agy authentication state unknown"} · ${hint}`,
+    ];
+  }
+
+  if (status.ok) {
+    const lines = [
+      `Agy CLI: OK (keyring, ${status.state || "fresh"})`,
+      `  - source: ${status.source || "google-keyring"}`,
+    ];
+    if (status.accountEmail) lines.push(`  - account: ${status.accountEmail}`);
+    if (status.credentialPath) lines.push(`  - log: ${status.credentialPath}`);
+    return lines;
+  }
+
+  const lines = [
+    `Agy CLI: FAIL (${status.errorCode || "AGY_AUTH_STATUS_FAILED"})`,
+    `  - ${status.error || "agy authentication state unknown"}`,
+  ];
+  if (status.accountEmail) lines.push(`  - account: ${status.accountEmail}`);
+  if (status.credentialPath) lines.push(`  - log: ${status.credentialPath}`);
+  if (status.hint) lines.push(`  - ${status.hint}`);
+  return lines;
+}
+
 function formatDirectAuthStatus(status = {}, options = {}) {
   if (status.provider === "claude") {
     return formatClaudeDirectAuthStatus(status, options);
   }
+  if (status.provider === "agy") {
+    return formatAgyDirectAuthStatus(status, options);
+  }
   return formatCodexDirectAuthStatus(status, options);
 }
 
@@ -257,8 +437,11 @@ module.exports = {
   inspectDirectAuthStatus,
   inspectCodexDirectAuth,
   inspectClaudeDirectAuth,
+  inspectAgyDirectAuth,
   formatDirectAuthStatus,
   formatCodexDirectAuthStatus,
   formatClaudeDirectAuthStatus,
+  formatAgyDirectAuthStatus,
   normalizeDirectAuthProvider,
+  classifyAgyLogTail,
 };

package/src/agents/providers/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+module.exports = {
+  ...require("./claudeEventTranslator"),
+  ...require("./claudeOauthTokenReader"),
+  ...require("./claudeSessionFiles"),
+  ...require("./claudeThreadProvider"),
+  ...require("./codexEventTranslator"),
+  ...require("./codexThreadProvider"),
+  ...require("./directAuthStatus"),
+  ...require("./upstreamTransport"),
+  credentials: require("./credentials"),
+};

package/src/{agent → agents/providers}/upstreamTransport.js

@@ -6,12 +6,12 @@ const {
   defaultAgentModelForProvider,
   defaultRouterModelForProvider,
   sameModelProvider,
-} = require("../config");
+} = require("../../config");
 const {
   resolveRuntimeConfig,
   resolveCompletionUrl,
   resolveAnthropicMessagesUrl,
-} = require("../code/nativeRunner");
+} = require("../../code/nativeRunner");
 const { resolveClaudeUpstreamCredentials } = require("./credentials/claude");
 const { resolveCodexUpstreamCredentials } = require("./credentials/codex");
 const { buildUpstreamAuthFromCredential } = require("./credentials");

package/src/{chat → app/chat}/agentSockets.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const net = require("net");
-const { PTY_SOCKET_MESSAGE_TYPES, PTY_SOCKET_SUBSCRIBE_MODES } = require("../shared/ptySocketContract");
+const { PTY_SOCKET_MESSAGE_TYPES, PTY_SOCKET_SUBSCRIBE_MODES } = require("../../runtime/contracts/ptySocketContract");
 
 function createAgentSockets(options = {}) {
   const {

package/src/{chat → app/chat}/commandExecutor.js

@@ -1,7 +1,7 @@
 const path = require("path");
-const EventBus = require("../bus");
-const { IPC_REQUEST_TYPES } = require("../shared/eventContract");
-const UfooInit = require("../init");
+const EventBus = require("../../coordination/bus");
+const { IPC_REQUEST_TYPES } = require("../../runtime/contracts/eventContract");
+const UfooInit = require("../cli/features/init");
 const { runGroupCoreCommand } = require("../cli/groupCoreCommands");
 const {
   loadConfig: loadProjectConfig,
@@ -12,30 +12,30 @@ const {
   SETTINGS_MODEL_DEFAULTS,
   defaultAgentModelForProvider,
   defaultRouterModelForProvider,
-} = require("../config");
-const { resolveTransport } = require("../code/nativeRunner");
-const { resolveDisplayNickname } = require("../daemon/nicknameScope");
+} = require("../../config");
+const { resolveTransport } = require("../../code/nativeRunner");
+const { resolveDisplayNickname } = require("../../runtime/daemon/nicknameScope");
 const { parseIntervalMs, formatIntervalMs } = require("./cronScheduler");
-const { isGlobalControllerProjectRoot, resolveGlobalControllerUfooDir } = require("../projects");
-const { loadPromptProfileRegistry } = require("../group/promptProfiles");
-const { resolveSoloAgentType } = require("../solo/commands");
+const { isGlobalControllerProjectRoot, resolveGlobalControllerUfooDir } = require("../../runtime/projects");
+const { loadPromptProfileRegistry } = require("../../orchestration/groups/promptProfiles");
+const { resolveSoloAgentType } = require("../../orchestration/solo/commands");
 const {
   inspectDirectAuthStatus,
   formatDirectAuthStatus,
-} = require("../agent/directAuthStatus");
+} = require("../../agents/providers/directAuthStatus");
 
 function defaultCreateDoctor(projectRoot) {
-  const UfooDoctor = require("../doctor");
+  const UfooDoctor = require("../cli/features/doctor");
   return new UfooDoctor(projectRoot);
 }
 
 function defaultCreateContext(projectRoot) {
-  const UfooContext = require("../context");
+  const UfooContext = require("../../coordination/context");
   return new UfooContext(projectRoot);
 }
 
 function defaultCreateSkills(projectRoot) {
-  const UfooSkills = require("../skills");
+  const UfooSkills = require("../cli/features/skills");
   return new UfooSkills(projectRoot);
 }
 
@@ -51,6 +51,9 @@ function normalizeSettingsProvider(value = "", fallback = "codex-cli") {
   if (text === "claude" || text === "claude-cli" || text === "claude-code" || text === "anthropic") {
     return "claude-cli";
   }
+  if (text === "agy" || text === "agy-cli" || text === "antigravity") {
+    return "agy-cli";
+  }
   if (text === "codex" || text === "codex-cli" || text === "codex-code" || text === "openai") {
     return "codex-cli";
   }
@@ -58,7 +61,10 @@ function normalizeSettingsProvider(value = "", fallback = "codex-cli") {
 }
 
 function agentProviderKey(value = "") {
-  return normalizeSettingsProvider(value) === "claude-cli" ? "claude" : "codex";
+  const provider = normalizeSettingsProvider(value);
+  if (provider === "claude-cli") return "claude";
+  if (provider === "agy-cli") return "agy";
+  return "codex";
 }
 
 function defaultGateModelForProvider(value = "") {
@@ -147,6 +153,7 @@ function createCommandExecutor(options = {}) {
     resolveTerminalApp = defaultResolveTerminalApp,
     sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
     schedule = (fn, ms) => setTimeout(fn, ms),
+    clearLog = null,
   } = options;
 
   if (!projectRoot) {
@@ -237,7 +244,7 @@ function createCommandExecutor(options = {}) {
 
     if (subcommand === "stop") {
       statusMsg("{gray-fg}⚙{/gray-fg} Stopping daemon...");
-      stopDaemon(targetRoot);
+      stopDaemon(targetRoot, { source: "chat-command:/daemon stop" });
       await sleep(1000);
       if (!isDaemonRunning(targetRoot)) {
         statusMsg("{gray-fg}✓{/gray-fg} Daemon stopped");
@@ -249,8 +256,12 @@ function createCommandExecutor(options = {}) {
 
     if (subcommand === "restart") {
       statusMsg("{gray-fg}⚙{/gray-fg} Restarting daemon...");
-      stopDaemon(targetRoot);
+      stopDaemon(targetRoot, { source: "chat-command:/daemon restart" });
       await sleep(500);
+      if (isDaemonRunning(targetRoot)) {
+        statusMsg("{gray-fg}✗{/gray-fg} Failed to stop daemon");
+        return;
+      }
       startDaemon(targetRoot);
       await sleep(1000);
       if (isDaemonRunning(targetRoot)) {
@@ -475,14 +486,17 @@ function createCommandExecutor(options = {}) {
     if (args.length === 0) {
       logMessage(
         "error",
-        "{white-fg}✗{/white-fg} Usage: /launch <claude|codex|ucode> [nickname=<name>] [profile=<id>] [count=<n>] [scope=inplace|window]"
+        "{white-fg}✗{/white-fg} Usage: /launch <claude|codex|agy|ucode> [nickname=<name>] [profile=<id>] [count=<n>] [scope=inplace|window]"
       );
       return;
     }
 
-    const agentType = String(args[0] || "").trim().toLowerCase();
-    if (agentType !== "claude" && agentType !== "codex" && agentType !== "ucode") {
-      logMessage("error", "{white-fg}✗{/white-fg} Unknown agent type. Use: claude, codex, or ucode");
+    const agentTypeInput = String(args[0] || "").trim().toLowerCase();
+    // Accept friendly aliases the same way `ufoo launch` does in cli.js.
+    let agentType = agentTypeInput;
+    if (agentTypeInput === "antigravity" || agentTypeInput === "uagy") agentType = "agy";
+    if (agentType !== "claude" && agentType !== "codex" && agentType !== "agy" && agentType !== "ucode") {
+      logMessage("error", "{white-fg}✗{/white-fg} Unknown agent type. Use: claude, codex, agy, or ucode");
       return;
     }
     const normalizedAgent = agentType === "ucode" ? "ufoo" : agentType;
@@ -657,7 +671,7 @@ function createCommandExecutor(options = {}) {
 
     const profile = String(args[1] || "").trim();
     if (!profile) {
-      logMessage("error", "{white-fg}✗{/white-fg} Usage: /solo run <prompt-profile> [agent=codex|claude|ucode] [nickname=<name>] [scope=inplace|window]");
+      logMessage("error", "{white-fg}✗{/white-fg} Usage: /solo run <prompt-profile> [agent=codex|claude|agy|ucode] [nickname=<name>] [scope=inplace|window]");
       return;
     }
 
@@ -1251,13 +1265,15 @@ function createCommandExecutor(options = {}) {
       logMessage("system", `  • provider: ${key}`);
       logMessage("system", `  • model: ${model || `(unset, recommended ${defaultAgentModelForProvider(provider)})`}`);
       logMessage("system", `  • defaults: codex=${SETTINGS_MODEL_DEFAULTS.agent.codex}, claude=${SETTINGS_MODEL_DEFAULTS.agent.claude}`);
-      logMessage("system", "  • use: /settings agent set provider=<codex|claude> model=<id>");
+      logMessage("system", "  • use: /settings agent set provider=<codex|claude|agy> model=<id>");
       return;
     }
 
-    if (action === "codex" || action === "claude") {
+    if (action === "codex" || action === "claude" || action === "agy") {
       const kv = parseKeyValueArgs(args.slice(1));
-      const provider = action === "claude" ? "claude-cli" : "codex-cli";
+      const provider = action === "claude"
+        ? "claude-cli"
+        : (action === "agy" ? "agy-cli" : "codex-cli");
       const model = String(kv.model || defaultAgentModelForProvider(provider)).trim();
       saveConfig(projectRoot, {
         agentProvider: provider,
@@ -1443,10 +1459,8 @@ function createCommandExecutor(options = {}) {
   }
 
   async function handleUfooCommand(args = []) {
-    // Handle /ufoo command (session marker from daemon)
-    // When daemon sends /ufoo <marker>, we should just check for pending messages
+    // Legacy /ufoo <single-token> compatibility: check pending messages silently.
     if (args.length > 0) {
-      // This is a probe marker, check for pending messages
       const subscriberId = process.env.UFOO_SUBSCRIBER_ID;
       if (subscriberId) {
         try {
@@ -1460,7 +1474,7 @@ function createCommandExecutor(options = {}) {
           // Ignore errors when checking messages
         }
       }
-      // Don't log anything else for probe markers
+      // Do not log anything else for legacy single-token input.
       return;
     }
 
@@ -1562,6 +1576,20 @@ function createCommandExecutor(options = {}) {
     const { command, args } = parsed;
 
     switch (command) {
+      case "clear":
+        if (typeof clearLog === "function") {
+          clearLog();
+        } else {
+          logMessage("error", "{white-fg}✗{/white-fg} /clear is not available in this view");
+        }
+        return true;
+      case "multi":
+        if (typeof options.toggleMultiWindow === "function") {
+          options.toggleMultiWindow();
+        } else {
+          logMessage("error", "{white-fg}✗{/white-fg} Multi-window mode is not available");
+        }
+        return true;
       case "doctor":
         await handleDoctorCommand();
         return true;