flavor-code 1.4.0-beta.5 → 1.4.0-beta.7

package/README.md

@@ -178,6 +178,8 @@ Common commands:
 
 You can submit steering or queue follow-ups while a run is in progress; once the current model response finishes, the task picks up new instructions at safe boundaries.
 
+During planned work, a wide CLI shows the main task plan and sub-agent exploration side by side; if only one track exists it uses the full row, and narrow terminals stack both tracks. Long streamed responses keep a live `Writing response` activity below the latest output. LSP tools locate the nearest nested project configuration for each target file, so monorepos and sandbox/worktree projects do not need a `tsconfig.json` or `jsconfig.json` at the Flavor workspace root; JavaScript and CommonJS files are supported by the bundled TypeScript server as well.
+
 `/commit` and `/review` use the cheap sub-agent model and degrade gracefully when it is unavailable. Session checkpoints are tagged with the current git state (`branch@sha`), so `/tree` shows what the workspace looked like at each node. `/explain <symbol>` runs on the same cheap model: it assembles call relations from the code graph, the symbol's real source slice, and recent commits touching the file, then generates a five-part newcomer walkthrough (what it does / key implementation points / call flow / why it is written this way / gotchas); an interactive picker disambiguates multiple matches, and a missing graph degrades to a `/ast init` hint instead of an error.
 
 #### CLI pals and cross-project work

package/README.zh-CN.md

@@ -178,6 +178,8 @@ OAuth PKCE 的运行时行为与配置约定见 [PKCE 规范](./docs/specs/pkce-
 
 运行中可以提交 steering 或排队 follow-up；当前模型响应结束后，任务会在安全边界处接收新指令。
 
+有任务规划时，宽终端会把主任务计划与子 Agent 探索左右并排展示；只有一类工作时占满整行，窄终端则自动纵向排列。长内容流式输出期间，最新内容下方会持续显示 `Writing response` 动作。LSP 工具会从目标文件向上寻找最近的嵌套项目配置，因此 monorepo、sandbox 或 worktree 项目无需在 Flavor 工作区根部额外放置 `tsconfig.json` / `jsconfig.json`；内置 TypeScript 服务也支持 JavaScript 与 CommonJS 文件。
+
 `/commit` 与 `/review` 使用廉价子 Agent 模型，模型不可用时优雅降级。会话 checkpoint 会标记当前 git 状态（`branch@sha`），`/tree` 可以看到每个节点对应的工作区现场。`/explain <符号>` 同样走廉价模型：它把代码图中的调用关系、符号的真实源码切片和该文件的近期提交历史组装成证据，生成面向新人的五段式讲解（做什么 / 关键实现点 / 调用关系 / 为什么这样写 / 注意事项）；多个符号命中时弹出选择卡片，可方向键选择或直接输入更精确的名字；代码图未建立时提示 `/ast init`，不会抛错。
 
 #### CLI Pals 与跨项目协作

package/dist/{app-SXNJDSI2.js → app-H2XGMAOY.js}

@@ -2,7 +2,7 @@
 import { createRequire } from "node:module"; const require = createRequire(import.meta.url);
 import {
   statusPresentation
-} from "./chunk-2BF7CVWZ.js";
+} from "./chunk-RAYH6K2H.js";
 import {
   COMMAND_DESCRIPTIONS,
   MVP_COMMANDS,
@@ -19,7 +19,7 @@ import {
   thinkingWindow,
   transcriptReducer,
   withTimeout
-} from "./chunk-J7TLT6LR.js";
+} from "./chunk-ITKOMJD6.js";
 import "./chunk-N5MXHJKD.js";
 import "./chunk-KQMKY7C5.js";
 import {
@@ -38,7 +38,7 @@ import {
   useStdout,
   use_app_default,
   use_input_default
-} from "./chunk-IQAZ42TM.js";
+} from "./chunk-XMRKRPNC.js";
 import {
   execFileNoThrow
 } from "./chunk-ZJCAQXA7.js";
@@ -1007,7 +1007,7 @@ function TaskStatusLine({ block, interactive }) {
     thinkingScroll.current = { start: state.start, lastTime: time };
     return state.text;
   })() : void 0;
-  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "column", width: "100%", children: [
     /* @__PURE__ */ jsxs2(Box_default, { ref, flexDirection: "row", children: [
       /* @__PURE__ */ jsxs2(Text, { ...presentation.color === void 0 ? {} : { color: presentation.color }, children: [
         presentation.glyph,
@@ -1039,38 +1039,70 @@ function ThinkingLineView({ text }) {
     /* @__PURE__ */ jsx3(Text, { color: THINKING_TEXT, wrap: "truncate-end", children: text })
   ] });
 }
+var SPLIT_TRACK_MIN_COLUMNS = 72;
 function TaskProgressPanel({
   blocks,
   interactive,
   maxHeight = 8,
+  columns = 80,
   scrollRef,
   onHoverChange
 }) {
   if (blocks.length === 0 || maxHeight <= 0) return null;
+  const taskBlocks = blocks.filter((block) => block.task?.role === "main");
+  const subagentBlocks = blocks.filter((block) => block.task?.role === "subagent");
+  const hasTasks = taskBlocks.length > 0;
+  const hasSubagents = subagentBlocks.length > 0;
+  const split = hasTasks && hasSubagents && columns >= SPLIT_TRACK_MIN_COLUMNS;
   return /* @__PURE__ */ jsxs2(
     Box_default,
     {
       flexDirection: "column",
       flexShrink: 0,
+      width: "100%",
       maxHeight,
       onMouseEnter: () => onHoverChange?.(true),
       onMouseLeave: () => onHoverChange?.(false),
       children: [
-        /* @__PURE__ */ jsx3(Text, { dimColor: true, children: "\u2500\u2500 task progress \u2500\u2500" }),
+        split ? /* @__PURE__ */ jsx3(SplitTrackHeaders, {}) : /* @__PURE__ */ jsx3(TrackHeader, { role: hasTasks ? "main" : "subagent" }),
         maxHeight > 1 ? /* @__PURE__ */ jsx3(
           ScrollBox_default,
           {
             ...scrollRef === void 0 ? {} : { ref: scrollRef },
             flexDirection: "column",
             flexShrink: 1,
+            width: "100%",
             maxHeight: maxHeight - 1,
-            children: blocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
+            children: split ? pairedTrackRows(taskBlocks, subagentBlocks).map(([task, subagent], index) => /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", columnGap: 2, children: [
+              /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, flexDirection: "column", children: task === void 0 ? null : /* @__PURE__ */ jsx3(TaskStatusLine, { block: task, interactive }) }),
+              /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, flexDirection: "column", children: subagent === void 0 ? null : /* @__PURE__ */ jsx3(TaskStatusLine, { block: subagent, interactive }) })
+            ] }, `${task?.id ?? "task"}:${subagent?.id ?? "subagent"}:${index}`)) : hasTasks && hasSubagents ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
+              taskBlocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id)),
+              /* @__PURE__ */ jsx3(TrackHeader, { role: "subagent" }),
+              subagentBlocks.map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
+            ] }) : (hasTasks ? taskBlocks : subagentBlocks).map((block) => /* @__PURE__ */ jsx3(TaskStatusLine, { block, interactive }, block.id))
           }
         ) : null
       ]
     }
   );
 }
+function TrackHeader({ role }) {
+  return /* @__PURE__ */ jsxs2(Text, { dimColor: true, children: [
+    "\u2500\u2500 ",
+    role === "main" ? "task plan" : "subagent exploration",
+    " \u2500\u2500"
+  ] });
+}
+function SplitTrackHeaders() {
+  return /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", width: "100%", columnGap: 2, children: [
+    /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsx3(TrackHeader, { role: "main" }) }),
+    /* @__PURE__ */ jsx3(Box_default, { flexBasis: 0, flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsx3(TrackHeader, { role: "subagent" }) })
+  ] });
+}
+function pairedTrackRows(tasks, subagents) {
+  return Array.from({ length: Math.max(tasks.length, subagents.length) }, (_, index) => [tasks[index], subagents[index]]);
+}
 
 // src/ui/file-diff-style.ts
 var CONTENT = "#f8f8f2";
@@ -2550,6 +2582,7 @@ function TerminalLayout({
         blocks: activeTaskBlocks,
         interactive: activeSession,
         maxHeight: taskPanelRows,
+        columns,
         ...taskScrollRef === void 0 ? {} : { scrollRef: taskScrollRef },
         ...onTaskPanelHoverChange === void 0 ? {} : { onHoverChange: onTaskPanelHoverChange }
       }

package/dist/{chunk-J7TLT6LR.js → chunk-ITKOMJD6.js}

@@ -1399,7 +1399,7 @@ function transcriptReducer(state, action) {
     return finishActive(withUsage);
   }
   if (event.type === "text") {
-    return { ...state, active: addText(withoutModelActivity(state.active), event.text) };
+    return { ...state, active: addStreamingText(state.active, event.text) };
   }
   if (event.type === "thinking") {
     return { ...state, active: attachThinking(state.active, event.text) };
@@ -1857,6 +1857,17 @@ function addText(turn, text, onNewLine = false) {
   }
   return withBlocks({ ...turn, assistantText }, blocks);
 }
+function addStreamingText(turn, text) {
+  const activity = turn.blocks.find((block) => block.kind === "status" && block.activity === "model" && block.state === "running");
+  if (activity === void 0) return addText(turn, text);
+  const withoutActivity = withBlocks(turn, turn.blocks.filter((block) => block !== activity));
+  const withText = addText(withoutActivity, text);
+  const { thinkingText: _thinkingText, ...writingActivity } = activity;
+  return withBlocks(withText, [...withText.blocks, {
+    ...writingActivity,
+    text: "Writing response"
+  }]);
+}
 function boundedTranscriptBlock(block) {
   const presentation = block.presentation === void 0 ? void 0 : boundedTranscriptPresentation(block.presentation);
   const tool = block.tool === void 0 ? void 0 : {
@@ -6856,6 +6867,7 @@ import { mkdirSync as mkdirSync4, readFileSync as readFileSync3, renameSync as r
 import { createHash as createHash18, randomUUID as randomUUID20 } from "crypto";
 import { homedir as homedir3, release as osRelease, tmpdir as tmpdir4, version as osVersion } from "os";
 import { basename as basename7, dirname as dirname17, join as join30, relative as relative22, resolve as resolve31, sep as sep22 } from "path";
+import { performance } from "perf_hooks";
 
 // src/agent/subagents.ts
 import { z as z9 } from "zod";
@@ -18826,10 +18838,12 @@ var LspConnection = class {
     this.#disposed = true;
     this.#rejectAll(new Error("LSP connection disposed"));
     this.#shutdownPromise = (async () => {
+      const closed = waitForProcessClose(this.#process);
       await terminateProcessTree(this.#process.pid);
       this.#process.stdin.destroy();
       this.#process.stdout.destroy();
       this.#process.stderr.destroy();
+      await closed;
     })();
     return this.#shutdownPromise;
   }
@@ -18948,6 +18962,18 @@ var LspConnection = class {
     this.#pending.clear();
   }
 };
+function waitForProcessClose(child) {
+  if (child.exitCode !== null || child.signalCode !== null) return Promise.resolve();
+  return new Promise((resolveClose) => {
+    const finish = () => {
+      clearTimeout(timer);
+      resolveClose();
+    };
+    const timer = setTimeout(finish, 2e3);
+    timer.unref();
+    child.once("close", finish);
+  });
+}
 var LspBuffer = class {
   #data = Buffer.alloc(0);
   feed(chunk, onMessage) {
@@ -18978,7 +19004,7 @@ var TYPESCRIPT_CLI = resolve23(
 var KNOWN_SERVERS = [
   {
     language: "typescript",
-    extensions: [".ts", ".tsx", ".mts", ".cts"],
+    extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs"],
     command: process.execPath,
     args: [TYPESCRIPT_CLI, "--lsp", "--stdio"],
     rootFiles: ["tsconfig.json", "jsconfig.json"]
@@ -19063,35 +19089,39 @@ var RealLspManager = class {
     if (this.#disposed) throw new Error("LSP manager is disposed");
     const language = this.#languageForUri(uri);
     if (language === void 0) throw new Error(`No language server configured for ${uri}; use Read/Grep or the project compiler`);
-    const existing = this.#connections.get(language);
-    if (existing !== void 0) return existing;
-    const pending = this.#pendingStarts.get(language);
-    if (pending !== void 0) return pending;
     const config = this.#serverConfigs.find((c) => c.language === language);
     if (config === void 0) throw new Error(`No language server configured for ${language}`);
-    const hasRoot = config.rootFiles.some((file) => existsSync5(resolve23(this.#workspace, file)));
-    if (!hasRoot) throw new Error(`Cannot start ${language} language server: workspace needs ${config.rootFiles.join(" or ")}`);
-    const startPromise = this.#startServer(config);
-    this.#pendingStarts.set(language, startPromise);
+    const filePath = uriToPath(uri);
+    const projectRoot = findLanguageServerRoot(filePath, this.#workspace, config.rootFiles);
+    if (projectRoot === void 0) {
+      throw new Error(`Cannot start ${language} language server: no ${config.rootFiles.join(" or ")} found from ${dirname15(filePath)} up to workspace ${this.#workspace}`);
+    }
+    const connectionKey = `${language}:${projectRoot}`;
+    const existing = this.#connections.get(connectionKey);
+    if (existing !== void 0) return existing;
+    const pending = this.#pendingStarts.get(connectionKey);
+    if (pending !== void 0) return pending;
+    const startPromise = this.#startServer(config, projectRoot);
+    this.#pendingStarts.set(connectionKey, startPromise);
     try {
       const connection = await startPromise;
       if (this.#disposed) {
         await connection.shutdown();
         throw new Error("LSP manager is disposed");
       }
-      this.#connections.set(language, connection);
+      this.#connections.set(connectionKey, connection);
       return connection;
     } finally {
-      this.#pendingStarts.delete(language);
+      this.#pendingStarts.delete(connectionKey);
     }
   }
-  async #startServer(config) {
+  async #startServer(config, projectRoot) {
     try {
       await access2(config.command, constants10.X_OK);
     } catch {
     }
-    const connection = new LspConnection(config.command, config.args, this.#workspace);
-    const rootUri = pathToFileURL2(this.#workspace).href;
+    const connection = new LspConnection(config.command, config.args, projectRoot);
+    const rootUri = pathToFileURL2(projectRoot).href;
     try {
       await connection.initialize(rootUri);
       this.#onStatus?.(`${config.language} Language Server ready (${config.command})`);
@@ -19127,7 +19157,21 @@ function createLspTools(workspace, options = {}) {
   const toUri = (filePath) => pathToFileURL2(filePath).href;
   const langTag = (file) => {
     const ext = file.slice(file.lastIndexOf(".")).toLowerCase();
-    const map = { ".ts": "ts", ".tsx": "tsx", ".mts": "ts", ".cts": "ts", ".py": "py", ".pyi": "py", ".pyx": "py", ".rs": "rs", ".go": "go" };
+    const map = {
+      ".ts": "ts",
+      ".tsx": "tsx",
+      ".mts": "ts",
+      ".cts": "ts",
+      ".js": "js",
+      ".jsx": "jsx",
+      ".mjs": "js",
+      ".cjs": "js",
+      ".py": "py",
+      ".pyi": "py",
+      ".pyx": "py",
+      ".rs": "rs",
+      ".go": "go"
+    };
     const tag = map[ext];
     return tag === void 0 ? "" : " [" + tag + "]";
   };
@@ -19195,6 +19239,12 @@ function languageIdForPath(filePath) {
       return "typescript";
     case ".cts":
       return "typescript";
+    case ".jsx":
+      return "javascriptreact";
+    case ".js":
+    case ".mjs":
+    case ".cjs":
+      return "javascript";
     case ".py":
     case ".pyi":
     case ".pyx":
@@ -19207,6 +19257,19 @@ function languageIdForPath(filePath) {
       return "typescript";
   }
 }
+function findLanguageServerRoot(filePath, workspace, rootFiles) {
+  const root = resolve23(workspace);
+  const target = resolve23(filePath);
+  if (!isWithin7(root, target)) return void 0;
+  let current = dirname15(target);
+  while (true) {
+    if (rootFiles.some((file) => existsSync5(resolve23(current, file)))) return current;
+    if (current === root) return void 0;
+    const parent = dirname15(current);
+    if (parent === current || !isWithin7(root, parent)) return void 0;
+    current = parent;
+  }
+}
 function isWithin7(root, candidate) {
   const delta = relative17(root, candidate);
   return delta === "" || !delta.startsWith(`..${sep17}`) && delta !== ".." && !isAbsolute12(delta);
@@ -24238,6 +24301,12 @@ async function createProductionRuntime(options) {
         holders.transcriptTurns = { entries: transcript.turns };
       } catch {
       }
+      try {
+        holders.userTiming = {
+          entries: performance.getEntriesByType("measure").length + performance.getEntriesByType("mark").length
+        };
+      } catch {
+      }
       return holders;
     };
     const rotateForHeap = (continuation, reading) => {

package/dist/{chunk-JZVC4477.js → chunk-PT72RZVC.js}

@@ -4,7 +4,7 @@ import {
   message,
   redactErrorText,
   redactSecrets
-} from "./chunk-J7TLT6LR.js";
+} from "./chunk-ITKOMJD6.js";
 
 // src/rpc/server.ts
 import { createInterface } from "readline";

package/dist/{chunk-2BF7CVWZ.js → chunk-RAYH6K2H.js}

@@ -28,13 +28,13 @@ function statusPresentation(block, elapsedMs, interactive) {
   if (block.state === "running" && block.activity === "model") {
     return interactive ? {
       glyph: activityFrame(elapsedMs),
-      text: "Flavoring",
+      text: block.text,
       color: "#81c8f2",
       metaLabel: formatElapsed(elapsedMs),
       metaColor: "ansi:blackBright"
     } : {
       glyph: "\xB7",
-      text: "Flavoring",
+      text: block.text,
       color: "#81c8f2"
     };
   }