u-foo 3.0.0 → 3.0.1

package/src/code/taskRoute.js

@@ -0,0 +1,73 @@
+"use strict";
+
+/**
+ * Structural / explicit decomposition upgrade decisions (R7).
+ * Not a language-specific bug-keyword classifier.
+ */
+
+function shouldUpgradeToDecomposition(task = "", options = {}) {
+  const text = String(task || "").trim();
+  const reasons = [];
+
+  if (options.forceDirect === true || options.disableDecomposition === true) {
+    return {
+      upgrade: false,
+      reason: "forced_direct",
+      reasons: ["forced_direct"],
+    };
+  }
+  if (options.forceDecomposition === true || options.forceDecompose === true) {
+    return {
+      upgrade: true,
+      reason: "forced_decomposition",
+      reasons: ["forced_decomposition"],
+    };
+  }
+  if (!text) {
+    return { upgrade: false, reason: "empty", reasons: ["empty"] };
+  }
+
+  // Explicit user/model requests (EN + ZH).
+  if (/(?:\bdecompos(?:e|ition)\b|\bbreak\s+(?:this|it)\s+down\b|\bmulti[- ]?step\s+plan\b|拆解|分步|分解任务|制定计划)/i.test(text)) {
+    reasons.push("explicit_decompose_request");
+  }
+
+  // Multiple independently verifiable goals (numbered / bulleted / conjunctions).
+  const numbered = (text.match(/(?:^|\n)\s*(?:\d+[\).]|[-*•])\s+\S+/g) || []).length;
+  if (numbered >= 2) reasons.push("multiple_listed_goals");
+
+  const multiClause = /(?:^|[;；。\n])\s*(?:and\s+also|also|然后|并且|同时|另外|以及)\b/i.test(text)
+    || (text.split(/[;；]/).map((s) => s.trim()).filter((s) => s.length > 12).length >= 3);
+  if (multiClause) reasons.push("multi_clause_objectives");
+
+  // High-risk / multi-file structural cues (not "fix" alone).
+  if (/\b(?:across\s+(?:files?|modules?|packages?)|multiple\s+files?|refactor\s+the\s+\w+|迁移|跨文件|多文件)\b/i.test(text)) {
+    reasons.push("multi_file_or_refactor_scope");
+  }
+  if (/\b(?:checkpoint|rollback|migration|schema\s+change|生产环境|回滚)\b/i.test(text)) {
+    reasons.push("high_risk_change");
+  }
+
+  // Runtime budget / prior failures may request upgrade.
+  if (Number(options.failureCount || 0) >= 2) {
+    reasons.push("repeated_failures");
+  }
+  if (options.modelRequestedUpgrade === true) {
+    reasons.push("model_route_decision");
+  }
+  if (options.hasPlanGraph === true) {
+    // Already structured — keep direct loop unless other reasons fire.
+    // (graph exists is not itself a decompose trigger)
+  }
+
+  const upgrade = reasons.length > 0;
+  return {
+    upgrade,
+    reason: upgrade ? reasons[0] : "direct_default",
+    reasons,
+  };
+}
+
+module.exports = {
+  shouldUpgradeToDecomposition,
+};

package/src/ui/ink/UcodeApp.js

@@ -950,18 +950,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 +962,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 +996,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 +1050,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
       flushActiveMerge,
       flushTableBuffer,
       props.state,
-      props.resumeAfterUserInteraction,
+      props.submitUserInteractionAnswer,
       refreshPlanUi,
     ]);