@detergent-software/conductor 3.0.0-dev.8 → 3.0.0

package/build/host/terminal.js

@@ -0,0 +1,46 @@
+import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { run as runCommand } from "../run.js";
+import { appleTerminal, iterm } from "./macos-terminal.js";
+import { hostPlatform } from "./platform.js";
+import { tmux } from "./tmux.js";
+import { windowsTerminal } from "./windows-terminal.js";
+// config.json's workers.terminal: auto is Windows Terminal on Windows, iTerm on macOS where it is
+// installed and Terminal where it isn't, and tmux elsewhere.
+export const TERMINALS = ['auto', 'windows-terminal', 'terminal', 'iterm', 'tmux'];
+const ITERM_APPS = ['/Applications/iTerm.app', join(homedir(), 'Applications', 'iTerm.app')];
+// This platform's terminal, or the one config.json names.
+export function terminal({ choice = 'auto', installed = existsSync, platform = hostPlatform(), run = runCommand, } = {}) {
+    const picked = choice !== 'auto'
+        ? choice
+        : platform === 'win32'
+            ? 'windows-terminal'
+            : platform === 'darwin'
+                ? ITERM_APPS.some((app) => installed(app))
+                    ? 'iterm'
+                    : 'terminal'
+                : 'tmux';
+    const terminals = {
+        iterm: () => iterm(run),
+        terminal: () => appleTerminal(run),
+        tmux: () => tmux(run),
+        'windows-terminal': () => windowsTerminal(run),
+    };
+    return terminals[picked]();
+}
+export function workerTabs(where, onLaunch) {
+    return {
+        hint: (window) => where.attachHint(window),
+        onLaunch,
+        open: (tab) => where.open({
+            command: ['claude', 'attach', tab.handle],
+            cwd: tab.cwd,
+            env: {},
+            hold: true,
+            title: tab.title,
+            window: tab.window,
+        }),
+    };
+}
+//# sourceMappingURL=terminal.js.map

package/build/host/terminal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../src/host/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC,OAAO,EAAE,GAAG,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAqB,YAAY,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,kGAAkG;AAClG,6DAA6D;AAC7D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAU,CAAC;AA4C5F,MAAM,UAAU,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;AAE7F,0DAA0D;AAC1D,MAAM,UAAU,QAAQ,CAAC,EACvB,MAAM,GAAG,MAAM,EACf,SAAS,GAAG,UAAU,EACtB,QAAQ,GAAG,YAAY,EAAE,EACzB,GAAG,GAAG,UAAU,MAOd,EAAE;IACJ,MAAM,MAAM,GACV,MAAM,KAAK,MAAM;QACf,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,QAAQ,KAAK,OAAO;YACpB,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,QAAQ,KAAK,QAAQ;gBACrB,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACxC,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,UAAU;gBACd,CAAC,CAAC,MAAM,CAAC;IACjB,MAAM,SAAS,GAA0C;QACvD,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;QACvB,QAAQ,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC;QAClC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;QACrB,kBAAkB,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;KAC/C,CAAC;IACF,OAAO,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAe,EAAE,QAAiB;IAC3D,OAAO;QACL,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;QAC1C,QAAQ;QACR,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CACZ,KAAK,CAAC,IAAI,CAAC;YACT,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC;YACzC,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC;KACL,CAAC;AACJ,CAAC"}

package/build/host/tmux.js

@@ -0,0 +1,39 @@
+import { outputOf } from "../run.js";
+import { shLine, viaSh } from "./shell.js";
+// tmux: a detached session per window, made by its first tab, and a tmux window per tab. It runs
+// where there is no desktop (a server over ssh), so a person reaches it with `tmux attach`. tmux
+// starts a tab in the tmux server's environment, so `env` goes on the command line, and runs it in
+// its default-shell, so the line goes through sh.
+export function tmux(run) {
+    return {
+        attachHint: (window) => `tmux attach -t ${tmuxSession(window)}`,
+        name: 'tmux',
+        open: async (tab) => {
+            const session = tmuxSession(tab.window);
+            // `=` matches the name exactly, not as a prefix.
+            const has = await run('tmux', ['has-session', '-t', `=${session}`], { timeoutMs: 30_000 });
+            if (has.error !== null && /ENOENT/.test(has.error))
+                return 'no tmux to open it in';
+            // tmux expands formats in -n and -c, and `#(…)` in one runs a command: `##` is a plain `#`.
+            const literal = (text) => text.replace(/#/g, '##');
+            const title = literal(tab.title.replace(/\s+/g, ' ').trim().slice(0, 80));
+            const open = (where) => run('tmux', [...where, '-n', title, '-c', literal(tab.cwd), viaSh(shLine(tab))], { timeoutMs: 30_000 });
+            const inSession = ['new-window', '-t', `=${session}:`];
+            let result = await open(has.code === 0 ? inSession : ['new-session', '-d', '-s', session]);
+            // Another tab made the session since has-session asked.
+            if (has.code !== 0 && /duplicate session/.test(result.stderr))
+                result = await open(inSession);
+            return result.code === 0 ? null : outputOf(result, 500);
+        },
+    };
+}
+// The tmux session a window's tabs open in: its name in lower case, with a dash for anything tmux
+// reads in a target (`.` and `:`) and anything a person would have to quote. "Conductor · web"
+// becomes conductor-web.
+export function tmuxSession(window) {
+    return (window
+        .toLowerCase()
+        .replace(/[^a-z0-9_-]+/g, '-')
+        .replace(/^-+|-+$/g, '') || 'conductor');
+}
+//# sourceMappingURL=tmux.js.map

package/build/host/tmux.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tmux.js","sourceRoot":"","sources":["../../src/host/tmux.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAE3C,iGAAiG;AACjG,iGAAiG;AACjG,mGAAmG;AACnG,kDAAkD;AAClD,MAAM,UAAU,IAAI,CAAC,GAAQ;IAC3B,OAAO;QACL,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,WAAW,CAAC,MAAM,CAAC,EAAE;QAC/D,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxC,iDAAiD;YACjD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;YAC3F,IAAI,GAAG,CAAC,KAAK,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,OAAO,uBAAuB,CAAC;YACnF,4FAA4F;YAC5F,MAAM,OAAO,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC1E,MAAM,IAAI,GAAG,CAAC,KAAwB,EAAE,EAAE,CACxC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1G,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,OAAO,GAAG,CAAC,CAAC;YACvD,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;YAC3F,wDAAwD;YACxD,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAE,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9F,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC1D,CAAC;KACF,CAAC;AACJ,CAAC;AAED,kGAAkG;AAClG,+FAA+F;AAC/F,yBAAyB;AACzB,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,OAAO,CACL,MAAM;SACH,WAAW,EAAE;SACb,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC;SAC7B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,WAAW,CAC1C,CAAC;AACJ,CAAC"}

package/build/host/windows-terminal.js

@@ -0,0 +1,46 @@
+import { outputOf } from "../run.js";
+import { failedText } from "./shell.js";
+// Windows Terminal (wt.exe). Not hidden: when the named window doesn't exist yet, Windows Terminal
+// creates it with the spawn's SW_HIDE, and the tab runs where nobody sees it (ATK-469, ATK-336).
+export function windowsTerminal(run) {
+    return {
+        attachHint: () => null,
+        name: 'Windows Terminal',
+        open: async (tab) => {
+            const args = windowsTerminalArgs(tab);
+            if (typeof args === 'string')
+                return args;
+            const result = await run('wt.exe', args, { cwd: tab.cwd, timeoutMs: 60_000, windowsHide: false });
+            if (result.code === 0)
+                return null;
+            return result.error !== null && /ENOENT/.test(result.error)
+                ? 'no Windows Terminal (wt.exe) to open it in'
+                : outputOf(result, 500);
+        },
+    };
+}
+// wt.exe's arguments for a tab in the named window. wt.exe splits its own arguments on `;`, so the
+// window and title lose it, a folder with one is left out (the tab starts in its profile's, as
+// tabs did before ATK-529), and a command with one can't open (a string says why). A held command
+// runs in pwsh and chains its prompt with `||`. The tab gets wt.exe's environment, which is the
+// caller's even in a window already open, so `env` needs no setting.
+export function windowsTerminalArgs(tab) {
+    const split = tab.command.find((part) => part.includes(';'));
+    if (split !== undefined)
+        return `a Windows Terminal tab can't take ";": ${split}`;
+    const clean = (text) => text.replace(/;/g, ',').replace(/\s+/g, ' ').trim();
+    const command = tab.hold
+        ? ['pwsh', '-Command', `${psLine(tab.command)} || Read-Host ${psQuote(failedText(tab.command))}`]
+        : tab.command;
+    const folder = tab.cwd.includes(';') ? [] : ['-d', tab.cwd];
+    return ['-w', clean(tab.window), 'new-tab', '--title', clean(tab.title).slice(0, 80), ...folder, ...command];
+}
+// A command as pwsh runs it: words bare where they can be, and a quoted program called with `&`.
+function psLine(command) {
+    const words = command.map((word) => (/^[\w.:/\\-]+$/.test(word) ? word : psQuote(word)));
+    return words[0]?.startsWith("'") ? `& ${words.join(' ')}` : words.join(' ');
+}
+function psQuote(text) {
+    return `'${text.replace(/'/g, "''")}'`;
+}
+//# sourceMappingURL=windows-terminal.js.map

package/build/host/windows-terminal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"windows-terminal.js","sourceRoot":"","sources":["../../src/host/windows-terminal.ts"],"names":[],"mappings":"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"}

package/build/in-process.js

@@ -1,22 +1,23 @@
 import { loadConfig } from "./config.js";
 import { providerCredentials } from "./credentials.js";
-import { adoOrganization, PROFILE_FILE, readProfile, trackerKey } from "./profile.js";
+import { profileHere } from "./profile-layers.js";
+import { adoOrganization, profileProblem, trackerKey } from "./profile.js";
 import { gitToplevel } from "./wait.js";
 // What a tracker verb run in-process (no daemon) needs: the project of the checkout it runs in, and
 // the machine's accounts. `conduct note` and `conduct brief` share it.
 // The profile of the checkout around `cwd`, when `key` (an item key, checked already) is one of its
 // items; else why not, after `why` (why it runs here), for the verb's refusal. `purpose` ends the
 // sentence: "post it from", "read it from".
-export async function checkoutProject(cwd, key, why, purpose) {
+export async function checkoutProject(paths, cwd, key, why, purpose) {
     const checkout = await gitToplevel(cwd);
     if (checkout === null)
         return { refusal: `${why}, and this isn't a project checkout to ${purpose}` };
     let profile;
     try {
-        profile = readProfile(checkout).profile;
+        profile = profileHere(checkout, paths);
     }
-    catch {
-        return { refusal: `${why}, and ${checkout} has no readable ${PROFILE_FILE}` };
+    catch (error) {
+        return { refusal: `${why}, and ${checkout} has no readable profile: ${profileProblem(error)}` };
     }
     if (key.split('-')[0] !== trackerKey(profile).toUpperCase())
         return { refusal: `${why}, and ${key} isn't an item of ${profile.name}, this checkout's project` };

package/build/in-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"in-process.js","sourceRoot":"","sources":["../src/in-process.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAoB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAgB,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,oGAAoG;AACpG,uEAAuE;AAEvE,oGAAoG;AACpG,kGAAkG;AAClG,4CAA4C;AAC5C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,GAAW,EACX,GAAW,EACX,OAAe;IAEf,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,0CAA0C,OAAO,EAAE,EAAE,CAAC;IACrG,IAAI,OAAgB,CAAC;IACrB,IAAI,CAAC;QACH,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,SAAS,QAAQ,oBAAoB,YAAY,EAAE,EAAE,CAAC;IAChF,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE;QACzD,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,SAAS,GAAG,qBAAqB,OAAO,CAAC,IAAI,2BAA2B,EAAE,CAAC;IACrG,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC;AAED,8FAA8F;AAC9F,kGAAkG;AAClG,4BAA4B;AAC5B,MAAM,UAAU,gBAAgB,CAAC,KAAqB,EAAE,KAAmC;IACzF,OAAO,mBAAmB,CAAC;QACzB,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9E,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ;KAC5C,CAAC,CAAC;AACL,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,kBAAkB,CAAC,KAAkC;IACnE,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC;QACtF,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"in-process.js","sourceRoot":"","sources":["../src/in-process.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAoB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAgB,cAAc,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,oGAAoG;AACpG,uEAAuE;AAEvE,oGAAoG;AACpG,kGAAkG;AAClG,4CAA4C;AAC5C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAuC,EACvC,GAAW,EACX,GAAW,EACX,GAAW,EACX,OAAe;IAEf,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,0CAA0C,OAAO,EAAE,EAAE,CAAC;IACrG,IAAI,OAAgB,CAAC;IACrB,IAAI,CAAC;QACH,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,SAAS,QAAQ,6BAA6B,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAClG,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE;QACzD,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,SAAS,GAAG,qBAAqB,OAAO,CAAC,IAAI,2BAA2B,EAAE,CAAC;IACrG,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC;AAED,8FAA8F;AAC9F,kGAAkG;AAClG,4BAA4B;AAC5B,MAAM,UAAU,gBAAgB,CAAC,KAAqB,EAAE,KAAmC;IACzF,OAAO,mBAAmB,CAAC;QACzB,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9E,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ;KAC5C,CAAC,CAAC;AACL,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,kBAAkB,CAAC,KAAkC;IACnE,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC;QACtF,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC"}

package/build/inbox.js

@@ -3,8 +3,10 @@ import { formatCondition, parseCondition } from "./conditions.js";
 import { loginText } from "./credentials.js";
 import { ConductorError } from "./errors.js";
 import { inboxLinkSchema, link, uniqueLinks } from "./links.js";
-import { handoffKindSchema, renamedTo } from "./protocol.js";
+import { handoffKindSchema } from "./protocol.js";
+import { RELEASE_GATES, releaseAsk, releaseGate } from "./release-kinds.js";
 import { resolveOpenWait } from "./resolve.js";
+import { refusalProblems } from "./rules-service.js";
 import { formatTokens } from "./spend.js";
 import {} from "./store.js";
 import { describePending, pendingCallSchema } from "./transcript.js";
@@ -33,10 +35,10 @@ export const UNWATCHED_HANDOFFS = new Set([
     'scope',
 ]);
 // The phases that close a gate besides its own condition. A merge waits for the PR, so a Progress
-// note while it waits leaves it open.
+// note while it waits leaves it open; a release's gate (npm-otp) closes once the worker goes on.
 const GATE_PHASES = {
+    ...Object.fromEntries(RELEASE_GATES.map((gate) => [gate, ['Resumed', 'Landed', 'Done']])),
     merge: ['Landed', 'Done'],
-    'npm-otp': ['Resumed', 'Landed', 'Done'],
     plan: ['Plan approved'],
 };
 // How a merge item resolves while its PR's checks are red; green checks raise it again.
@@ -75,10 +77,17 @@ const loginData = z.looseObject({
     command: z.string(),
     error: z.string().nullable().optional(),
     label: z.string(),
+    // The ADO organization a machine token's spell is kept to (ATK-536).
+    organization: z.string().optional(),
     provider: z.string(),
 });
 const ignoredData = z.looseObject({ author: z.string(), kind: z.enum(['approve', 'revise']) });
-const rulesData = z.looseObject({ file: z.string(), problems: z.array(z.string()).optional() });
+// `upgrade`: the command a profile written for a newer conductor needs (ProfileTooNewError).
+const rulesData = z.looseObject({
+    file: z.string(),
+    problems: z.array(z.string()).optional(),
+    upgrade: z.string().optional(),
+});
 const waitData = z.looseObject({
     // A PR's settled checks, on a checks wait (watchers/index.ts).
     checks: z.string().optional(),
@@ -95,9 +104,15 @@ const checksData = z.looseObject({
 });
 const workerData = z.looseObject({
     error: z.string().optional(),
-    // The worktree a retire kept, because its PR hadn't merged (worker.retired).
+    // The worktree a retire kept, because its PR hadn't merged (worker.retired), and the repository it
+    // belongs to: the project's clone, or for one made before clones the person's checkout.
     kept: z
-        .looseObject({ branch: z.string().nullable(), reason: z.string(), worktree: z.string() })
+        .looseObject({
+        branch: z.string().nullable(),
+        reason: z.string(),
+        repo: z.string().nullable().optional(),
+        worktree: z.string(),
+    })
         .optional()
         .catch(undefined),
     kind: z.string().optional(),
@@ -134,10 +149,10 @@ export function inboxLines(items, now) {
         ...i.links.map((l) => `    ${l.label}: ${l.href}`),
     ]);
 }
-// The inbox (design note, section 7): everything that waits on Jason, raised from phase notes,
+// The inbox (design note, section 7): everything that waits on the operator, raised from phase notes,
 // waits and session events, each with its exact commands and links. Items resolve themselves when
 // their condition is seen (the approval comment, the PR merged, the version on its tag, a later
-// note), or when Jason answers one (`conduct approve`, `revise`, `done`).
+// note), or when the operator answers one (`conduct approve`, `revise`, `done`).
 export function inboxService({ onWaitResolved, store, tracker }) {
     // Items whose approve or revise comment is being posted.
     const answering = new Set();
@@ -261,6 +276,8 @@ export function inboxService({ onWaitResolved, store, tracker }) {
         // The worker waits on something now, so it isn't idle. A park that keeps failing still is.
         resolveAll(openOf(worker, ['stall']).filter((i) => !isParkStall(i)), `waiting on ${text}`);
         const condition = conditionOf(text);
+        // A wait on a release (an npm version on its dist-tag) holds its kind's gate (release-kinds.ts).
+        const asked = condition && event.subject !== null ? releaseAsk(condition, event.subject) : null;
         if (condition?.kind === 'approval') {
             gate(event.project, condition.item, 'plan', text, worker, () => ({
                 commands: planCommands(condition.item),
@@ -268,15 +285,11 @@ export function inboxService({ onWaitResolved, store, tracker }) {
                 text: planText(condition.item),
             }));
         }
-        else if (condition?.kind === 'npm' && event.subject !== null) {
-            gate(event.project, event.subject, 'npm-otp', text, worker, () => ({
-                commands: [],
-                links: [],
-                text: `approve the npm stage of ${condition.package}@${condition.version} (${condition.tag}); the npm stage approve line is on ${event.subject}`,
-            }));
+        else if (asked !== null) {
+            gate(event.project, asked.item, asked.gate, text, worker, () => ({ commands: [], links: [], text: asked.text }));
         }
         else if (condition?.kind === 'pr' && condition.on === 'merged') {
-            // A merge is Jason's only when a note said so; the wait just names its PR.
+            // A merge is the operator's only when a note said so; the wait just names its PR.
             for (const open of openOn(event.project, event.subject, ['merge'])) {
                 if (open.condition === null)
                     store.setInboxCondition(open.id, text);
@@ -288,7 +301,7 @@ export function inboxService({ onWaitResolved, store, tracker }) {
     const gate = (project, item, kind, condition, worker, fresh) => {
         const open = openOn(project, item, [kind]);
         if (open.length === 0) {
-            // Jason approved the plan before its worker waited on it: the comment is there, and the
+            // The operator approved the plan before its worker waited on it: the comment is there, and the
             // watcher resolves this wait on its next pass. A new Plan note raises a new item anyway.
             const latest = store.latestInbox(project, item, kind);
             if (kind === 'plan' && latest?.resolvedBy?.startsWith('approve (conduct approve'))
@@ -304,9 +317,10 @@ export function inboxService({ onWaitResolved, store, tracker }) {
             raise({ ...fresh(), condition, item, kind, project, worker });
             return;
         }
-        // The newest npm wait is the version that waits: a stage that failed is replaced by the next.
+        // A release's newest wait is the version that waits: a stage that failed is replaced by the next.
+        const release = RELEASE_GATES.includes(kind);
         for (const o of open)
-            if (o.condition === null || kind === 'npm-otp')
+            if (o.condition === null || release)
                 store.setInboxCondition(o.id, condition);
     };
     // The item's open merge items for a PR, and its open checks failures on it.
@@ -328,11 +342,12 @@ export function inboxService({ onWaitResolved, store, tracker }) {
             return;
         const { checks, condition: text, resolution = text, worker } = data.data;
         const condition = conditionOf(text);
+        const release = condition ? releaseGate(condition.kind) : null;
         if (condition?.kind === 'approval') {
             resolveAll(openOn(event.project, condition.item, ['plan']), resolution);
         }
-        else if (condition?.kind === 'npm') {
-            resolveAll(openOn(event.project, event.subject, ['npm-otp']).filter((i) => i.condition === null || i.condition === text), resolution);
+        else if (release !== null) {
+            resolveAll(openOn(event.project, event.subject, [release]).filter((i) => i.condition === null || i.condition === text), resolution);
         }
         else if (condition?.kind === 'pr' && /^pr \S+ (merged|abandoned|closed unmerged)\b/.test(resolution)) {
             // Right after the PR, so a check named "… merged …" in a checks line isn't the PR merging.
@@ -351,7 +366,7 @@ export function inboxService({ onWaitResolved, store, tracker }) {
         }
     };
     // A PR's required checks failed (watchers/index.ts): a failure with each run's link, and the
-    // PR's merge held, so nothing asks Jason to merge it while it is red. One failure per PR.
+    // PR's merge held, so nothing asks the operator to merge it while it is red. One failure per PR.
     const onChecksFailed = (event) => {
         const data = checksData.safeParse(event.data);
         if (!data.success || event.subject === null)
@@ -412,16 +427,16 @@ export function inboxService({ onWaitResolved, store, tracker }) {
             worker,
         });
     };
-    // A lost provider login (logins.ts): one item per provider and account, however many projects
-    // and calls find it, resolved when the login works again. Spells live in memory, so a restart
+    // A lost provider login (logins.ts): one item per provider and account (and organization, for a
+    // machine ADO token), however many projects and calls find it, resolved when the login works again. Spells live in memory, so a restart
     // resolves the items (start) and a login still lost raises its item again.
     const logins = new Map();
     const onLogin = (event) => {
         const data = loginData.safeParse(event.data);
         if (!data.success)
             return;
-        const { account, command, error = null, label, provider } = data.data;
-        const key = `${provider}:${account}`;
+        const { account, command, error = null, label, organization = null, provider } = data.data;
+        const key = organization === null ? `${provider}:${account}` : `${provider}:${account} ${organization}`;
         const open = logins.get(key);
         const item = open === undefined ? null : store.getInbox(open);
         if (event.kind === 'provider.login-restored') {
@@ -439,33 +454,37 @@ export function inboxService({ onWaitResolved, store, tracker }) {
             kind: 'login',
             links: [],
             project: event.project,
-            text: `${loginText({ label, provider }, event.project)}${error ? `: ${error.slice(0, 120)}` : ''}`,
+            text: `${loginText({ label, provider }, event.project, organization)}${error ? `: ${error.slice(0, 120)}` : ''}`,
             worker: null,
         });
         logins.set(key, raised.id);
     };
-    // A rules file the conductor refused waits on Jason until it loads again; the last good rules
+    // A rules file the conductor refused waits on the operator until it loads again; the last good rules
     // (a project's whole last good profile, when it has one) stay in force meanwhile. One item per
     // file, found by its link.
     const openRules = (file) => store.openInbox().filter((i) => isRulesItem(i) && i.links[0]?.href === file);
+    // A project's profile loading clears every refusal of it, whichever of its files that one named
+    // (its machine profile, its repo layer, or the checkout it was registered by before clones).
+    const openProfile = (project) => store.openInbox().filter((i) => isRulesItem(i) && i.project === project && i.links[0]?.label === 'profile');
     const onRules = (event) => {
         const data = rulesData.safeParse(event.data);
         if (!data.success)
             return;
-        const { file, problems = [] } = data.data;
+        const { file, problems = [], upgrade } = data.data;
         if (event.kind === 'rules.loaded') {
-            resolveAll(openRules(file), 'the rules loaded');
+            const loaded = [...openRules(file), ...(event.project === null ? [] : openProfile(event.project))];
+            resolveAll([...new Map(loaded.map((i) => [i.id, i])).values()], 'the rules loaded');
             return;
         }
         resolveAll(openRules(file), 'refused again');
         raise({
-            commands: [RULES_COMMAND],
+            commands: [RULES_COMMAND, ...(upgrade === undefined ? [] : [upgrade])],
             condition: null,
             item: null,
             kind: 'failed',
             links: [link(file, event.project === null ? 'rules' : 'profile')],
             project: event.project,
-            text: `${file} was refused, so ${event.project === null ? 'its last good rules stay in force' : 'the project stays on its last good profile, if it has one'}: ${problems.slice(1).join('; ') || (problems[0] ?? 'see conduct rules')}`,
+            text: `${file} was refused, so ${event.project === null ? 'its last good rules stay in force' : 'the project stays on its last good profile, if it has one, and launches nothing until it loads'}: ${refusalProblems(problems).join('; ') || 'see conduct rules'}`,
             worker: null,
         });
     };
@@ -485,7 +504,7 @@ export function inboxService({ onWaitResolved, store, tracker }) {
         const earlierFailures = () => openOn(event.project, event.subject, ['failed']).filter((i) => i.worker !== null && i.worker !== worker && store.getWorker(i.worker)?.name === name);
         switch (event.kind) {
             case 'worker.compact-failed':
-                // The manager tries a worker once a run (ATK-497): a session it couldn't compact is Jason's
+                // The manager tries a worker once a run (ATK-497): a session it couldn't compact is the operator's
                 // to compact or retire. A rule's own `inbox context` item is another matter.
                 if (compactFailures(worker).length > 0)
                     return;
@@ -553,7 +572,7 @@ export function inboxService({ onWaitResolved, store, tracker }) {
                 // behind on Windows.
                 const { kept } = data.data;
                 if (kept) {
-                    const root = store.listProjects().find((p) => p.name === event.project)?.root;
+                    const root = kept.repo ?? store.listProjects().find((p) => p.name === event.project)?.clone;
                     raise({
                         commands: root
                             ? [
@@ -630,7 +649,7 @@ export function inboxService({ onWaitResolved, store, tracker }) {
             answering.add(id);
             let comment;
             try {
-                // As Jason: the comment carries the key owner's name, and the worker reads it on the tracker.
+                // As the operator: the comment carries the key owner's name, and the worker reads it on the tracker.
                 comment = await tracker.comment(key, body, profile);
             }
             finally {
@@ -647,8 +666,8 @@ export function inboxService({ onWaitResolved, store, tracker }) {
             const profile = profileOf(project);
             let comment;
             try {
-                // As Jason, as `conduct approve` posts it: the worker's approval wait reads it, and the
-                // work skill records it as the conductor's, not his.
+                // As the operator, as `conduct approve` posts it: the worker's approval wait reads it, and the
+                // work skill records it as the conductor's, not theirs.
                 comment = await tracker.comment(key, `approve: auto-approved by the conductor: rule "${rule}", at once`, profile);
             }
             catch (error) {
@@ -749,10 +768,9 @@ function mergeIsFor(item, pr) {
     return named.size === 0 || named.has(Number(/#(\d+)$/.exec(pr)?.[1]));
 }
 // The item a note's Handoff kind raises; undefined for `conductor` and for a kind protocol 2 doesn't
-// have. A reader stays lenient: a protocol 1 note a worker posted itself (`jason`) raises what its
-// kind is called now; `conduct note` refuses a new one.
+// have.
 function noteKindOf(kind) {
-    const parsed = handoffKindSchema.safeParse(renamedTo(kind) ?? kind);
+    const parsed = handoffKindSchema.safeParse(kind);
     return parsed.success && parsed.data !== 'conductor' ? NOTE_KINDS[parsed.data] : undefined;
 }
 function planCommands(item) {