@maplezzk/pi-interactive-subagents 3.8.0 → 3.8.2

package/README.md

@@ -28,7 +28,7 @@ subagent({ name: "Scout: DB", agent: "scout", task: "Map database schema" });
 ## Install
 
 ```bash
-pi install @maplezzk/pi-interactive-subagents
+pi install npm:@maplezzk/pi-interactive-subagents
 ```
 
 Supported multiplexers:
@@ -56,7 +56,9 @@ zellij --session pi   # then run: pi
 # just run pi inside Otty — no wrapper needed
 ```
 
-Optional: set `PI_SUBAGENT_MUX=cmux|tmux|zellij|wezterm|herdr|otty` to force a specific backend.
+Optional: set `PI_SUBAGENT_MUX=muxy|cmux|tmux|zellij|wezterm|herdr|otty` to force a specific backend.
+
+You can also configure it from inside Pi with `/config:subagent`. Run it without arguments for an interactive menu, or use `/config:subagent auto|muxy|cmux|tmux|zellij|wezterm|herdr|otty` for a direct choice. The selection is persisted in Pi's user extension config directory; explicit `PI_TERMINAL_MUX` / `PI_SUBAGENT_MUX` environment variables take precedence. `/subagent-config` and `/pi-subagent-config` remain available as compatibility aliases.
 
 > **Otty notes:**
 > - Otty sets `TERM_PROGRAM=otty` automatically when pi runs inside it; the backend detects this env var.

package/README.zh-CN.md

@@ -17,7 +17,7 @@ subagent({ name: "Scout: DB", agent: "scout", task: "梳理数据库 schema" });
 ## 安装
 
 ```bash
-pi install @maplezzk/pi-interactive-subagents
+pi install npm:@maplezzk/pi-interactive-subagents
 ```
 
 支持的终端复用器：[cmux](https://github.com/manaflow-ai/cmux)、[tmux](https://github.com/tmux/tmux)、[zellij](https://zellij.dev)、[WezTerm](https://wezfurlong.org/wezterm/)、[herdr](https://herdr.dev)、[Otty](https://otty.sh)。
@@ -32,7 +32,10 @@ tmux new -A -s pi 'pi'
 zellij --session pi   # 然后运行 pi
 ```
 
-可选：设置 `PI_SUBAGENT_MUX=cmux|tmux|zellij|wezterm|herdr|otty` 强制指定后端。
+可选：设置 `PI_SUBAGENT_MUX=muxy|cmux|tmux|zellij|wezterm|herdr|otty` 强制指定后端。
+
+也可以在 Pi 内通过 `/config:subagent` 配置：不带参数打开选择菜单，或直接运行
+`/config:subagent auto|muxy|cmux|tmux|zellij|wezterm|herdr|otty`。选择会保存到 Pi 的用户扩展配置目录；显式设置的 `PI_TERMINAL_MUX` / `PI_SUBAGENT_MUX` 优先级更高。`/subagent-config` 和 `/pi-subagent-config` 仍作为兼容别名保留。
 
 ## 主要能力
 

package/locales/index.json

@@ -2,5 +2,41 @@
   "agentEndNudge": {
     "zh-CN": "【自动提醒】\n• 已完成 → 调用 subagent_done 结束。\n• 结束前自检：是否在原地打转？若是，立刻收敛结果，用 caller_ping 抛回主 agent，不要过度思考。\n• 还在处理 → 忽略。",
     "en-US": "[Auto reminder]\n• Done → call subagent_done to finish.\n• Before finishing, self-check: are you spinning in place? If so, converge your result immediately and hand it back to the main agent with caller_ping — don't overthink.\n• Still working → ignore."
+  },
+  "muxCommandDescription": {
+    "zh-CN": "配置 subagent 使用的终端复用器",
+    "en-US": "Configure the terminal multiplexer used by subagents"
+  },
+  "muxConfigTitle": {
+    "zh-CN": "选择 subagent 终端复用器（当前：{value}）",
+    "en-US": "Choose the subagent multiplexer (current: {value})"
+  },
+  "muxAuto": {
+    "zh-CN": "自动检测",
+    "en-US": "Auto-detect"
+  },
+  "muxAvailable": {
+    "zh-CN": "可用",
+    "en-US": "available"
+  },
+  "muxUnavailable": {
+    "zh-CN": "未检测到",
+    "en-US": "unavailable"
+  },
+  "muxExit": {
+    "zh-CN": "退出",
+    "en-US": "Exit"
+  },
+  "muxSaved": {
+    "zh-CN": "subagent 终端复用器已设置为：{value}",
+    "en-US": "Subagent multiplexer set to: {value}"
+  },
+  "muxInvalid": {
+    "zh-CN": "不支持的 mux：{value}。可选：auto、muxy、cmux、tmux、zellij、wezterm、herdr、otty。",
+    "en-US": "Unsupported mux: {value}. Choose auto, muxy, cmux, tmux, zellij, wezterm, herdr, or otty."
+  },
+  "muxInteractiveOnly": {
+    "zh-CN": "请在支持 UI 的 Pi 会话中运行 /config:subagent。",
+    "en-US": "Run /config:subagent in a Pi session with UI support."
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maplezzk/pi-interactive-subagents",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "description": "Interactive async subagents for pi — spawn, orchestrate, and manage sub-agent sessions in multiplexer panes. Fork of HazAT/pi-interactive-subagents.",
   "type": "module",
   "main": "./index.ts",
@@ -25,7 +25,8 @@
   },
   "pi": {
     "extensions": [
-      "./index.ts"
+      "./index.ts",
+      "../pi-extensions-i18n/index.ts"
     ]
   },
   "engines": {
@@ -57,8 +58,8 @@
   ],
   "dependencies": {
     "ajv": "^8.20.0",
-    "pi-extensions-i18n": "^0.3.0",
-    "pi-terminal-mux": "^0.2.1"
+    "pi-extensions-i18n": "^0.3.1",
+    "pi-terminal-mux": "^0.2.2"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": ">=0.80.0 <0.81.0",

package/pi-extension/subagents/index.ts

@@ -4,6 +4,7 @@ import { Type, type Static } from "@sinclair/typebox";
 import { Box, Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { createTranslator, loadCatalog } from "pi-extensions-i18n";
 import {
   readdirSync,
   readFileSync,
@@ -30,8 +31,24 @@ import {
   readScreen,
   getLastSplitSource,
   clearLastSplitSource,
+  isMuxyAvailable,
+  isCmuxAvailable,
+  isTmuxAvailable,
+  isZellijAvailable,
+  isWezTermAvailable,
+  isHerdrAvailable,
+  isOttyAvailable,
+  type MuxBackend,
 } from "pi-terminal-mux";
 
+import {
+  applyPersistedMuxPreference,
+  loadMuxConfig,
+  saveMuxPreference,
+  SUBAGENT_MUX_BACKENDS,
+  type SubagentMuxPreference,
+} from "./mux-config.ts";
+
 import {
   findLastAssistantMessage,
   getNewEntries,
@@ -57,6 +74,8 @@ import {
   type SubagentActivityState,
 } from "./activity.ts";
 
+const i18n = createTranslator(loadCatalog(new URL("../../locales/index.json", import.meta.url)));
+
 /** Absolute path to `pi-extension/subagents`. https://github.com/nodejs/node/issues/37845 */
 const SUBAGENTS_DIR = dirname(fileURLToPath(import.meta.url));
 
@@ -935,6 +954,83 @@ function resolveResumeLaunchBehavior(params: { autoExit?: boolean }): { autoExit
   return { autoExit, interactive: !autoExit };
 }
 
+function isMuxBackendAvailable(backend: MuxBackend): boolean {
+  switch (backend) {
+    case "muxy": return isMuxyAvailable();
+    case "cmux": return isCmuxAvailable();
+    case "tmux": return isTmuxAvailable();
+    case "zellij": return isZellijAvailable();
+    case "wezterm": return isWezTermAvailable();
+    case "herdr": return isHerdrAvailable();
+    case "otty": return isOttyAvailable();
+  }
+}
+
+function muxPreferenceLabel(preference: SubagentMuxPreference): string {
+  return preference === "auto" ? i18n.t("muxAuto") : preference;
+}
+
+function registerMuxConfigCommand(pi: ExtensionAPI): void {
+  const command = {
+    description: i18n.t("muxCommandDescription"),
+    handler: async (args, ctx) => {
+      const requested = args.trim().toLowerCase();
+      if (requested) {
+        const preference = requested === "auto" || (SUBAGENT_MUX_BACKENDS as readonly string[]).includes(requested)
+          ? requested as SubagentMuxPreference
+          : null;
+        if (!preference) {
+          ctx.ui.notify(i18n.t("muxInvalid", { value: requested }), "warning");
+          return;
+        }
+        try {
+          const saved = saveMuxPreference(preference);
+          ctx.ui.notify(i18n.t("muxSaved", { value: muxPreferenceLabel(saved.mux) }), "info");
+        } catch (error) {
+          ctx.ui.notify(String(error), "error");
+        }
+        return;
+      }
+
+      if (!ctx.hasUI) {
+        ctx.ui.notify(i18n.t("muxInteractiveOnly"), "warning");
+        return;
+      }
+
+      const current = loadMuxConfig();
+      const detected = getMuxBackend();
+      const options: Array<{ preference: SubagentMuxPreference; label: string }> = [
+        {
+          preference: "auto",
+          label: `${current.mux === "auto" ? "●" : "○"} ${i18n.t("muxAuto")} — ${detected ?? i18n.t("muxUnavailable")}`,
+        },
+        ...SUBAGENT_MUX_BACKENDS.map((backend) => ({
+          preference: backend,
+          label: `${current.mux === backend ? "●" : "○"} ${backend} — ${isMuxBackendAvailable(backend) ? i18n.t("muxAvailable") : i18n.t("muxUnavailable")}`,
+        })),
+      ];
+      const exit = i18n.t("muxExit");
+      const choice = await ctx.ui.select(
+        i18n.t("muxConfigTitle", { value: muxPreferenceLabel(current.mux) }),
+        [...options.map((option) => option.label), exit],
+      );
+      if (!choice || choice === exit) return;
+
+      const selected = options.find((option) => option.label === choice);
+      if (!selected) return;
+      try {
+        const saved = saveMuxPreference(selected.preference);
+        ctx.ui.notify(i18n.t("muxSaved", { value: muxPreferenceLabel(saved.mux) }), "info");
+      } catch (error) {
+        ctx.ui.notify(String(error), "error");
+      }
+    },
+  };
+  for (const name of ["config:subagent", "subagent-config", "pi-subagent-config"] as const) {
+    pi.registerCommand(name, command);
+  }
+}
+
 export const __test__ = {
   borderLine,
   getShellReadyDelayMs,
@@ -1431,6 +1527,8 @@ async function watchSubagent(
 }
 
 export default function subagentsExtension(pi: ExtensionAPI) {
+  applyPersistedMuxPreference();
+
   // Expose launchSubagent / watchSubagent for programmatic use by other extensions
   (globalThis as any).__pi_subagents = { launchSubagent, watchSubagent };
 
@@ -2075,6 +2173,8 @@ export default function subagentsExtension(pi: ExtensionAPI) {
     },
   });
 
+  registerMuxConfigCommand(pi);
+
   // ── subagent_result message renderer ──
   pi.registerMessageRenderer("subagent_result", (message, options, theme) => {
     const details = message.details as any;

package/pi-extension/subagents/mux-config.ts

@@ -0,0 +1,96 @@
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import type { MuxBackend } from "pi-terminal-mux";
+
+export type SubagentMuxPreference = "auto" | MuxBackend;
+export type SubagentMuxConfigSource = "environment" | "file" | "default";
+
+export interface SubagentMuxConfig {
+  mux: SubagentMuxPreference;
+  source: SubagentMuxConfigSource;
+}
+
+const BACKENDS: readonly MuxBackend[] = ["muxy", "cmux", "tmux", "zellij", "wezterm", "herdr", "otty"];
+const CONFIG_FILE = "config.json";
+
+function isMuxBackend(value: unknown): value is MuxBackend {
+  return typeof value === "string" && (BACKENDS as readonly string[]).includes(value);
+}
+
+function normalizePreference(value: unknown): SubagentMuxPreference | null {
+  if (value === "auto") return "auto";
+  return isMuxBackend(value) ? value : null;
+}
+
+function environmentPreference(): MuxBackend | null {
+  const value = (process.env.PI_TERMINAL_MUX ?? process.env.PI_SUBAGENT_MUX ?? "").trim().toLowerCase();
+  return isMuxBackend(value) ? value : null;
+}
+
+/** User-level config shared by the subagent extension across Pi sessions. */
+export function muxConfigPath(): string {
+  return join(getAgentDir(), "extensions", "pi-interactive-subagents", CONFIG_FILE);
+}
+
+function readStoredPreference(path: string): SubagentMuxPreference | null {
+  try {
+    if (!existsSync(path)) return null;
+    const parsed = JSON.parse(readFileSync(path, "utf-8")) as { mux?: unknown };
+    return normalizePreference(parsed.mux);
+  } catch {
+    return null;
+  }
+}
+
+/** Environment variables override the persisted slash-command setting. */
+export function loadMuxConfig(path = muxConfigPath()): SubagentMuxConfig {
+  const env = environmentPreference();
+  if (env) return { mux: env, source: "environment" };
+
+  const stored = readStoredPreference(path);
+  if (stored) return { mux: stored, source: "file" };
+
+  return { mux: "auto", source: "default" };
+}
+
+/** Apply the persisted setting when no explicit environment override exists. */
+export function applyPersistedMuxPreference(path = muxConfigPath()): void {
+  if (environmentPreference()) return;
+  const preference = readStoredPreference(path);
+  if (!preference || preference === "auto") return;
+  process.env.PI_TERMINAL_MUX = preference;
+}
+
+/** Persist a slash-command selection and make it effective immediately. */
+export function saveMuxPreference(preference: SubagentMuxPreference, path = muxConfigPath()): SubagentMuxConfig {
+  const normalized = normalizePreference(preference);
+  if (!normalized) throw new Error(`Unsupported subagent mux preference: ${String(preference)}`);
+
+  let existing: Record<string, unknown> = {};
+  try {
+    if (existsSync(path)) {
+      const parsed = JSON.parse(readFileSync(path, "utf-8")) as unknown;
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        existing = parsed as Record<string, unknown>;
+      }
+    }
+  } catch {
+    // A malformed file is replaced with a valid config by this explicit save.
+  }
+
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify({ ...existing, mux: normalized }, null, 2)}\n`, "utf-8");
+
+  if (normalized === "auto") {
+    delete process.env.PI_TERMINAL_MUX;
+    delete process.env.PI_SUBAGENT_MUX;
+  } else {
+    process.env.PI_TERMINAL_MUX = normalized;
+    delete process.env.PI_SUBAGENT_MUX;
+  }
+
+  return { mux: normalized, source: "file" };
+}
+
+export { BACKENDS as SUBAGENT_MUX_BACKENDS };