flavor-code 1.2.17 → 1.2.20

package/README.md

@@ -247,9 +247,9 @@ flavor mcp disable docs
 
 </details>
 
-A Skill is a `SKILL.md` with YAML frontmatter, placed in `.flavor/skills/<name>/` or `~/.flavor-code/skills/<name>/`. Flavor loads skills progressively based on the task, and you can invoke one explicitly with `/<skill-name>`.
+A Skill is a `SKILL.md` with YAML frontmatter, placed in `.flavor/skills/<name>/` or `~/.flavor-code/skills/<name>/`. Flavor loads skills progressively based on the task, and you can invoke one explicitly with `/<skill-name>`. Skill bodies support `$ARGUMENTS`, `$ARGUMENTS[N]`, and `$N` substitutions. A running composite Skill can load a dependency through the read-only `Skill` tool; plugin-qualified names such as `superharness:test-driven-development` resolve to discovered skills.
 
-Plugins live in `.flavor/plugins/` and can register commands, tools, hooks, Skill roots, and model adapters.
+Plugins live in `.flavor/plugins/` and can register commands, tools, hooks, Skill roots, and model adapters. `additionalContext` returned by `SessionStart` and `UserPromptSubmit` hooks is added to the current task context, enabling reliable project-level engineering policy injection.
 
 > [!WARNING]
 > Plugins and agent self-registered tools are in-process JavaScript, not a security sandbox. Only install, enable, and approve code you trust.

package/README.zh-CN.md

@@ -247,9 +247,9 @@ flavor mcp disable docs
 
 </details>
 
-Skill 是带有 YAML 头信息的 `SKILL.md`，放在 `.flavor/skills/<name>/` 或 `~/.flavor-code/skills/<name>/`。Flavor 会按任务渐进加载，也支持通过 `/<skill-name>` 显式调用。
+Skill 是带有 YAML 头信息的 `SKILL.md`，放在 `.flavor/skills/<name>/` 或 `~/.flavor-code/skills/<name>/`。Flavor 会按任务渐进加载，也支持通过 `/<skill-name>` 显式调用。Skill 正文支持 `$ARGUMENTS`、`$ARGUMENTS[N]` 和 `$N` 参数占位符；运行中的组合 Skill 可以使用只读 `Skill` 工具继续加载依赖 Skill，插件限定名称（如 `superharness:test-driven-development`）会安全解析到已发现的 Skill。
 
-插件放在 `.flavor/plugins/`，可以注册命令、工具、Hook、Skill 根目录和模型适配器。
+插件放在 `.flavor/plugins/`，可以注册命令、工具、Hook、Skill 根目录和模型适配器。`SessionStart` 与 `UserPromptSubmit` Hook 返回的 `additionalContext` 会进入当前任务上下文，可用于注入项目级工程规则。
 
 > [!WARNING]
 > 插件和 Agent 自注册工具是进程内执行的 JavaScript，不是安全沙箱。只安装、启用和批准你信任的代码。

package/dist/{app-F4P7RV2X.js → app-5D5RSGQX.js}

@@ -14,8 +14,9 @@ import {
   modelContentTranscriptText,
   packageVersion,
   redactErrorText,
-  transcriptReducer
-} from "./chunk-QQCXJC4U.js";
+  transcriptReducer,
+  withTimeout
+} from "./chunk-AXLUVJKC.js";
 import "./chunk-IG4Z23CL.js";
 import {
   Box_default,
@@ -874,21 +875,27 @@ function CodeBlock({ token }) {
   const langLabel = token.lang?.trim();
   const label = langLabel && langLabel.length > 0 ? langLabel : "code";
   const topBarWidth = Math.max(0, columns - 4 - label.length - 4);
-  return /* @__PURE__ */ jsxs(Box_default, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
-      "\u256D\u2500 ",
-      /* @__PURE__ */ jsx(Text, { color: "cyan", children: label }),
-      " ",
-      "\u2500".repeat(topBarWidth),
-      "\u256E"
-    ] }),
-    /* @__PURE__ */ jsx(Box_default, { flexDirection: "column", paddingX: 1, children: truncated.map((line, i) => /* @__PURE__ */ jsx(Text, { color: "gray", children: line }, i)) }),
-    /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
-      "\u2570",
-      "\u2500".repeat(Math.max(0, columns - 6)),
-      "\u256F"
+  return (
+    // Code blocks are self-contained painted regions. Marking the region
+    // opaque prevents ScrollBox's incremental renderer from blitting cached
+    // blank cells over clean, single-line code bodies during transcript
+    // scrolls/redraws.
+    /* @__PURE__ */ jsxs(Box_default, { flexDirection: "column", paddingX: 1, opaque: true, children: [
+      /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+        "\u256D\u2500 ",
+        /* @__PURE__ */ jsx(Text, { color: "cyan", children: label }),
+        " ",
+        "\u2500".repeat(topBarWidth),
+        "\u256E"
+      ] }),
+      /* @__PURE__ */ jsx(Box_default, { flexDirection: "column", paddingX: 1, children: truncated.map((line, i) => /* @__PURE__ */ jsx(Text, { color: "gray", children: line }, i)) }),
+      /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+        "\u2570",
+        "\u2500".repeat(Math.max(0, columns - 6)),
+        "\u256F"
+      ] })
     ] })
-  ] });
+  );
 }
 function BlockquoteView({ token }) {
   return /* @__PURE__ */ jsx(Box_default, { flexDirection: "column", children: token.tokens.map((child, i) => {
@@ -1098,9 +1105,15 @@ function AssistantTextInner({ text }) {
 var AssistantText = React2.memo(AssistantTextInner);
 
 // src/ui/signals.ts
-function createSessionInterruptHandler(getSession, shutdown) {
+function createSessionInterruptHandler(getSession, shutdown, options) {
+  let shuttingDown = false;
   return () => {
+    if (shuttingDown) {
+      options.forceExit();
+      return;
+    }
     if (getSession()?.interrupt() === "cancelled") return;
+    shuttingDown = true;
     void shutdown();
   };
 }
@@ -1901,7 +1914,8 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
   const interruptRef = useRef4(void 0);
   interruptRef.current ??= createSessionInterruptHandler(
     () => runtimeRef.current?.session,
-    () => shutdownRef.current(runtimeRef.current)
+    () => shutdownRef.current(runtimeRef.current),
+    { forceExit: () => process.exit(1) }
   );
   const interrupt = interruptRef.current;
   useEffect3(() => {
@@ -3529,11 +3543,23 @@ async function submitSafely(session, prompt, report) {
     safeReport(report, safeUiError(error));
   }
 }
-async function shutdownRuntime(runtime, exit, report) {
+var SHUTDOWN_TIMEOUT_MS = 8e3;
+var FORCE_EXIT_GRACE_MS = 250;
+async function shutdownRuntime(runtime, exit, report, options = {}) {
+  const timeoutMs = options.shutdownTimeoutMs ?? SHUTDOWN_TIMEOUT_MS;
+  let timedOut = false;
   try {
-    await closeAndDisposeRuntime(runtime, report);
+    const outcome = await withTimeout(closeAndDisposeRuntime(runtime, report), timeoutMs);
+    timedOut = outcome.timedOut;
+    if (timedOut) report(`Shutdown timed out after ${timeoutMs}ms; forcing exit.`);
   } finally {
     exit();
+    if (timedOut) {
+      const forceExit = options.forceExit ?? (() => {
+        process.exit(1);
+      });
+      setTimeout(forceExit, FORCE_EXIT_GRACE_MS);
+    }
   }
 }
 async function closeAndDisposeRuntime(runtime, report) {
@@ -3565,6 +3591,7 @@ export {
   HISTORY_CAP,
   MentionMenu,
   PromptLine,
+  SHUTDOWN_TIMEOUT_MS,
   SinglePendingPrompt,
   TerminalLayout,
   appRuntimeOptions,

package/dist/{chunk-YRIPE5K5.js → chunk-A7PMQ22O.js}

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