@firstpick/pi-package-webui 0.7.1 → 0.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,6 +2,7 @@ import { closeSync, fstatSync, openSync, readFileSync, readSync } from "node:fs"
2
2
  import path from "node:path";
3
3
  import { AgentSession, formatSkillsForPrompt } from "@earendil-works/pi-coding-agent";
4
4
  import { readWebuiSettings } from "./lib/git-workflow-preferences.mjs";
5
+ import { SUBAGENT_GATE_UPDATE_EVENT } from "./lib/subagent-gate.mjs";
5
6
 
6
7
  const HELPER_COMMAND = "webui-helper";
7
8
  const RESPONSE_PREFIX = "__PI_WEBUI_HELPER_RESPONSE__:";
@@ -198,6 +199,32 @@ function subagentText(value, maxLength = 240) {
198
199
  return text ? text.slice(0, maxLength) : "";
199
200
  }
200
201
 
202
+ function subagentModel(value) {
203
+ return subagentText(value, 240);
204
+ }
205
+
206
+ function subagentThinking(value) {
207
+ return subagentText(value, 40);
208
+ }
209
+
210
+ function subagentThinkingFromModel(value) {
211
+ const match = subagentModel(value).match(/:(off|minimal|low|medium|high|xhigh|max)$/i);
212
+ return subagentThinking(match?.[1]?.toLowerCase());
213
+ }
214
+
215
+ function subagentExecutionMetadata(step = {}, defaults = {}) {
216
+ const stepModel = subagentModel(step?.model);
217
+ const model = stepModel || subagentModel(defaults?.model) || undefined;
218
+ return {
219
+ model,
220
+ thinking: subagentThinking(step?.thinking)
221
+ || subagentThinkingFromModel(stepModel)
222
+ || subagentThinking(defaults?.thinking)
223
+ || subagentThinkingFromModel(model)
224
+ || undefined,
225
+ };
226
+ }
227
+
201
228
  function subagentMode(value, fallback = "single") {
202
229
  return ["single", "parallel", "chain"].includes(value) ? value : fallback;
203
230
  }
@@ -370,26 +397,28 @@ function subagentTranscriptOutput(sessionFile) {
370
397
  }
371
398
  }
372
399
 
373
- function subagentInitialAgentsFromStep(step) {
400
+ function subagentInitialAgentsFromStep(step, defaults = {}) {
374
401
  if (!step || typeof step !== "object") return [];
375
402
  if (Array.isArray(step.parallel)) {
376
403
  return step.parallel.flatMap((task) => {
377
404
  const name = subagentAgentName(task?.agent);
378
405
  const count = Number.isInteger(task?.count) && task.count > 0 ? Math.min(task.count, 32) : 1;
379
- return name ? Array.from({ length: count }, (_unused, index) => ({ name, index })) : [];
406
+ const metadata = subagentExecutionMetadata(task, defaults);
407
+ return name ? Array.from({ length: count }, (_unused, index) => ({ name, index, ...metadata })) : [];
380
408
  });
381
409
  }
382
410
  const name = subagentAgentName(step.agent);
383
- return name ? [{ name, index: 0 }] : [];
411
+ return name ? [{ name, index: 0, ...subagentExecutionMetadata(step, defaults) }] : [];
384
412
  }
385
413
 
386
414
  function subagentInitialAgentsFromArgs(args = {}) {
415
+ const defaults = subagentExecutionMetadata(args);
387
416
  if (Array.isArray(args.tasks) && args.tasks.length) {
388
- return args.tasks.flatMap((task) => subagentInitialAgentsFromStep(task));
417
+ return args.tasks.flatMap((task) => subagentInitialAgentsFromStep(task, defaults));
389
418
  }
390
- if (Array.isArray(args.chain) && args.chain.length) return subagentInitialAgentsFromStep(args.chain[0]);
419
+ if (Array.isArray(args.chain) && args.chain.length) return subagentInitialAgentsFromStep(args.chain[0], defaults);
391
420
  const name = subagentAgentName(args.agent);
392
- return name ? [{ name, index: 0 }] : [];
421
+ return name ? [{ name, index: 0, ...defaults }] : [];
393
422
  }
394
423
 
395
424
  function subagentRunningAgentsFromDetails(details, runId) {
@@ -398,7 +427,9 @@ function subagentRunningAgentsFromDetails(details, runId) {
398
427
  if (Array.isArray(details.progress)) candidates.push(...details.progress);
399
428
  if (Array.isArray(details.results)) {
400
429
  for (const result of details.results) {
401
- if (result?.progress && typeof result.progress === "object") candidates.push({ agent: result.agent, ...result.progress });
430
+ if (result?.progress && typeof result.progress === "object") {
431
+ candidates.push({ agent: result.agent, model: result.model, thinking: result.thinking, ...result.progress });
432
+ }
402
433
  }
403
434
  }
404
435
  return candidates.flatMap((entry, index) => {
@@ -419,6 +450,8 @@ function subagentRunningAgentsFromDetails(details, runId) {
419
450
  turnCount: Number.isFinite(entry.turnCount) ? entry.turnCount : undefined,
420
451
  toolCount: Number.isFinite(entry.toolCount) ? entry.toolCount : undefined,
421
452
  tokens: Number.isFinite(entry.tokens) ? entry.tokens : undefined,
453
+ model: subagentModel(entry.model) || undefined,
454
+ thinking: subagentThinking(entry.thinking) || subagentThinkingFromModel(entry.model) || undefined,
422
455
  nested: false,
423
456
  }];
424
457
  });
@@ -515,6 +548,7 @@ export default function webuiRpcHelper(pi) {
515
548
  let lastPublishedSubagentSignature = "";
516
549
  const asyncSubagentRuns = new Map();
517
550
  const foregroundSubagentRuns = new Map();
551
+ const subagentGates = new Map();
518
552
 
519
553
  function publicSubagentRuns() {
520
554
  return [...foregroundSubagentRuns.values(), ...asyncSubagentRuns.values()]
@@ -534,6 +568,8 @@ export default function webuiRpcHelper(pi) {
534
568
  index: Number.isInteger(agent.index) ? agent.index : index,
535
569
  currentTool: subagentText(agent.currentTool, 120) || undefined,
536
570
  activityState: subagentText(agent.activityState, 80) || undefined,
571
+ model: subagentModel(agent.model) || undefined,
572
+ thinking: subagentThinking(agent.thinking) || subagentThinkingFromModel(agent.model) || undefined,
537
573
  nested: agent.nested === true,
538
574
  })),
539
575
  }))
@@ -541,10 +577,48 @@ export default function webuiRpcHelper(pi) {
541
577
  .sort((a, b) => a.startedAt - b.startedAt || a.id.localeCompare(b.id));
542
578
  }
543
579
 
580
+ function publicSubagentGates() {
581
+ return [...subagentGates.values()]
582
+ .slice(-32)
583
+ .map((gate) => ({
584
+ version: 1,
585
+ id: subagentText(gate.id, 160),
586
+ status: ["running", "satisfied", "failed", "cancelled"].includes(gate.status) ? gate.status : "failed",
587
+ requiredSuccesses: Number.isInteger(gate.requiredSuccesses) ? gate.requiredSuccesses : 1,
588
+ qualifyingSuccesses: Number.isInteger(gate.qualifyingSuccesses) ? gate.qualifyingSuccesses : 0,
589
+ requireDistinctProviders: gate.requireDistinctProviders === true,
590
+ startedAt: Number.isFinite(gate.startedAt) ? gate.startedAt : Date.now(),
591
+ updatedAt: Number.isFinite(gate.updatedAt) ? gate.updatedAt : Date.now(),
592
+ endedAt: Number.isFinite(gate.endedAt) ? gate.endedAt : undefined,
593
+ attempts: (Array.isArray(gate.attempts) ? gate.attempts : []).slice(-100).map((attempt, index) => ({
594
+ id: subagentText(attempt?.id || `${gate.id}:${index}`, 240),
595
+ taskIndex: Number.isInteger(attempt?.taskIndex) ? attempt.taskIndex : index,
596
+ attempt: Number.isInteger(attempt?.attempt) ? attempt.attempt : 1,
597
+ maxAttempts: Number.isInteger(attempt?.maxAttempts) ? attempt.maxAttempts : 1,
598
+ agent: subagentAgentName(attempt?.agent) || "subagent",
599
+ label: subagentText(attempt?.label, 200) || undefined,
600
+ phase: subagentText(attempt?.phase, 120) || undefined,
601
+ retrySafety: attempt?.retrySafety === "read-only" ? "read-only" : "may-write",
602
+ runId: subagentText(attempt?.runId, 160) || undefined,
603
+ retryOf: subagentText(attempt?.retryOf, 160) || undefined,
604
+ model: subagentModel(attempt?.model) || undefined,
605
+ provider: subagentText(attempt?.provider, 80) || undefined,
606
+ status: ["launching", "running", "succeeded", "failed", "not-qualifying", "cancelled"].includes(attempt?.status) ? attempt.status : "failed",
607
+ failureKind: subagentText(attempt?.failureKind, 80) || undefined,
608
+ error: subagentText(attempt?.error, 1000) || undefined,
609
+ startedAt: Number.isFinite(attempt?.startedAt) ? attempt.startedAt : undefined,
610
+ endedAt: Number.isFinite(attempt?.endedAt) ? attempt.endedAt : undefined,
611
+ })),
612
+ }))
613
+ .filter((gate) => gate.id)
614
+ .sort((left, right) => left.startedAt - right.startedAt || left.id.localeCompare(right.id));
615
+ }
616
+
544
617
  function publishSubagentStatus() {
545
618
  if (!subagentContext?.hasUI) return;
546
619
  const runs = publicSubagentRuns();
547
- const snapshot = { version: 1, available: subagentBridgeAvailable, runs };
620
+ const gates = publicSubagentGates();
621
+ const snapshot = { version: 1, available: subagentBridgeAvailable, runs, gates };
548
622
  const signature = JSON.stringify(snapshot);
549
623
  if (signature === lastPublishedSubagentSignature) return;
550
624
  lastPublishedSubagentSignature = signature;
@@ -593,6 +667,51 @@ export default function webuiRpcHelper(pi) {
593
667
  return value && path.isAbsolute(value) ? path.normalize(value) : "";
594
668
  }
595
669
 
670
+ function subagentStatusStepForAgent(status, agent) {
671
+ const steps = Array.isArray(status?.steps) ? status.steps : [];
672
+ const indexed = steps[agent.index];
673
+ if (indexed?.agent === agent.name) return indexed;
674
+ return steps.find((step) => step?.agent === agent.name && ["running", "queued", "pending"].includes(step?.status))
675
+ || steps.find((step) => step?.agent === agent.name)
676
+ || (steps.length === 1 ? steps[0] : undefined);
677
+ }
678
+
679
+ async function enrichAsyncSubagentAgent(run, agent, statusByDir) {
680
+ const targetRunId = subagentText(agent.targetRunId || run.id, 160);
681
+ let asyncDir = subagentText(agent.asyncDir || (targetRunId === run.id ? run.asyncDir : ""), 4096);
682
+ if (!asyncDir) {
683
+ try {
684
+ const data = await requestSubagentStatus({ id: targetRunId });
685
+ asyncDir = subagentAsyncDirFromStatusText(data?.text);
686
+ } catch {
687
+ return;
688
+ }
689
+ }
690
+ if (!asyncDir) return;
691
+ agent.asyncDir = asyncDir;
692
+ if (targetRunId === run.id) run.asyncDir = asyncDir;
693
+ if (!statusByDir.has(asyncDir)) {
694
+ try {
695
+ statusByDir.set(asyncDir, JSON.parse(readFileSync(path.join(asyncDir, "status.json"), "utf8")));
696
+ } catch {
697
+ statusByDir.set(asyncDir, null);
698
+ }
699
+ }
700
+ const status = statusByDir.get(asyncDir);
701
+ if (!status || (status.runId && status.runId !== targetRunId)) return;
702
+ const step = subagentStatusStepForAgent(status, agent);
703
+ if (!step) return;
704
+ agent.model = subagentModel(step.model) || agent.model;
705
+ agent.thinking = subagentThinking(step.thinking) || subagentThinkingFromModel(step.model) || agent.thinking;
706
+ }
707
+
708
+ async function enrichAsyncSubagentRun(run) {
709
+ const statusByDir = new Map();
710
+ for (const agent of Array.isArray(run?.agents) ? run.agents : []) {
711
+ await enrichAsyncSubagentAgent(run, agent, statusByDir);
712
+ }
713
+ }
714
+
596
715
  function subagentOutputSnapshotFromAgent(run, agent, patch = {}) {
597
716
  return {
598
717
  version: 1,
@@ -614,6 +733,8 @@ export default function webuiRpcHelper(pi) {
614
733
  turnCount: Number.isFinite(patch.turnCount) ? patch.turnCount : Number.isFinite(agent.turnCount) ? agent.turnCount : undefined,
615
734
  toolCount: Number.isFinite(patch.toolCount) ? patch.toolCount : Number.isFinite(agent.toolCount) ? agent.toolCount : undefined,
616
735
  tokens: Number.isFinite(patch.tokens) ? patch.tokens : Number.isFinite(agent.tokens) ? agent.tokens : undefined,
736
+ model: subagentModel(patch.model || agent.model) || undefined,
737
+ thinking: subagentThinking(patch.thinking || agent.thinking) || undefined,
617
738
  recentTools: subagentRecentTools(patch.recentTools || agent.recentTools),
618
739
  recentOutput: subagentOutputLines(patch.recentOutput || agent.recentOutput),
619
740
  transcript: Array.isArray(patch.transcript) ? patch.transcript : [],
@@ -630,10 +751,11 @@ export default function webuiRpcHelper(pi) {
630
751
  if (run.source === "foreground") return subagentOutputSnapshotFromAgent(run, agent);
631
752
 
632
753
  const targetRunId = subagentText(agent.targetRunId || run.id, 160);
633
- let asyncDir = subagentText(run.asyncDir, 4096);
754
+ let asyncDir = subagentText(agent.asyncDir || (targetRunId === run.id ? run.asyncDir : ""), 4096);
634
755
  if (!asyncDir) {
635
756
  const data = await requestSubagentStatus({ id: targetRunId });
636
757
  asyncDir = subagentAsyncDirFromStatusText(data?.text);
758
+ if (asyncDir) agent.asyncDir = asyncDir;
637
759
  if (asyncDir && targetRunId === run.id) run.asyncDir = asyncDir;
638
760
  }
639
761
  if (!asyncDir) return subagentOutputSnapshotFromAgent(run, agent);
@@ -674,7 +796,18 @@ export default function webuiRpcHelper(pi) {
674
796
  }
675
797
  for (const run of parsedRuns) {
676
798
  const previous = asyncSubagentRuns.get(run.id);
677
- asyncSubagentRuns.set(run.id, { ...previous, ...run, eventSeenAt: previous?.eventSeenAt || Date.now() });
799
+ const previousAgents = Array.isArray(previous?.agents) ? previous.agents : [];
800
+ const merged = {
801
+ ...previous,
802
+ ...run,
803
+ eventSeenAt: previous?.eventSeenAt || Date.now(),
804
+ agents: run.agents.map((agent) => ({
805
+ ...previousAgents.find((candidate) => candidate.index === agent.index && candidate.name === agent.name),
806
+ ...agent,
807
+ })),
808
+ };
809
+ await enrichAsyncSubagentRun(merged);
810
+ asyncSubagentRuns.set(run.id, merged);
678
811
  }
679
812
  publishSubagentStatus();
680
813
  } catch {
@@ -734,6 +867,13 @@ export default function webuiRpcHelper(pi) {
734
867
  if (id) asyncSubagentRuns.delete(id);
735
868
  publishSubagentStatus();
736
869
  }),
870
+ pi.events.on(SUBAGENT_GATE_UPDATE_EVENT, (value) => {
871
+ const id = subagentText(value?.id, 160);
872
+ if (!id) return;
873
+ subagentGates.set(id, { ...value, id });
874
+ while (subagentGates.size > 32) subagentGates.delete(subagentGates.keys().next().value);
875
+ publishSubagentStatus();
876
+ }),
737
877
  ].filter((unsubscribe) => typeof unsubscribe === "function");
738
878
 
739
879
  function allToolNames() {
@@ -917,6 +1057,7 @@ export default function webuiRpcHelper(pi) {
917
1057
  subagentPollGeneration += 1;
918
1058
  foregroundSubagentRuns.clear();
919
1059
  asyncSubagentRuns.clear();
1060
+ subagentGates.clear();
920
1061
  lastPublishedSubagentSignature = "";
921
1062
  publishSubagentStatus();
922
1063
  scheduleSubagentStatusPoll(subagentPollGeneration, 0);
@@ -939,6 +1080,8 @@ export default function webuiRpcHelper(pi) {
939
1080
  name: agent.name,
940
1081
  status: "running",
941
1082
  index,
1083
+ model: agent.model,
1084
+ thinking: agent.thinking,
942
1085
  nested: false,
943
1086
  }));
944
1087
  if (!initialAgents.length) return;
@@ -961,7 +1104,17 @@ export default function webuiRpcHelper(pi) {
961
1104
  subagentContext = ctx;
962
1105
  const details = event.partialResult?.details || event.result?.details;
963
1106
  const agents = subagentRunningAgentsFromDetails(details, details?.runId || id);
964
- if (agents.length) run.agents = agents;
1107
+ if (agents.length) {
1108
+ run.agents = agents.map((agent) => {
1109
+ const previous = run.agents.find((candidate) => candidate.index === agent.index && candidate.name === agent.name);
1110
+ return {
1111
+ ...previous,
1112
+ ...agent,
1113
+ model: agent.model || previous?.model,
1114
+ thinking: agent.thinking || previous?.thinking,
1115
+ };
1116
+ });
1117
+ }
965
1118
  if (details?.runId) run.id = subagentText(details.runId, 160);
966
1119
  run.mode = subagentMode(details?.mode, run.mode);
967
1120
  publishSubagentStatus();
@@ -980,6 +1133,7 @@ export default function webuiRpcHelper(pi) {
980
1133
  subagentPollTimer = null;
981
1134
  foregroundSubagentRuns.clear();
982
1135
  asyncSubagentRuns.clear();
1136
+ subagentGates.clear();
983
1137
  for (const unsubscribe of subagentEventUnsubscribers) unsubscribe();
984
1138
  });
985
1139