@wrongstack/cli 1.0.26 → 1.0.27

package/dist/{cli-main-TN3KZ2P6.js → cli-main-TQTH73ZK.js}

@@ -15,12 +15,16 @@ import {
   MAX_TUI_THINKING_WORD_LENGTH,
   clearSuggestions,
   getSuggestions,
+  killHqSessionFleet,
   normalizeTuiThinkingWord,
   removeSuggestions,
+  resolveExecutionMode,
   runGit,
   setAutoSuggestions,
-  setSuggestions
-} from "./chunk-OWNC7LMD.js";
+  setSuggestions,
+  spawnHqAgent,
+  terminateHqAgent
+} from "./chunk-HDMFKTT3.js";
 import {
   deriveFsAccessPair,
   filterSafeForProject,
@@ -95,20 +99,20 @@ import {
   loadCachedAcpRegistry,
   refreshAcpRegistry,
   setupProvider
-} from "./chunk-5SEYGOCH.js";
+} from "./chunk-RDGGWMTI.js";
 import {
   createHqCommandDispatcher,
   createProjectKanbanAssignHandler,
   createProjectKanbanTransitionHandler
-} from "./chunk-2EBVTYJR.js";
+} from "./chunk-NRXWOMK7.js";
 import {
   startCliHqConnection
-} from "./chunk-KJS5543T.js";
+} from "./chunk-RGFWGUAB.js";
 import {
   buildProviderForId,
   resolveProviderCfg,
   resolveRawProviderConnection
-} from "./chunk-S4FFHDJG.js";
+} from "./chunk-SDJCLEK6.js";
 import {
   buildWin32CmdShimInvocation
 } from "./chunk-U3SS4NRH.js";
@@ -2214,12 +2218,12 @@ function createHostExploreCompanion(input) {
     mailbox: mailbox(),
     leaderSessionId: sessionId,
     leaderAgentId: "leader",
-    onProbe: async (probe) => {
+    onProbe: async (probe2) => {
       const subagentId = await ensureResident();
       const taskId = randomUUID2();
       await director.assignInternal({
         id: taskId,
-        description: buildProbeTaskText(probe),
+        description: buildProbeTaskText(probe2),
         subagentId
       });
       return { subagentId, taskId };
@@ -3165,6 +3169,7 @@ import { AutoApprovePermissionPolicy } from "@wrongstack/core/security";
 import { createSessionEventBridge, resolveSessionLoggingConfig } from "@wrongstack/core/storage";
 
 // src/fleet/host-context.ts
+import { fenceIfUntrusted } from "@wrongstack/core/agent";
 import {
   DEFAULT_EAGER_SKILL_LIMIT,
   loadProjectSkillAugmentation,
@@ -3233,9 +3238,14 @@ async function resolveHostSubagentSkillResolution(deps, roster, subCfg, availabl
       const compose = (bodyChars) => [
         `## Skill: ${skillName}`,
         "",
-        body.length > bodyChars ? `${body.slice(0, bodyChars).trimEnd()}
+        fenceIfUntrusted(
+          manifest.source,
+          skillName,
+          body.length > bodyChars ? `${body.slice(0, bodyChars).trimEnd()}
 
 _(body trimmed)_` : body,
+          manifest.originTool
+        ),
         ...augmentation ? [
           "",
           `### Project practice for \`${skillName}\``,
@@ -5040,6 +5050,9 @@ function plainMaskedKey(key) {
   if (key.length <= 8) return "\u2022".repeat(key.length);
   return `${key.slice(0, 4)}\u2026${key.slice(-4)}`;
 }
+function hasEditableModel(provider, modelId) {
+  return provider.models?.includes(modelId) === true || Object.hasOwn(provider.customModels ?? {}, modelId);
+}
 function createAuthPanelHost(deps) {
   const loadProviders = () => loadConfigProviders(deps.profileConfigPath, deps.vault, {
     warn: (message) => {
@@ -5241,7 +5254,7 @@ function createAuthPanelHost(deps) {
     },
     async getModelEdit(providerId, modelId) {
       const provider = (await loadProviders())[providerId];
-      if (!provider?.models?.includes(modelId)) return null;
+      if (!provider || !hasEditableModel(provider, modelId)) return null;
       const details = provider.customModels?.[modelId];
       const modelsDev = details?.modelsDev ?? {};
       const limit = modelsDev["limit"];
@@ -5270,7 +5283,7 @@ function createAuthPanelHost(deps) {
         if (typeof value === "string") return value;
       return mutate((all) => {
         const provider = all[edit.providerId];
-        if (!provider?.models?.includes(edit.modelId))
+        if (!provider || !hasEditableModel(provider, edit.modelId))
           return `Model "${edit.modelId}" no longer exists.`;
         const existing = provider.customModels?.[edit.modelId] ?? {};
         const modelsDev = { ...existing.modelsDev ?? {} };
@@ -5279,8 +5292,7 @@ function createAuthPanelHost(deps) {
         const limit = { ...modelsDev["limit"] ?? {} };
         if (context === void 0) delete limit["context"];
         else limit["context"] = context;
-        if (output === void 0) delete limit["output"];
-        else limit["output"] = output;
+        delete limit["output"];
         if (Object.keys(limit).length) modelsDev["limit"] = limit;
         else delete modelsDev["limit"];
         const cost = { ...modelsDev["cost"] ?? {} };
@@ -5291,8 +5303,10 @@ function createAuthPanelHost(deps) {
         if (Object.keys(cost).length) modelsDev["cost"] = cost;
         else delete modelsDev["cost"];
         if (!provider.customModels) provider.customModels = {};
+        const { modelsDev: _previousModelsDev, maxOutput: _previousMaxOutput, ...kept } = existing;
         provider.customModels[edit.modelId] = {
-          ...existing,
+          ...kept,
+          ...typeof output === "number" ? { maxOutput: output } : {},
           ...Object.keys(modelsDev).length ? { modelsDev } : {}
         };
         return null;
@@ -6104,7 +6118,7 @@ async function runCliExecution(params) {
     governanceHandle,
     setConfig
   } = params;
-  const { execute } = await import("./execution-7QIP6GRY.js");
+  const { execute } = await import("./execution-3STBD2U7.js");
   return execute(
     toExecuteDeps({
       core: {
@@ -6850,6 +6864,7 @@ ${res.out}` };
         };
       }
       starting = true;
+      const ownerSessionId = deps.getSessionId?.();
       let releaseRunLease;
       try {
         releaseRunLease = await store.acquireRunLease(`cli:${process.pid}:${crypto.randomUUID()}`);
@@ -6890,6 +6905,7 @@ ${res.out}` };
           phases,
           autonomous: true
         }).build();
+        graph.sessionId = ownerSessionId;
         await persist(graph);
         const worktreesEnabled = deps.worktrees !== false && process.env["WRONGSTACK_GOAL_WORKTREES"] !== "0";
         let worktrees;
@@ -6957,6 +6973,7 @@ ${res.out}` };
                 return false;
               }
             } : void 0,
+            sessionId: graph.sessionId,
             brain: deps.brain,
             onTaskUpdate: () => {
               void persist(graph);
@@ -7011,6 +7028,7 @@ ${res.out}` };
         };
       }
       starting = true;
+      if (!graph.sessionId) graph.sessionId = deps.getSessionId?.();
       let releaseRunLease;
       try {
         releaseRunLease = await store.acquireRunLease(
@@ -7084,6 +7102,7 @@ ${res.out}` };
                 return false;
               }
             } : void 0,
+            sessionId: graph.sessionId,
             brain: deps.brain,
             onTaskUpdate: () => {
               void persist(graph);
@@ -7624,7 +7643,7 @@ import {
 } from "@wrongstack/core/coordination";
 import { loadDirectorState } from "@wrongstack/core/storage";
 import { AgentError as AgentError2 } from "@wrongstack/core/types";
-import { color as color5, expectDefined as expectDefined2 } from "@wrongstack/core/utils";
+import { color as color5, expectDefined as expectDefined2, isSessionTranscriptFileName } from "@wrongstack/core/utils";
 function createFleetCommandHandlers(input) {
   return {
     onSpawn: async (description, options) => {
@@ -7896,6 +7915,9 @@ async function readFleetLog(fleetRoot, subagentId, mode) {
   }
   return summarizeTranscript(transcript);
 }
+function isSubagentTranscriptFile(name) {
+  return name.toLowerCase().endsWith(".jsonl") && isSessionTranscriptFileName(name);
+}
 async function findTranscripts(root) {
   let runIds;
   try {
@@ -7913,7 +7935,7 @@ async function findTranscripts(root) {
         return [];
       }
       const found = await Promise.all(
-        files.filter((file) => file.endsWith(".jsonl")).map(async (file) => {
+        files.filter((file) => isSubagentTranscriptFile(file)).map(async (file) => {
           const fullPath = path8.join(directory, file);
           try {
             const stat6 = await fs2.stat(fullPath);
@@ -8077,6 +8099,7 @@ function createSddHandlers(deps) {
     getSddRuntimeState
   } = deps;
   const onSddParallelRun = async (opts) => {
+    const ownerSessionId = sessionRef.current?.id ?? session.id;
     const { tracker, builder, graphId } = await getSddRuntimeState();
     if (!tracker || !builder) {
       return "No active SDD session with tasks. Use /sdd new to start one.";
@@ -8145,6 +8168,7 @@ function createSddHandlers(deps) {
     const boardStore = new sddApi.SddBoardStore({ baseDir: wpaths.projectSddBoards });
     const sddSupervisor = new sddApi.SddSupervisor({
       brain,
+      sessionId: ownerSessionId,
       reassignModels: agentCore.effectiveFallbackChain(config)
     });
     const sddSubagentFactory = multiAgentHost.makeSubagentFactory(config);
@@ -17282,6 +17306,7 @@ var HELP = [
   `/jev features: ${JEV_FEATURES.join(", ")}`,
   "/jev test \u2014 one billed connection probe using saved settings",
   "/jev logs [feature] \u2014 recent process activity and persistent log path",
+  "/jev logcontent on|off \u2014 record full request/response content in the log file",
   "/jev remove-key \u2014 delete the profile key (environment key may still apply)",
   "Changes are saved in the active profile. Restart existing sessions to apply all consumers."
 ].join("\n");
@@ -17306,6 +17331,7 @@ function buildJevCommand(opts) {
               ([key, on]) => `${on ? "on " : "off"} ${key} \xB7 ${s.readiness[key]?.state}: ${s.readiness[key]?.reason}`
             ),
             `Profile compaction: ${s.contextStrategy}. Model tiers: /tier. Conditions do not prove runtime use.`,
+            s.logContent ? "Activity log: FULL content (request/response/error) \u2192 /jev logcontent off to stop" : "Activity log: metadata only \u2192 /jev logcontent on for full content",
             "",
             HELP
           ].join("\n")
@@ -17315,10 +17341,12 @@ function buildJevCommand(opts) {
       if (sub === "logs") {
         const log = jevActivitySnapshot();
         const rows = log.entries.filter((entry) => !arg || entry.feature === arg).slice(0, 30);
+        const content = jevSettingsSnapshot(opts.configStore.get()).logContent;
         return {
           message: [
             `Jev activity \xB7 this process \xB7 ${log.path ?? "no disk entries yet"}`,
             log.writeError ?? "",
+            `Content: ${content ? "request/response recorded in the log file only \u2014 never in this view" : "not recorded \xB7 /jev logcontent on"}`,
             ...rows.map(
               (e) => `${new Date(e.at).toISOString()} ${e.feature} ${e.outcome} ${e.durationMs}ms ${e.route}/${e.model} ${e.inputTokens ?? 0}in ${e.reason ?? ""}
   ${e.project} ${JSON.stringify(e.answers ?? {})}`
@@ -17366,6 +17394,8 @@ function buildJevCommand(opts) {
         patch = { recallTurnContext: arg === "on" };
       else if (sub === "compaction") patch = { contextStrategy: arg };
       else if (sub === "timeout") patch = { requestTimeoutMs: Number(arg) };
+      else if (sub === "logcontent" && ["on", "off"].includes(arg))
+        patch = { logContent: arg === "on" };
       else if (sub === "remove-key") patch = { apiKey: null };
       else if (sub === "feature" && ["on", "off"].includes(value))
         patch = { features: { [arg]: value === "on" } };
@@ -23028,6 +23058,13 @@ ${formatExplainedCall(explained)}` };
       let next;
       let done;
       if (sub === "allow" || sub === "deny") {
+        if (sub === "allow" && isYoloLockedOff()) {
+          return {
+            message: color45.yellow(
+              "Session allow rules are not honoured under --restricted (every write asks). Deny rules still apply."
+            )
+          };
+        }
         const tool = rest.split(/\s+/)[0] ?? "";
         const pattern = rest.slice(tool.length).trim();
         if (!tool) return { message: color45.yellow(`Usage: /permissions ${sub} <tool> [pattern]`) };
@@ -24608,6 +24645,14 @@ function executeSddTaskMutation(cmd, restJoined) {
 }
 
 // src/slash-commands/sdd.ts
+function dependentFirstView(graph) {
+  return {
+    ...graph,
+    edges: graph.edges.map(
+      (edge) => edge.type === "depends_on" ? { ...edge, from: edge.to, to: edge.from } : edge
+    )
+  };
+}
 function buildSddCommand(opts) {
   const sessionState = getSessionState(opts.context);
   return {
@@ -25257,7 +25302,7 @@ ${lines.join("\n")}`
             if (!graph) {
               return { message: "Could not load task graph." };
             }
-            const analysis = analyzeCriticalPath(graph);
+            const analysis = analyzeCriticalPath(dependentFirstView(graph));
             return { message: formatCriticalPathAnalysis(graph, analysis) };
           } catch {
             return { message: "Could not analyze critical path." };
@@ -27089,153 +27134,13 @@ function buildWebuiCommand() {
 }
 
 // src/slash-commands/theme.ts
-import { THEME_PRESET_IDS } from "@wrongstack/core/types";
+import { THEME_PRESET_IDS, THEME_PRESET_META } from "@wrongstack/core/types";
 import { color as color54, writeOut as writeOut3 } from "@wrongstack/core/utils";
-var THEME_META = {
-  catppuccin: { name: "Catppuccin Mocha", desc: "Soft pastel dark theme (Default)" },
-  "tokyo-night": { name: "Tokyo Night", desc: "Deep violet, neon orange & cyan" },
-  nord: { name: "Nord", desc: "Cool arctic blue & slate pastels" },
-  cyberpunk: { name: "Cyberpunk Neon", desc: "High-contrast magenta, cyan & yellow" },
-  dracula: { name: "Dracula", desc: "Vibrant purple, pink & green" },
-  "gruvbox-dark": { name: "Gruvbox Dark", desc: "Warm earthy retro \u2014 orange, olive & aqua" },
-  "solarized-dark": { name: "Solarized Dark", desc: "Base16 classic \u2014 teal & ochre precision" },
-  "one-dark": { name: "One Dark", desc: "Atom's iconic palette \u2014 blue-led, warm accents" },
-  monokai: { name: "Monokai", desc: "Sublime classic \u2014 vivid magenta, cyan & lime" },
-  "rose-pine": { name: "Ros\xE9 Pine", desc: "Aesthetic pine & foam \u2014 soft evening pastels" },
-  kanagawa: { name: "Kanagawa", desc: "Hokusai-inspired waves \u2014 sumi ink on washi" },
-  "ayu-dark": { name: "Ayu Dark", desc: "Simple pleasant dark \u2014 warm orange + cool blue" },
-  everforest: { name: "Everforest", desc: "Green-based comfort \u2014 forest greens & warm tans" },
-  "night-owl": { name: "Night Owl", desc: "Sarah Drasner's night \u2014 deep navy + bold accents" },
-  synthwave: { name: "Synthwave '84", desc: "Hot pink + neon cyan on deep purple" },
-  "github-dark": { name: "GitHub Dark", desc: "GitHub's default dark \u2014 crisp blue on near-black" },
-  "material-ocean": {
-    name: "Material Ocean",
-    desc: "Deepest Material variant \u2014 ink blue with pastel accents"
-  },
-  nightfox: { name: "Nightfox", desc: "Balanced slate blue with muted sage and rose" },
-  oxocarbon: {
-    name: "Oxocarbon",
-    desc: "IBM Carbon-derived \u2014 neutral greys, electric blue & pink"
-  },
-  "catppuccin-macchiato": {
-    name: "Catppuccin Macchiato",
-    desc: "Warmer, one shade lighter than Mocha"
-  },
-  "catppuccin-frappe": {
-    name: "Catppuccin Frapp\xE9",
-    desc: "The lightest Catppuccin dark \u2014 gentle midday contrast"
-  },
-  "gruvbox-material": {
-    name: "Gruvbox Material",
-    desc: "Softened Gruvbox \u2014 same warmth, lower eye strain"
-  },
-  "tokyo-night-storm": {
-    name: "Tokyo Night Storm",
-    desc: "Tokyo Night on a lifted blue-grey base"
-  },
-  "rose-pine-moon": {
-    name: "Ros\xE9 Pine Moon",
-    desc: "Ros\xE9 Pine at dusk \u2014 deeper base, same soft accents"
-  },
-  zenburn: { name: "Zenburn", desc: "The classic low-contrast grey \u2014 desaturated and calm" },
-  palenight: { name: "Palenight", desc: "Material Palenight \u2014 indigo base, candy accents" },
-  horizon: { name: "Horizon", desc: "Warm coral and mint on charcoal \u2014 sunset gradient" },
-  sonokai: { name: "Sonokai", desc: "Monokai Pro descendant \u2014 punchy on warm graphite" },
-  "edge-dark": { name: "Edge Dark", desc: "Clean, evenly-weighted palette on desaturated navy" },
-  moonfly: { name: "Moonfly", desc: "Near-black base with high-chroma accents \u2014 max contrast" },
-  melange: { name: "Melange", desc: "Warm sepia and clay \u2014 the least blue dark theme here" },
-  poimandres: { name: "Poimandres", desc: "Teal-forward, low-saturation \u2014 mint on deep indigo" },
-  "vitesse-dark": {
-    name: "Vitesse Dark",
-    desc: "Anthony Fu's minimal palette \u2014 muted, print-like"
-  },
-  aura: { name: "Aura Dark", desc: "Vivid purple and spring green on near-black violet" },
-  "dark-plus": { name: "VS Code Dark+", desc: "VS Code's default \u2014 familiar blue/orange/teal" },
-  monochrome: { name: "Monochrome", desc: "Pure grayscale \u2014 no hue, only luminance" },
-  matrix: { name: "Matrix Green", desc: "Phosphor green CRT terminal \u2014 digital rain aesthetic" },
-  amber: { name: "Amber CRT", desc: "Warm phosphor CRT terminal \u2014 glowing vintage amber" },
-  "cyber-noir": {
-    name: "Cyber Noir",
-    desc: "Stark white and slate on jet black \u2014 minimalist high contrast"
-  },
-  "cobalt-mono": {
-    name: "Cobalt Monochrome",
-    desc: "Luminous cyan on deep abyss blue \u2014 oceanic blueprint"
-  },
-  "blood-moon": {
-    name: "Blood Moon",
-    desc: "Crimson & scarlet on obsidian \u2014 brooding dark mode"
-  },
-  cobalt2: {
-    name: "Cobalt2",
-    desc: "Wes Bos' signature theme \u2014 deep navy with golden yellow & cyan"
-  },
-  "shades-of-purple": {
-    name: "Shades of Purple",
-    desc: "Ahmad Awais' bold purple palette with neon yellow & magenta"
-  },
-  "flexoki-dark": {
-    name: "Flexoki Dark",
-    desc: "Steph Ango's inky warm paper palette \u2014 natural earthy accents"
-  },
-  laserwave: {
-    name: "LaserWave",
-    desc: "80s retrowave \u2014 neon flamingo and turquoise on violet"
-  },
-  andromeda: {
-    name: "Andromeda",
-    desc: "Deep interstellar dark with vibrant neon teal and pink"
-  },
-  "github-dark-dimmed": {
-    name: "GitHub Dark Dimmed",
-    desc: "GitHub's softer slate dark theme \u2014 gentle blues and pastels"
-  },
-  snazzy: {
-    name: "Hyper Snazzy",
-    desc: "Sindre Sorhus' elegant saturated terminal palette"
-  },
-  "tokyo-night-moon": {
-    name: "Tokyo Night Moon",
-    desc: "Tokyo Night on balanced deep indigo \u2014 vibrant accents"
-  },
-  "gruvbox-dark-hard": {
-    name: "Gruvbox Dark Hard",
-    desc: "Maximum contrast Gruvbox on deep pitch charcoal"
-  },
-  "oceanic-next": {
-    name: "Oceanic Next",
-    desc: "Teal-and-slate classic \u2014 calm blue, warm coral"
-  },
-  "one-half-dark": {
-    name: "One Half Dark",
-    desc: "Atom's One Half \u2014 One Dark with cleaner contrast"
-  },
-  "ayu-mirage": { name: "Ayu Mirage", desc: "Dusk-slate Ayu, between Dark and Light" },
-  seti: { name: "Seti", desc: "Long-running VS Code classic \u2014 charcoal, gold, cyan" },
-  "paraiso-dark": { name: "Paraiso Dark", desc: "Base16 plum \u2014 warm, muted, low-glare" },
-  darcula: { name: "Darcula", desc: "JetBrains' default dark \u2014 grey-green with amber" },
-  "slack-dark": { name: "Slack Aubergine", desc: "Deep aubergine with sky blue and lime" },
-  "vitesse-black": { name: "Vitesse Black", desc: "Vitesse on true black \u2014 least glare here" },
-  "atom-dark": { name: "Atom Dark", desc: "The original Atom grey \u2014 neutral, low-chroma" },
-  "github-dark-high-contrast": {
-    name: "GitHub Dark High Contrast",
-    desc: "Accessible GitHub \u2014 boosted text and borders"
-  },
-  "contrast-max": {
-    name: "Maximum Contrast",
-    desc: "Original \u2014 pure black, AAA-targeted text and borders"
-  },
-  "colorblind-safe": {
-    name: "Colorblind Safe",
-    desc: "Original \u2014 blue/orange coding, no red-vs-green reliance"
-  },
-  sandstone: { name: "Sandstone", desc: "Original \u2014 warm stone neutrals with sage and clay" },
-  "everforest-hard": {
-    name: "Everforest Hard",
-    desc: "Everforest on its deepest base \u2014 more depth, same greens"
-  }
-};
-var THEME_OPTIONS = THEME_PRESET_IDS.map((id) => ({ id, ...THEME_META[id] }));
+var THEME_OPTIONS = THEME_PRESET_IDS.map((id) => ({
+  id,
+  name: THEME_PRESET_META[id].name,
+  desc: THEME_PRESET_META[id].description
+}));
 function presetHelpLines(perLine = 4) {
   const lines = [];
   for (let i = 0; i < THEME_PRESET_IDS.length; i += perLine) {
@@ -27954,6 +27859,24 @@ ${lines.join("\n")}` };
 import { readHqRuntimeFileSync, resolveHqConfig, resolveHqDataDir } from "@wrongstack/core/hq";
 import { noOpVault as noOpVault5 } from "@wrongstack/core/security";
 import { color as color56 } from "@wrongstack/core/utils";
+
+// src/hq-live-status.ts
+var probe;
+function setHqLiveStatusProbe(next) {
+  probe = next;
+  return () => {
+    if (probe === next) probe = void 0;
+  };
+}
+function readHqLiveStatus() {
+  try {
+    return probe?.();
+  } catch {
+    return void 0;
+  }
+}
+
+// src/slash-commands/hq.ts
 function maskToken(t) {
   if (t.length <= 10) return `${t.slice(0, 2)}\u2026(${t.length})`;
   return `${t.slice(0, 6)}\u2026${t.slice(-4)} (${t.length} chars)`;
@@ -27972,6 +27895,14 @@ async function probeHq(url) {
     return color56.red("unreachable");
   }
 }
+function describeLiveConnection() {
+  const live = readHqLiveStatus();
+  if (live === void 0) return color56.dim("no HQ connection in this process");
+  const state = live.connected ? color56.green("connected") : color56.amber("reconnecting");
+  const queued = live.queuedFrames > 0 ? color56.dim(` \xB7 ${live.queuedFrames} frames queued`) : "";
+  const session = live.sessionId ? color56.dim(` \xB7 session ${live.sessionId.slice(-12)}`) : "";
+  return `${state} ${color56.dim(`as ${live.clientId.slice(0, 12)}`)}${session}${queued}`;
+}
 function buildHqCommand(opts) {
   return {
     name: "hq",
@@ -27992,8 +27923,8 @@ function buildHqCommand(opts) {
       "  /hq on | off            Enable / disable HQ publishing",
       "  /hq clear               Remove all HQ settings",
       "",
-      "Saved to the active profile config. Telemetry connects on the",
-      "NEXT session start (an already-running session keeps its connection).",
+      "Saved to the active profile config. The running terminal session",
+      "follows the change within a few seconds (set/token/on/off/clear).",
       "A locally running `wstack --hq` is auto-discovered with no config.",
       "",
       "/hq is the canonical HQ command. The /settings hq* entries write the same",
@@ -28045,7 +27976,7 @@ function buildHqCommand(opts) {
         return {
           message: `${color56.green("\u2713")} HQ set \u2192 ${color56.cyan(url)}${tokLine}
   status: ${reach}
-  ${color56.dim("Connects on the next session start.")}`
+  ${color56.dim("This session re-points within a few seconds.")}`
         };
       }
       if (sub === "token") {
@@ -28114,7 +28045,7 @@ function buildHqCommand(opts) {
           if (runtime) {
             lines.push("");
             lines.push(
-              `  ${color56.green("A local HQ is running")} at ${color56.cyan(runtime.url)} ${color56.dim("(start a new session to attach)")}`
+              `  ${color56.green("A local HQ is running")} at ${color56.cyan(runtime.url)} ${color56.dim("(/hq on to attach)")}`
             );
           }
           const message = lines.join("\n");
@@ -28146,6 +28077,7 @@ function buildHqCommand(opts) {
         );
         if (resolved.projectAlias) lines.push(`  alias:   ${color56.cyan(resolved.projectAlias)}`);
         lines.push(`  status:  ${await probeHq(resolved.url)}`);
+        lines.push(`  this:    ${describeLiveConnection()}`);
         return { message: lines.join("\n") };
       }
       return {
@@ -29198,6 +29130,7 @@ var ALL_SETTINGS_KEYS = [
   "memory",
   "skills",
   "models-registry",
+  "tool-coach",
   "max-iterations",
   "limits",
   "auto-proceed-max-iterations",
@@ -29880,6 +29813,20 @@ async function executeSettingsSubcommand(sub, rest, opts) {
         message: `${color61.green("\u2713")} Models registry \u2192 ${on ? color61.cyan("on") : color61.dim("off")}   ${color61.dim("restart to apply")}`
       };
     }
+    if (sub === "tool-coach") {
+      const raw = (rest[0] ?? "").toLowerCase();
+      if (!["on", "off"].includes(raw))
+        return { message: `${color61.amber("Usage:")} /settings tool-coach on|off` };
+      const on = raw === "on";
+      await persistConfigSetting(persistDeps, (cfg) => {
+        const feats = cfg.features ?? {};
+        feats.toolCoach = on;
+        cfg.features = feats;
+      });
+      return {
+        message: `${color61.green("\u2713")} Tool Coach \u2192 ${on ? color61.cyan("on") : color61.dim("off")}   ${color61.dim("applies to the next task")}`
+      };
+    }
     if (sub === "stream-fleet") {
       const raw = (rest[0] ?? "").toLowerCase();
       const mode = raw === "on" ? "full" : raw === "off" || raw === "full" ? raw : void 0;
@@ -30106,6 +30053,7 @@ var SETTINGS_HELP = [
   "  /settings memory on|off         Register remember/forget tools",
   "  /settings skills on|off         Discover and load skills from disk",
   "  /settings models-registry on|off   Fetch model catalog at startup",
+  "  /settings tool-coach on|off    Guide tool choice and recovery during tasks",
   "  /settings max-concurrent <n>   Max concurrent subagents (0 = default)",
   "  /settings max-iterations <n>    Max agent iterations before pausing (0 = default)",
   "  /settings auto-proceed-max-iterations <n>   Max auto turns before pausing (0 = unlimited)",
@@ -30225,6 +30173,7 @@ function formatCurrentSettingsView(opts) {
     `  memory features:            ${feats?.memory !== false ? color62.cyan("on") : color62.dim("off")}   ${color62.dim("change: /settings memory on|off")}`,
     `  skills features:            ${feats?.skills !== false ? color62.cyan("on") : color62.dim("off")}   ${color62.dim("change: /settings skills on|off")}`,
     `  models registry:            ${feats?.modelsRegistry !== false ? color62.cyan("on") : color62.dim("off")}   ${color62.dim("change: /settings models-registry on|off")}`,
+    `  Tool Coach:                 ${feats?.toolCoach !== false ? color62.cyan("on") : color62.dim("off")}   ${color62.dim("change: /settings tool-coach on|off")}`,
     `  max concurrent:             ${color62.cyan(maxConcurrent === 0 ? "default" : String(maxConcurrent))}   ${color62.dim("change: /settings max-concurrent <n>")}`,
     `  max iterations:             ${color62.cyan(String(tools?.maxIterations ?? "default"))}   ${color62.dim("change: /settings max-iterations <n>")}`,
     `  auto-proceed max iters:     ${color62.cyan(String(au?.autoProceedMaxIterations ?? "unlimited"))}   ${color62.dim("change: /settings auto-proceed-max-iterations <n>")}`,
@@ -34000,7 +33949,7 @@ var KIND_BLURBS = {
   "git-history": "reset --hard, clean -f, push --force, filter-branch",
   publish: "npm publish, docker push, kubectl delete namespace",
   "download-and-run": "curl | sh, and inline payloads that fetch then execute",
-  "bulk-delete": "find -exec rm, inline rmSync across many paths",
+  "bulk-delete": "find -exec rm, inline rmSync, container volume deletes, database drops",
   "agent-state": "writes to WrongStack's own config.json / trust.json / auth.json",
   "credential-bind": "attaching a well-known API key to a chosen provider endpoint"
 };
@@ -34472,7 +34421,6 @@ function setupCliSlashCommands(params) {
 // src/wiring/command-host-state.ts
 import {
   areSubagentsAllowedForSession as areSubagentsAllowedForSession4,
-  FLEET_ROSTER as FLEET_ROSTER5,
   mailboxSessionTag as mailboxSessionTag6,
   makeKanbanQueueTool
 } from "@wrongstack/core/coordination";
@@ -34557,9 +34505,11 @@ async function setupCommandHostState(input) {
   const liveSessionId = () => input.sessionRef.current?.id ?? input.session.id;
   input.hqCommandController.sessionId = liveSessionId;
   input.hqCommandController.sessionTag = () => mailboxSessionTag6(liveSessionId());
-  input.hqCommandController.killFleet = () => killFleet2(input.getDirector());
-  input.hqCommandController.terminateAgent = (subagentId) => terminateAgent(input.getDirector(), subagentId);
-  input.hqCommandController.spawnAgent = (role, task, maxIterations) => spawnAgent2(input.getDirector(), liveSessionId(), role, task, maxIterations);
+  input.hqCommandController.killFleet = (sessionId) => killHqSessionFleet(input.getDirector(), sessionId ?? liveSessionId(), {
+    multiConversation: input.hqMultiConversation === true
+  });
+  input.hqCommandController.terminateAgent = (subagentId) => terminateHqAgent(input.getDirector(), subagentId);
+  input.hqCommandController.spawnAgent = (role, task, maxIterations, sessionId) => spawnHqAgent(input.getDirector(), sessionId ?? liveSessionId(), role, task, maxIterations);
   input.hqCommandController.kanbanDispatch = async (request) => {
     const director = input.getDirector();
     const sessionId = request.sessionId ?? liveSessionId();
@@ -34727,49 +34677,6 @@ async function setupCommandHostState(input) {
     sddRunRegistry
   };
 }
-async function killFleet2(director) {
-  if (!director) return 0;
-  let killed = 0;
-  for (const subagent of director.status().subagents) {
-    if (subagent.status === "running" || subagent.status === "idle") {
-      try {
-        await director.remove(subagent.id);
-        killed++;
-      } catch {
-      }
-    }
-  }
-  return killed;
-}
-async function terminateAgent(director, subagentId) {
-  if (!director) return false;
-  try {
-    await director.terminate(subagentId);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function spawnAgent2(director, sessionId, role, task, maxIterations) {
-  if (!director) {
-    throw new AgentError3({
-      message: "Director is not available.",
-      code: "AGENT_RUN_FAILED",
-      context: { phase: "hq-spawn", role }
-    });
-  }
-  if (!areSubagentsAllowedForSession4(sessionId)) {
-    throw new Error("Subagents are disabled for this session.");
-  }
-  const base = FLEET_ROSTER5[role] ?? {
-    id: `manual-${Date.now()}`,
-    name: role,
-    maxIterations: maxIterations ?? 0,
-    maxToolCalls: 200
-  };
-  const config = task !== void 0 ? { ...base, task } : base;
-  return director.spawn({ ...config, originSessionId: sessionId });
-}
 
 // src/wiring/dep-watcher.ts
 import * as path24 from "node:path";
@@ -34902,7 +34809,7 @@ function setupDepWatcherBridge(deps) {
 }
 
 // src/wiring/director-announcement.ts
-import { FLEET_ROSTER as FLEET_ROSTER6 } from "@wrongstack/core/coordination";
+import { FLEET_ROSTER as FLEET_ROSTER5 } from "@wrongstack/core/coordination";
 async function ensureDirectorAndAnnounce(args) {
   const {
     multiAgentHost,
@@ -34919,7 +34826,7 @@ async function ensureDirectorAndAnnounce(args) {
   if (director) {
     if (priorFleetState) director.setCheckpointState(priorFleetState);
     const directorToolNames = [];
-    for (const tool of director.tools(FLEET_ROSTER6)) {
+    for (const tool of director.tools(FLEET_ROSTER5)) {
       toolRegistry.register(tool);
       directorToolNames.push(tool.name);
     }
@@ -34927,10 +34834,10 @@ async function ensureDirectorAndAnnounce(args) {
     const browserSurface = flags.webui === true || flags.simpleui === true;
     if (browserSurface) {
       renderer.writeInfo(
-        `Director mode enabled (${Object.keys(FLEET_ROSTER6).length} roles) \u2192 ${fleetRoot}`
+        `Director mode enabled (${Object.keys(FLEET_ROSTER5).length} roles) \u2192 ${fleetRoot}`
       );
     } else {
-      renderer.writeInfo(`Director mode enabled. Roster: ${Object.keys(FLEET_ROSTER6).join(", ")}`);
+      renderer.writeInfo(`Director mode enabled. Roster: ${Object.keys(FLEET_ROSTER5).join(", ")}`);
       renderer.writeInfo(`  fleet root \u2192 ${fleetRoot}`);
       renderer.writeInfo(`  manifest   \u2192 ${manifestPath}`);
       renderer.writeInfo(`  scratchpad \u2192 ${sharedScratchpadPath}`);
@@ -35234,12 +35141,15 @@ function startGovernanceHqTelemetry(options) {
         };
       }
       if (stopped) return;
-      const payload = projectGovernanceHqSnapshot(
-        options.publisher.project.projectId,
-        now(),
-        result
-      );
-      options.publisher.publishEvent({ type: "governance.snapshot", payload });
+      try {
+        const payload = projectGovernanceHqSnapshot(
+          options.publisher.project.projectId,
+          now(),
+          result
+        );
+        options.publisher.publishEvent({ type: "governance.snapshot", payload });
+      } catch {
+      }
     } finally {
       inFlight = false;
     }
@@ -35264,6 +35174,8 @@ function toHqMcpServers(servers) {
     lastFailureAt: server.lastFailureAt === void 0 ? void 0 : new Date(server.lastFailureAt).toISOString()
   }));
 }
+var DEFAULT_SCOPE_CHECK_INTERVAL_MS = 1e3;
+var MCP_HEALTH_KEEPALIVE_MS = 2 * 6e4;
 function setupHqTelemetry(deps) {
   const {
     events,
@@ -35281,13 +35193,15 @@ function setupHqTelemetry(deps) {
     hqPublisherRef,
     mcpRegistry
   } = deps;
+  const liveSession = deps.liveSession ?? (() => session);
+  const liveProjectRoot = deps.liveProjectRoot ?? (() => projectRoot);
   let stopHqSessionBridge;
   const stopHqAuxBridges = [];
   const approvalRegistry = createApprovalRegistry(events);
   teardownHandlers.push(() => approvalRegistry.dispose());
   if (deps.approvalMirror) {
     deps.approvalMirror.current = approvalRegistry;
-    deps.approvalMirror.sessionId = () => session.id;
+    deps.approvalMirror.sessionId = () => liveSession().id;
     teardownHandlers.push(() => {
       if (deps.approvalMirror?.current === approvalRegistry) {
         deps.approvalMirror.current = void 0;
@@ -35298,23 +35212,126 @@ function setupHqTelemetry(deps) {
   const hqCommandController = {
     steerMailbox: brainMailbox,
     interruptLeader: () => false,
-    sessionTag: () => mailboxSessionTag8(session.id),
-    // Boot-session seed. `setupCommandHostState` rebinds both to the LIVE
-    // writer ref, because an in-process resume / session.new swaps
-    // `ctx.session` for a new writer object and this captured one goes stale.
-    sessionId: () => session.id,
+    sessionTag: () => mailboxSessionTag8(liveSession().id),
+    // `setupCommandHostState` rebinds both to the LIVE writer ref too, because
+    // an in-process resume / session.new swaps `ctx.session` for a new writer
+    // object and a captured one goes stale.
+    sessionId: () => liveSession().id,
     allowRunCommand: () => flags["hq-allow-exec"] === true,
     resolveApproval: (toolUseId, decision, commandSessionId) => approvalRegistry.resolve(toolUseId, decision, commandSessionId),
     resolveUserInput: (requestId, response, commandSessionId) => approvalRegistry.resolveUserInput?.(requestId, response, commandSessionId) ?? false,
-    kanbanTransition: createProjectKanbanTransitionHandler(projectRoot),
-    kanbanAssign: createProjectKanbanAssignHandler(projectRoot)
+    // Resolved per command: an in-place project switch must not leave HQ's
+    // Kanban moves writing into the project this terminal just left.
+    kanbanTransition: (request) => createProjectKanbanTransitionHandler(liveProjectRoot())(request),
+    kanbanAssign: (request) => createProjectKanbanAssignHandler(liveProjectRoot())(request)
   };
   const hqOnCommand = createHqCommandDispatcher(hqCommandController);
-  const hqConnection = startCliHqConnection({
+  const stopSessionScope = () => {
+    stopHqSessionBridge?.();
+    stopHqSessionBridge = void 0;
+    for (const stop of stopHqAuxBridges) {
+      try {
+        stop();
+      } catch {
+      }
+    }
+    stopHqAuxBridges.length = 0;
+  };
+  let boundSessionId;
+  const bindSessionScope = (publisher) => {
+    stopSessionScope();
+    const writer = liveSession();
+    const sessionId = writer.id;
+    const root = liveProjectRoot();
+    boundSessionId = sessionId;
+    try {
+      stopHqSessionBridge = startSessionTelemetryBridge({
+        publisher,
+        events,
+        sessionId,
+        projectRoot: root,
+        projectName: path27.basename(root),
+        globalRoot,
+        writer,
+        // biome-ignore lint/suspicious/noExplicitAny: initialAgents shape
+        initialAgents: tracker?.getAgents?.(),
+        startedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    } catch {
+    }
+    try {
+      stopHqAuxBridges.push(
+        startFleetTelemetryBridge({ events, publisher, runId: sessionId, sessionId })
+      );
+    } catch {
+    }
+    try {
+      stopHqAuxBridges.push(startGovernanceHqTelemetry({ publisher, projectRoot: root }));
+    } catch {
+    }
+    try {
+      const publishMcpHealth = () => {
+        publisher.publishEvent({
+          type: "mcp.health.snapshot",
+          payload: { servers: toHqMcpServers(mcpRegistry.operationalHealth()) },
+          sessionId
+        });
+      };
+      publishMcpHealth();
+      stopHqAuxBridges.push(publisher.onConnected(publishMcpHealth));
+      const mcpKeepAlive = setInterval(publishMcpHealth, MCP_HEALTH_KEEPALIVE_MS);
+      mcpKeepAlive.unref?.();
+      stopHqAuxBridges.push(() => clearInterval(mcpKeepAlive));
+      stopHqAuxBridges.push(
+        mcpRegistry.onOperation((operation) => {
+          publisher.publishEvent({
+            type: "mcp.operation",
+            payload: {
+              operation,
+              servers: toHqMcpServers(mcpRegistry.operationalHealth())
+            },
+            sessionId
+          });
+        })
+      );
+    } catch {
+    }
+    try {
+      stopHqAuxBridges.push(startBrainTelemetryBridge({ events, publisher, sessionId }));
+    } catch {
+    }
+    try {
+      stopHqAuxBridges.push(startWorktreeTelemetryBridge({ events, publisher, sessionId }));
+    } catch {
+    }
+    try {
+      stopHqAuxBridges.push(
+        startToolTelemetryBridge({ events, publisher, projectRoot: root, sessionId })
+      );
+    } catch {
+    }
+    try {
+      stopHqAuxBridges.push(startCostTelemetryBridge({ events, publisher, sessionId }));
+    } catch {
+    }
+    try {
+      stopHqAuxBridges.push(
+        startApprovalTelemetryBridge({
+          registry: approvalRegistry,
+          publisher,
+          projectRoot: root,
+          sessionId
+        })
+      );
+    } catch {
+    }
+  };
+  const connect = (root) => startCliHqConnection({
     clientKind: tuiOwnsScreen ? "tui" : "cli",
-    projectRoot,
-    projectName: path27.basename(projectRoot),
+    projectRoot: root,
+    projectName: path27.basename(root),
     appConfig: config,
+    ...deps.getConfig !== void 0 ? { getAppConfig: deps.getConfig } : {},
     onCommand: hqOnCommand,
     capabilities: [
       "telemetry.publish",
@@ -35327,118 +35344,54 @@ function setupHqTelemetry(deps) {
     ],
     onConnect: (publisher) => {
       hqPublisherRef.current = publisher;
-      stopHqSessionBridge?.();
-      stopHqSessionBridge = void 0;
-      for (const stop of stopHqAuxBridges) {
-        try {
-          stop();
-        } catch {
-        }
-      }
-      stopHqAuxBridges.length = 0;
-      try {
-        stopHqSessionBridge = startSessionTelemetryBridge({
-          publisher,
-          events,
-          sessionId: session.id,
-          projectRoot,
-          projectName: path27.basename(projectRoot),
-          globalRoot,
-          writer: session,
-          // biome-ignore lint/suspicious/noExplicitAny: initialAgents shape
-          initialAgents: tracker?.getAgents?.(),
-          startedAt: (/* @__PURE__ */ new Date()).toISOString()
-        });
-      } catch {
-      }
-      try {
-        stopHqAuxBridges.push(
-          startFleetTelemetryBridge({
-            events,
-            publisher,
-            runId: session.id,
-            sessionId: session.id
-          })
-        );
-      } catch {
-      }
-      try {
-        stopHqAuxBridges.push(startGovernanceHqTelemetry({ publisher, projectRoot }));
-      } catch {
-      }
-      try {
-        publisher.publishEvent({
-          type: "mcp.health.snapshot",
-          payload: { servers: toHqMcpServers(mcpRegistry.operationalHealth()) },
-          sessionId: session.id
-        });
-        stopHqAuxBridges.push(
-          mcpRegistry.onOperation((operation) => {
-            publisher.publishEvent({
-              type: "mcp.operation",
-              payload: {
-                operation,
-                servers: toHqMcpServers(mcpRegistry.operationalHealth())
-              },
-              sessionId: session.id
-            });
-          })
-        );
-      } catch {
-      }
-      try {
-        stopHqAuxBridges.push(
-          startBrainTelemetryBridge({ events, publisher, sessionId: session.id })
-        );
-      } catch {
-      }
-      try {
-        stopHqAuxBridges.push(
-          startWorktreeTelemetryBridge({ events, publisher, sessionId: session.id })
-        );
-      } catch {
-      }
-      try {
-        stopHqAuxBridges.push(
-          startToolTelemetryBridge({
-            events,
-            publisher,
-            projectRoot,
-            sessionId: session.id
-          })
-        );
-      } catch {
-      }
-      try {
-        stopHqAuxBridges.push(
-          startCostTelemetryBridge({ events, publisher, sessionId: session.id })
-        );
-      } catch {
-      }
-      try {
-        stopHqAuxBridges.push(
-          startApprovalTelemetryBridge({
-            registry: approvalRegistry,
-            publisher,
-            projectRoot,
-            sessionId: session.id
-          })
-        );
-      } catch {
-      }
+      bindSessionScope(publisher);
+    },
+    // `/hq off` (or clearing the endpoint) retired the publisher: stop the
+    // bridges bound to it so nothing keeps queueing into a closed socket.
+    onDisconnect: () => {
+      stopSessionScope();
+      boundSessionId = void 0;
+      hqPublisherRef.current = void 0;
     }
   });
+  let boundProjectRoot = projectRoot;
+  let hqConnection = connect(boundProjectRoot);
   hqPublisherRef.getKanbanSyncStats = () => hqConnection.getKanbanSyncStats();
   hqPublisherRef.current = hqConnection.getPublisher();
-  teardownHandlers.push(() => stopHqSessionBridge?.());
-  teardownHandlers.push(() => {
-    for (const stop of stopHqAuxBridges) {
-      try {
-        stop();
-      } catch {
+  const scopeWatcher = setInterval(() => {
+    try {
+      const root = liveProjectRoot();
+      if (root !== boundProjectRoot) {
+        boundProjectRoot = root;
+        stopSessionScope();
+        hqConnection.stop();
+        hqConnection = connect(root);
+        hqPublisherRef.current = hqConnection.getPublisher();
+        return;
+      }
+      const publisher = hqPublisherRef.current;
+      if (publisher !== void 0 && liveSession().id !== boundSessionId) {
+        bindSessionScope(publisher);
       }
+    } catch {
     }
-  });
+  }, deps.scopeCheckIntervalMs ?? DEFAULT_SCOPE_CHECK_INTERVAL_MS);
+  scopeWatcher.unref?.();
+  teardownHandlers.push(() => clearInterval(scopeWatcher));
+  teardownHandlers.push(
+    setHqLiveStatusProbe(() => {
+      const publisher = hqPublisherRef.current;
+      if (publisher === void 0) return void 0;
+      return {
+        clientId: publisher.identity.clientId,
+        projectId: publisher.project.projectId,
+        connected: publisher.connected,
+        queuedFrames: publisher.getQueueStats().entries,
+        sessionId: boundSessionId
+      };
+    })
+  );
+  teardownHandlers.push(() => stopSessionScope());
   teardownHandlers.push(() => {
     hqPublisherRef.getKanbanSyncStats = void 0;
     hqConnection.stop();
@@ -37758,6 +37711,7 @@ import {
 } from "@wrongstack/core/coordination";
 import { ProviderCacheLedger } from "@wrongstack/core/infrastructure";
 import { restoreSessionPermissionOverrides } from "@wrongstack/core/security";
+import { restoreRequiredSkillsFromEvents } from "@wrongstack/core/skills";
 import {
   attachTodosCheckpoint,
   cleanOrphanLocks,
@@ -37997,6 +37951,7 @@ async function setupSession(params) {
     restoreSessionSubagentPolicy(context, restoredEvents, restoredSubagentsAllowed);
     restoreSessionSubagentModelPlan(context, restoredEvents);
   } else seedSessionSubagentPolicy(context);
+  restoreRequiredSkillsFromEvents(context, restoredEvents);
   restoreSessionPermissionOverrides(context.meta, {
     events: restoredEvents,
     permissionOverrides: restoredPermissionOverrides
@@ -39626,7 +39581,10 @@ async function runInteractive(cliCtx) {
     mailboxSessionTag: mailboxSessionTag7,
     hqPublisherRef,
     approvalMirror,
-    mcpRegistry
+    mcpRegistry,
+    liveSession: () => context.session ?? session,
+    liveProjectRoot: () => context.projectRoot ?? projectRoot,
+    getConfig: () => configStore.get()
   });
   setupDepWatcherConsumers({
     dwCfg,
@@ -39683,6 +39641,7 @@ async function runInteractive(cliCtx) {
     },
     getDirector: () => director,
     hqCommandController,
+    hqMultiConversation: resolveExecutionMode(positional, flags) === "webui",
     multiAgentHost,
     events,
     sessionRef,
@@ -39966,4 +39925,4 @@ export {
   CLI_VERSION,
   runInteractive
 };
-//# sourceMappingURL=cli-main-TN3KZ2P6.js.map
+//# sourceMappingURL=cli-main-TQTH73ZK.js.map