@a-t-h-i/bot-lobby 0.6.45 → 0.6.46

package/src/webui/protocol.ts

@@ -276,78 +276,6 @@ export interface PlannerSeedInfo {
   body: string;
 }
 
-/** The Metrics tab's KPI row as data: runs, success, average run, cost, tasks. */
-export interface MetricsTiles {
-  runs: number;
-  successes: number;
-  stalls: number;
-  avgMs: number;
-  p90Ms: number;
-  cost: number;
-  completed: number;
-  active: number;
-  avgCompleteMs: number;
-}
-
-/** One per-model group as `metrics.get` carries it. */
-export interface MetricGroupInfo {
-  model: string;
-  thinking: string;
-  kinds: string[];
-  runs: number;
-  successes: number;
-  timeouts: number;
-  avgMs: number;
-  p50Ms: number;
-  p90Ms: number;
-  avgTurns: number;
-  avgTools: number;
-  avgTokens: number;
-  avgCost: number;
-  totalCost: number;
-  tokensPerSecond: number;
-}
-
-/** One agent's share of all run time. */
-export interface MetricsAgentShare {
-  agent: string;
-  runs: number;
-  ms: number;
-  share: number;
-}
-
-/** Completed tasks' request-to-done time by the oracle's model and thinking. */
-export interface MetricsTaskTime {
-  model: string;
-  thinking: string;
-  tasks: number;
-  avgMs: number;
-}
-
-/** What the classifier did and spared, when it has run. */
-export interface MetricsClassifier {
-  calls: number;
-  ok: number;
-  p50Ms: number;
-  p90Ms: number;
-  input: number;
-  byPurpose: Record<string, number>;
-  seatRunsSkipped: number;
-  questionsAnswered: number;
-  quickFixesHeld: number;
-  routed: number;
-  routedOk: number;
-}
-
-/** `metrics.get`: the dashboard figures for one grouping and search. */
-export interface MetricsData {
-  tiles: MetricsTiles;
-  groups: MetricGroupInfo[];
-  daily: Array<{ date: string; runs: number; successes: number; cost: number }>;
-  timeShare: { byAgent: MetricsAgentShare[]; taskTimes: MetricsTaskTime[] };
-  classifier?: MetricsClassifier;
-}
-
 /** Who a knowledge file belongs to. */
 export type KnowledgeAgentName = "master" | "designer" | "backend" | "qa";
 
@@ -395,6 +323,8 @@ export interface EntryRefInfo {
 
 /** `tasks.get`: one task read whole, in the terminal's wording. */
 export interface TaskDetail {
+  canAccept: boolean;
+  canForceClose: boolean;
   timing?: TimingProjection;
   delivery?: Delivery;
   /** The full request, when it says more than the title. */
@@ -414,7 +344,7 @@ export interface TaskDetail {
   work?: WorkClock;
   amendments: string[];
   /** Approvals waiting on you: `kind` plus `for <domain>: <detail>`. */
-  waiting: Array<{ kind: string; detail: string }>;
+  waiting: Array<{ id: string; domain: string; kind: string; detail: string }>;
   blockers: Array<{ reason: string; need: string }>;
   /** The last six runs, one line each (`✓ DEV worker · 3m 12s · …`). */
   runs: string[];
@@ -589,6 +519,9 @@ export interface Api {
   "tasks.get": { request: { taskId: string }; result: TaskDetail };
   "tasks.open": { request: { taskId: string }; result: { sessionId?: string; key?: string; notice?: string } };
   "tasks.resume": { request: { taskId: string }; result: { notice: string; key?: string } };
+  "tasks.accept": { request: { taskId: string }; result: { notice: string } };
+  "tasks.forceClose": { request: { taskId: string; title: string }; result: { notice: string } };
+  "tasks.resolveApproval": { request: { taskId: string; approvalId: string; decision: "approved" | "rejected"; note?: string }; result: { notice: string } };
   "tasks.deliveryReview": { request: { taskId: string }; result: { delivery: Delivery } };
   "tasks.deliveryDefer": { request: { taskId: string; reviewId: string }; result: { delivery: Delivery } };
   "tasks.deliver": { request: { taskId: string; reviewId: string; action: DeliveryAction; confirmMain?: boolean }; result: { delivery: Delivery } };
@@ -624,7 +557,6 @@ export interface Api {
   "quickfix.cancel": { request: { id: string }; result: { notice: string } };
   "quickfix.runAnyway": { request: { id: string }; result: { notice: string } };
   "quickfix.movedToTask": { request: { id: string }; result: { notice: string; key?: string } };
-  "metrics.get": { request: { groupBy: "model" | "model-kind"; query?: string; from?: string; to?: string; timeZone?: string }; result: MetricsData };
   "projects.browse": { request: { path?: string }; result: FolderListing };
   "projects.open": { request: { path: string }; result: { project: ProjectInfo } };
   "knowledge.files": { request: Record<string, never>; result: { files: KnowledgeFileInfo[]; models?: Partial<Record<KnowledgeAgentName, string>> } };

package/src/workflow/workflow.ts

@@ -28,6 +28,7 @@ import { spawnPiProcess, type ProcessRunner, type RelayAsk } from "../execution/
 import { previewDir } from "../ask/relay.ts";
 import type { AskQuestion, AskResult } from "../ask/types.ts";
 import { mapConcurrent } from "../execution/agent-runner.ts";
+import { taskExecution } from "../execution/task-cancellation.ts";
 import { parseWorkerResult } from "../roles/worker.ts";
 import { autoNote, DESK_TOOLS, DeskSession } from "../desk/session.ts";
 import type { Handover } from "../desk/desk.ts";
@@ -1171,7 +1172,7 @@ function handoverLog(handovers: readonly Handover[]): string {
   return `File handovers:\n${lines.join("\n")}`;
 }
 
-function handleResolveApproval(task: Task, params: OrchestrateParams): string {
+export function handleResolveApproval(task: Task, params: OrchestrateParams): string {
   const id = params.approvalId?.trim();
   const decision = params.decision;
   if (!id || (decision !== "approved" && decision !== "rejected")) {
@@ -1557,7 +1558,9 @@ async function handleComplete(task: Task, params: OrchestrateParams, deps: Workf
   // The gate refuses before any side effect, so a refusal leaves the task untouched.
   const oversized = overThreshold(readDataRoots(deps.root, deps.configDir), deps.config.knowledge.compactionThreshold);
   if (oversized.length > 0) throw new Error(`cannot complete: knowledge files over the compaction threshold: ${oversized.map((entry) => `${entry.agent}/${entry.file} (${entry.chars})`).join(", ")}. First record domain-relevant facts where they belong with action=knowledge (domain=designer|backend|qa), then rewrite each oversized file with action=compact, then call complete again.`);
+  deps.signal?.throwIfAborted();
   const committed = await commitTaskWork(task, params, deps);
+  deps.signal?.throwIfAborted();
   const summary = params.text?.trim() || task.proposal || task.title;
   recordCompletion(deps, task, summary);
   removeTaskScratchpads(deps.root, deps.configDir, task.id);
@@ -1598,6 +1601,7 @@ async function commitTaskWork(task: Task, params: OrchestrateParams, deps: Workf
   }
   let result: Awaited<ReturnType<typeof commitFiles>>;
   try {
+    deps.signal?.throwIfAborted();
     result = await commitFiles(state.top, dirty, message);
   } catch (error) {
     throw new Error(`cannot complete: git refused the commit: ${(error as Error).message}`);
@@ -2098,14 +2102,19 @@ export async function runWorkflowAction(params: OrchestrateParams, deps: Workflo
   }
   const gone = missingWorktree(task);
   if (gone && params.action !== "status") return { ok: false, taskId: task.id, state: task.state, message: `Rejected: ${gone}` };
+  const execution = taskExecution(deps.root, deps.configDir, task.id, deps.signal);
   const finished = new Map<string, AgentRun>();
   const identity = { root: deps.root, configDir: deps.configDir, taskId: task.id, sessionId: task.ownerSessionId };
-  const wait = <T>(run: () => Promise<T>) => {
+  const wait = async <T>(run: () => Promise<T>) => {
+    execution.signal.throwIfAborted();
     saveTask(deps.root, deps.configDir, task);
-    return withBlockingRequest(identity, run);
+    const result = await withBlockingRequest(identity, run);
+    execution.signal.throwIfAborted();
+    return result;
   };
   const tracked: WorkflowDeps = {
     ...deps,
+    signal: execution.signal,
     choose: (...args) => wait(() => deps.choose(...args)),
     ask: (...args) => wait(() => deps.ask(...args)),
     ...(deps.askQuestions ? { askQuestions: (...args: Parameters<NonNullable<WorkflowDeps["askQuestions"]>>) => wait(() => deps.askQuestions!(...args)) } : {}),
@@ -2113,6 +2122,7 @@ export async function runWorkflowAction(params: OrchestrateParams, deps: Workflo
     cwd: taskCwd(task, deps.cwd),
     // An agent can work for an hour: what the action has done so far (implementing, reviewing) is saved before it starts, so every window reads it.
     runProcess: (args, options) => {
+      execution.signal.throwIfAborted();
       saveTask(deps.root, deps.configDir, task);
       return (deps.runProcess ?? spawnPiProcess)(args, options);
     },
@@ -2134,6 +2144,7 @@ export async function runWorkflowAction(params: OrchestrateParams, deps: Workflo
   const working = new Set<string>();
   try {
     const message = await handler(task, params, tracked);
+    execution.signal.throwIfAborted();
     const runs = recordRunLog(task, finished, deps);
     saveTask(deps.root, deps.configDir, task);
     return { ok: true, taskId: task.id, state: task.state, message: `${message}${runsFooter(runs)}${budgetFooter(task, deps)}`, runs };
@@ -2142,6 +2153,7 @@ export async function runWorkflowAction(params: OrchestrateParams, deps: Workflo
     saveTask(deps.root, deps.configDir, task);
     return { ok: false, taskId: task.id, state: task.state, message: `Rejected: ${(error as Error).message}${budgetFooter(task, deps)}`, runs };
   } finally {
+    execution.release();
     for (const runId of working) noteWorkerRun(deps.root, deps.configDir, task.id, { runId, startedAt: "", status: "cancelled" });
   }
 }