u-foo 2.3.32 → 2.4.0

package/bin/ufoo.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 /* eslint-disable no-console */
-const { runCli } = require("../src/cli");
-const { runDaemonCli } = require("../src/daemon/run");
-const { runChat } = require("../src/chat");
-const { runInternalRunner } = require("../src/agent/internalRunner");
-const { runPtyRunner } = require("../src/agent/ptyRunner");
-const { resolveGlobalControllerProjectRoot } = require("../src/projects");
+const { runCli } = require("../src/app/cli/run");
+const { runDaemonCli } = require("../src/runtime/daemon/run");
+const { runChat } = require("../src/app/chat");
+const { runInternalRunner } = require("../src/agents/internal/internalRunner");
+const { resolveGlobalControllerProjectRoot } = require("../src/runtime/projects");
 
 const rawArgv = process.argv.slice(2);
 
@@ -33,23 +32,6 @@ async function main() {
     await runInternalRunner({ projectRoot: process.cwd(), agentType, extraArgs });
     return;
   }
-  if (cmd === "agent-pty-runner") {
-    const agentType = argv[1] || "codex";
-    const extraArgs = argv.slice(2);
-    try {
-      await runPtyRunner({ projectRoot: process.cwd(), agentType, extraArgs });
-    } catch (err) {
-      const normalized = String(agentType || "").trim().toLowerCase();
-      if (normalized === "ufoo" || normalized === "ucode" || normalized === "ufoo-code") {
-        throw err;
-      }
-      // Fallback to headless runner if PTY is unavailable
-      // eslint-disable-next-line no-console
-      console.error(`[pty-runner] ${err.message || err}. Falling back to headless internal runner.`);
-      await runInternalRunner({ projectRoot: process.cwd(), agentType, extraArgs });
-    }
-    return;
-  }
   if (cmd === "chat") {
     await runChat(chatProjectRoot, { globalMode });
     return;

package/modules/AGENTS.template.md

@@ -3,6 +3,6 @@
 
 > **Default: do not write a decision.** Record one only for important, plan-level knowledge that should constrain future work: architectural choices, trade-off analysis, cross-agent coordination, or precedent-setting integration contracts. NOT for routine findings, simple fixes, or because the user asked for a plan/evaluation/recommendation. Durable project facts belong in shared memory, not decisions. → `ufoo ctx decisions new "Title"` BEFORE acting only when that high bar is met.
 > **Read shared memory before writing it.** Durable facts live in `.ufoo/memory/`; use `ufoo memory list/show`, `recall`, `search_memory`, or redacted `search_history` evidence before `remember` / `edit_memory`.
-> **Auto-execute bus messages.** On `ubus`: execute tasks immediately, reply to sender, then `ufoo bus ack`. Never ask the user.
+> **Auto-execute bus messages.** On `ubus`: execute tasks immediately, then `ufoo bus ack`. Never ask the user.
 > **Full protocol**: `/ufoo` skill (auto-loaded on session start). Docs: `.ufoo/docs/`
 <!-- /ufoo -->

package/modules/bus/SKILLS/ubus/SKILL.md

@@ -120,7 +120,7 @@ ufoo bus ack "$SUBSCRIBER"
 
 **This is critical** - if you don't ack, the daemon will keep injecting `/ubus` commands.
 
-If there's nothing to do (no actionable task), just ack immediately without sending a reply.
+**Default behavior is ack-only, no reply.** If there's nothing to do (no actionable task, no question to answer, no follow-up the sender genuinely needs), just ack and stop. Silence is a valid response — see "Handling Received Messages" below for when a reply IS warranted.
 
 ### 6. Routing Override
 
@@ -164,15 +164,40 @@ ufoo bus nick <subscriber-id> "new-nickname"
 
 ## Handling Received Messages
 
-When receiving targeted messages:
-
-1. **Understand request** - Read message content
-2. **Execute task** - If task delegation, execute it
-3. **Reply to sender** - Send response after completion
-
-```bash
-ufoo bus send "<sender-id>" "<reply-content>"
-```
+When receiving targeted messages, the default flow is **execute → ack → stop**.
+Replies are the exception, not the default.
+
+1. **Understand request** — Read message content.
+2. **Execute task** — If the message delegates a task, do it.
+3. **`ufoo bus ack "$SUBSCRIBER"`** — Always ack, even when not replying.
+4. **Reply ONLY when substantive.** Send `ufoo bus send` to the sender only if at least one of the following is true:
+   - The sender asked a question → reply with the answer.
+   - The sender delegated a task → reply with the result / artifact / status.
+   - You discovered something the sender needs to proceed → reply with that fact.
+
+   ```bash
+   # Use this only when the criteria above are met.
+   ufoo bus send "<sender-id>" "<substantive-reply>"
+   ```
+
+### Anti-pattern: greet / ack loops
+
+If the inbound message is itself just a greeting, an acknowledgment, or a
+pleasantry, **do not reply**. Acking is enough. A bare-acknowledgment reply
+will be auto-injected on the other side, triggering them to reply in kind,
+and the two of you will ping-pong forever.
+
+| Inbound | Reply? |
+|---|---|
+| `👋` / `hi` / `hello` / `你好` | ❌ ack only |
+| `👍` / `ok` / `收到` / `thanks` / `noted` | ❌ ack only |
+| `已完成 / done / finished` (without a result the sender asked for) | ❌ ack only |
+| `请把 src/foo.ts 改成 ...` (task) | ✅ reply with result |
+| `这个 bug 的根因是什么？` (question) | ✅ reply with answer |
+| `我帮你找到了 X，需要你做 Y` (request) | ✅ reply with status |
+
+When in doubt: ack and wait. If the sender genuinely needs something
+from you, they will follow up with a concrete question or task.
 
 ## Sending Messages
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.3.32",
+  "version": "2.4.0",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",
@@ -19,6 +19,7 @@
     "ufoo": "bin/ufoo.js",
     "uclaude": "bin/uclaude.js",
     "ucodex": "bin/ucodex.js",
+    "uagy": "bin/uagy.js",
     "ucode": "bin/ucode.js",
     "ucode-core": "bin/ucode-core.js"
   },
@@ -49,16 +50,15 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.138",
     "@openai/codex-sdk": "^0.130.0",
-    "blessed": "^0.1.81",
+    "@xterm/addon-serialize": "^0.14.0",
+    "@xterm/headless": "^6.0.0",
     "chalk": "^4.1.2",
     "commander": "^13.1.0",
     "gray-matter": "^4.0.3",
     "ink": "^5.2.1",
     "node-pty": "^1.1.0",
     "react": "^18.3.1",
-    "ws": "^8.19.0",
-    "xterm-addon-serialize": "^0.11.0",
-    "xterm-headless": "^5.3.0"
+    "ws": "^8.19.0"
   },
   "devDependencies": {
     "jest": "^30.2.0"

package/scripts/chat-app-smoke.js

@@ -7,7 +7,7 @@
  */
 
 const { runInk } = require("../src/ui/runInk");
-const { createChatApp } = require("../src/ui/components/ChatApp");
+const { createChatApp } = require("../src/ui/ink/ChatApp");
 
 (async () => {
   const props = {

package/scripts/global-chat-switch-benchmark.js

@@ -3,11 +3,11 @@
 const fs = require("fs");
 const path = require("path");
 const { spawn, spawnSync } = require("child_process");
-const UfooInit = require("../src/init");
-const { socketPath, isRunning } = require("../src/daemon");
-const { connectWithRetry } = require("../src/chat/transport");
-const { createDaemonTransport } = require("../src/chat/daemonTransport");
-const { createDaemonCoordinator } = require("../src/chat/daemonCoordinator");
+const UfooInit = require("../src/app/cli/features/init");
+const { socketPath, isRunning } = require("../src/runtime/daemon");
+const { connectWithRetry } = require("../src/app/chat/transport");
+const { createDaemonTransport } = require("../src/app/chat/daemonTransport");
+const { createDaemonCoordinator } = require("../src/app/chat/daemonCoordinator");
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));

package/scripts/ink-demo.js

@@ -9,7 +9,7 @@
  */
 
 const { runInk } = require("../src/ui/runInk");
-const { createInkDemo } = require("../src/ui/components/InkDemo");
+const { createInkDemo } = require("../src/ui/ink/InkDemo");
 
 (async () => {
   const handle = await runInk((React, ink) => {

package/scripts/ink-smoke.js

@@ -7,7 +7,7 @@
  */
 
 const { runInk } = require("../src/ui/runInk");
-const { createInkDemo } = require("../src/ui/components/InkDemo");
+const { createInkDemo } = require("../src/ui/ink/InkDemo");
 
 (async () => {
   const handle = await runInk((React, ink) => {

package/scripts/ucode-app-smoke.js

@@ -7,7 +7,7 @@
  */
 
 const { runInk } = require("../src/ui/runInk");
-const { createUcodeApp } = require("../src/ui/components/UcodeApp");
+const { createUcodeApp } = require("../src/ui/ink/UcodeApp");
 
 (async () => {
   const props = {

package/src/{agent → agents/activity}/activityDetector.js

@@ -10,7 +10,7 @@
  *                      BLOCKED ----+
  */
 
-const { isTranscriptActive } = require("./claudeSessionFiles");
+const { isTranscriptActive } = require("../providers/claudeSessionFiles");
 
 const ACTIVITY_STATES = {
   starting: "starting",
@@ -46,6 +46,27 @@ const INPUT_PATTERNS = {
     /\[Y\/n\]/,                        // Bracket-style prompt
     /\by\/n\b/i,                       // y/n prompt (common in confirmation dialogs)
   ],
+  // agy (Antigravity CLI) shows ink-style menus and y/n approvals.
+  agy: [
+    /Use arrow keys to navigate, Enter to select/, // Any agy menu selector
+    /Select login method:/,            // Initial OAuth login picker
+    /Yes, and run (?:in|without) sandbox/i, // Terminal command approval (sandbox toggle)
+    /\bn\b\s*-\s*Don't run/i,          // y/n/edit confirmation
+  ],
+};
+
+// Agent-specific FATAL patterns that immediately move the agent into BLOCKED
+// state (no quiet-window/timeout waiting). Reserved for hard backend errors
+// the user can't resolve by waiting — e.g. agy's account-eligibility / region
+// check failure, which returns 400 from the backend and the conversation
+// never advances.
+const FATAL_PATTERNS = {
+  agy: [
+    /Eligibility check failed/,        // 18+/region not allowed
+    /User location is not supported/,  // Geo restriction
+    /Account ineligible/,              // Generic account-state failure
+    /FAILED_PRECONDITION/,             // gRPC backend precondition reject
+  ],
 };
 
 const COMMON_PATTERNS = [
@@ -80,7 +101,7 @@ class ActivityDetector {
   /**
    * @param {string} agentType - e.g. "claude-code", "codex"
    * @param {object} [options]
-   * @param {string} [options.mode] - launch mode ("internal-pty"/"terminal"/"tmux"/"iterm2")
+   * @param {string} [options.mode] - launch mode ("terminal"/"tmux"/"iterm2"/"pty-runner")
    * @param {number} [options.bufferSize=4000] - rolling buffer size in chars
    * @param {number} [options.tailLines=10] - number of tail lines used for quiet-time prompt detection
    * @param {boolean} [options.startOnOutput=false] - allow STARTING -> WORKING on first output
@@ -259,6 +280,22 @@ class ActivityDetector {
 
     const tailBuffer = this._tailWindow();
 
+    // Fatal-pattern check first: these go straight to BLOCKED with no
+    // recovery timer. Used for backend errors the user can't wait out.
+    const fatalPatterns = FATAL_PATTERNS[this.agentType] || [];
+    for (const pattern of fatalPatterns) {
+      const match = pattern.exec(tailBuffer);
+      if (!match) continue;
+      const matchedText = String(match[0] || "");
+      const matchIndex = Number.isFinite(match.index)
+        ? match.index
+        : Math.max(0, tailBuffer.length - matchedText.length);
+      if (this._hasDeniedContext(tailBuffer, matchIndex, matchedText.length)) continue;
+      this._clearBlockedTimer();
+      this._setState(ACTIVITY_STATES.blocked, `fatal:${pattern.source}`);
+      return;
+    }
+
     // Check agent-specific patterns only after output has stabilized.
     const agentPatterns = INPUT_PATTERNS[this.agentType] || [];
     const allPatterns = [...agentPatterns, ...COMMON_PATTERNS];

package/src/{agent → agents/activity}/activityStatePublisher.js

@@ -5,7 +5,7 @@ const { writeActivityState } = require("./activityStateWriter");
 /**
  * Unified activity state publisher.
  * Encapsulates the "write to disk + broadcast event" pattern used by
- * ptyRunner, launcher, notifier, and internalRunner.
+ * launcher, notifier, and internalRunner.
  *
  * Dedupe key is `state|detail` so that within the same canonical state
  * (e.g. `working`) callers can publish detail transitions like

package/src/{agent → agents/activity}/activityStateWriter.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
-const { readJSON, writeJSON } = require("../bus/utils");
-const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
+const { readJSON, writeJSON } = require("../../coordination/bus/utils");
+const { appendAgentRegistryDiagnostic } = require("../../coordination/state/agentRegistryDiagnostics");
 
 /**
  * Centralized helper for writing activity_state to all-agents.json.

package/src/{agent → agents/activity}/activityTracker.js

@@ -7,7 +7,7 @@
  * canonical activity model (`starting`/`ready`/`working`/`idle`/`waiting_input`/`blocked`)
  * plus a short detail string (e.g. `thinking`, `tool bash`). Publishes through
  * an injected publisher so the same tracker can be reused by internal,
- * internal-pty, or future runner shapes.
+ * internal, or future runner shapes.
  *
  * Design contract:
  *  - The tracker never reads PTY text or guesses state from prose. All state

package/src/agents/activity/index.js

@@ -0,0 +1,8 @@
+"use strict";
+
+module.exports = {
+  ...require("./activityDetector"),
+  ...require("./activityStatePublisher"),
+  ...require("./activityStateWriter"),
+  ...require("./activityTracker"),
+};

package/src/{agent → agents/controller}/controllerToolExecutor.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const EventBus = require("../bus");
-const { getToolDefinition, CALLER_TIERS } = require("../tools");
-const { dispatchMessageHandler } = require("../tools/handlers/dispatchMessage");
-const { ackBusHandler } = require("../tools/handlers/ackBus");
+const EventBus = require("../../coordination/bus");
+const { getToolDefinition, CALLER_TIERS } = require("../../tools");
+const { dispatchMessageHandler } = require("../../tools/handlers/dispatchMessage");
+const { ackBusHandler } = require("../../tools/handlers/ackBus");
 
 function normalizeObjectArgs(value) {
   if (!value) return {};

package/src/agents/controller/index.js

@@ -0,0 +1,8 @@
+"use strict";
+
+module.exports = {
+  ...require("./controllerToolExecutor"),
+  ...require("./loopObservability"),
+  ...require("./loopRuntime"),
+  ...require("./ufooAgent"),
+};

package/src/{agent → agents/controller}/loopObservability.js

@@ -2,8 +2,8 @@
 
 const fs = require("fs");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
-const { redactSecrets } = require("../providerapi/redactor");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { redactSecrets } = require("../../runtime/privacy/redactor");
 
 const LOOP_EVENT_SCHEMA_VERSION = 1;
 

package/src/{agent → agents/controller}/loopRuntime.js

@@ -2,7 +2,7 @@
 
 const { executeControllerTool } = require("./controllerToolExecutor");
 const { createLoopObserver } = require("./loopObservability");
-const { finalizeRouterPayload } = require("../controller/routerFinalize");
+const { finalizeRouterPayload } = require("../../orchestration/controller/routerFinalize");
 
 const DEFAULT_LOOP_OPTIONS = {
   enabled: false,

package/src/{agent → agents/controller}/ufooAgent.js

@@ -1,17 +1,17 @@
 const fs = require("fs");
 const path = require("path");
-const { buildStatus } = require("../daemon/status");
-const { getUfooPaths } = require("../ufoo/paths");
-const { normalizeGateRouterResult } = require("../controller/gateRouter");
-const { normalizeProvider, sendUpstreamPrompt } = require("./upstreamTransport");
-const { normalizeAgentTypeAlias } = require("../bus/utils");
-const { buildCachedMemoryPrefix } = require("../memory");
-const { listProjectRuntimes, isGlobalControllerProjectRoot } = require("../projects");
-const { assignMissingLaunchNicknames } = require("../controller/launchRouting");
+const { buildStatus } = require("../../runtime/daemon/status");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { normalizeGateRouterResult } = require("../../orchestration/controller/gateRouter");
+const { normalizeProvider, sendUpstreamPrompt } = require("../providers/upstreamTransport");
+const { normalizeAgentTypeAlias } = require("../../coordination/bus/utils");
+const { buildCachedMemoryPrefix } = require("../../coordination/memory");
+const { listProjectRuntimes, isGlobalControllerProjectRoot } = require("../../runtime/projects");
+const { assignMissingLaunchNicknames } = require("../../orchestration/controller/launchRouting");
 const {
   CONTROLLER_MODES,
   resolveControllerMode,
-} = require("../controller/flags");
+} = require("../../orchestration/controller/flags");
 
 function loadSessionState(projectRoot) {
   const dir = getUfooPaths(projectRoot).agentDir;

package/src/agents/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = {
+  ...require("./activity"),
+  ...require("./controller"),
+  ...require("./internal"),
+  ...require("./launch"),
+  ...require("./prompts"),
+  ...require("./providers"),
+};

package/src/agents/internal/index.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = require("./internalRunner");

package/src/{agent → agents/internal}/internalRunner.js

@@ -1,25 +1,26 @@
 const fs = require("fs");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../../coordination/state/paths");
 const { spawnSync } = require("child_process");
-const EventBus = require("../bus");
-const { readJSON, writeJSON } = require("../bus/utils");
-const { createActivityStatePublisher } = require("./activityStatePublisher");
-const { createActivityTracker } = require("./activityTracker");
-const { loadConfig, normalizeCodexInternalThreadMode } = require("../config");
-const { createCodexThreadProvider } = require("./codexThreadProvider");
-const { createClaudeThreadProvider } = require("./claudeThreadProvider");
-const { resolveClaudeUpstreamCredentials } = require("./credentials/claude");
-const { buildUpstreamAuthFromCredential } = require("./credentials");
-const { listToolsForCallerTier, CALLER_TIERS } = require("../tools");
-const { redactToolCallPayload, redactSecrets } = require("../providerapi/redactor");
-const { buildCachedMemoryPrefix } = require("../memory");
-const { shouldForwardStreamToPublisher } = require("./publisherRouting");
-const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
+const EventBus = require("../../coordination/bus");
+const { readJSON, writeJSON } = require("../../coordination/bus/utils");
+const { createActivityStatePublisher } = require("../activity/activityStatePublisher");
+const { createActivityTracker } = require("../activity/activityTracker");
+const { loadConfig, normalizeCodexInternalThreadMode } = require("../../config");
+const { createCodexThreadProvider } = require("../providers/codexThreadProvider");
+const { createClaudeThreadProvider } = require("../providers/claudeThreadProvider");
+const { resolveClaudeUpstreamCredentials } = require("../providers/credentials/claude");
+const { buildUpstreamAuthFromCredential } = require("../providers/credentials");
+const { listToolsForCallerTier, CALLER_TIERS } = require("../../tools");
+const { redactToolCallPayload, redactSecrets } = require("../../runtime/privacy/redactor");
+const { buildCachedMemoryPrefix } = require("../../coordination/memory");
+const { normalizePublisher, shouldForwardStreamToPublisher } = require("../launch/publisherRouting");
+const { appendAgentRegistryDiagnostic } = require("../../coordination/state/agentRegistryDiagnostics");
 const {
   buildDefaultStartupBootstrapPrompt,
   isValueForCodexOption,
-} = require("./defaultBootstrap");
+} = require("../prompts/defaultBootstrap");
+const { buildPromptInjectionText } = require("../../coordination/bus/promptEnvelope");
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -161,6 +162,21 @@ function buildMemoryPrefix(projectRoot, limit = 50) {
   }
 }
 
+function readAgentsMap(projectRoot) {
+  try {
+    const data = readJSON(getUfooPaths(projectRoot).agentsFile, null);
+    return data && data.agents && typeof data.agents === "object" ? data.agents : {};
+  } catch {
+    return {};
+  }
+}
+
+function buildInternalPromptMessage(projectRoot, subscriber, evt = {}) {
+  const message = String((evt.data && evt.data.message) || "");
+  if (evt.__agentViewRaw) return message;
+  return buildPromptInjectionText(evt, subscriber, readAgentsMap(projectRoot));
+}
+
 function createBusSender(projectRoot, subscriber) {
   const eventBus = new EventBus(projectRoot);
   let sendQueue = Promise.resolve();
@@ -187,11 +203,20 @@ function createBusSender(projectRoot, subscriber) {
 
 function isChatUiSource(source = "") {
   const value = String(source || "").trim();
-  return value === "chat-direct" || value === "chat-internal-agent-view";
+  return value === "chat-direct"
+    || value === "chat-agent-view"
+    || value === "chat-internal-agent-view";
+}
+
+function isUfooAgentDispatchSource(source = "") {
+  const value = String(source || "").trim();
+  return value === "ufoo-agent" || value === "ufoo-agent-gate-router";
 }
 
 function shouldStreamReplyToPublisher(projectRoot, publisher, evt = {}) {
-  if (isChatUiSource(evt && evt.data ? evt.data.source : "")) return true;
+  const source = evt && evt.data ? evt.data.source : "";
+  if (isChatUiSource(source)) return true;
+  if (normalizePublisher(publisher) === "ufoo-agent" && isUfooAgentDispatchSource(source)) return true;
   return shouldForwardStreamToPublisher(projectRoot, publisher);
 }
 
@@ -311,7 +336,8 @@ async function handleEvent(
 ) {
   if (!evt || !evt.data || !evt.data.message) return;
   const memoryPrefix = buildMemoryPrefix(projectRoot);
-  const prompt = [bootstrapText, memoryPrefix, evt.data.message]
+  const promptMessage = buildInternalPromptMessage(projectRoot, subscriber, evt);
+  const prompt = [bootstrapText, memoryPrefix, promptMessage]
     .map((item) => String(item || "").trim())
     .filter(Boolean)
     .join("\n\n");
@@ -732,9 +758,6 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
   const queueDir = path.join(getUfooPaths(projectRoot).busQueuesDir, safeSubscriber(subscriber));
   const queueFile = path.join(queueDir, "pending.jsonl");
   const normalizedAgentType = String(agentType || "").trim().toLowerCase();
-  if (normalizedAgentType === "ufoo" || normalizedAgentType === "ucode" || normalizedAgentType === "ufoo-code") {
-    throw new Error("ufoo core is not supported by headless internal runner; use internal-pty");
-  }
   const provider = normalizedAgentType === "codex" ? "codex-cli" : "claude-cli";
   const model = process.env.UFOO_AGENT_MODEL || "";
   const bootstrap = resolveInternalBootstrap({