squadrant 0.16.2 → 0.16.3

package/dist/index.js

@@ -5880,6 +5880,9 @@ ${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen, {
   }
   return { ...pane, title };
 }
+function pickMostRecentTask(tasks) {
+  return tasks.reduce((a, b) => (b.createdAt ?? 0) > (a.createdAt ?? 0) ? b : a);
+}
 async function runCrewSend(project, name, message, runtime, workspaceId, deps) {
   const crew = await findCrewPane(runtime, workspaceId, project, name);
   if (!crew) {
@@ -5890,8 +5893,8 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps) {
     throw new Error(blockedByModalMessage());
   }
   try {
-    const tasks = await deps.listTasks(project);
-    const task = tasks.find((t) => t.name === name);
+    const matches = (await deps.listTasks(project)).filter((t) => t.name === name);
+    const task = matches.length > 0 ? pickMostRecentTask(matches) : void 0;
     if (task) {
       if (TERMINAL_STATES.has(task.state)) {
         await deps.emitEvent(project, { type: "task.reopened", id: task.id });
@@ -5929,7 +5932,7 @@ async function runCrewClose(project, name, runtime, workspaceId, deps) {
       matches = (await deps.listTasks(project)).filter((t) => t.name === name);
     }
     if (matches.length > 0) {
-      const primary = matches.reduce((a, b) => (b.createdAt ?? 0) > (a.createdAt ?? 0) ? b : a);
+      const primary = pickMostRecentTask(matches);
       taskId = primary.id;
       if (primary.cwd && projRoot && primary.cwd !== projRoot) {
         worktreeCwd = primary.cwd;
@@ -9341,16 +9344,23 @@ function isPermissionNotification(message) {
   const lower = message.toLowerCase();
   return lower.includes("permission") || lower.includes("approve");
 }
+function installHookEntry(hooks, event, matcher, command) {
+  if (!Array.isArray(hooks[event]))
+    hooks[event] = [];
+  const entries = hooks[event];
+  const already = entries.some((m) => m?.matcher === matcher && Array.isArray(m?.hooks) && m.hooks.some((h) => typeof h?.command === "string" && h.command.includes(command)));
+  if (!already) {
+    entries.push({ matcher, hooks: [{ type: "command", command, timeout: 10 }] });
+  }
+}
 function mergeClaudeHooks(settings, hookCmd) {
   const next = structuredClone(settings ?? {});
   next.hooks ??= {};
   for (const ev of EVENTS) {
-    if (!Array.isArray(next.hooks[ev]))
-      next.hooks[ev] = [];
-    const already = next.hooks[ev].some((m) => Array.isArray(m?.hooks) && m.hooks.some((h) => typeof h.command === "string" && h.command.includes(hookCmd)));
-    if (!already) {
-      next.hooks[ev].push({ matcher: "", hooks: [{ type: "command", command: `${hookCmd} ${ev}`, timeout: 10 }] });
-    }
+    installHookEntry(next.hooks, ev, "", `${hookCmd} ${ev}`);
+  }
+  for (const [ev, matcher] of MATCHED_EVENTS) {
+    installHookEntry(next.hooks, ev, matcher, `${hookCmd} ${ev}`);
   }
   return next;
 }
@@ -9430,8 +9440,32 @@ function resolveLastAssistantText(payload) {
   }
   return null;
 }
+function formatAskUserQuestionPrompt(toolInput) {
+  const questions = toolInput?.questions;
+  if (!Array.isArray(questions) || questions.length === 0)
+    return null;
+  const parts = [];
+  for (const q of questions) {
+    if (!q || typeof q !== "object")
+      continue;
+    const text = q.question;
+    if (typeof text !== "string" || !text.trim())
+      continue;
+    const options = Array.isArray(q.options) ? q.options : [];
+    const labels = options.map((o) => o && typeof o.label === "string" ? o.label.trim() : null).filter((l) => !!l);
+    parts.push(labels.length > 0 ? `${text.trim()} (options: ${labels.join(", ")})` : text.trim());
+  }
+  return parts.length > 0 ? parts.join(" | ") : null;
+}
 function mapClaudeHookToEvent(event, payload, taskId) {
   switch (event) {
+    case "PreToolUse": {
+      const toolName = payload?.tool_name;
+      if (toolName !== "AskUserQuestion")
+        return null;
+      const question = formatAskUserQuestionPrompt(payload?.tool_input) ?? "crew opened an AskUserQuestion prompt (options unavailable)";
+      return { type: "task.input.requested", id: taskId, requestId: nextAskUserQuestionRequestId++, question };
+    }
     case "Stop": {
       const text = resolveLastAssistantText(payload);
       const question = text ? detectTrailingQuestion2(text) : null;
@@ -9458,10 +9492,14 @@ function mapClaudeHookToEvent(event, payload, taskId) {
       return null;
   }
 }
-var EVENTS, claudeInteractive;
+var EVENTS, MATCHED_EVENTS, nextAskUserQuestionRequestId, claudeInteractive;
 var init_claude2 = __esm({
   "packages/agents/dist/interactive/claude.js"() {
     EVENTS = ["Stop", "SubagentStop", "SessionEnd", "PostToolUse", "Notification", "UserPromptSubmit"];
+    MATCHED_EVENTS = [
+      ["PreToolUse", "AskUserQuestion"]
+    ];
+    nextAskUserQuestionRequestId = Date.now();
     claudeInteractive = {
       provider: "claude",
       tier: "strong",
@@ -9814,6 +9852,7 @@ __export(dist_exports4, {
   createOpencodeEmitter: () => createOpencodeEmitter,
   deriveTranscriptPath: () => deriveTranscriptPath,
   detectTrailingQuestion: () => detectTrailingQuestion2,
+  formatAskUserQuestionPrompt: () => formatAskUserQuestionPrompt,
   getHeadlessAdapter: () => getHeadlessAdapter,
   getInteractiveAdapter: () => getInteractiveAdapter,
   isPermissionNotification: () => isPermissionNotification,
@@ -11310,6 +11349,22 @@ function defaultWriteResult(id, payload) {
   writeFileSync10(file, payload);
   return file;
 }
+async function runCrewSignal(signal, o, deps) {
+  const taskId = o.taskId ?? process.env.SQUADRANT_CREW_TASK_ID;
+  const project = o.project ?? process.env.SQUADRANT_CREW_PROJECT;
+  if (!taskId)
+    throw new Error("not running under a crew (SQUADRANT_CREW_TASK_ID unset)");
+  if (!project)
+    throw new Error("not running under a crew (SQUADRANT_CREW_PROJECT unset)");
+  const current = await deps.call(buildStatusRequest(project, taskId));
+  if (current && TERMINAL_STATES.has(current.state)) {
+    throw new Error(
+      `Task ${taskId} is already terminal (state=${current.state}) \u2014 signal '${signal}' would be silently ignored by the daemon. Stop here: your task record was never reopened for this turn. Ask the captain to run 'squadrant crew send' to reopen it before signaling again.`
+    );
+  }
+  const req = buildSignalRequest(signal, { ...o, writeResult: o.writeResult ?? defaultWriteResult });
+  await deps.call(req);
+}
 function addControlPlaneCrewCommands(crew) {
   crew.command("dispatch <project> <task>").description("Dispatch a crew task via the control-plane daemon").requiredOption("--provider <p>", "claude|opencode|codex (gemini: experimental, headless not supported)").option("--mode <m>", "headless|interactive", "interactive").option("--cwd <dir>", "working dir for the crew (project/worktree); required for codex to edit code").action(async (project, task, opts) => {
     const req = buildDispatchRequest({ project, task, provider: opts.provider, mode: opts.mode, cwd: opts.cwd });
@@ -11391,15 +11446,14 @@ function addControlPlaneCrewCommands(crew) {
       process.exit(2);
     }
     try {
-      const req = buildSignalRequest(state, {
+      await runCrewSignal(state, {
         ...opts.message !== void 0 ? { message: opts.message } : {},
         ...opts.question !== void 0 ? { question: opts.question } : {},
         ...opts.error !== void 0 ? { error: opts.error } : {},
         ...opts.taskId !== void 0 ? { taskId: opts.taskId } : {},
         ...opts.project !== void 0 ? { project: opts.project } : {},
         writeResult: defaultWriteResult
-      });
-      await squadrantdCall(req);
+      }, { call: squadrantdCall });
       process.exit(0);
     } catch (e) {
       process.stderr.write(`${e.message}
@@ -14631,22 +14685,38 @@ var EFFORT_MEANING = {
   balance: "normal routing \u2014 use default crew routing rules unchanged",
   low: "conserve tokens \u2014 bias crew spawns toward opencode/sonnet; reserve opus for work that genuinely needs it"
 };
-function runEffortGet(configPath = DEFAULT_CONFIG_PATH, projectName) {
+function runEffortGet(configPath = DEFAULT_CONFIG_PATH, projectName, projectConfigRoot) {
   const config = loadConfig(configPath);
-  const effort = resolveEffort(config, projectName);
+  if (projectName && !(projectName in config.projects)) {
+    const known = Object.keys(config.projects).sort().join(", ") || "(no projects registered)";
+    throw new Error(`Unknown project '${projectName}'. Known projects: ${known}`);
+  }
+  const effort = resolveEffort(config, projectName, projectConfigRoot);
   const description = `${effort}: ${EFFORT_MEANING[effort]}`;
   return { effort, description };
 }
-function runEffortSet(value, configPath = DEFAULT_CONFIG_PATH) {
+function runEffortSet(value, configPath = DEFAULT_CONFIG_PATH, projectName, projectConfigRoot) {
   if (!VALID_EFFORTS.includes(value)) {
     throw new Error(
       `Invalid effort '${value}'. Valid values: ${VALID_EFFORTS.join(" | ")}`
     );
   }
+  if (projectName) {
+    const config2 = loadConfig(configPath);
+    if (!(projectName in config2.projects)) {
+      const known = Object.keys(config2.projects).sort().join(", ") || "(no projects registered)";
+      throw new Error(`Unknown project '${projectName}'. Known projects: ${known}`);
+    }
+    saveProjectOverride(projectName, { effort: value }, projectConfigRoot);
+    return;
+  }
   const config = loadConfig(configPath);
   config.defaults.effort = value;
   saveConfig(config, configPath);
 }
+function effortScopeLabel(projectName) {
+  return projectName ? `project: ${projectName}` : "global";
+}
 function canonical(p) {
   try {
     return fs28.realpathSync(p);
@@ -14654,11 +14724,16 @@ function canonical(p) {
     return path29.resolve(p);
   }
 }
-async function notifyCaptainsOfEffort(effort, config, driver, cwd = process.cwd(), append) {
+async function notifyCaptainsOfEffort(effort, config, driver, cwd = process.cwd(), append, scopeProject, projectConfigRoot) {
   const here = canonical(cwd);
   const notice = `\u{1F39A}\uFE0F effort \u2192 ${effort}: ${EFFORT_MEANING[effort]}`;
   for (const [projName, proj] of Object.entries(config.projects)) {
     if (canonical(proj.path) === here) continue;
+    if (scopeProject) {
+      if (projName !== scopeProject) continue;
+    } else if (loadProjectOverride(projName, projectConfigRoot).effort !== void 0) {
+      continue;
+    }
     try {
       const ref = await driver.status(proj.captainName);
       if (ref) {
@@ -14668,22 +14743,28 @@ async function notifyCaptainsOfEffort(effort, config, driver, cwd = process.cwd(
     }
   }
 }
-var effortCommand = new Command28("effort").description("Get or set the global crew tokenomics dial (max | balance | low)").argument("[value]", "effort level to set: max | balance | low").option("--project <name>", "show resolved effort for a specific project").action(async (value, options) => {
+var effortCommand = new Command28("effort").description("Get or set the crew tokenomics dial (max | balance | low) \u2014 global by default, or per-project with --project").argument("[value]", "effort level to set: max | balance | low").option("--project <name>", "target a specific project (get: show its resolved effort; set: write a per-project override)").action(async (value, options) => {
   if (value === void 0) {
-    const { effort: effort2, description } = runEffortGet(void 0, options.project);
+    let result;
+    try {
+      result = runEffortGet(void 0, options.project);
+    } catch (err) {
+      console.error(chalk28.red(err.message));
+      process.exit(1);
+    }
     const label = options.project ? `${options.project} project` : "global";
-    console.log(chalk28.bold(`Current effort (${label}):`), chalk28.cyan(effort2));
-    console.log(chalk28.dim(EFFORT_MEANING[effort2]));
+    console.log(chalk28.bold(`Current effort (${label}):`), chalk28.cyan(result.effort));
+    console.log(chalk28.dim(EFFORT_MEANING[result.effort]));
     return;
   }
   try {
-    runEffortSet(value);
+    runEffortSet(value, void 0, options.project);
   } catch (err) {
     console.error(chalk28.red(err.message));
     process.exit(1);
   }
   const effort = value;
-  console.log(chalk28.green(`\u2714 effort \u2192 ${effort}`));
+  console.log(chalk28.green(`\u2714 effort \u2192 ${effort} (${effortScopeLabel(options.project)})`));
   console.log(chalk28.dim(EFFORT_MEANING[effort]));
   try {
     const { createCmuxDriver: createCmuxDriver2, RuntimeRegistry: RuntimeRegistry2 } = await Promise.resolve().then(() => (init_dist3(), dist_exports3));
@@ -14692,7 +14773,7 @@ var effortCommand = new Command28("effort").description("Get or set the global c
     const driver = registry.global(config);
     const stateRoot = path29.join(path29.dirname(DEFAULT_CONFIG_PATH), "state");
     const append = (project, text) => appendCaptainMessage({ stateRoot, project, text, source: "daemon" });
-    await notifyCaptainsOfEffort(effort, config, driver, process.cwd(), append);
+    await notifyCaptainsOfEffort(effort, config, driver, process.cwd(), append, options.project);
   } catch {
     console.log(chalk28.dim("(no running captain detected \u2014 change applies on next launch)"));
   }
@@ -15048,10 +15129,8 @@ function mapHookSub(sub, payload, taskId) {
       return mapClaudeHookToEvent("Stop", payload, taskId);
     case "notification":
       return mapClaudeHookToEvent("Notification", payload, taskId);
-    case "ask-question": {
-      const q = typeof payload?.question === "string" ? payload.question : "awaiting input";
-      return { type: "task.input.requested", id: taskId, requestId: 0, question: q };
-    }
+    case "ask-question":
+      return mapClaudeHookToEvent("PreToolUse", payload, taskId);
     case "session-end":
       return mapClaudeHookToEvent("SessionEnd", payload, taskId);
     default: