u-foo 2.3.32 → 2.4.0

package/src/{daemon → runtime/daemon}/status.js

@@ -1,10 +1,10 @@
 const fs = require("fs");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
-const { isMetaActive } = require("../bus/utils");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { isMetaActive } = require("../../coordination/bus/utils");
 const { resolveDisplayNickname, resolveScopedNickname } = require("./nicknameScope");
-const { readReportSummary, countControllerInboxEntries } = require("../report/store");
-const { readRecentLoopSummary } = require("../agent/loopObservability");
+const { readReportSummary, countControllerInboxEntries } = require("../../coordination/report/store");
+const { readRecentLoopSummary } = require("../../agents/controller/loopObservability");
 
 function readBus(projectRoot) {
   const busPath = getUfooPaths(projectRoot).agentsFile;
@@ -16,7 +16,7 @@ function readBus(projectRoot) {
 }
 
 function readDecisions(projectRoot) {
-  const DecisionsManager = require("../context/decisions");
+  const DecisionsManager = require("../../coordination/context/decisions");
   const manager = new DecisionsManager(projectRoot);
   const dir = manager.decisionsDir;
   let open = 0;

package/src/runtime/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = {
+  projects: require("./projects"),
+  terminal: require("./terminal"),
+  contracts: {
+    ...require("./contracts/eventContract"),
+    ...require("./contracts/ptySocketContract"),
+  },
+};

package/src/{projects → runtime/projects}/registry.js

@@ -2,7 +2,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const { canonicalProjectRoot, buildProjectId, trimTrailingSlashes } = require("./projectId");
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../../coordination/state/paths");
 
 const DEFAULT_STALE_TTL_MS = 30 * 1000;
 const DEFAULT_TMP_CLEANUP_AGE_MS = 5 * 60 * 1000;

package/src/{terminal → runtime/terminal}/adapterRouter.js

@@ -5,7 +5,6 @@ const {
 const { createTerminalAdapter } = require("./adapters/terminalAdapter");
 const { createTmuxAdapter } = require("./adapters/tmuxAdapter");
 const { createInternalQueueAdapter } = require("./adapters/internalQueueAdapter");
-const { createInternalPtyAdapter } = require("./adapters/internalPtyAdapter");
 const { createHostAdapter } = require("./adapters/hostAdapter");
 
 function createTerminalAdapterRouter(options = {}) {
@@ -65,15 +64,6 @@ function createTerminalAdapterRouter(options = {}) {
       });
     }
 
-    if (launchMode === "internal-pty") {
-      return createInternalPtyAdapter({
-        sendRaw,
-        sendResize,
-        requestSnapshot,
-        createAdapter,
-      });
-    }
-
     if (launchMode === "internal") {
       return createInternalQueueAdapter({
         sendRaw,

package/src/{terminal → runtime/terminal}/adapters/internalAdapter.js

@@ -1,10 +1,6 @@
-const { createInternalPtyAdapter } = require("./internalPtyAdapter");
 const { createInternalQueueAdapter } = require("./internalQueueAdapter");
 
 function createInternalAdapter(options = {}) {
-  if (options.usePty) {
-    return createInternalPtyAdapter(options);
-  }
   return createInternalQueueAdapter(options);
 }
 

package/src/tools/handlers/common.js

@@ -1,4 +1,4 @@
-const EventBus = require("../../bus");
+const EventBus = require("../../coordination/bus");
 const { CALLER_TIERS, normalizeCallerTier } = require("../types");
 
 function extractAuditFields(ctx = {}) {

package/src/tools/handlers/listAgents.js

@@ -1,4 +1,4 @@
-const { buildStatus } = require("../../daemon/status");
+const { buildStatus } = require("../../runtime/daemon/status");
 
 function listAgentsHandler(ctx = {}) {
   const status = buildStatus(ctx.projectRoot);

package/src/tools/handlers/memory.js

@@ -1,6 +1,6 @@
-const MemoryManager = require("../../memory");
-const { estimateTokens } = require("../../memory");
-const { searchHistory } = require("../../memory/historySearch");
+const MemoryManager = require("../../coordination/memory");
+const { estimateTokens } = require("../../coordination/memory");
+const { searchHistory } = require("../../coordination/memory/historySearch");
 const { buildToolError, extractAuditFields, requireSubscriber } = require("./common");
 
 const BANNED_TIME_PATTERNS = [

package/src/tools/handlers/readBusSummary.js

@@ -1,4 +1,4 @@
-const { buildStatus } = require("../../daemon/status");
+const { buildStatus } = require("../../runtime/daemon/status");
 
 function readBusSummaryHandler(ctx = {}) {
   const status = buildStatus(ctx.projectRoot);

package/src/tools/handlers/readOpenDecisions.js

@@ -1,4 +1,4 @@
-const DecisionsManager = require("../../context/decisions");
+const DecisionsManager = require("../../coordination/context/decisions");
 
 function readOpenDecisionsHandler(ctx = {}, args = {}) {
   const limit = Number.isFinite(Number(args.limit)) && Number(args.limit) > 0

package/src/tools/handlers/readProjectRegistry.js

@@ -1,4 +1,4 @@
-const { listProjectRuntimes } = require("../../projects/registry");
+const { listProjectRuntimes } = require("../../runtime/projects/registry");
 
 function readProjectRegistryHandler(_ctx = {}, args = {}) {
   const validate = args.validate !== false;

package/src/tools/handlers/readPromptHistory.js

@@ -1,8 +1,8 @@
 const fs = require("fs");
 const path = require("path");
 
-const { buildStatus } = require("../../daemon/status");
-const { getUfooPaths } = require("../../ufoo/paths");
+const { buildStatus } = require("../../runtime/daemon/status");
+const { getUfooPaths } = require("../../coordination/state/paths");
 
 function clipPromptText(value = "", maxChars = 240) {
   const text = String(value || "").replace(/\s+/g, " ").trim();

package/src/tools/schemaFixtures.js

@@ -456,7 +456,7 @@ const LAUNCH_AGENT_SCHEMA = Object.freeze({
     properties: Object.freeze({
       agent: Object.freeze({
         type: "string",
-        enum: Object.freeze(["codex", "claude", "ucode"]),
+        enum: Object.freeze(["codex", "claude", "ucode", "agy"]),
       }),
       count: Object.freeze({ type: "integer", minimum: 1 }),
       nickname: Object.freeze({ type: "string" }),

package/src/ui/MIGRATION.md

@@ -1,14 +1,14 @@
 # Ink TUI Migration Plan
 
-Status: Ink is the default TUI for chat and ucode. The legacy blessed
-renderer remains available with `UFOO_TUI=blessed` as a temporary fallback.
+Status: Ink is the only TUI for chat and ucode. The legacy blessed renderer
+has been removed after the parity close-out.
 
 ## Why
 
-The legacy chat, ucode and internal-agent TUIs all use blessed. Blessed is
-an unmaintained imperative widget tree with no modern equivalent of React's
-component model, and it's awkward to extend (manual layout math, manual
-redraws, no useful test harness).
+The removed legacy chat, ucode and internal-agent TUIs used blessed. Blessed
+is an unmaintained imperative widget tree with no modern equivalent of
+React's component model, and it was awkward to extend (manual layout math,
+manual redraws, no useful test harness).
 
 ink (the React-for-terminals library, what Claude Code, Codex CLI fronts
 and the Gemini CLI all use) gives us declarative components, flexbox
@@ -16,11 +16,10 @@ layout, hooks, and proper isolation of pure logic from rendering.
 
 ## Approach
 
-- Ink is the default renderer; `UFOO_TUI=blessed` keeps the legacy path
-  available while fallback removal is evaluated separately.
-- Pure helpers live in `src/ui/format/` and are shared by both, so behaviour
-  parity is enforced by test rather than copy/paste.
-- Components live in `src/ui/components/`, written in plain JS via
+- Ink is the renderer for both chat and ucode.
+- Pure helpers live in `src/ui/format/`, so behaviour parity is enforced by
+  test rather than copy/paste.
+- Components live in `src/ui/ink/`, written in plain JS via
   `React.createElement` (no JSX, no build step) so jest stays vanilla.
 - ink is loaded through `src/ui/runInk.js`, a thin CJS→ESM bridge so the
   rest of the codebase stays CommonJS.
@@ -61,7 +60,6 @@ layout, hooks, and proper isolation of pure logic from rendering.
 
 ```sh
 ./bin/ucode.js
-# fallback: UFOO_TUI=blessed ./bin/ucode.js
 ```
 
 ### Editor
@@ -129,25 +127,18 @@ layout, hooks, and proper isolation of pure logic from rendering.
 
 ## P2 dropped, folded into P3
 
-The internal-agent view in chat is not an independent program — it's a
-view mode owned by `src/chat/agentViewController.js`. Today it works by
-detaching `screen.children`, writing raw `\x1b[2J` to stdout, and
-flipping `screen.grabKeys`. There is no clean seam to mount an isolated
-ink subtree inside a still-blessed chat host, so attempting P2 in
-isolation would force us to build a stdout-arbitration layer we'd throw
-away once chat itself is on ink. P3.6 ports the agent view as a chat
-sub-mode instead.
+The internal-agent view in chat is not an independent program. It is now
+an Ink chat sub-mode, so the earlier plan to mount a separate subtree was
+folded into P3.6.
 
 ## P3 audit (chat TUI surface)
 
-Source: `src/chat/index.js` (2215 lines) + ~30 controllers in
-`src/chat/`. Highlights:
+Source: the current Ink host in `src/ui/ink/ChatApp.js`, with
+shared daemon and command helpers under `src/app/chat/`. Highlights:
 
 ### Lifecycle
 - Public entrypoint `runChat(projectRoot, { globalMode })` from
-  `src/chat/index.js`. Wires `daemonCoordinator.connect()` then loops
-  forever; exit goes through `process.exit(0)` from a screen `destroy`
-  hook.
+  `src/app/chat/index.js`; it delegates directly to the Ink ChatApp.
 - Runners injected via closures: `daemonCoordinator.send`,
   `executeCommand`, `inputSubmitHandler.handleSubmit`,
   `daemonMessageRouter.handleMessage`.
@@ -187,19 +178,10 @@ Source: `src/chat/index.js` (2215 lines) + ~30 controllers in
 - `daemonReconnect.restartDaemonFlow()` provides a per-project lock for
   daemon restarts.
 
-### Side controllers
+### Shared helpers
 - `cronScheduler` — `/cron start|stop|list` + the cron dashboard view.
 - `settingsController` — launch mode / agent provider,
   with daemon restart on mode/provider change. `autoResume` stays config/command-driven.
-- `chatLogController` — log buffer + history file replay
-  (`loadHistory`, `appendHistory`, `markStreamStart`,
-  `setHistoryTarget`, `resetViewState`).
-- `statusLineController` — debounced status line with background-task
-  suffix (e.g. `(ufoo-agent processing)`); `queueStatusLine`,
-  `resolveStatusLine`, `enqueueBusStatus`, `resolveBusStatus`.
-- `streamTracker` — per-publisher stream state + markdown rendering
-  (`beginStream`, `appendStreamDelta`, `finalizeStream`,
-  `markPendingDelivery`, `consumePendingDelivery`).
 - `transientAgentState` — TTL-bounded `working / waiting_input /
   blocked` markers per agent.
 - `projectCloseController` — `requestCloseProject(index)` runs daemon
@@ -207,31 +189,20 @@ Source: `src/chat/index.js` (2215 lines) + ~30 controllers in
 - `agentDirectory` — agent label resolution + window clamping (pure).
 - `internalAgentLogHistory` — bus log replay for internal agents.
 
-### Internal-agent sub-view (`agentViewController`, 1072 lines)
-- Public API: `getCurrentView`, `getViewingAgent`,
-  `isAgentViewUsesBus`, `getAgentInputSuppressUntil`,
-  `get/setAgentOutputSuppressed`, `renderAgentDashboard`,
-  `setAgentBarVisible`, `enterAgentView(agentId, options)`,
-  `exitAgentView`, `sendRawToAgent`, `sendResizeToAgent`,
-  `requestAgentSnapshot`, `writeToAgentTerm`, `placeAgentCursor`,
-  `handleBusAgentKey`, `handleResizeInAgentView`, `refreshAgentView`.
-- Two render modes inside it: PTY mirror (raw ANSI passthrough +
-  cursor placement, `agentSockets.connectOutput/Input`,
-  `requestSnapshot`) and an embedded bus subview (own input value,
-  cursor, log, animated status indicator).
-- `agentBar.computeAgentBar` renders the agent strip across both
-  modes.
+### Internal-agent sub-view
+- Ink owns the agent sub-view inside ChatApp.
+- PTY mirror mode uses `agentSockets.connectOutput/Input` and
+  `requestSnapshot`.
+- Embedded bus mode keeps its own input value, cursor, log and status.
 - `agentSockets.createAgentSockets` owns the PTY/bus socket
   lifecycle.
-- Exit/restore reattaches `screen.children`, restores scroll region
-  and unfreezes `screen.render`.
 
-### Layout (`createChatLayout`)
-- 9 widgets: screen, logBox, statusLine, completionPanel, dashboard,
-  inputBottomLine, promptBox, input, inputTopLine.
-- Geometry rules: dashboard 1-2 lines, input 5-9 lines (autosizes by
-  content), log fills the rest. Many `height: "100%-N"` strings →
-  ink flex layout in the port.
+### Layout (Ink)
+- `ChatApp` owns the chat surface as a React tree under
+  `src/ui/ink/`.
+- Dashboard, log, status, completion, internal-agent panes and input are
+  rendered from React state with ink flex layout. No blessed widget geometry
+  or controller layer remains.
 
 ### Commands
 `/bus`, `/ctx`, `/daemon`, `/doctor`, `/cron`, `/group`, `/init`,
@@ -243,45 +214,30 @@ and `shouldEchoCommandInChat(text)` are pure.
 
 ### Cross-cutting
 - `text.js`: `escapeBlessed`, `stripBlessedTags`, `stripAnsi`,
-  `truncateAnsi`, `decodeEscapedNewlines`. Pervasive — used by every
-  log message, status line and dashboard line. The blessed-tag
-  helpers (`escapeBlessed`/`stripBlessedTags`) become no-ops in ink;
-  the ANSI helpers stay relevant.
+  `truncateAnsi`, `decodeEscapedNewlines`. The blessed-tag helpers are now
+  compatibility shims for older daemon/router log strings; ink call sites
+  strip or normalize those tags before rendering. The ANSI helpers stay
+  relevant.
 - `rawKeyMap.keyToRaw(ch, key)`: converts ink-style key events to
   PTY bytes for the agent view. Stays as-is.
 - `transport.js`: `startDaemon`, `stopDaemon`, `connectWithRetry`.
   Framework-agnostic, no migration needed.
 
-### Migration concern shortlist (1 per section)
-1. **Entry**: 50+ `screen.render()` calls turn into React state
-   updates; build a `useReducer` so dispatchers are async-safe.
-2. **State machine**: `setGlobalScope` is async + debounced — model
-   it as an effect, not a setter.
-3. **Input**: cursor math already lives in `src/ui/format` (P0); we
-   reuse it.
-4. **Daemon**: keep `daemonConnection` / `daemonCoordinator` as-is;
-   wrap the message router in a `useEffect` subscription that pumps
-   into `dispatch`.
-5. **Side controllers**: keep the controllers as plain modules;
-   `useEffect` subscribes/unsubscribes instead of attaching to
-   blessed events.
-6. **Agent view**: ink can't render arbitrary ANSI inside a `<Box>`,
-   but it can yield stdout to a "raw mode" component that writes
-   straight through during PTY mirror; we'll model it with
-   `<Static>`-style raw write or by suspending ink's render and
-   passing stdout through, then re-mount on exit.
-7. **Layout**: replace `height: "100%-N"` with flexbox + `flexGrow`.
-8. **Commands**: long-running commands run on a serialised promise
-   chain like ucode's `runChainRef`.
-9. **Cross-cutting**: drop blessed-tag helpers from ink call sites;
-   ANSI/text helpers stay.
+### Removal notes
+1. **Entry**: `src/app/chat/index.js` delegates directly to `runChatInk()`.
+2. **ucode**: `src/code/tui.js` is a compatibility export wrapper around
+   `src/ui/format/` and `runUcodeInkTui()`.
+3. **Controllers**: the blessed widget controllers and their tests were
+   removed with the fallback path.
+4. **Markup**: old brace-tag helpers remain only where shared daemon/chat
+   helpers still emit or sanitize legacy log markup.
 
 ### P3 phase plan
 
 | Step | Goal | Status |
 |---|---|---|
 | P3.1 | This audit | ✅ |
-| P3.2 | `UFOO_TUI=ink` switch in `runChat()` | ✅ |
+| P3.2 | Ink-only `runChat()` entrypoint | ✅ |
 | P3.3 | ChatApp shell (banner + log + input + status) | ✅ |
 | P3.4 | Five dashboard views as React components | ✅ |
 | P3.5 | Daemon connection + PROMPT/BUS_SEND wiring | ✅ |
@@ -317,7 +273,6 @@ and `shouldEchoCommandInChat(text)` are pure.
 ```sh
 ./bin/ufoo.js chat                   # project mode
 ./bin/ufoo.js chat --global          # global controller mode
-# fallback: UFOO_TUI=blessed ./bin/ufoo.js chat
 ```
 
 ### Layout
@@ -366,8 +321,7 @@ and `shouldEchoCommandInChat(text)` are pure.
   with daemon stop/start/restart, cron IPC, project switching and agent
   activation callbacks.
 - **Input history persistence** — `<projectRoot>/.ufoo/chat/input-history.jsonl`
-  is loaded on mount and appended on every submit; format matches the
-  blessed inputHistoryController.
+  is loaded on mount and appended on every submit.
 - **Daemon message routing** — Ink routes daemon envelopes through
   `daemonMessageRouter`, including BUS phase status, transient states,
   pending delivery markers, streams, close/launch refreshes and loop

package/src/ui/format/index.js

@@ -1,12 +1,8 @@
 "use strict";
 
 /**
- * Pure formatting + input-math helpers shared between the legacy blessed TUI
- * (src/code/tui.js, src/chat/index.js) and the new ink-based TUIs under
- * src/ui/components/. No blessed import allowed in this module.
- *
- * Anything that touches a blessed widget (escapeBlessedLiteral, the blessed
- * banner builder, resolveLogContentWidth) stays in src/code/tui.js.
+ * Pure formatting + input-math helpers for the ink-based TUIs under
+ * src/ui/ink/. No terminal widget import is allowed in this module.
  */
 
 const chalk = require("chalk");
@@ -72,24 +68,6 @@ function displayCellWidth(text = "") {
   );
 }
 
-// NOTE: returns a blessed-flavoured tag string ("{cyan-bg}{white-fg}...").
-// Used by the legacy blessed TUI; ink callers should not render this directly
-// (the tags would show up as literal text). When P1 needs the same output for
-// ink, add a sibling helper that emits chalk/ANSI instead.
-function formatHighlightedUserInput(text = "", {
-  width = 80,
-  escapeText = (value) => String(value || ""),
-} = {}) {
-  const plain = String(text || "").trim();
-  if (!plain) return "";
-  const targetWidth = Math.max(1, Math.floor(Number(width) || 80) - 1);
-  const prefix = " → ";
-  const suffix = " ";
-  const contentWidth = displayCellWidth(`${prefix}${plain}${suffix}`);
-  const pad = " ".repeat(Math.max(0, targetWidth - contentWidth));
-  return `{cyan-bg}{white-fg}${prefix}${escapeText(plain)}${suffix}${pad}{/white-fg}{/cyan-bg}`;
-}
-
 class StreamBuffer {
   constructor(writer, options = {}) {
     this.writer = writer;
@@ -254,7 +232,7 @@ function loadActiveAgents(workspaceRoot) {
 }
 
 function renderLogLinesWithMarkdown(text = "", state = {}, escapeFn = (value) => String(value || "")) {
-  const { renderMarkdownLines } = require("../../shared/markdownRenderer");
+  const { renderMarkdownLines } = require("./markdownRenderer");
   return renderMarkdownLines(text, state, escapeFn);
 }
 
@@ -331,7 +309,7 @@ function moveCursorToVisualLineBoundary({
   boundary = "start",
   strWidth,
 } = {}) {
-  const inputMath = require("../../chat/inputMath");
+  const inputMath = require("../../app/chat/inputMath");
   const text = String(inputValue || "");
   const normalizedWidth = Number.isFinite(width) ? Math.max(1, Math.floor(width)) : 1;
   const pos = clampCursorPos(cursorPos, text);
@@ -350,7 +328,7 @@ function moveCursorVertically({
   preferredCol = null,
   strWidth,
 } = {}) {
-  const inputMath = require("../../chat/inputMath");
+  const inputMath = require("../../app/chat/inputMath");
   const text = String(inputValue || "");
   const normalizedWidth = Number.isFinite(width) ? Math.max(1, Math.floor(width)) : 1;
   const pos = clampCursorPos(cursorPos, text);
@@ -974,7 +952,6 @@ module.exports = {
   findLogicalLineEnd,
   findLogicalLineStart,
   findTrailingEscapeTagPrefix,
-  formatHighlightedUserInput,
   formatPendingElapsed,
   loadActiveAgents,
   moveCursorByWord,

package/src/ui/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { runInk } = require("./runInk");
-const { createInkDemo } = require("./components/InkDemo");
+const { createInkDemo } = require("./ink/InkDemo");
 
 module.exports = {
   runInk,