u-foo 3.0.0 → 3.0.2

package/src/ui/format/index.js

@@ -1103,13 +1103,52 @@ function buildCompletions({
       }
     }
 
-    // Generic top-level argument lists (e.g. /resume <session-id>).
+    // Generic top-level argument lists (e.g. /resume <session-id>,
+    // /model <id> [thinking]). /model supports a secondary intensity menu.
     if (
       Array.isArray(argListForHead)
       && argListForHead.length > 0
       && !(headNode && headNode.children)
       && (endsWithWhitespace || tail.length >= 1)
     ) {
+      const secondaryList = argumentLists && typeof argumentLists === "object"
+        ? argumentLists[`${headKey}/thinking`] || argumentLists[`${headKey}/think`]
+        : null;
+      const supportsThinkingMenu = head === "/model" && Array.isArray(secondaryList) && secondaryList.length > 0;
+
+      // Secondary menu: "/model <id> " or "/model <id> <partial>"
+      if (supportsThinkingMenu && (
+        (tail.length === 1 && endsWithWhitespace)
+        || tail.length >= 2
+      )) {
+        if (tail.length > 2) return [];
+        const modelId = String(tail[0] || "").trim();
+        if (!modelId) return [];
+        const partial = tail.length >= 2 && !endsWithWhitespace
+          ? String(tail[1] || "").toLowerCase()
+          : "";
+        const out = [];
+        for (const item of secondaryList) {
+          const id = String((item && (item.alias || item.cmd || item.id || item.name)) || item || "");
+          if (!id) continue;
+          if (partial && !id.toLowerCase().startsWith(partial)) continue;
+          const desc = String((item && (item.desc || item.summary || item.description || item.source)) || "");
+          out.push({
+            kind: "argument",
+            label: `${head} ${modelId} ${id}`,
+            replace: `${head} ${modelId} ${id}`,
+            description: desc,
+            hasChildren: false,
+          });
+          if (out.length >= limit) break;
+        }
+        if (partial && out.length === 1) {
+          const candidate = String(out[0].replace || "").trim().split(/\s+/).pop() || "";
+          if (candidate.toLowerCase() === partial && !out[0].hasChildren) return [];
+        }
+        return out;
+      }
+
       if (tail.length > 1) return [];
       const partial = String(tail[0] || "").toLowerCase();
       const out = [];
@@ -1118,17 +1157,23 @@ function buildCompletions({
         if (!id) continue;
         if (partial && !id.toLowerCase().startsWith(partial)) continue;
         const desc = String((item && (item.desc || item.summary || item.description || item.source)) || "");
+        const hasChildren = Boolean(
+          (item && item.hasChildren)
+          || supportsThinkingMenu
+        );
         out.push({
           kind: "argument",
           label: `${head} ${id}`,
-          replace: `${head} ${id} `,
+          // Trailing space keeps the popup open for the thinking submenu.
+          replace: hasChildren ? `${head} ${id} ` : `${head} ${id} `,
           description: desc,
-          hasChildren: false,
+          hasChildren,
         });
         if (out.length >= limit) break;
       }
       if (partial && out.length === 1) {
         const candidate = String(out[0].replace || "").trim().split(/\s+/).pop() || "";
+        // Keep the popup open when the sole match still has a submenu.
         if (candidate.toLowerCase() === partial && !out[0].hasChildren) return [];
       }
       return out;

package/src/ui/ink/ChatApp.js

@@ -165,38 +165,58 @@ function loadChatHistory(projectRoot, cap = 200, options = {}) {
     const raw = fs.readFileSync(file, "utf8");
     const lines = raw.split(/\r?\n/).filter(Boolean);
     const out = [];
-    const pushLine = (line = "") => {
+    const pushLine = (line = "", sourceType = "") => {
       const value = String(line || "");
       if (!value.trim()) {
-        if (out.length > 0 && out[out.length - 1] !== "") out.push("");
+        if (out.length > 0) {
+          const last = out[out.length - 1];
+          const lastText = typeof last === "object" ? last.text : last;
+          if (lastText !== "") out.push({ text: "", sourceType: sourceType || "system" });
+        }
         return;
       }
-      out.push(value);
+      out.push(sourceType ? { text: value, sourceType } : value);
     };
     for (const line of lines) {
       try {
         const entry = JSON.parse(line);
         if (!entry) continue;
         if (entry.type === "spacer") {
-          pushLine("");
+          pushLine("", "system");
           continue;
         }
         const text = String(entry.text || "");
         if (!text) continue;
+        const sourceType = String(entry.type || "");
         // Strip blessed-tag markup that the legacy log writer used; ink
         // can't render those tags and we don't want them shown literally.
         const stripped = text.replace(/\{[^{}]+\}/g, "");
         for (const renderedLine of normalizeInkLogLines(stripped)) {
-          pushLine(renderedLine);
+          pushLine(renderedLine, sourceType);
         }
       } catch {
         // ignore malformed lines
       }
     }
-    while (out.length > 0 && out[0] === "") out.shift();
-    while (out.length > 0 && out[out.length - 1] === "") out.pop();
+    while (out.length > 0) {
+      const first = out[0];
+      const firstText = typeof first === "object" ? first.text : first;
+      if (firstText !== "") break;
+      out.shift();
+    }
+    while (out.length > 0) {
+      const last = out[out.length - 1];
+      const lastText = typeof last === "object" ? last.text : last;
+      if (lastText !== "") break;
+      out.pop();
+    }
     const capped = out.slice(-cap);
-    while (capped.length > 0 && capped[0] === "") capped.shift();
+    while (capped.length > 0) {
+      const first = capped[0];
+      const firstText = typeof first === "object" ? first.text : first;
+      if (firstText !== "") break;
+      capped.shift();
+    }
     return capped;
   } catch {
     return [];
@@ -435,12 +455,26 @@ function createThrottledSender(send, windowMs = 500) {
 // Kinds whose log entries render as a margin-bottom "transcript cell" in
 // buildChatLogGroups. Kept in sync with canAppendToChatLogGroup in
 // chatLogModel.js.
-const STATIC_GROUPABLE_KINDS = new Set(["assistant", "agent", "success", "error", "meta", "plain"]);
+const STATIC_GROUPABLE_KINDS = new Set([
+  "assistant",
+  "agent",
+  "report",
+  "success",
+  "error",
+  "meta",
+  "system",
+  "plain",
+]);
 
 // Shared row colors for both the dynamic (stream) and <Static> renderers.
+// Aligned with ucode LOG_LINE_TEXT_PROPS: user green+bold, system dim gray,
+// team bus/agent cyan, ufoo assistant white/bold marker.
 const CHAT_LOG_ROW_PALETTE = {
+  user: { marker: "green", speaker: "green", body: "green", bold: true },
   assistant: { marker: "cyan", speaker: "white", body: undefined, bold: true },
   agent: { marker: "cyan", speaker: "cyan", body: undefined, bold: false },
+  report: { marker: "yellow", speaker: "yellow", body: undefined, bold: false },
+  system: { marker: "gray", speaker: "gray", body: "gray", bold: false, dim: true },
   error: { marker: "red", speaker: "red", body: "red", bold: true },
   success: { marker: "green", speaker: "green", body: "green", bold: false },
   divider: { marker: "gray", speaker: "gray", body: "gray", bold: false },
@@ -460,21 +494,39 @@ function decorateStaticLogEntry(prev, entry) {
   const markdownState = prev && prev.markdownState && typeof prev.markdownState === "object"
     ? { inCodeBlock: Boolean(prev.markdownState.inCodeBlock) }
     : { inCodeBlock: false };
-  const sourceText = entry && typeof entry === "object" && entry.text != null
-    ? String(entry.text)
-    : entry;
-  const row = buildChatLogLineModel(sourceText, { markdownState });
+  const source = entry && typeof entry === "object" ? entry : { text: entry };
+  const sourceText = source.text != null ? String(source.text) : String(entry || "");
+  const sourceType = String(source.sourceType || source.type || "");
+  const meta = source.meta && typeof source.meta === "object" ? source.meta : {};
+  const row = buildChatLogLineModel({
+    ...source,
+    text: sourceText,
+    sourceType,
+    meta,
+  }, { markdownState, sourceType, meta });
   const continuation = Boolean(
     prev
-    && (row.kind === "plain" || row.kind === "spacer")
-    && STATIC_GROUPABLE_KINDS.has(prev.groupKind)
+    && (
+      ((row.kind === "plain" || row.kind === "spacer") && STATIC_GROUPABLE_KINDS.has(prev.groupKind))
+      || (prev.groupKind === "user" && row.kind === "user" && row.marker !== "›")
+    )
   );
   const groupKind = continuation ? prev.groupKind : row.kind;
   // A gap belongs between visual blocks: only on entries that START a new
   // block, and only when the previous block was a transcript group (whose
   // old dynamic renderer contributed a trailing marginBottom).
-  const marginBefore = Boolean(!continuation && prev && STATIC_GROUPABLE_KINDS.has(prev.groupKind));
-  return { entry, row, groupKind, continuation, marginBefore, markdownState };
+  // User turns also get a leading gap so › prompts don't sit flush against
+  // the previous transcript cell (ucode parity).
+  const marginBefore = Boolean(
+    !continuation
+    && prev
+    && (
+      STATIC_GROUPABLE_KINDS.has(prev.groupKind)
+      || prev.groupKind === "user"
+      || row.kind === "user"
+    )
+  );
+  return { entry: source, row, groupKind, continuation, marginBefore, markdownState };
 }
 
 function createInkStreamState({
@@ -1315,7 +1367,15 @@ function createChatApp({ React, ink, props, interactive = true }) {
       }
       const lines = normalizeInkLogLines(text);
       if (lines.length === 0) return;
-      dispatch({ type: "log/appendMany", lines });
+      const payload = lines.map((line, index) => ({
+        text: line,
+        type,
+        sourceType: type,
+        // Attach router meta only on the first physical line so multi-line
+        // bus/reply bodies don't duplicate publisher payloads.
+        meta: index === 0 && meta && typeof meta === "object" ? meta : {},
+      }));
+      dispatch({ type: "log/appendMany", lines: payload });
       appendScopedHistory(type, stripBlessedTags(text), meta);
     }, [appendScopedHistory, setStatusText]);
 
@@ -3505,6 +3565,8 @@ function createChatApp({ React, ink, props, interactive = true }) {
       return buildChatLogGroups(lines.map((line, idx) => ({
         id: `s-${idx}`,
         text: idx === 0 ? `${prefix}${line}` : `  ${line}`,
+        sourceType: "bus",
+        type: "bus",
       })));
     }, [state.activeStream]);
 
@@ -3512,6 +3574,18 @@ function createChatApp({ React, ink, props, interactive = true }) {
       return null;
     }
 
+    const renderUserLogBody = (bodyText = "") => {
+      const body = String(bodyText || "");
+      const atMatch = body.match(/^@([^\s]+)\s+(.*)$/);
+      if (atMatch) {
+        return {
+          at: atMatch[1],
+          rest: atMatch[2] || "",
+        };
+      }
+      return { at: "", rest: body };
+    };
+
     const renderChatLogEntry = (entry, group) => {
       const row = entry && entry.row ? entry.row : buildChatLogLineModel("");
       const key = entry && entry.id ? entry.id : `log-${row.body}`;
@@ -3529,12 +3603,31 @@ function createChatApp({ React, ink, props, interactive = true }) {
           h(Text, { color: colors.body, bold: true, wrap: "truncate" }, row.body),
         );
       }
+      if (row.kind === "user") {
+        const userBody = renderUserLogBody(row.bodyText);
+        return h(Box, { key, width: "100%", marginBottom: 1 },
+          h(Text, { color: "green", bold: true }, row.markerText || "› "),
+          userBody.at
+            ? h(Text, { color: "magenta", bold: true }, `@${userBody.at} `)
+            : null,
+          h(Text, { color: "green", bold: true, wrap: "wrap" }, userBody.rest),
+        );
+      }
       const markerText = entry && entry.continuation
-        ? (group && (group.kind === "assistant" || group.kind === "agent") ? "   " : "  ")
+        ? (group && (group.kind === "assistant" || group.kind === "agent" || group.kind === "report") ? "   " : "  ")
         : row.markerText;
+      const bodyProps = {
+        color: colors.body,
+        wrap: "wrap",
+      };
+      if (colors.dim) bodyProps.dimColor = true;
       return h(Box, { key, width: "100%" },
-        h(Text, { color: colors.marker, bold: row.kind === "error" }, markerText),
-        h(Text, { color: colors.body, wrap: "wrap" },
+        h(Text, {
+          color: colors.marker,
+          bold: row.kind === "error" || row.kind === "assistant",
+          dimColor: Boolean(colors.dim),
+        }, markerText),
+        h(Text, bodyProps,
           row.speaker && !(entry && entry.continuation)
             ? h(Text, { color: colors.speaker, bold: colors.bold }, row.speaker)
             : null,
@@ -3551,7 +3644,7 @@ function createChatApp({ React, ink, props, interactive = true }) {
       if (entries.length === 0) return null;
       const first = entries[0] || {};
       const row = first.row || buildChatLogLineModel("");
-      if (row.kind === "spacer" || row.kind === "banner" || row.kind === "divider") {
+      if (row.kind === "spacer" || row.kind === "banner" || row.kind === "divider" || row.kind === "user") {
         return renderChatLogEntry(first, group);
       }
       return h(Box, {
@@ -3587,12 +3680,31 @@ function createChatApp({ React, ink, props, interactive = true }) {
           h(Text, { color: colors.body, bold: true, wrap: "truncate" }, row.body),
         );
       }
+      if (row.kind === "user") {
+        const userBody = renderUserLogBody(row.bodyText);
+        return h(Box, { key, width: "100%", marginTop, marginBottom: 1 },
+          h(Text, { color: "green", bold: true }, row.markerText || "› "),
+          userBody.at
+            ? h(Text, { color: "magenta", bold: true }, `@${userBody.at} `)
+            : null,
+          h(Text, { color: "green", bold: true, wrap: "wrap" }, userBody.rest),
+        );
+      }
       const markerText = continuation
-        ? (groupKind === "assistant" || groupKind === "agent" ? "   " : "  ")
+        ? (groupKind === "assistant" || groupKind === "agent" || groupKind === "report" ? "   " : "  ")
         : row.markerText;
+      const bodyProps = {
+        color: colors.body,
+        wrap: "wrap",
+      };
+      if (colors.dim) bodyProps.dimColor = true;
       return h(Box, { key, width: "100%", marginTop },
-        h(Text, { color: colors.marker, bold: row.kind === "error" }, markerText),
-        h(Text, { color: colors.body, wrap: "wrap" },
+        h(Text, {
+          color: colors.marker,
+          bold: row.kind === "error" || row.kind === "assistant",
+          dimColor: Boolean(colors.dim),
+        }, markerText),
+        h(Text, bodyProps,
           row.speaker && !continuation
             ? h(Text, { color: colors.speaker, bold: colors.bold }, row.speaker)
             : null,

package/src/ui/ink/UcodeApp.js

@@ -323,14 +323,36 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
     const { UCODE_COMMAND_REGISTRY, UCODE_COMMAND_TREE } = require("../../code/commands");
     const { listSessionSummaries } = require("../../code/sessionStore");
-    const { suggestUcodeModels, applyUcodeModelCommand } = require("../../code/modelCommand");
+    const { suggestUcodeModels, suggestUcodeThinkingLevels, applyUcodeModelCommand, listUcodeModels } = require("../../code/modelCommand");
     let resumeSessions = [];
     try {
       resumeSessions = listSessionSummaries(props.workspaceRoot || process.cwd(), { limit: 40 });
     } catch {
       resumeSessions = [];
     }
-    const modelSuggestions = suggestUcodeModels(props.state || {});
+    const [remoteModels, setRemoteModels] = useState([]);
+    useEffect(() => {
+      let cancelled = false;
+      (async () => {
+        try {
+          const listed = await listUcodeModels(props.state || {}, {
+            workspaceRoot: props.workspaceRoot || process.cwd(),
+          });
+          if (!cancelled && listed.ok) {
+            setRemoteModels(Array.isArray(listed.models) ? listed.models : []);
+          }
+        } catch {
+          if (!cancelled) setRemoteModels([]);
+        }
+      })();
+      return () => { cancelled = true; };
+    }, [
+      props.workspaceRoot,
+      props.state && props.state.provider,
+      props.state && props.state.model,
+    ]);
+    const modelSuggestions = suggestUcodeModels(props.state || {}, { models: remoteModels });
+    const thinkingSuggestions = suggestUcodeThinkingLevels(props.state || {});
 
     const completions = fmt.buildCompletions({
       text: draft,
@@ -341,6 +363,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
       argumentLists: {
         "/resume": resumeSessions,
         "/model": modelSuggestions,
+        "/model/thinking": thinkingSuggestions,
       },
       limit: 20,
     });
@@ -541,7 +564,9 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
           return;
         }
         case "model": {
-          const applied = applyUcodeModelCommand(props.state || {}, result);
+          const applied = await applyUcodeModelCommand(props.state || {}, result, {
+            workspaceRoot: runtimeWorkspace,
+          });
           appendLogText(applied.output || "", applied.ok ? "system" : "error");
           if (applied.ok && result.action === "set" && typeof props.persistSessionState === "function") {
             try {
@@ -950,18 +975,8 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
       // Pending approval/choice/chat takes priority over nudge / new NL.
       try {
-        const {
-          hasPendingUserInteraction,
-          parseUserInteractionInput,
-          getPendingUserInteraction,
-        } = require("../../code/context/userInteraction");
+        const { hasPendingUserInteraction } = require("../../code/context/userInteraction");
         if (props.state && props.state.executionState && hasPendingUserInteraction(props.state.executionState)) {
-          const pending = getPendingUserInteraction(props.state.executionState);
-          const parsed = parseUserInteractionInput(pending, trimmed);
-          if (!parsed.ok) {
-            appendLogText(parsed.error || "Invalid reply", "error");
-            return;
-          }
           appendLogText(`› ${trimmed}`, "user");
           const startedAt = Date.now();
           setStatus({
@@ -972,14 +987,14 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
           });
           runChainRef.current = runChainRef.current
             .then(async () => {
-              const resume = typeof props.resumeAfterUserInteraction === "function"
-                ? props.resumeAfterUserInteraction
-                : require("../../code/agent").resumeAfterUserInteraction;
+              const submit = typeof props.submitUserInteractionAnswer === "function"
+                ? props.submitUserInteractionAnswer
+                : require("../../code/protocol").submitUserInteractionAnswer;
               let streamBuf = "";
               let sawStreamText = false;
               let streamStarted = false;
               let dropLeadingStreamBlank = false;
-              const result = await resume(trimmed, props.state, {
+              const result = await submit(trimmed, props.state, {
                 onDelta: (delta) => {
                   const text = String(delta || "");
                   if (!text) return;
@@ -1006,19 +1021,12 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
               }
               flushTableBuffer();
               refreshPlanUi();
-              if (result && result.waitingUserInteraction) {
-                appendLogText("Still waiting for your reply.", "system");
-                setStatus({ message: "", type: "thinking", showTimer: false, startedAt: 0 });
-                return;
-              }
               if (!result || result.ok === false) {
                 appendLogText(`Error: ${(result && result.error) || "resume failed"}`, "error");
-              } else {
-                // Skip summary echo when deltas were already rendered (mirrors NL path).
-                const shouldSkipSummary = Boolean(result.streamed && result.ok && sawStreamText);
-                if (result.summary && !shouldSkipSummary) {
-                  appendLogText(result.summary);
-                }
+              } else if (result.shouldEchoSummary) {
+                appendLogText(result.echoSummaryText || result.summary || "", result.waitingUserInteraction ? "system" : "assistant");
+              } else if (result.waitingUserInteraction) {
+                appendLogText("Still waiting for your reply.", "system");
               }
               setStatus({ message: "", type: "thinking", showTimer: false, startedAt: 0 });
             })
@@ -1067,7 +1075,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
       flushActiveMerge,
       flushTableBuffer,
       props.state,
-      props.resumeAfterUserInteraction,
+      props.submitUserInteractionAnswer,
       refreshPlanUi,
     ]);