u-foo 3.0.10 → 3.0.11

package/README.md

@@ -113,7 +113,7 @@ per-project MCP server mode.
 
 ```text
 ufoo / ufoo chat
-  -> src/app/chat + src/ui/ink
+  -> src/app/chat + src/ui/rustChatHost + crates/ufoo-tui
   -> project daemon over .ufoo/run/ufoo.sock
   -> runtime daemon launch/resume/recover/reports/cron/groups
   -> orchestration router, group templates, solo roles
@@ -314,7 +314,8 @@ Global `ucode` settings:
 ```text
 src/
   app/            chat client state and CLI command entry
-  ui/             Ink components and pure formatting helpers
+  ui/             Rust TUI hosts + pure formatting helpers
+  crates/ufoo-tui Rust ratatui child (required for chat/ucode)
   runtime/        daemon, projects, terminal adapters, contracts, privacy, process helpers
   coordination/   bus, context, memory, history, reports, state, status
   orchestration/  router/controller logic, groups, solo roles
@@ -343,23 +344,38 @@ npm run test:watch
 npm run test:coverage
 ```
 
-The repository is CommonJS, targets Node.js 18+, and has no build step.
+The repository is CommonJS, targets Node.js 18+, and ships a Rust TTY UI
+(`crates/ufoo-tui`) as platform binaries under `dist/tui/`.
 
 ## Release
 
-Use the standard npm flow from a clean worktree:
+Releases are published by GitHub Actions (`.github/workflows/release.yml`).
+The workflow builds `ufoo-tui` for `darwin-arm64`, `darwin-x64`, `linux-x64`,
+and `linux-arm64`, stages them under `dist/tui/<platform>/`, then runs
+`npm publish`.
+
+1. Bump the version and push a matching tag:
 
 ```bash
 npm test
-npm pack --dry-run
-npm version patch
-npm publish --access public
+npm version patch   # commits package.json + creates tag vX.Y.Z
 git push --follow-tags
 ```
 
-`npm pack --dry-run` should be used to verify the final tarball. Publishing
-requires an npm account/token with permission for `u-foo`.
+2. Ensure the repo secret `NPM_TOKEN` is set (npm automation token with
+   publish rights for `u-foo`).
+3. The `Release` workflow runs on the `v*` tag. Use **Actions → Release →
+   Run workflow** for a manual dry-run (`dry_run=true` packs but does not publish).
+
+Local one-platform staging (dev only):
+
+```bash
+npm run pack:tui          # cargo build + copy into dist/tui/$PLATFORM
+npm pack --dry-run        # requires at least one staged binary (prepack check)
+```
 
+Publishing without the GitHub workflow still requires an npm account/token with
+permission for `u-foo`, plus staged `dist/tui/` binaries.
 ## Troubleshooting
 
 Run a local entry directly if the linked binary is not on `PATH`:

package/README.zh-CN.md

@@ -110,7 +110,7 @@ MCP bridge 会连接 home 级 global controller daemon，并通过全局项目 r
 
 ```text
 ufoo / ufoo chat
-  -> src/app/chat + src/ui/ink
+  -> src/app/chat + src/ui/rustChatHost + crates/ufoo-tui
   -> project daemon over .ufoo/run/ufoo.sock
   -> runtime daemon launch/resume/recover/reports/cron/groups
   -> orchestration router, group templates, solo roles
@@ -306,7 +306,8 @@ ufoo ucode build
 ```text
 src/
   app/            chat client state 和 CLI command entry
-  ui/             Ink components 和纯格式化 helper
+  ui/             Rust TUI hosts + 纯格式化 helper
+  crates/ufoo-tui Rust ratatui 子进程（chat/ucode 必需）
   runtime/        daemon、projects、terminal adapters、contracts、privacy、process helpers
   coordination/   bus、context、memory、history、reports、state、status
   orchestration/  router/controller logic、groups、solo roles
@@ -336,22 +337,34 @@ npm run test:coverage
 npm run bench:global-switch
 ```
 
-本仓库是 CommonJS，目标 Node.js 18+，没有 build step。
+本仓库是 CommonJS，目标 Node.js 18+，并通过 `dist/tui/` 附带 Rust TTY UI
+（`crates/ufoo-tui`）的平台二进制。
 
 ## 发布
 
-请在干净工作区按标准 npm 流程发布：
+发布由 GitHub Actions（`.github/workflows/release.yml`）完成：多平台编译
+`ufoo-tui`（`darwin-arm64` / `darwin-x64` / `linux-x64` / `linux-arm64`），
+写入 `dist/tui/<platform>/`，再执行 `npm publish`。
+
+1. 升版本并推送对应 tag：
 
 ```bash
 npm test
-npm pack --dry-run
-npm version patch
-npm publish --access public
+npm version patch   # 提交 package.json 并创建 tag vX.Y.Z
 git push --follow-tags
 ```
 
-发布前用 `npm pack --dry-run` 检查最终 tarball。发布需要有 `u-foo` 权限的
-npm 账号/token。
+2. 仓库需配置 secret `NPM_TOKEN`（对 `u-foo` 有发布权限的 npm automation token）。
+3. 推送 `v*` tag 后自动跑 `Release` workflow。也可在 Actions 里手动
+   **Run workflow**（`dry_run=true` 只打包不发布）。
+
+本地单平台预演：
+
+```bash
+npm run pack:tui
+npm pack --dry-run
+```
+
 
 ## 故障排查
 

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "u-foo",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Icyoung/ufoo.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Icyoung/ufoo/issues"
+  },
   "author": "UFOO Team",
   "keywords": [
     "cli",
@@ -29,6 +36,7 @@
     "templates/",
     "online/",
     "scripts/",
+    "dist/tui/",
     "SKILLS/",
     "LICENSE",
     "README.md"
@@ -39,6 +47,8 @@
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.js",
+    "pack:tui": "node scripts/pack-tui.js",
+    "prepack": "node scripts/pack-tui.js --check",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage"
@@ -51,9 +61,7 @@
     "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"
   },
   "devDependencies": {

package/scripts/pack-tui.js

@@ -0,0 +1,112 @@
+#!/usr/bin/env node
+/* eslint-disable no-console */
+"use strict";
+
+/**
+ * Stage a release `ufoo-tui` binary under dist/tui/<platform>-<arch>/.
+ *
+ * Usage:
+ *   node scripts/pack-tui.js            # build current host + stage
+ *   node scripts/pack-tui.js --copy-only # stage from existing target/release
+ *   node scripts/pack-tui.js --check     # exit 0 only if at least one staged binary exists
+ */
+
+const fs = require("fs");
+const path = require("path");
+const { spawnSync } = require("child_process");
+
+const ROOT = path.resolve(__dirname, "..");
+const DIST_ROOT = path.join(ROOT, "dist", "tui");
+const BINARY_NAME = process.platform === "win32" ? "ufoo-tui.exe" : "ufoo-tui";
+
+function hostPlatform() {
+  return `${process.platform}-${process.arch}`;
+}
+
+function listStagedPlatforms() {
+  if (!fs.existsSync(DIST_ROOT)) return [];
+  const out = [];
+  for (const entry of fs.readdirSync(DIST_ROOT, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const bin = path.join(DIST_ROOT, entry.name, "ufoo-tui");
+    const binExe = path.join(DIST_ROOT, entry.name, "ufoo-tui.exe");
+    if (fs.existsSync(bin) || fs.existsSync(binExe)) out.push(entry.name);
+  }
+  return out.sort();
+}
+
+function findReleaseBinary() {
+  const candidates = [
+    path.join(ROOT, "target", "release", BINARY_NAME),
+    path.join(ROOT, "crates", "ufoo-tui", "target", "release", BINARY_NAME),
+  ];
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) {
+      return candidate;
+    }
+  }
+  return null;
+}
+
+function buildRelease() {
+  console.log("[pack-tui] cargo build -p ufoo-tui --release");
+  const result = spawnSync("cargo", ["build", "-p", "ufoo-tui", "--release"], {
+    cwd: ROOT,
+    stdio: "inherit",
+    env: process.env,
+  });
+  if (result.status !== 0) {
+    throw new Error("cargo build failed");
+  }
+}
+
+function stageBinary(sourcePath, platform = hostPlatform()) {
+  const destDir = path.join(DIST_ROOT, platform);
+  fs.mkdirSync(destDir, { recursive: true });
+  const destName = platform.startsWith("win32") ? "ufoo-tui.exe" : "ufoo-tui";
+  const destPath = path.join(destDir, destName);
+  fs.copyFileSync(sourcePath, destPath);
+  try {
+    fs.chmodSync(destPath, 0o755);
+  } catch {
+    // Windows may ignore chmod
+  }
+  console.log(`[pack-tui] staged ${destPath}`);
+  return destPath;
+}
+
+function main(argv = process.argv.slice(2)) {
+  const copyOnly = argv.includes("--copy-only");
+  const checkOnly = argv.includes("--check");
+
+  if (checkOnly) {
+    const plats = listStagedPlatforms();
+    if (plats.length === 0) {
+      console.error("[pack-tui] no staged binaries under dist/tui/<platform>/");
+      process.exit(1);
+    }
+    console.log(`[pack-tui] staged platforms: ${plats.join(", ")}`);
+    return;
+  }
+
+  if (!copyOnly) {
+    buildRelease();
+  }
+
+  const source = findReleaseBinary();
+  if (!source) {
+    throw new Error(
+      `release binary not found (looked for target/release/${BINARY_NAME}). `
+        + "Run cargo build -p ufoo-tui --release first.",
+    );
+  }
+  stageBinary(source);
+  console.log(`[pack-tui] ok (${hostPlatform()})`);
+}
+
+try {
+  main();
+} catch (err) {
+  console.error(`[pack-tui] ${err && err.message ? err.message : err}`);
+  process.exit(1);
+}

package/scripts/postinstall.js

@@ -30,6 +30,17 @@ for (const platform of platforms) {
   }
 }
 
+// Ensure the platform ufoo-tui binary from the npm pack is executable.
+try {
+  const plat = `${process.platform}-${process.arch}`;
+  const tuiBin = path.join(__dirname, "..", "dist", "tui", plat, "ufoo-tui");
+  if (fs.existsSync(tuiBin)) {
+    fs.chmodSync(tuiBin, 0o755);
+  }
+} catch {
+  // Non-fatal — doctor / launch will report missing binary.
+}
+
 // Collect all skill sources from the package-level SKILLS directory.
 function collectSkillSources(pkgRoot) {
   const sources = [];

package/src/agents/activity/activityReconcile.js

@@ -0,0 +1,106 @@
+"use strict";
+
+const fs = require("fs");
+const { readJSON } = require("../../coordination/bus/utils");
+
+const DEFAULT_GRACE_MS = 5000;
+const BUSY_DISK_STATES = new Set(["working", "waiting_input", "blocked"]);
+const DELIVERABLE_LOCAL_STATES = new Set(["idle", "ready"]);
+
+function asState(value = "") {
+  return String(value || "").trim().toLowerCase();
+}
+
+function resolveGraceMs(detector, options = {}) {
+  if (Number.isFinite(options.graceMs) && options.graceMs > 0) {
+    return options.graceMs;
+  }
+  const quiet = Number(detector && detector.quietWindowMs);
+  const base = Number.isFinite(quiet) && quiet > 0 ? quiet : DEFAULT_GRACE_MS;
+  // Cap so internal-pty (30s quiet) does not leave inject stamps stuck that long.
+  return Math.min(base, DEFAULT_GRACE_MS);
+}
+
+function readDiskMeta(agentsFile, subscriber) {
+  if (!agentsFile || !subscriber || !fs.existsSync(agentsFile)) return null;
+  try {
+    const data = readJSON(agentsFile, null);
+    const meta = data && data.agents && data.agents[subscriber];
+    return meta && typeof meta === "object" ? meta : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Heal false `working` when the in-process ActivityDetector already believes
+ * the agent is deliverable (idle/ready) but all-agents.json still says busy.
+ *
+ * Typical cause: DeliveryScheduler stamps `working` (detail=inject) after
+ * inject while the detector never saw meaningful PTY output, so it never
+ * re-publishes idle (publisher dedupe + no state transition).
+ *
+ * Waits `graceMs` (≤ quiet window, capped at 5s) after disk `activity_since`
+ * so the inject stamp can still close the mid-turn double-inject race.
+ *
+ * Does not clear `waiting_input` / `blocked` — those need explicit recovery.
+ *
+ * @returns {{ ok: boolean, reconciled: boolean, reason: string }}
+ */
+function reconcileDetectorOwnedActivity(options = {}) {
+  const {
+    detector,
+    publisher,
+    agentsFile,
+    subscriber,
+    now = Date.now(),
+  } = options;
+
+  if (!detector || !publisher || !agentsFile || !subscriber) {
+    return { ok: false, reconciled: false, reason: "missing" };
+  }
+
+  const snap = typeof detector.getState === "function"
+    ? detector.getState()
+    : { state: "", since: now, detail: "" };
+  const local = asState(snap.state);
+  if (!DELIVERABLE_LOCAL_STATES.has(local)) {
+    return { ok: true, reconciled: false, reason: "local_busy" };
+  }
+
+  const diskMeta = readDiskMeta(agentsFile, subscriber);
+  if (!diskMeta) {
+    return { ok: false, reconciled: false, reason: "missing_agent" };
+  }
+
+  const diskState = asState(diskMeta.activity_state);
+  if (diskState !== "working") {
+    return { ok: true, reconciled: false, reason: BUSY_DISK_STATES.has(diskState) ? "disk_gated" : "disk_ok" };
+  }
+
+  const graceMs = resolveGraceMs(detector, options);
+  const sinceMs = Date.parse(String(diskMeta.activity_since || ""));
+  const diskAge = Number.isFinite(sinceMs) ? Math.max(0, now - sinceMs) : graceMs;
+  if (diskAge < graceMs) {
+    return { ok: true, reconciled: false, reason: "grace" };
+  }
+
+  const publishState = local === "ready" ? "idle" : local;
+  const changed = publisher.publish(publishState, {
+    since: snap.since,
+    previous: diskState,
+    detail: "",
+  }, { force: true, reconcile: true });
+
+  return {
+    ok: true,
+    reconciled: Boolean(changed),
+    reason: changed ? "cleared" : "unchanged",
+  };
+}
+
+module.exports = {
+  DEFAULT_GRACE_MS,
+  reconcileDetectorOwnedActivity,
+  resolveGraceMs,
+};

package/src/agents/activity/activityStatePublisher.js

@@ -1,5 +1,8 @@
+"use strict";
+
 const fs = require("fs");
 const path = require("path");
+const { readJSON } = require("../../coordination/bus/utils");
 const { writeActivityState } = require("./activityStateWriter");
 
 /**
@@ -16,7 +19,9 @@ const { writeActivityState } = require("./activityStateWriter");
  * @param {string} options.subscriber  - Subscriber ID (e.g. "claude-code:abc123")
  * @param {string} options.projectRoot - Project root (unused, kept for API compat)
  * @param {boolean} [options.force=true] - Force overwrite priority-protected states
- * publish(state, extra, { force }) can override this default for one transition.
+ * publish(state, extra, { force, reconcile }) can override defaults for one
+ * transition. `reconcile: true` skips in-memory dedupe when disk disagrees
+ * (daemon inject stamp / lost-update healing).
  */
 function createActivityStatePublisher(options = {}) {
   const {
@@ -28,9 +33,33 @@ function createActivityStatePublisher(options = {}) {
   let lastState = "";
   let lastDetail = "";
 
+  function readDiskActivity() {
+    try {
+      if (!agentsFile || !fs.existsSync(agentsFile)) return null;
+      const data = readJSON(agentsFile, null);
+      const meta = data && data.agents && data.agents[subscriber];
+      if (!meta || typeof meta !== "object") return null;
+      return {
+        state: typeof meta.activity_state === "string" ? meta.activity_state : "",
+        detail: typeof meta.activity_detail === "string" ? meta.activity_detail : "",
+      };
+    } catch {
+      return null;
+    }
+  }
+
   function publish(state, extra = {}, publishOptions = {}) {
     const detail = typeof extra.detail === "string" ? extra.detail : "";
-    if (state === lastState && detail === lastDetail) return false;
+    const reconcile = publishOptions.reconcile === true;
+    if (!reconcile && state === lastState && detail === lastDetail) return false;
+    if (reconcile) {
+      const disk = readDiskActivity();
+      if (disk && disk.state === state && disk.detail === detail) {
+        lastState = state;
+        lastDetail = detail;
+        return false;
+      }
+    }
     const since = extra.since || undefined;
     const effectiveForce = typeof publishOptions.force === "boolean"
       ? publishOptions.force

package/src/agents/activity/index.js

@@ -5,4 +5,5 @@ module.exports = {
   ...require("./activityStatePublisher"),
   ...require("./activityStateWriter"),
   ...require("./activityTracker"),
+  ...require("./activityReconcile"),
 };

package/src/agents/launch/launcher.js

@@ -10,6 +10,7 @@ const { showBanner } = require("../../ui/format/banner");
 const AgentNotifier = require("./notifier");
 const { ActivityDetector } = require("../activity/activityDetector");
 const { createActivityStatePublisher } = require("../activity/activityStatePublisher");
+const { reconcileDetectorOwnedActivity } = require("../activity/activityReconcile");
 const { detectLaunchEnvironment } = require("./launchEnvironment");
 const { getUfooPaths } = require("../../coordination/state/paths");
 const { createTerminalAdapterRouter } = require("../../runtime/terminal/adapterRouter");
@@ -697,6 +698,23 @@ class AgentLauncher {
               detail: snap.detail,
             });
           });
+          // Heal daemon inject-stamp desync (disk working, detector idle).
+          const agentsFilePath = getUfooPaths(this.cwd).agentsFile;
+          const activityReconcileTimer = setInterval(() => {
+            try {
+              reconcileDetectorOwnedActivity({
+                detector: launcherActivityDetector,
+                publisher: launcherPublisher,
+                agentsFile: agentsFilePath,
+                subscriber: subscriberId,
+              });
+            } catch {
+              // reconcile must never break the launcher
+            }
+          }, 2000);
+          if (typeof activityReconcileTimer.unref === "function") {
+            activityReconcileTimer.unref();
+          }
           // 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
@@ -763,6 +781,7 @@ class AgentLauncher {
           wrapper.onExit = async ({ exitCode, signal }) => {
             // 清理 timers
             clearTimeout(forceReadyTimer);
+            clearInterval(activityReconcileTimer);
             launcherActivityDetector.destroy();
 
             // Agy: harvest conversation id from the trailing `Resume: agy

package/src/agents/launch/ptyRunner.js

@@ -7,6 +7,7 @@ const { PTY_SOCKET_MESSAGE_TYPES, PTY_SOCKET_SUBSCRIBE_MODES } = require("../../
 const { getUfooPaths } = require("../../coordination/state/paths");
 const { ActivityDetector } = require("../activity/activityDetector");
 const { createActivityStatePublisher } = require("../activity/activityStatePublisher");
+const { reconcileDetectorOwnedActivity } = require("../activity/activityReconcile");
 const {
   parseStreamEnvelope,
   shouldAutoReplyFromPtyToPublisher,
@@ -734,7 +735,7 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
     activityPublisher.publish(snap.state, {
       since: snap.since,
       detail: snap.detail,
-    });
+    }, { reconcile: true, force: true });
   }
 
   activityDetector.onChange((newState, oldState) => {
@@ -766,6 +767,23 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
   // instead of waiting for the next 30s heartbeat tick.
   writeActivityState();
 
+  // Heal daemon inject-stamp desync (disk working, detector idle/ready).
+  const activityReconcileTimer = setInterval(() => {
+    try {
+      reconcileDetectorOwnedActivity({
+        detector: activityDetector,
+        publisher: activityPublisher,
+        agentsFile: agentsFilePath,
+        subscriber,
+      });
+    } catch {
+      // reconcile must never break the runner
+    }
+  }, 2000);
+  if (typeof activityReconcileTimer.unref === "function") {
+    activityReconcileTimer.unref();
+  }
+
   function attachPty(proc) {
     proc.onData((data) => {
       const raw = String(data || "");
@@ -932,6 +950,7 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
 
   const stop = () => {
     running = false;
+    clearInterval(activityReconcileTimer);
     cleanupInjectServer(injectServer);
     if (process.stdin && outerInputHandler) {
       if (typeof process.stdin.off === "function") {