billion-context-pi 0.1.69 → 0.1.70-pr.444.239

package/README.md

@@ -79,6 +79,8 @@ That's it. The extension auto-loads on next Pi startup. No configuration needed
 > **Using another sub-agent extension?** billion-context-pi ships its own `acp_delegate` sub-agent tool (see below) at a fraction of the context cost (~600 tok vs ~7K tok/turn). Two delegation tools in one session only make the model's choice noisier, so pick one:
 > - **Use ACP's delegate** — remove the other extension: `pi remove npm:pi-subagents`
 > - **Keep your own sub-agent** — turn ACP's delegate off in `acp.json`: `{ "delegate": false }` (see *Using your own sub-agent instead* below)
+>
+> If you keep `pi-subagents` installed, billion-context-pi detects it at session start: a **project-level** install (`<cwd>/.pi/npm` or the project extensions dir) automatically stands `acp_delegate` down for that project — a reminder then tells you how to give pi-subagents' agents ACP compression via `/acp-subagents`. A **user-level-only** install (`~/.pi/npm`, user extensions dir) leaves `acp_delegate` active and logs a warning instead. Set `"delegate": { "forceEnable": true }` in `acp.json` to keep `acp_delegate` active regardless of detection.
 
 ## How it works
 

package/README.zh-CN.md

@@ -78,6 +78,8 @@ pi install npm:billion-context-pi
 > **你另有子代理扩展?** billion-context-pi 自带 `acp_delegate` 子代理工具(见下文),上下文成本极低(~600 tok vs ~7K tok/轮)。同一会话里两套委派工具只会让模型的选择更混乱,二选一:
 > - **用 ACP 的 delegate** —— 卸载另一个扩展:`pi remove npm:pi-subagents`
 > - **保留你自己的子代理** —— 在 `acp.json` 里关掉 ACP 的 delegate:`{ "delegate": false }`(见下文*改用你自己的子代理*)
+>
+> 若保留已安装的 `pi-subagents`,billion-context-pi 会在会话启动时检测:**项目级**安装(`<cwd>/.pi/npm` 或项目内 extensions 目录)会自动停用该项目的 `acp_delegate`,并提醒你运行 `/acp-subagents` 让 pi-subagents 的子代理获得 ACP 压缩;仅**用户级**(全局)安装时只记一条警告日志,`acp_delegate` 保持启用。在 `acp.json` 中设置 `"delegate": { "forceEnable": true }` 可在检测到第三方子代理时仍强制保留 `acp_delegate`。
 
 ## 工作原理
 

package/dist/config.d.ts

@@ -29,6 +29,13 @@ export interface DelegateConfig {
     /** Enable acp_delegate tools (delegate/wait/cancel) and their system-prompt
      *  section. Default: true. Set `enabled: false` to skip registering them. */
     enabled?: boolean;
+    /** Keep acp_delegate active even when a third-party subagent extension
+     *  (pi-subagents) is installed. Default: false — when pi-subagents is
+     *  detected at session start, acp_delegate stands down (tools, fleet
+     *  shortcut and system-prompt section skipped) to avoid two overlapping
+     *  sub-agent systems, and a reminder points at /acp-subagents so the
+     *  third-party agents can still get ACP compression tools (#415). */
+    forceEnable?: boolean;
     /** How delegate usage is reported back to the main session.
      *  "separate" (default) — delegate tokens tracked in a separate accumulator;
      *  main session totals stay clean, delegate usage shows as its own block in
@@ -89,6 +96,9 @@ export interface DelegateConfig {
  *  corresponding timeout/watchdog is disabled. */
 export interface DelegatePolicy {
     enabled: boolean;
+    /** Resolved delegate.forceEnable (default false): keep acp_delegate even
+     *  when a third-party subagent extension (pi-subagents) is installed (#415). */
+    forceEnable: boolean;
     displayUsage: "merged" | "separate";
     maxDepth: number;
     syncTimeoutMs: number | null;

package/dist/index.js

@@ -4532,6 +4532,7 @@ var debug = {
 var DEFAULT_FLEET_SHORTCUT = "ctrl+alt+d";
 var DEFAULT_DELEGATE_POLICY = {
   enabled: true,
+  forceEnable: false,
   displayUsage: "separate",
   maxDepth: 2,
   syncTimeoutMs: 5 * 6e4,
@@ -4565,19 +4566,28 @@ function resolveDelegate(adapter) {
     DEFAULT_DELEGATE_POLICY.asyncTimeoutMs
   );
   const maxConcurrent = resolveMaxConcurrent(process.env.PI_ACP_DELEGATE_MAX_CONCURRENT, cfg.maxConcurrent);
+  const forceEnable = resolveForceEnable(process.env.PI_ACP_DELEGATE_FORCE_ENABLE, cfg.forceEnable);
   if (idleMs === null) {
     logWarn("config", {
       event: "delegate-idle-watchdog-disabled",
       hint: "no-output watchdog is off; hung async runs must be cancelled manually via acp_delegate_cancel"
     });
   }
-  return { enabled, displayUsage, maxDepth, syncTimeoutMs, idleMs, asyncTimeoutMs, maxConcurrent, thinkingLevel: cfg.thinkingLevel, agents: cfg.agents, notifyIfRead: cfg.notifyIfRead ?? "skip", fleetShortcut: resolveFleetShortcut(cfg.fleetShortcut) };
+  return { enabled, forceEnable, displayUsage, maxDepth, syncTimeoutMs, idleMs, asyncTimeoutMs, maxConcurrent, thinkingLevel: cfg.thinkingLevel, agents: cfg.agents, notifyIfRead: cfg.notifyIfRead ?? "skip", fleetShortcut: resolveFleetShortcut(cfg.fleetShortcut) };
 }
 function resolveFleetShortcut(value) {
   if (typeof value === "string") return value;
   if (value !== void 0) logWarn("config", { event: "delegate-config-invalid", field: "fleetShortcut", value: String(value), fallback: DEFAULT_FLEET_SHORTCUT });
   return DEFAULT_FLEET_SHORTCUT;
 }
+function resolveForceEnable(envValue, cfgValue) {
+  if (envValue === "true") return true;
+  if (envValue === "false") return false;
+  if (envValue !== void 0) {
+    logWarn("config", { event: "delegate-config-invalid", field: "forceEnable", value: envValue, fallback: cfgValue === true });
+  }
+  return cfgValue === true;
+}
 function resolveMaxDepth(value) {
   if (value === void 0) return DEFAULT_DELEGATE_POLICY.maxDepth;
   const n = Number(value);
@@ -4992,7 +5002,9 @@ function coreOutToAgentMessages(coreOut, originalById) {
   const emittedSplit = /* @__PURE__ */ new Set();
   const kernelTextByCallId = /* @__PURE__ */ new Map();
   for (const core of coreOut) {
-    if (core.toolCallId && core.text) kernelTextByCallId.set(core.toolCallId, core.text);
+    if (core.contentType === "tool-call" && core.toolCallId && core.text) {
+      kernelTextByCallId.set(core.toolCallId, core.text);
+    }
   }
   for (const core of coreOut) {
     if (core.id.startsWith("acp_summary_")) continue;
@@ -6377,6 +6389,7 @@ function createRuntime(adapter) {
   }
   let refused = false;
   let refusalMessage = null;
+  let delegateStoodDown = false;
   return { core, store, get refused() {
     return refused;
   }, set refused(v2) {
@@ -6385,6 +6398,10 @@ function createRuntime(adapter) {
     return refusalMessage;
   }, set refusalMessage(v2) {
     refusalMessage = v2;
+  }, get delegateStoodDown() {
+    return delegateStoodDown;
+  }, set delegateStoodDown(v2) {
+    delegateStoodDown = v2;
   }, get adapter() {
     return adapterRef;
   }, setAdapter: (a) => {
@@ -11600,7 +11617,7 @@ function resolveActivePack(adapter, cwd, provider, modelId, resolver) {
 }
 var HOST_VERSION = (() => {
   try {
-    return "0.1.69";
+    return "0.1.70";
   } catch {
     return "dev";
   }
@@ -17895,6 +17912,11 @@ import * as fs6 from "fs";
 import * as os2 from "os";
 import * as path11 from "path";
 var ACP_TOOLS3 = ["compress", "decompress", "search_context", "acp_status"];
+var DELEGATE_STAND_DOWN_MESSAGE = [
+  "[billion-context-pi] pi-subagents detected \u2014 acp_delegate has been automatically disabled to avoid two overlapping sub-agent systems.",
+  "pi-subagents' agents do NOT get ACP context compression by default. Run /acp-subagents to inject compress/decompress/search_context/acp_status into its agent overrides.",
+  'To keep acp_delegate despite pi-subagents being installed, set "delegate": { "forceEnable": true } in acp.json.'
+].join("\n");
 function resolveAgentDir() {
   const envDir = process.env.PI_CODING_AGENT_DIR;
   if (envDir) {
@@ -17925,38 +17947,39 @@ function parseFrontmatterTools(content) {
   if (!name) return null;
   return tools ? { name, tools } : { name };
 }
-function findPiSubagentsInstall(agentDir, cwd) {
-  const candidates = [
-    path11.join(agentDir, "npm", "node_modules", "pi-subagents"),
-    path11.join(cwd, CONFIG_DIR_NAME2, "npm", "node_modules", "pi-subagents")
-  ];
-  const extensionRoots = [
-    path11.join(agentDir, "extensions"),
-    path11.join(cwd, CONFIG_DIR_NAME2, "extensions")
-  ];
-  for (const dir of candidates) {
-    if (fs6.existsSync(path11.join(dir, "package.json"))) return dir;
+function npmInstallAt(base) {
+  const dir = path11.join(base, "npm", "node_modules", "pi-subagents");
+  return fs6.existsSync(path11.join(dir, "package.json")) ? dir : null;
+}
+function extensionInstallUnder(root) {
+  let entries;
+  try {
+    entries = fs6.readdirSync(root, { withFileTypes: true });
+  } catch {
+    return null;
   }
-  for (const root of extensionRoots) {
-    let entries;
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const pkgPath = path11.join(root, entry.name, "package.json");
     try {
-      entries = fs6.readdirSync(root, { withFileTypes: true });
-    } catch {
-      continue;
-    }
-    for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-      const pkgPath = path11.join(root, entry.name, "package.json");
-      try {
-        if (JSON.parse(fs6.readFileSync(pkgPath, "utf-8")).name === "pi-subagents") {
-          return path11.join(root, entry.name);
-        }
-      } catch {
+      if (JSON.parse(fs6.readFileSync(pkgPath, "utf-8")).name === "pi-subagents") {
+        return path11.join(root, entry.name);
       }
+    } catch {
     }
   }
   return null;
 }
+function findPiSubagentsInstall(agentDir, cwd) {
+  return npmInstallAt(agentDir) ?? npmInstallAt(path11.join(cwd, CONFIG_DIR_NAME2)) ?? extensionInstallUnder(path11.join(agentDir, "extensions")) ?? extensionInstallUnder(path11.join(cwd, CONFIG_DIR_NAME2, "extensions"));
+}
+function findPiSubagentsInstalls(agentDir, cwd) {
+  const pick = (paths) => paths.filter((p) => p !== null);
+  return {
+    user: pick([npmInstallAt(agentDir), extensionInstallUnder(path11.join(agentDir, "extensions"))]),
+    project: pick([npmInstallAt(path11.join(cwd, CONFIG_DIR_NAME2)), extensionInstallUnder(path11.join(cwd, CONFIG_DIR_NAME2, "extensions"))])
+  };
+}
 function discoverBuiltinAgents(installDir) {
   const agentsDir = path11.join(installDir, "agents");
   let entries;
@@ -18254,7 +18277,7 @@ async function statusReport(runtime, ctx) {
   const sentTokens = estimateTokens(coreMessages, coveredIds, imageTokens) + systemPromptTokens;
   const viewSentTokens = adjustedTokenCount(runtime.core, coreMessages, state, config, sentTokens, imageTokens, systemPromptTokens);
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: anchorStale ? viewSentTokens : Math.max(viewSentTokens, realUsage?.tokens ?? 0) });
-  const versionStr = "0.1.69" ? `billion-context-pi@${"0.1.69"} \xB7 pack: ${resolveSurfaceMeta(runtime.adapter, ctx?.cwd ?? process.cwd(), ctx?.model?.provider, ctx?.model?.id).pack}` : void 0;
+  const versionStr = "0.1.70" ? `billion-context-pi@${"0.1.70"} \xB7 pack: ${resolveSurfaceMeta(runtime.adapter, ctx?.cwd ?? process.cwd(), ctx?.model?.provider, ctx?.model?.id).pack}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -18866,7 +18889,7 @@ async function autoInstallLatest(latest, extDirOverride) {
       "--no-fund",
       "--no-save"
     ];
-    const prevVersion = (await readPackageJson(join15(extDir, "package.json")))?.version ?? "0.1.69";
+    const prevVersion = (await readPackageJson(join15(extDir, "package.json")))?.version ?? "0.1.70";
     const { code, stderr } = await runNpmImpl(installArgs(latest), { cwd: npmDir, timeout: 6e4 });
     if (code !== 0) {
       logWarn("update", {
@@ -18884,7 +18907,7 @@ async function autoInstallLatest(latest, extDirOverride) {
     }
     const verify = await verifyInstall(npmDir, latest);
     if (!verify.ok) {
-      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.69";
+      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.70";
       logWarn("update", { event: "auto-install-verify-failed", latest, reason: verify.reason, rollbackTo });
       const rb = await runNpmImpl(installArgs(rollbackTo), { cwd: npmDir, timeout: 6e4 });
       logInfo("update", { event: "rollback", from: latest, to: rollbackTo, ok: rb.code === 0 });
@@ -18959,7 +18982,7 @@ async function checkForUpdate(autoUpdate, notify) {
     }
     const latest = await fetchLatestVersion(tag);
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.69";
+    const current = runtimeVersion ?? "0.1.70";
     const hasUpdate = isVersionNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -19125,6 +19148,7 @@ function wireDelegateReadTracking(pi) {
 }
 function wireSessionLifecycle(pi, runtime, standDownIfProxied) {
   let ompWarned = false;
+  let subagentStandDownWarned = false;
   pi.on("session_start", async (_event, ctx) => {
     if (isUnsupportedHost(ctx.sessionManager)) {
       runtime.refused = true;
@@ -19147,7 +19171,8 @@ function wireSessionLifecycle(pi, runtime, standDownIfProxied) {
     setDelegatePolicy(DEFAULT_DELEGATE_POLICY);
     const sid = ctx.sessionManager.getSessionId();
     const modelInfo = ctx.model;
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.69" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.70" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    let delegateStoodDown = false;
     try {
       await runtime.reloadConfig(ctx.cwd);
       const delegateCfg = resolveDelegate(runtime.adapter);
@@ -19155,9 +19180,24 @@ function wireSessionLifecycle(pi, runtime, standDownIfProxied) {
       setDelegatePolicy(delegateCfg);
       setDelegateDefaults({ thinkingLevel: delegateCfg.thinkingLevel, agents: delegateCfg.agents });
       setDelegateNotifyIfRead(delegateCfg.notifyIfRead);
+      if (delegateCfg.enabled && !delegateCfg.forceEnable) {
+        const scopes = findPiSubagentsInstalls(resolveAgentDir(), ctx.cwd ?? process.cwd());
+        if (scopes.project[0] !== void 0) {
+          delegateStoodDown = true;
+          logWarn("delegate", { event: "delegate-auto-disabled", sid, install: scopes.project[0], scope: "project", hint: "run /acp-subagents to give its agents ACP compression tools; delegate.forceEnable=true keeps acp_delegate" });
+          if (!subagentStandDownWarned) {
+            subagentStandDownWarned = true;
+            if (ctx.hasUI) ctx.ui.notify(DELEGATE_STAND_DOWN_MESSAGE, "warning");
+            else console.error(DELEGATE_STAND_DOWN_MESSAGE);
+          }
+        } else if (scopes.user[0] !== void 0) {
+          logWarn("delegate", { event: "delegate-user-scope-detected", sid, install: scopes.user[0], action: "warn-only", hint: "user-level pi-subagents does not disable acp_delegate; run /acp-subagents to give its agents ACP compression tools" });
+        }
+      }
     } catch (e) {
       logThrow("config", e, { sid, phase: "session_start" });
     }
+    runtime.delegateStoodDown = delegateStoodDown;
     try {
       runtime.setPrompts(resolvePrompts(runtime.adapter.prompts, { acknowledgeRisk: runtime.adapter.acknowledgePromptsRisk === true }));
     } catch (e) {
@@ -19165,7 +19205,7 @@ function wireSessionLifecycle(pi, runtime, standDownIfProxied) {
       runtime.setPrompts(defaultPrompts);
     }
     const delegatePolicy2 = resolveDelegate(runtime.adapter);
-    if (delegatePolicy2.enabled) {
+    if (delegatePolicy2.enabled && !runtime.delegateStoodDown) {
       pi.registerTool(makeDelegateTool(pi));
       pi.registerTool(makeDelegateWaitTool(pi));
       pi.registerTool(makeDelegateCancelTool(pi));
@@ -19412,7 +19452,7 @@ function wireSystemPrompt(pi, runtime) {
       }
       runtime.setPrompts(defaultPrompts);
     }
-    const delegate = resolveDelegate(runtime.adapter).enabled;
+    const delegate = resolveDelegate(runtime.adapter).enabled && !runtime.delegateStoodDown;
     const acp = buildAcpSystemPrompt(runtime.prompts, merged.promptSections);
     const delegateText = merged.delegatePrompt !== void 0 ? merged.delegatePrompt : ACP_DELEGATE_PROMPT;
     const prompt = delegate && delegateText !== null ? `${acp}