u-foo 2.3.32 → 2.4.0

package/src/config.js

@@ -8,10 +8,16 @@ const SETTINGS_MODEL_DEFAULTS = Object.freeze({
   agent: Object.freeze({
     codex: "gpt-5.5",
     claude: "opus-4.7",
+    // agy (Antigravity CLI) only supports model selection via in-REPL
+    // `/model` slash command, which persists across launches. There is no
+    // command-line flag for model, so the value here is a placeholder for
+    // display; we never pass it on the agy command line.
+    agy: "",
   }),
   router: Object.freeze({
     codex: "gpt-5.3-codex-spark",
     claude: "sonnet-4.7",
+    agy: "",
   }),
 });
 
@@ -42,7 +48,6 @@ const DEFAULT_UCODE_CONFIG = {
 function normalizeLaunchMode(value) {
   if (value === "auto") return "auto";
   if (value === "internal") return "internal";
-  if (value === "internal-pty") return "internal-pty";
   if (value === "tmux") return "tmux";
   if (value === "terminal") return "terminal";
   if (value === "host") return "host";
@@ -51,12 +56,14 @@ function normalizeLaunchMode(value) {
 
 function normalizeAgentProvider(value) {
   if (value === "claude-cli") return "claude-cli";
+  if (value === "agy-cli" || value === "agy" || value === "antigravity") return "agy-cli";
   return "codex-cli";
 }
 
 function providerKey(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";
 }
 
@@ -69,7 +76,12 @@ function defaultAgentModelForProvider(value = "") {
 }
 
 function defaultRouterProviderForAgentProvider(value = "") {
-  return providerKey(value) === "claude" ? "claude" : "codex";
+  const key = providerKey(value);
+  if (key === "claude") return "claude";
+  // agy has no router-model API; fall back to codex (the controller still
+  // routes via codex/claude regardless of which agent provider runs).
+  if (key === "agy") return "codex";
+  return "codex";
 }
 
 function defaultRouterModelForProvider(value = "") {
@@ -256,6 +268,7 @@ module.exports = {
   saveGlobalUcodeConfig,
   normalizeLaunchMode,
   normalizeAgentProvider,
+  providerKey,
   sameModelProvider,
   defaultAgentModelForProvider,
   defaultRouterProviderForAgentProvider,

package/src/{bus → coordination/bus}/activate.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../state/paths");
 const { spawn, spawnSync } = require("child_process");
-const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
+const { createTerminalAdapterRouter } = require("../../runtime/terminal/adapterRouter");
 
 /**
  * 激活指定 agent 的终端

package/src/{bus → coordination/bus}/daemon.js

@@ -4,8 +4,15 @@ const { readJSON, writeJSON, isPidAlive, isAgentPidAlive, isMetaActive, ensureDi
 const Injector = require("./inject");
 const QueueManager = require("./queue");
 const MessageManager = require("./message");
-const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
-const { INJECTION_MODES, getInjectionModeFromEvent } = require("./messageMeta");
+const { createTerminalAdapterRouter } = require("../../runtime/terminal/adapterRouter");
+const {
+  INJECTION_MODES,
+  getInjectionModeFromEvent,
+} = require("./messageMeta");
+const {
+  buildPromptInjectionText,
+  shouldRenderPromptEnvelope,
+} = require("./promptEnvelope");
 
 function isBusyActivityState(value = "") {
   const state = String(value || "").trim().toLowerCase();
@@ -128,7 +135,7 @@ class BusDaemon {
       const child = spawn(
         process.execPath,
         [
-          path.join(__dirname, "..", "..", "bin", "ufoo.js"),
+          path.join(__dirname, "..", "..", "..", "bin", "ufoo.js"),
           "bus",
           "daemon",
           "--interval",
@@ -293,7 +300,7 @@ class BusDaemon {
       const launchMode = meta?.launch_mode || "";
       // Delivery ownership:
       // - notifier/injector: terminal/tmux
-      // - internal queue loop: internal/internal-pty
+      // - internal queue loop: internal
       // Bus daemon only handles legacy/unknown launch modes.
       const adapter = this.adapterRouter.getAdapter({ launchMode, agentId: subscriber, meta });
       const { supportsNotifierInjector, supportsInternalQueueLoop } = adapter.capabilities;
@@ -348,8 +355,9 @@ class BusDaemon {
               continue;
             }
             try {
+              const injectionText = buildPromptInjectionText(evt, subscriber, busData.agents || {});
               // eslint-disable-next-line no-await-in-loop
-              await this.injector.inject(subscriber, String(evt.data.message));
+              await this.injector.inject(subscriber, injectionText);
               deliveredCount += 1;
               currentActivityState = "working";
               this.lastWorkingAt.set(subscriber, Date.now());
@@ -523,3 +531,5 @@ class BusDaemon {
 }
 
 module.exports = BusDaemon;
+module.exports.buildPromptInjectionText = buildPromptInjectionText;
+module.exports.shouldRenderPromptEnvelope = shouldRenderPromptEnvelope;

package/src/coordination/bus/envelope.js

@@ -0,0 +1,173 @@
+"use strict";
+
+const ACTION_TAGS = ["reply", "report", "fyi"];
+const ACTION_TAG_SET = new Set(ACTION_TAGS);
+const MUTUALLY_EXCLUSIVE_WITH_FYI = new Set(["reply", "report"]);
+
+const TAG_RENDER_ORDER = ["reply", "report", "fyi"];
+const MAX_TAG_COUNT = 8;
+
+const TASK_ID_PATTERN = /^[A-Za-z0-9_.\-]+$/;
+const TASK_ID_MAX_LENGTH = 64;
+
+function asTrimmedString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function normalizeTagList(input) {
+  if (input == null) return [];
+  const list = Array.isArray(input) ? input : String(input).split(/[\s,]+/);
+  const seen = new Set();
+  const out = [];
+  for (const item of list) {
+    const tag = asTrimmedString(item).toLowerCase();
+    if (!tag) continue;
+    if (seen.has(tag)) continue;
+    seen.add(tag);
+    out.push(tag);
+  }
+  return out;
+}
+
+function validateTags(tags) {
+  if (tags.length > MAX_TAG_COUNT) {
+    throw new Error(`Too many tags (max ${MAX_TAG_COUNT}): ${tags.join(", ")}`);
+  }
+  for (const tag of tags) {
+    if (!ACTION_TAG_SET.has(tag)) {
+      throw new Error(`Unknown tag "${tag}". Allowed action tags: ${ACTION_TAGS.join(", ")}`);
+    }
+  }
+  if (tags.includes("fyi")) {
+    const conflicts = tags.filter((tag) => MUTUALLY_EXCLUSIVE_WITH_FYI.has(tag));
+    if (conflicts.length > 0) {
+      throw new Error(`[fyi] is mutually exclusive with [${conflicts.join("], [")}]`);
+    }
+  }
+}
+
+function validateTaskId(taskId) {
+  const id = asTrimmedString(taskId);
+  if (!id) return "";
+  if (id.length > TASK_ID_MAX_LENGTH) {
+    throw new Error(`task_id too long (max ${TASK_ID_MAX_LENGTH}): "${id}"`);
+  }
+  if (!TASK_ID_PATTERN.test(id)) {
+    throw new Error(`task_id contains invalid characters (allowed: A-Z a-z 0-9 _ . -): "${id}"`);
+  }
+  return id;
+}
+
+function sortTagsForRender(tags) {
+  const order = new Map(TAG_RENDER_ORDER.map((tag, index) => [tag, index]));
+  return tags.slice().sort((a, b) => {
+    const ai = order.has(a) ? order.get(a) : TAG_RENDER_ORDER.length;
+    const bi = order.has(b) ? order.get(b) : TAG_RENDER_ORDER.length;
+    if (ai !== bi) return ai - bi;
+    return a.localeCompare(b);
+  });
+}
+
+function parseTagsFromOptions(options = {}) {
+  const opts = options && typeof options === "object" ? options : {};
+  const collected = [];
+  if (opts.reply) collected.push("reply");
+  if (opts.report) collected.push("report");
+  if (opts.fyi) collected.push("fyi");
+
+  if (Array.isArray(opts.tags)) {
+    for (const tag of opts.tags) {
+      const value = asTrimmedString(tag).toLowerCase();
+      if (value) collected.push(value);
+    }
+  } else if (typeof opts.tags === "string") {
+    for (const tag of opts.tags.split(/[\s,]+/)) {
+      const value = asTrimmedString(tag).toLowerCase();
+      if (value) collected.push(value);
+    }
+  }
+
+  const tags = normalizeTagList(collected);
+  validateTags(tags);
+
+  const taskId = validateTaskId(opts.taskId || opts.task_id || opts.task);
+  const reportTo = asTrimmedString(opts.reportTo || opts.report_to);
+
+  return { tags, taskId, reportTo };
+}
+
+function formatTagList({ tags = [], taskId = "" } = {}) {
+  const segments = [];
+  for (const tag of sortTagsForRender(tags)) {
+    segments.push(`[${tag}]`);
+  }
+  const id = asTrimmedString(taskId);
+  if (id) segments.push(`[task:${id}]`);
+  return segments.join(" ");
+}
+
+function buildPartyLabel({ id = "", nickname = "" } = {}) {
+  const trimmedId = asTrimmedString(id);
+  const trimmedNickname = asTrimmedString(nickname);
+  if (!trimmedId && !trimmedNickname) return "";
+  if (trimmedId && trimmedNickname && trimmedId !== trimmedNickname) {
+    return `${trimmedId}(${trimmedNickname})`;
+  }
+  return trimmedId || trimmedNickname;
+}
+
+function renderHeader({
+  kind = "bus",
+  fromId = "",
+  fromNickname = "",
+  toId = "",
+  toNickname = "",
+  tags = [],
+  taskId = "",
+} = {}) {
+  let prefix;
+  let partyLabel;
+  if (kind === "manual") {
+    prefix = "[manual]<to:";
+    partyLabel = buildPartyLabel({ id: toId, nickname: toNickname });
+  } else {
+    prefix = "[ufoo]<from:";
+    partyLabel = buildPartyLabel({ id: fromId, nickname: fromNickname });
+  }
+  if (!partyLabel) partyLabel = "unknown";
+
+  const tagSegment = formatTagList({ tags, taskId });
+  const head = `${prefix}${partyLabel}>`;
+  return tagSegment ? `${head} ${tagSegment}` : head;
+}
+
+function renderEnvelope({
+  kind = "bus",
+  fromId = "",
+  fromNickname = "",
+  toId = "",
+  toNickname = "",
+  tags = [],
+  taskId = "",
+  message = "",
+} = {}) {
+  const header = renderHeader({ kind, fromId, fromNickname, toId, toNickname, tags, taskId });
+  const body = String(message || "");
+  return body ? `${header}\n${body}` : header;
+}
+
+module.exports = {
+  ACTION_TAGS,
+  TAG_RENDER_ORDER,
+  MAX_TAG_COUNT,
+  TASK_ID_PATTERN,
+  TASK_ID_MAX_LENGTH,
+  normalizeTagList,
+  validateTags,
+  validateTaskId,
+  sortTagsForRender,
+  parseTagsFromOptions,
+  formatTagList,
+  renderHeader,
+  renderEnvelope,
+};

package/src/{bus → coordination/bus}/index.js

@@ -16,7 +16,7 @@ const {
   sleep,
 } = require("./utils");
 const { shakeTerminalByTty } = require("./shake");
-const { resolveDisplayNickname } = require("../daemon/nicknameScope");
+const { resolveDisplayNickname } = require("../../runtime/daemon/nicknameScope");
 const QueueManager = require("./queue");
 const SubscriberManager = require("./subscriber");
 const MessageManager = require("./message");
@@ -319,7 +319,11 @@ class EventBus {
 
     try {
       const eventName = options.event || "message";
-      const data = options.data || { message };
+      const data = options.data && typeof options.data === "object"
+        ? { ...options.data }
+        : { message };
+      if (options.rawInject === true) data.raw_inject = true;
+      if (options.envelope === false) data.envelope = false;
       const result = eventName === "message"
         ? await this.messageManager.send(target, message, publisher, {
           data,
@@ -639,7 +643,7 @@ class EventBus {
       ensureDir(logDir);
 
       const args = [
-        path.join(__dirname, "..", "..", "bin", "ufoo.js"),
+        path.join(__dirname, "..", "..", "..", "bin", "ufoo.js"),
         "bus",
         "alert",
         subscriber,

package/src/{bus → coordination/bus}/inject.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 const net = require("net");
 const path = require("path");
 const { subscriberToSafeName, isValidTty } = require("./utils");
-const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
+const { createTerminalAdapterRouter } = require("../../runtime/terminal/adapterRouter");
 
 const SHOULD_LOG_INJECT = process.env.UFOO_INJECT_DEBUG === "1";
 const logInject = (message) => {
@@ -415,10 +415,18 @@ class Injector {
       throw new Error(`Inject disabled for ${subscriber}. ufoo-code consumes bus internally.`);
     }
 
-    // 确定注入命令（codex 用 "ubus"，claude-code 用 "/ubus"）
+    // 确定注入命令：
+    // - codex: 裸 "ubus"（codex 没有 slash-command 命名空间）
+    // - agy: 裸 "ubus"（agy 的 `/` 是它自己的 slash-command 命名空间，
+    //   "/ubus" 会被识别为 unknown slash command 而不是 prompt）
+    // - claude-code 及其他: "/ubus"
     const command = commandOverride
       ? String(commandOverride)
-      : (subscriber.startsWith("codex:") ? "ubus" : "/ubus");
+      : (
+        subscriber.startsWith("codex:") || subscriber.startsWith("agy:")
+          ? "ubus"
+          : "/ubus"
+      );
 
     const meta = this.getAgentMeta(subscriber) || {};
     const launchMode = meta.launch_mode || "";

package/src/{bus → coordination/bus}/message.js

@@ -12,7 +12,7 @@ const {
 } = require("./utils");
 const NicknameManager = require("./nickname");
 const { buildMessageData } = require("./messageMeta");
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../state/paths");
 
 const SEQ_LOCK_TIMEOUT_MS = 5000;
 const SEQ_LOCK_POLL_MS = 25;

package/src/coordination/bus/messageMeta.js

@@ -0,0 +1,130 @@
+"use strict";
+
+const {
+  parseTagsFromOptions,
+  validateTags,
+  validateTaskId,
+  normalizeTagList,
+} = require("./envelope");
+
+const INJECTION_MODES = {
+  IMMEDIATE: "immediate",
+  QUEUED: "queued",
+};
+
+function normalizeInjectionMode(value, fallback = INJECTION_MODES.IMMEDIATE) {
+  const raw = String(value || "").trim().toLowerCase();
+  if (raw === INJECTION_MODES.QUEUED) return INJECTION_MODES.QUEUED;
+  if (raw === INJECTION_MODES.IMMEDIATE) return INJECTION_MODES.IMMEDIATE;
+  return fallback;
+}
+
+function normalizeMessageSource(value) {
+  const raw = String(value || "").trim();
+  return raw || "";
+}
+
+function asTrimmedString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function resolveTagsFromOptions(options = {}) {
+  const dataIn = options && typeof options.data === "object" && options.data ? options.data : {};
+  const hasFlagOption = "reply" in options || "report" in options || "fyi" in options;
+  const hasTagsOption = "tags" in options;
+  const hasTaskOption = "taskId" in options || "task_id" in options || "task" in options;
+  const hasReportToOption = "reportTo" in options || "report_to" in options;
+
+  if (hasFlagOption || hasTagsOption || hasTaskOption || hasReportToOption) {
+    return parseTagsFromOptions(options);
+  }
+
+  const tags = normalizeTagList(dataIn.tags);
+  validateTags(tags);
+  const taskId = validateTaskId(dataIn.task_id);
+  const reportTo = asTrimmedString(dataIn.report_to);
+  return { tags, taskId, reportTo };
+}
+
+function buildMessageData(message, options = {}) {
+  const base = options && typeof options.data === "object" && options.data
+    ? { ...options.data }
+    : {};
+  const data = { ...base, message };
+  data.injection_mode = normalizeInjectionMode(
+    options.injectionMode || data.injection_mode,
+    INJECTION_MODES.IMMEDIATE,
+  );
+  const source = normalizeMessageSource(options.source || data.source);
+  if (source) {
+    data.source = source;
+  } else {
+    delete data.source;
+  }
+
+  const { tags, taskId, reportTo } = resolveTagsFromOptions(options);
+
+  if (tags.length > 0) {
+    data.tags = tags;
+  } else {
+    delete data.tags;
+  }
+
+  if (taskId) {
+    data.task_id = taskId;
+  } else {
+    delete data.task_id;
+  }
+
+  if (reportTo) {
+    data.report_to = reportTo;
+  } else {
+    delete data.report_to;
+  }
+
+  return data;
+}
+
+function getInjectionModeFromEvent(evt, fallback = INJECTION_MODES.IMMEDIATE) {
+  const data = evt && typeof evt.data === "object" && evt.data ? evt.data : {};
+  return normalizeInjectionMode(
+    data.injection_mode || evt?.injection_mode,
+    fallback,
+  );
+}
+
+function getTagsFromEvent(evt) {
+  const data = evt && typeof evt.data === "object" && evt.data ? evt.data : {};
+  const tags = normalizeTagList(data.tags);
+  try {
+    validateTags(tags);
+  } catch {
+    return [];
+  }
+  return tags;
+}
+
+function getTaskIdFromEvent(evt) {
+  const data = evt && typeof evt.data === "object" && evt.data ? evt.data : {};
+  try {
+    return validateTaskId(data.task_id);
+  } catch {
+    return "";
+  }
+}
+
+function getReportToFromEvent(evt) {
+  const data = evt && typeof evt.data === "object" && evt.data ? evt.data : {};
+  return asTrimmedString(data.report_to);
+}
+
+module.exports = {
+  INJECTION_MODES,
+  normalizeInjectionMode,
+  normalizeMessageSource,
+  buildMessageData,
+  getInjectionModeFromEvent,
+  getTagsFromEvent,
+  getTaskIdFromEvent,
+  getReportToFromEvent,
+};

package/src/coordination/bus/promptEnvelope.js

@@ -0,0 +1,65 @@
+"use strict";
+
+const { getTagsFromEvent, getTaskIdFromEvent } = require("./messageMeta");
+const { renderEnvelope } = require("./envelope");
+
+const MANUAL_INJECTION_SOURCES = new Set([
+  "chat-direct",
+  "chat-internal-agent-view",
+  "chat-manual",
+  "manual",
+]);
+
+function asTrimmedString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function shouldRenderPromptEnvelope(evt = {}) {
+  const data = evt && typeof evt.data === "object" && evt.data ? evt.data : {};
+  return data.raw_inject !== true
+    && data.rawInject !== true
+    && data.envelope !== false
+    && data.prompt_envelope !== false;
+}
+
+function getPublisherId(evt = {}) {
+  const publisher = evt.publisher;
+  if (typeof publisher === "string") return publisher;
+  if (publisher && typeof publisher === "object") {
+    return asTrimmedString(publisher.subscriber || publisher.id || publisher.nickname);
+  }
+  return "";
+}
+
+function getAgentNickname(meta = {}) {
+  return asTrimmedString(meta.display_nickname || meta.nickname || meta.scoped_nickname);
+}
+
+function buildPromptInjectionText(evt = {}, subscriber = "", agents = {}) {
+  const data = evt && typeof evt.data === "object" && evt.data ? evt.data : {};
+  const message = String(data.message || "");
+  if (!shouldRenderPromptEnvelope(evt)) return message;
+
+  const source = asTrimmedString(data.source).toLowerCase();
+  const kind = MANUAL_INJECTION_SOURCES.has(source) ? "manual" : "bus";
+  const publisherId = getPublisherId(evt);
+  const publisherMeta = publisherId && agents ? agents[publisherId] : null;
+  const targetMeta = subscriber && agents ? agents[subscriber] : null;
+
+  return renderEnvelope({
+    kind,
+    fromId: publisherId,
+    fromNickname: publisherMeta ? getAgentNickname(publisherMeta) : "",
+    toId: subscriber,
+    toNickname: targetMeta ? getAgentNickname(targetMeta) : "",
+    tags: getTagsFromEvent(evt),
+    taskId: getTaskIdFromEvent(evt),
+    message,
+  });
+}
+
+module.exports = {
+  buildPromptInjectionText,
+  getPublisherId,
+  shouldRenderPromptEnvelope,
+};

package/src/{bus → coordination/bus}/shake.js

@@ -7,7 +7,7 @@
  */
 
 const fs = require("fs");
-const { isITerm2 } = require("../terminal/detect");
+const { isITerm2 } = require("../../runtime/terminal/detect");
 
 function shakeTerminalByTty(ttyPath, options = {}) {
   if (!ttyPath) return false;

package/src/{bus → coordination/bus}/store.js

@@ -3,9 +3,9 @@
 const fs = require("fs");
 const path = require("path");
 const { getTimestamp, ensureDir, safeNameToSubscriber, getTtyProcessInfo } = require("./utils");
-const { getUfooPaths } = require("../ufoo/paths");
-const { loadAgentsData, saveAgentsData } = require("../ufoo/agentsStore");
-const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
+const { getUfooPaths } = require("../state/paths");
+const { loadAgentsData, saveAgentsData } = require("../state/agentsStore");
+const { appendAgentRegistryDiagnostic } = require("../state/agentRegistryDiagnostics");
 
 function readQueueTty(queueDir) {
   try {

package/src/{bus → coordination/bus}/subscriber.js

@@ -2,7 +2,7 @@ const fs = require("fs");
 const { getTimestamp, isAgentPidAlive, isMetaActive, isValidTty, getTtyProcessInfo } = require("./utils");
 const NicknameManager = require("./nickname");
 const { spawnSync } = require("child_process");
-const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
+const { appendAgentRegistryDiagnostic } = require("../state/agentRegistryDiagnostics");
 
 function detectTerminalAppFromEnv() {
   const termProgram = process.env.TERM_PROGRAM || "";
@@ -92,7 +92,7 @@ function getJoinedPid() {
 
 function isInternalLaunchMode(meta) {
   const mode = String(meta?.launch_mode || "").trim();
-  return mode === "internal" || mode === "internal-pty";
+  return mode === "internal";
 }
 
 function hasProviderSession(meta) {

package/src/{bus → coordination/bus}/utils.js

@@ -2,8 +2,8 @@ const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
 const { spawnSync } = require("child_process");
-const { redactSecrets } = require("../providerapi/redactor");
-const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
+const { redactSecrets } = require("../../runtime/privacy/redactor");
+const { appendAgentRegistryDiagnostic } = require("../state/agentRegistryDiagnostics");
 
 /**
  * 获取当前 UTC 时间戳（ISO 8601 格式）

package/src/{history → coordination/history}/inputTimeline.js

@@ -3,9 +3,9 @@
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
-const { loadAgentsData } = require("../ufoo/agentsStore");
-const { redactSecrets, redactString } = require("../providerapi/redactor");
+const { getUfooPaths } = require("../state/paths");
+const { loadAgentsData } = require("../state/agentsStore");
+const { redactSecrets, redactString } = require("../../runtime/privacy/redactor");
 
 const HISTORY_DEBUG = process.env.UFOO_HISTORY_DEBUG === "1";
 const debugLog = (...args) => { if (HISTORY_DEBUG) console.error("[history]", ...args); };
@@ -223,7 +223,7 @@ function extractUserText(record) {
   return "";
 }
 
-function isProbeMarker(text) {
+function isLegacyUfooMarker(text) {
   return /^\/ufoo\s+\S+$/.test(text) || /^\$ufoo\s+\S+$/.test(text);
 }
 
@@ -321,7 +321,7 @@ function collectClaudeManualInputs(projectRoot, watermark = {}) {
         if (new Date(record.timestamp).getTime() <= cutoffMs) return;
       }
       const text = extractUserText(record);
-      if (!text || isProbeMarker(text)) return;
+      if (!text || isLegacyUfooMarker(text)) return;
       entries.push({
         ts: record.timestamp || "",
         source: "manual",

package/src/coordination/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = {
+  bus: require("./bus"),
+  context: require("./context"),
+  history: require("./history/inputTimeline"),
+  memory: require("./memory"),
+  report: require("./report/store"),
+  status: require("./status"),
+};

package/src/{memory → coordination/memory}/historySearch.js

@@ -2,7 +2,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 
-const { redactSecrets, redactString } = require("../providerapi/redactor");
+const { redactSecrets, redactString } = require("../../runtime/privacy/redactor");
 
 const MAX_RESULTS = 3;
 const MAX_TOTAL_TEXT_CHARS = 2000;