@rallycry/conveyor-agent 10.4.0 → 10.4.4

package/dist/{chunk-TZYEU4QE.js → chunk-VCXKVINO.js}

@@ -719,13 +719,16 @@ var AgentConnection = class _AgentConnection {
     };
   }
   // ── Convenience methods (thin wrappers around call / emit) ─────────
-  async emitStatus(status, reason) {
+  async emitStatus(status, reason, questionText) {
     this.lastEmittedStatus = status;
     await this.flushEvents();
     const payload = {
       sessionId: this.config.sessionId,
       status,
-      ...reason ? { reason } : {}
+      ...reason ? { reason } : {},
+      // Only sent with a pending TUI questionnaire (reason "user_question") so
+      // the server can surface the real question text in the notification.
+      ...questionText ? { questionText } : {}
     };
     const AWAIT_STATUSES = ["idle", "waiting_for_input", "connected"];
     if (AWAIT_STATUSES.includes(status)) {
@@ -2046,7 +2049,14 @@ var ReportAgentStatusRequestSchema = z.object({
   sessionId: z.string(),
   status: z.string(),
   /** Why the agent reports this status (e.g. "user_question" while an AskUserQuestion questionnaire is pending in the TUI). */
-  reason: z.string().optional()
+  reason: z.string().optional(),
+  /**
+   * The pending question text, sent only alongside `reason: "user_question"`
+   * so the server can surface it in the user-question notification body (and
+   * thus the Attention feed) instead of a generic string. Optional: older
+   * agents omit it and the server falls back to the generic wording.
+   */
+  questionText: z.string().optional()
 });
 var NotifyAgentVersionRequestSchema = z.object({
   sessionId: z.string(),
@@ -2069,7 +2079,10 @@ var CreateSubtaskRequestSchema = z.object({
   plan: z.string().optional(),
   storyPointValue: z.number().int().positive().optional(),
   ordinal: z.number().int().nonnegative().optional(),
-  followParentStatus: z.boolean().optional()
+  followParentStatus: z.boolean().optional(),
+  /** Sibling subtask ids or slugs this subtask blocks on (explicit dependency
+   * metadata — preferred over encoding order in plan text / ordinal). */
+  dependsOn: z.array(z.string().min(1)).max(32).optional()
 });
 var UpdateSubtaskRequestSchema = z.object({
   sessionId: z.string(),
@@ -2079,7 +2092,10 @@ var UpdateSubtaskRequestSchema = z.object({
   plan: z.string().optional(),
   status: z.string().optional(),
   storyPointValue: z.number().int().positive().optional(),
-  followParentStatus: z.boolean().optional()
+  followParentStatus: z.boolean().optional(),
+  /** Replace this subtask's dependency edges with these sibling ids/slugs.
+   * Empty array clears all. Omit to leave dependencies unchanged. */
+  dependsOn: z.array(z.string().min(1)).max(32).optional()
 });
 var DeleteSubtaskRequestSchema = z.object({
   sessionId: z.string(),
@@ -2500,6 +2516,9 @@ var CreateProjectSubtaskRequestSchema = z2.object({
   ordinal: z2.number().int().nonnegative().optional(),
   storyPointValue: z2.number().int().positive().optional(),
   followParentStatus: z2.boolean().optional(),
+  /** Sibling subtask ids or slugs this subtask blocks on (explicit dependency
+   * metadata — preferred over encoding order in plan text / ordinal). */
+  dependsOn: z2.array(z2.string().min(1)).max(32).optional(),
   requestingUserId: z2.string().optional()
 });
 var UpdateProjectSubtaskRequestSchema = z2.object({
@@ -3950,6 +3969,9 @@ async function startToolServers(mcpServers, tempDir) {
 }
 
 // src/harness/pty/spawn-args.ts
+function resolveClaudeBinary() {
+  return process.env.CONVEYOR_CLAUDE_BIN ?? "claude";
+}
 function buildSpawnArgs(input) {
   const args = [];
   if (input.resume) {
@@ -4239,9 +4261,9 @@ function extractSpawn(mod) {
 }
 async function loadPtySpawn() {
   const mod = await import("node-pty");
-  const spawn2 = extractSpawn(mod);
-  if (!spawn2) throw new Error("node-pty: spawn export not found");
-  return spawn2;
+  const spawn3 = extractSpawn(mod);
+  if (!spawn3) throw new Error("node-pty: spawn export not found");
+  return spawn3;
 }
 function inheritedEnv(socketPath) {
   const env = {};
@@ -4740,8 +4762,8 @@ var PtySession = class {
       // server doesn't load).
       ...this.mcpConfigPath ? { mcpConfigPath: this.mcpConfigPath } : {}
     });
-    const spawn2 = await loadPtySpawn();
-    const pty = spawn2(spec.file, spec.args, {
+    const spawn3 = await loadPtySpawn();
+    const pty = spawn3(spec.file, spec.args, {
       name: "xterm-color",
       cols: this.cols,
       rows: this.rows,
@@ -5195,7 +5217,7 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     ``,
     `## Important Rules`,
     `- When dependencies are set on children, use them to determine execution order. Fire all ready tasks in parallel (up to the PACK_CHILD_LIMIT backpressure \u2014 see the loop above).`,
-    `- When NO dependencies are set on any children, fall back to ordinal order (one at a time). This preserves backward compatibility.`,
+    `- Dependencies are explicit card metadata (set at creation via create_subtask's dependsOn, or rewired with update_subtask). Prefer them over reading order out of plan text. When NO dependencies are set on any children, fall back to ordinal order (one at a time) \u2014 this is legacy behavior; set dependsOn when a child truly blocks on another.`,
     `- After firing builds OR when waiting on CI, explicitly state you are going idle. Go idle when waiting \u2014 the system wakes you (or relaunches this environment) when a child changes status.`,
     `- Do NOT attempt to write code yourself. Your role is coordination only.`,
     `- If a child is stuck in "InProgress" for an unusually long time, use get_execution_logs(childTaskId) to check its logs and escalate to the team if it appears stuck.`,
@@ -5816,7 +5838,8 @@ function buildDiscoveryPrompt(context, runnerMode) {
       `### Parent Task Coordination`,
       `You are a parent task with child tasks. Focus on breaking work into child tasks with detailed plans, not planning implementation for yourself.`,
       `- Use \`list_subtasks\` to review existing children. Create or update child tasks using \`create_subtask\` / \`update_subtask\`.`,
-      `- Each child task should be a self-contained unit of work with a clear plan.`
+      `- Each child task should be a self-contained unit of work with a clear plan.`,
+      `- Set ordering as explicit **card metadata**, not prose: pass \`dependsOn\` (sibling ids/slugs) on \`create_subtask\` for any child that blocks on another. Leave independent children with no dependencies so the pack runner fans them out in parallel. Do NOT encode "do X after Y" only in the plan text \u2014 the runner schedules off dependsOn, not narrative.`
     ] : [
       `### Self-Update vs Subtasks`,
       `- If the work fits in a single task (1-3 SP), update YOUR OWN plan and properties \u2014 do not create subtasks`,
@@ -5830,6 +5853,7 @@ function buildDiscoveryPrompt(context, runnerMode) {
     `- Reference existing implementations when relevant (e.g., "follow the pattern in src/services/foo.ts")`,
     `- Include testing requirements and acceptance criteria`,
     `- Set \`storyPointValue\` based on estimated complexity`,
+    `- Express cross-child ordering as \`dependsOn\` (sibling ids/slugs) on \`create_subtask\` \u2014 explicit dependency metadata, not "after task 2" phrasing in the plan. Independent children get no dependencies so they run in parallel.`,
     ``,
     `### Plan Verification Requirements`,
     `Every plan MUST include a **Testing / Verification** section so the build agent has a clear definition of "done". Enumerate:`,
@@ -5876,6 +5900,7 @@ function buildAutoPrompt(context, runnerMode) {
     `- Reference existing implementations when relevant`,
     `- Include testing requirements and acceptance criteria`,
     `- Set \`storyPointValue\` based on estimated complexity`,
+    `- Express cross-child ordering as \`dependsOn\` (sibling ids/slugs) on \`create_subtask\` \u2014 explicit dependency metadata, not "after task 2" phrasing in the plan. Independent children get no dependencies so they run in parallel.`,
     ``,
     ...buildPlanCitationFormat(),
     ``,
@@ -5884,7 +5909,8 @@ function buildAutoPrompt(context, runnerMode) {
       `### Parent Task Guidance`,
       `You are a parent task. Your plan should define child tasks with detailed plans, not direct implementation steps.`,
       `After ExitPlanMode, you'll transition to Review mode to coordinate child task execution.`,
-      `Child task status lifecycle: Open \u2192 InProgress \u2192 ReviewPR \u2192 ReviewDev \u2192 Complete.`
+      `Child task status lifecycle: Open \u2192 InProgress \u2192 ReviewPR \u2192 ReviewDev \u2192 Complete.`,
+      `Set child ordering with \`dependsOn\` (sibling ids/slugs) on \`create_subtask\` \u2014 explicit metadata the pack runner schedules off, not order described in plan text. Independent children get none and run in parallel.`
     ] : [],
     ``,
     `### Autonomous Guidelines:`,
@@ -7359,6 +7385,7 @@ function buildCommonTools(connection, config) {
 import { z as z9 } from "zod";
 var SP_DESCRIPTION = "Story point value (1=Common, 2=Magic, 3=Rare, 5=Unique)";
 var FOLLOW_PARENT_STATUS_DESCRIPTION = "Child mirrors the parent task's status automatically \u2014 for subtasks that ship on the parent's branch/PR with no build or PR of their own. Manual status writes on a follower stick only until the parent's next transition.";
+var DEPENDS_ON_DESCRIPTION = "Sibling subtask ids or slugs this subtask blocks on (it won't start until they merge to dev). Set explicit dependency metadata here instead of describing order in the plan text \u2014 the pack runner schedules children off these edges. Omit / leave empty for independent children so they run in parallel.";
 function buildUpdateTaskTool(connection) {
   return defineTool(
     "update_task_plan",
@@ -7391,9 +7418,18 @@ function buildCreateSubtaskTool(connection) {
       plan: z9.string().optional().describe("Implementation plan in markdown"),
       ordinal: z9.number().optional().describe("Step/order number (0-based)"),
       storyPointValue: z9.number().optional().describe(SP_DESCRIPTION),
-      followParentStatus: z9.boolean().optional().describe(FOLLOW_PARENT_STATUS_DESCRIPTION)
+      followParentStatus: z9.boolean().optional().describe(FOLLOW_PARENT_STATUS_DESCRIPTION),
+      dependsOn: z9.array(z9.string()).optional().describe(DEPENDS_ON_DESCRIPTION)
     },
-    async ({ title, description, plan, ordinal, storyPointValue, followParentStatus }) => {
+    async ({
+      title,
+      description,
+      plan,
+      ordinal,
+      storyPointValue,
+      followParentStatus,
+      dependsOn
+    }) => {
       try {
         const result = await connection.call("createSubtask", {
           sessionId: connection.sessionId,
@@ -7402,9 +7438,10 @@ function buildCreateSubtaskTool(connection) {
           ...plan !== void 0 && { plan },
           ...storyPointValue !== void 0 && { storyPointValue },
           ...ordinal !== void 0 && { ordinal },
-          ...followParentStatus !== void 0 && { followParentStatus }
+          ...followParentStatus !== void 0 && { followParentStatus },
+          ...dependsOn !== void 0 && { dependsOn }
         });
-        return textResult(`Subtask created with ID: ${result.id}`);
+        return textResult(`Subtask created with ID: ${result.id} (slug: ${result.slug})`);
       } catch (error) {
         return textResult(
           `Failed to create subtask: ${error instanceof Error ? error.message : "Unknown error"}`
@@ -7416,7 +7453,7 @@ function buildCreateSubtaskTool(connection) {
 function buildUpdateSubtaskTool(connection) {
   return defineTool(
     "update_subtask",
-    "Update an existing subtask's fields (title, description, plan, ordinal, storyPointValue). Use when refining a child's plan or reordering. For the current task use update_task_plan.",
+    "Update an existing subtask's fields (title, description, plan, ordinal, storyPointValue, dependsOn). Use when refining a child's plan, reordering, or rewiring dependencies. For the current task use update_task_plan.",
     {
       subtaskId: z9.string().describe("The subtask ID to update"),
       title: z9.string().optional(),
@@ -7424,9 +7461,20 @@ function buildUpdateSubtaskTool(connection) {
       plan: z9.string().optional(),
       ordinal: z9.number().optional(),
       storyPointValue: z9.number().optional().describe(SP_DESCRIPTION),
-      followParentStatus: z9.boolean().optional().describe(FOLLOW_PARENT_STATUS_DESCRIPTION)
+      followParentStatus: z9.boolean().optional().describe(FOLLOW_PARENT_STATUS_DESCRIPTION),
+      dependsOn: z9.array(z9.string()).optional().describe(
+        `${DEPENDS_ON_DESCRIPTION} Replaces the full dependency set \u2014 pass [] to clear all, omit to leave unchanged.`
+      )
     },
-    async ({ subtaskId, title, description, plan, storyPointValue, followParentStatus }) => {
+    async ({
+      subtaskId,
+      title,
+      description,
+      plan,
+      storyPointValue,
+      followParentStatus,
+      dependsOn
+    }) => {
       try {
         await connection.call("updateSubtask", {
           sessionId: connection.sessionId,
@@ -7435,7 +7483,8 @@ function buildUpdateSubtaskTool(connection) {
           ...description !== void 0 && { description },
           ...plan !== void 0 && { plan },
           ...storyPointValue !== void 0 && { storyPointValue },
-          ...followParentStatus !== void 0 && { followParentStatus }
+          ...followParentStatus !== void 0 && { followParentStatus },
+          ...dependsOn !== void 0 && { dependsOn }
         });
         return textResult("Subtask updated.");
       } catch (error) {
@@ -8040,9 +8089,17 @@ async function handleResultCase(event, host, context, startTime, isTyping, lastA
 function hasAskUserQuestionBlock(event) {
   return event.message.content.some((b) => b.type === "tool_use" && b.name === "AskUserQuestion");
 }
-async function armQuestionPending(host, state) {
+function questionTextFromEvent(event) {
+  const text = event.questions.map((q) => q.question.trim()).filter((q) => q.length > 0).join("\n");
+  return text.length > 0 ? text : void 0;
+}
+async function armQuestionPending(host, state, event) {
   state.questionPending = true;
-  await host.connection.emitStatus("waiting_for_input", AGENT_STATUS_REASON_USER_QUESTION);
+  await host.connection.emitStatus(
+    "waiting_for_input",
+    AGENT_STATUS_REASON_USER_QUESTION,
+    questionTextFromEvent(event)
+  );
   await host.callbacks.onStatusChange("waiting_for_input");
 }
 async function clearQuestionPending(host, state, options) {
@@ -8056,7 +8113,7 @@ async function clearQuestionPending(host, state, options) {
 async function applyQuestionTransitions(event, host, state) {
   switch (event.type) {
     case "user_question":
-      await armQuestionPending(host, state);
+      await armQuestionPending(host, state, event);
       return;
     case "assistant":
       if (!hasAskUserQuestionBlock(event)) {
@@ -9493,74 +9550,77 @@ function readAgentVersion() {
   return null;
 }
 
-// src/execution/usage-sampler.ts
-var logger4 = createServiceLogger("usage-sampler");
-var OAUTH_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
-var OAUTH_USAGE_BETA = "oauth-2025-04-20";
-var KNOWN_RATE_LIMIT_TYPES = [
-  "five_hour",
-  "seven_day",
-  "seven_day_opus",
-  "seven_day_sonnet"
-];
-function normalizeUtilization(raw) {
-  if (typeof raw !== "number" || !Number.isFinite(raw)) return null;
-  const fraction = raw > 1 ? raw / 100 : raw;
-  return Math.max(0, Math.min(1, fraction));
-}
-function extractBucket(value) {
-  if (typeof value === "number") {
-    const utilization = normalizeUtilization(value);
-    return utilization === null ? null : { utilization, status: "allowed" };
-  }
-  if (value && typeof value === "object") {
-    const obj = value;
-    const utilization = normalizeUtilization(
-      obj.utilization ?? obj.used ?? obj.percent ?? obj.percentage
-    );
-    if (utilization === null) return null;
-    const status = typeof obj.status === "string" ? obj.status : "allowed";
-    return { utilization, status };
-  }
-  return null;
+// src/usage/parse-usage.ts
+function parseUsageGauges(stdout) {
+  const session = stdout.match(/Current session:\s*(\d+(?:\.\d+)?)%\s*used/i);
+  const weekly = [...stdout.matchAll(/Current week[^:\n]*:\s*(\d+(?:\.\d+)?)%\s*used/gi)];
+  return {
+    sessionUsage: session ? Number(session[1]) / 100 : null,
+    weeklyUsage: weekly.length ? Math.max(...weekly.map((m) => Number(m[1]))) / 100 : null
+  };
 }
-function mapUsageResponse(data) {
-  if (!data || typeof data !== "object") return [];
-  const root = data;
-  const candidates = [root];
-  for (const key of ["usage", "rate_limits", "rateLimits"]) {
-    const nested = root[key];
-    if (nested && typeof nested === "object") {
-      candidates.push(nested);
-    }
-  }
-  for (const container of candidates) {
-    const samples = [];
-    for (const type of KNOWN_RATE_LIMIT_TYPES) {
-      const bucket = extractBucket(container[type]);
-      if (bucket) samples.push({ rateLimitType: type, ...bucket });
+
+// src/usage/run-probe.ts
+import { spawn } from "child_process";
+var PROBE_TIMEOUT_MS = 15e3;
+function runUsageProbe(binary = resolveClaudeBinary(), args = ["-p", "/usage"]) {
+  return new Promise((resolve) => {
+    let stdout = "";
+    let settled = false;
+    const finish = (out) => {
+      if (settled) return;
+      settled = true;
+      resolve(out);
+    };
+    let child;
+    try {
+      child = spawn(binary, args, { stdio: ["ignore", "pipe", "ignore"] });
+    } catch {
+      finish("");
+      return;
     }
-    if (samples.length > 0) return samples;
-  }
-  return [];
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+      finish("");
+    }, PROBE_TIMEOUT_MS);
+    timer.unref?.();
+    child.stdout?.on("data", (d) => {
+      stdout += d.toString();
+    });
+    child.on("error", () => {
+      clearTimeout(timer);
+      finish("");
+    });
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      finish(code === 0 ? stdout : "");
+    });
+  });
 }
-async function sampleKeyUsage(token) {
+
+// src/execution/usage-sampler.ts
+var logger4 = createServiceLogger("usage-sampler");
+async function sampleKeyUsage(token, probe = runUsageProbe) {
   if (!token) return [];
   try {
-    const res = await fetch(OAUTH_USAGE_URL, {
-      headers: {
-        Authorization: `Bearer ${token}`,
-        "anthropic-beta": OAUTH_USAGE_BETA
-      }
-    });
-    if (!res.ok) {
-      logger4.info("OAuth usage endpoint returned non-200", { status: res.status });
-      return [];
+    const stdout = await probe();
+    const { sessionUsage, weeklyUsage } = parseUsageGauges(stdout);
+    const samples = [];
+    if (sessionUsage !== null) {
+      samples.push({ rateLimitType: "five_hour", utilization: sessionUsage, status: "allowed" });
+    }
+    if (weeklyUsage !== null) {
+      samples.push({ rateLimitType: "seven_day", utilization: weeklyUsage, status: "allowed" });
     }
-    const data = await res.json();
-    return mapUsageResponse(data);
+    if (samples.length === 0) {
+      logger4.info("usage sample produced no gauges", { stdoutLength: stdout.length });
+    }
+    return samples;
   } catch (error) {
-    logger4.info("OAuth usage sample failed", {
+    logger4.info("usage sample failed", {
       error: error instanceof Error ? error.message : String(error)
     });
     return [];
@@ -10080,7 +10140,11 @@ var SessionRunner = class _SessionRunner {
     const staleBatch = [...this.pendingMessages];
     const didExecuteInitialQuery = await this.executeInitialMode();
     if (staleBatch.length > 0 && didExecuteInitialQuery) {
+      const historyContents = new Set(
+        (this.fullContext?.chatHistory ?? []).filter((m) => m.role !== "assistant" && m.content.trim()).map((m) => m.content.trim())
+      );
       for (const stale of staleBatch) {
+        if (stale.content.trim() && !historyContents.has(stale.content.trim())) continue;
         const idx = this.pendingMessages.indexOf(stale);
         if (idx !== -1) this.pendingMessages.splice(idx, 1);
       }
@@ -10437,8 +10501,8 @@ var SessionRunner = class _SessionRunner {
       this.periodicFlushInFlight = false;
     }
   }
-  /** Sample the running Claude subscription key's rate-limit utilization from the
-   *  Anthropic OAuth usage endpoint and report it as `rate_limit_update` events.
+  /** Sample the running Claude subscription key's rate-limit utilization from
+   *  the Claude CLI `/usage` command and report it as `rate_limit_update` events.
    *  The API (`persistRateLimitSnapshot`) attributes them to the key this session
    *  launched under, keeping User Settings + the PtY-tab usage widget fresh and
    *  `selectBestKey` rotation honest. Best-effort — never throws, no-op when the
@@ -10933,10 +10997,10 @@ function loadConveyorConfig() {
 }
 
 // src/setup/commands.ts
-import { spawn, execSync } from "child_process";
+import { spawn as spawn2, execSync } from "child_process";
 function runSetupCommand(cmd, cwd, onOutput) {
   return new Promise((resolve, reject) => {
-    const child = spawn("sh", ["-c", cmd], {
+    const child = spawn2("sh", ["-c", cmd], {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env }
@@ -10975,7 +11039,7 @@ function runAuthTokenCommand(cmd, userEmail, cwd) {
   }
 }
 function runStartCommand(cmd, cwd, onOutput) {
-  const child = spawn("sh", ["-c", cmd], {
+  const child = spawn2("sh", ["-c", cmd], {
     cwd,
     stdio: ["ignore", "pipe", "pipe"],
     detached: true,
@@ -11046,4 +11110,4 @@ export {
   runStartCommand,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-TZYEU4QE.js.map
+//# sourceMappingURL=chunk-VCXKVINO.js.map