u-foo 3.0.1 → 3.0.3

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/MultilineInput.js

@@ -25,6 +25,11 @@
  *                               component (e.g. completion popup) can
  *                               handle them. Plain editing keys still work.
  *   placeholder (string)        rendered in gray when value is empty
+ *   onPasteText(filtered)       optional. Called for non-empty paste/insert
+ *                               chunks before insertText. May return:
+ *                                 string — insert that text instead
+ *                                 { text } — insert text (may be "")
+ *                                 null/undefined — fall back to filtered text
  *
  * Newlines: Enter submits. Use Alt+Enter (delivered as meta+Return) or end the
  * line with `\` (the legacy continuation trick) to insert a literal newline.
@@ -32,7 +37,8 @@
  * plain Enter, so it would silently submit.
  *
  * Bracketed paste arrives as a multi-byte `input` chunk in useInput; we route
- * it through insertText, so multi-line paste already works without extra code.
+ * it through insertText (or onPasteText), so multi-line paste already works
+ * without extra code.
  */
 
 const fmt = require("../format");
@@ -167,6 +173,7 @@ function createMultilineInput({ React, ink }) {
     // the IME composition window pops up at the visible (inverse) cursor
     // instead of at the bottom of the screen.
     linesBelowInput = 0,
+    onPasteText = null,
   }) {
     // Cursor is owned by this component. preferredCol tracks the visual
     // column we want to keep when bouncing across lines of different widths
@@ -392,7 +399,36 @@ function createMultilineInput({ React, ink }) {
       // Plain character / paste. Filter control bytes.
       if (input && !key.ctrl && !key.meta) {
         const filtered = input.replace(/[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f]/g, "");
-        if (filtered) insertText(filtered);
+        // Binary clipboard paste can strip to empty — still notify parent so
+        // it can try macOS PNGf clipboard ingest.
+        if (!filtered) {
+          if (typeof onPasteText === "function") {
+            try { onPasteText(""); } catch { /* ignore */ }
+          }
+          return;
+        }
+        if (typeof onPasteText === "function" && (filtered.length > 1 || filtered.includes("\n"))) {
+          let rewritten;
+          try {
+            rewritten = onPasteText(filtered);
+          } catch {
+            rewritten = filtered;
+          }
+          if (rewritten == null) {
+            insertText(filtered);
+            return;
+          }
+          if (typeof rewritten === "string") {
+            if (rewritten) insertText(rewritten);
+            return;
+          }
+          if (rewritten && typeof rewritten === "object") {
+            const nextText = rewritten.text == null ? filtered : String(rewritten.text);
+            if (nextText) insertText(nextText);
+            return;
+          }
+        }
+        insertText(filtered);
       }
     }, { isActive: interactive });
 

package/src/ui/ink/UcodeApp.js

@@ -17,6 +17,11 @@
 const { runInk } = require("../runInk");
 const fmt = require("../format");
 const { createMultilineInput } = require("./MultilineInput");
+const {
+  handleImagePaste,
+  formatUserLogWithAttachments,
+  buildAttachedImagesPromptPrefix,
+} = require("../../code/imageIngest");
 
 // Throttle for the live thinking-chain status line: rapid thinking_delta
 // chunks would otherwise re-render the footer on every SSE event.
@@ -70,6 +75,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
     );
     const [draft, setDraft] = useState("");
     const [draftVersion, setDraftVersion] = useState(0);
+    const [imageAttachments, setImageAttachments] = useState([]);
     // status: idle when message === "". `type` picks a STATUS_INDICATORS
     // bucket; `showTimer` and `startedAt` reproduce the blessed spinner
     // controls. The BG suffix is computed from backgroundTasksRef and
@@ -323,14 +329,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 +369,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
       argumentLists: {
         "/resume": resumeSessions,
         "/model": modelSuggestions,
+        "/model/thinking": thinkingSuggestions,
       },
       limit: 20,
     });
@@ -487,12 +516,20 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
     const runChainRef = useRef(Promise.resolve());
 
-    const executeLine = useCallback(async (rawValue) => {
-      const normalized = String(rawValue || "").replace(/\r?\n/g, " ").trim();
-      if (!normalized) return;
+    const executeLine = useCallback(async (rawValue, options = {}) => {
+      const modelSource = options.modelText != null ? options.modelText : rawValue;
+      const logSource = options.logText != null ? options.logText : modelSource;
+      const preserveNewlines = Boolean(options.preserveNewlines);
+      const modelNormalized = preserveNewlines
+        ? String(modelSource || "").trim()
+        : String(modelSource || "").replace(/\r?\n/g, " ").trim();
+      const logNormalized = fmt.redactUserMessageForLog(
+        String(logSource || "").replace(/\r?\n/g, " ").trim(),
+      );
+      if (!modelNormalized && !logNormalized) return;
       toolMergeScopeRef.current += 1;
       flushActiveMerge();
-      appendLogLine(`› ${normalized}`, "user");
+      appendLogLine(`› ${logNormalized || modelNormalized}`, "user");
 
       const runtimeWorkspace = String(
         (props.state && props.state.workspaceRoot) || props.workspaceRoot || process.cwd()
@@ -500,7 +537,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
       let result;
       try {
-        result = props.runSingleCommand(normalized, runtimeWorkspace);
+        result = props.runSingleCommand(modelNormalized, runtimeWorkspace);
       } catch (err) {
         appendLogText(`Error: ${err && err.message ? err.message : "command parse failed"}`, "error");
         return;
@@ -541,7 +578,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 {
@@ -938,21 +977,27 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
     const submit = useCallback((submitted) => {
       const value = String(submitted == null ? draft : submitted);
+      const attachments = Array.isArray(imageAttachments) ? imageAttachments.slice() : [];
       const trimmed = value.trim();
-      if (!trimmed) return;
+      if (!trimmed && attachments.length === 0) return;
       setDraft("");
       setDraftVersion((v) => v + 1);
+      setImageAttachments([]);
       setInputHistory((prev) => {
-        const next = prev.concat([trimmed]).slice(-200);
+        const historyValue = formatUserLogWithAttachments(trimmed, attachments) || trimmed;
+        const next = prev.concat([historyValue]).slice(-200);
         setHistoryIndex(next.length);
         return next;
       });
 
+      const modelText = `${buildAttachedImagesPromptPrefix(attachments)}${trimmed}`.trim();
+      const logText = formatUserLogWithAttachments(trimmed, attachments);
+
       // Pending approval/choice/chat takes priority over nudge / new NL.
       try {
         const { hasPendingUserInteraction } = require("../../code/context/userInteraction");
         if (props.state && props.state.executionState && hasPendingUserInteraction(props.state.executionState)) {
-          appendLogText(`› ${trimmed}`, "user");
+          appendLogText(`› ${logText}`, "user");
           const startedAt = Date.now();
           setStatus({
             message: "Applying your reply...",
@@ -1028,10 +1073,11 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
         if (!props.state.executionState || typeof props.state.executionState !== "object") {
           props.state.executionState = emptyExecutionState();
         }
-        const queued = enqueueUserPrompt(props.state.executionState, trimmed);
+        const queued = enqueueUserPrompt(props.state.executionState, modelText);
+        const reminderPreview = logText.slice(0, 120) + (logText.length > 120 ? "…" : "");
         appendLogText(
           queued.enqueued
-            ? `Queued user reminder for next model turn: ${trimmed.slice(0, 120)}${trimmed.length > 120 ? "…" : ""}`
+            ? `Queued user reminder for next model turn: ${reminderPreview}`
             : "Could not queue user reminder (empty).",
           "system",
         );
@@ -1040,10 +1086,15 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
       // Serialize executions so streaming tasks don't interleave.
       runChainRef.current = runChainRef.current
-        .then(() => executeLine(value))
+        .then(() => executeLine(modelText, {
+          modelText,
+          logText,
+          preserveNewlines: attachments.length > 0,
+        }))
         .catch((err) => appendLogText(`Error: ${err && err.message ? err.message : err}`, "error"));
     }, [
       draft,
+      imageAttachments,
       executeLine,
       appendLogText,
       appendLogLine,
@@ -1257,6 +1308,16 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
           }),
         );
       })() : null,
+      imageAttachments.length > 0
+        ? h(Box, { flexDirection: "column", width: "100%", marginBottom: 0 },
+          h(Text, { color: "cyan", dimColor: true },
+            imageAttachments.map((item) => {
+              const name = item.fileName || require("path").basename(String(item.relPath || "image"));
+              return `[img] ${name}`;
+            }).join("  "),
+          ),
+        )
+        : null,
       h(Box, { width: "100%" },
         h(MultilineInput, {
           value: draft,
@@ -1267,6 +1328,33 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
             }
             setDraft(next);
           },
+          onPasteText: (filtered) => {
+            const workspaceRoot = String(
+              (props.state && props.state.workspaceRoot) || props.workspaceRoot || process.cwd(),
+            );
+            const sessionId = String((props.state && props.state.sessionId) || "session");
+            const outcome = handleImagePaste(filtered, {
+              workspaceRoot,
+              sessionId,
+              tryClipboard: true,
+            });
+            if (Array.isArray(outcome.attachments) && outcome.attachments.length > 0) {
+              setImageAttachments((prev) => {
+                const next = prev.slice();
+                for (const item of outcome.attachments) {
+                  if (!item || !item.relPath) continue;
+                  if (next.some((existing) => existing.relPath === item.relPath)) continue;
+                  next.push(item);
+                }
+                return next;
+              });
+            }
+            if (Array.isArray(outcome.errors) && outcome.errors.length > 0 && outcome.attachments.length === 0) {
+              // Soft notice only when nothing was ingested.
+              appendLogText(`Image paste: ${outcome.errors[0]}`, "system");
+            }
+            return { text: outcome.text == null ? filtered : outcome.text };
+          },
           onSubmit: (value) => {
             setCompletionSuppressedDraft(null);
             submit(value);