@detergent-software/conductor 3.2.0 → 3.3.0-dev.2

package/plugin/hooks/model.ts

@@ -254,6 +254,11 @@ export function waitLabel(condition: string, now: number): string {
       if (host) return `PR #${number} ${PR_EVENTS[on] ?? on}${host === 'github' ? ` (${last(repo)})` : ''}`;
       break;
     }
+    case 'pr-opened': {
+      const [repo = ''] = read(/^(?:ado|github):([^:]+)/) ?? [];
+      if (repo) return `a new PR (${last(repo)})`;
+      break;
+    }
     case 'run': {
       const [pipeline = '', id = ''] = read(/^(?:ado|github):(.+)#(\d+):done$/) ?? [];
       if (pipeline) return `run #${id} to finish (${last(pipeline).replace(/\.ya?ml$/, '')})`;
@@ -427,6 +432,7 @@ export function parseFleet(body: unknown): ConductorWorker[] | null {
         activity: typeof w.activity === 'string' ? w.activity : w.status,
         id: w.id,
         item: typeof w.item === 'string' ? w.item : w.name,
+        links: links(w.links),
         name: w.name,
         phase: typeof w.phase === 'string' ? w.phase : null,
         pr: typeof w.pr === 'string' ? w.pr : null,
@@ -902,7 +908,7 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
-// An inbox item's named links; one without an href or a label is left out.
+// An inbox item's or a worker's named links; one without an href or a label is left out.
 function links(value: unknown): ConductorLink[] {
   if (!Array.isArray(value)) return [];
   return value.flatMap((l: unknown) =>

package/plugin/hooks/register.tsx

@@ -2,7 +2,7 @@ import type { EngineInterface, Register, RenderElement, Timer } from 'claude-cod
 
 import { atom, read, update } from 'claude-code';
 
-import type { ConductorSnapshot } from '../types';
+import type { ConductorLink, ConductorSnapshot } from '../types';
 
 import {
   age,
@@ -877,6 +877,14 @@ export const register: Register = (on) => {
     const now = await $.clock.now();
     const rule = (title: string): string =>
       `─ ${title} ${'─'.repeat(Math.max(0, e.props.bodyColumns - title.length - 3))}`;
+    // An inbox item's or a worker's [open <label>]: on the Windows terminal a Button that runs the
+    // browser once, else a Link (ATK-494).
+    const openButton = (key: string, { href, label }: ConductorLink): RenderElement =>
+      e.surface === 'terminal' && isWindows && isWebLink(href) ? (
+        <Button key={key} label={`open ${label}`} onPress={() => openLink($, href)} />
+      ) : (
+        <Link href={href} key={key} label={`open ${label}`} />
+      );
     if (snap === null) return <Text dimColor>Reading the conductor…</Text>;
     if (snap.error !== null) {
       return (
@@ -977,13 +985,7 @@ export const register: Register = (on) => {
                   onPress={(press) => copy($, command, press.surface)}
                 />
               ))}
-              {item.links.map(({ href, label }, n) =>
-                e.surface === 'terminal' && isWindows && isWebLink(href) ? (
-                  <Button key={`link-${item.id}-${n}`} label={`open ${label}`} onPress={() => openLink($, href)} />
-                ) : (
-                  <Link href={href} key={`link-${item.id}-${n}`} label={`open ${label}`} />
-                ),
-              )}
+              {item.links.map((l, n) => openButton(`link-${item.id}-${n}`, l))}
               {item.kind !== 'plan' && (
                 <Button
                   key={`done-${item.id}`}
@@ -1038,6 +1040,7 @@ export const register: Register = (on) => {
                         onPress={async () => $.ui.toast(await attach($, w.id, w.name))}
                       />
                       <Button key={`why-${w.id}`} label='why' onPress={async () => $.ui.toast(await why($, w.item))} />
+                      {w.links.map((l, n) => openButton(`link-worker-${w.id}-${n}`, l))}
                       <Text dimColor>
                         {w.status} · {tokens(w.spendToday)} tok today
                         {w.pr === null ? '' : ` · PR ${w.pr}`}

package/plugin/types/index.d.ts

@@ -43,6 +43,8 @@ export type ConductorWorker = {
   activity: string;
   id: number;
   item: string;
+  // Its PR's page and its item's, named by the daemon (ATK-742).
+  links: ConductorLink[];
   name: string;
   phase: null | string;
   // Its PR as the daemon spells it, such as `ado:Contoso.Web#1850`; null before it has one.

package/protocol/PROTOCOL.md

@@ -85,11 +85,12 @@ An answer by anyone else is ignored, and the plan's inbox item says whose it was
 
 ## Waits
 
-`conduct wait <verb …>` registers a wait for the worker whose worktree it runs in. The daemon parks the worker once its turn ends, and resumes it when the wait holds. With no daemon, it checks the wait here and blocks: exit 0 when the wait holds, exit 2 after 29 minutes, exit 1 when it can't check. Each verb has a full form, which the store keeps. `item <item> comment` holds on the first comment by an approver (as Approvals defines them) after the item's newest note of any phase, and no more than 10 minutes before the wait registered. A note never counts, and a comment by anyone else is ignored and named on the Handoff's inbox item (`comment.ignored`). `item <item> unlabelled <label>` holds once the daemon has seen the label on since the wait registered and then sees it off, so a label added after the note doesn't resolve it at once. A verb or full form that doesn't parse is refused with exit 1, and the error names the form it expects.
+`conduct wait <verb …>` registers a wait for the worker whose worktree it runs in. The daemon parks the worker once its turn ends, and resumes it when the wait holds. With no daemon, it checks the wait here and blocks: exit 0 when the wait holds, exit 2 after 29 minutes, exit 1 when it can't check. Each verb has a full form, which the store keeps. `item <item> comment` holds on the first comment by an approver (as Approvals defines them) after the item's newest note of any phase, and no more than 10 minutes before the wait registered. A note never counts, and a comment by anyone else is ignored and named on the Handoff's inbox item (`comment.ignored`). `item <item> unlabelled <label>` holds once the daemon has seen the label on since the wait registered and then sees it off, so a label added after the note doesn't resolve it at once. `pr opened` holds on a PR created in the repo after the wait registered, in any state, that its filters let through; the author lists are kept lowercase and sorted, so the same filters are the same wait. A verb or full form that doesn't parse is refused with exit 1, and the error names the form it expects.
 
 | Verb | Full form |
 |---|---|
 | `pr <n> [merged\|checks\|comment …] [--repo …]` | `pr:<ado\|github>:<repo>#<n>:<verdict\|merged\|checks\|comment>` |
+| `pr opened [--author a,b \| --not-author a,b] [--base b] [--repo …]` | `pr-opened:<ado\|github>:<repo>[:base=<b>][:author=a,b \| :not-author=a,b]` |
 | `merge <sha> [--for a,b] [--repo …]` | `merge:<ado\|github>:<repo>@<sha>[:for=a,b]` |
 | `run <pipeline> <id> [done]` | `run:ado:<pipeline>#<id>:done` |
 | `npm <version> [--tag t] [--package p]` | `npm:<package>@<version>:<tag>` |