@detergent-software/conductor 1.3.0-dev.5 → 1.3.0-dev.6

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Releases are tagged `conductor-v<version>` and staged on npm by `atk-conductor-release` (`pipelines/release-conductor.yml`), which writes each section below. `scripts/check-changelog.mjs` fails when a tag has no section here.
 
+## [1.3.0-dev.6](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTconductor-v1.3.0-dev.5&targetVersion=GTconductor-v1.3.0-dev.6) (2026-10-14)
+
+### Features
+
+* **conductor:** conduct state, branch, checkout and pr create (ATK-454) ([626f9eb](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/626f9eb0fb74f454190888c9e4fb420a642a8766))
+
+### Bug Fixes
+
+* **conductor:** pr help names every check before the push (ATK-454) ([b866334](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/b8663346be93057a499634c35a429b809a2de523))
+* **conductor:** review fixes for the worker verbs (ATK-454) ([6806665](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/68066658c029fab55bdbef56721beb1cb66af810))
+
 ## [1.3.0-dev.5](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTconductor-v1.3.0-dev.4&targetVersion=GTconductor-v1.3.0-dev.5) (2026-10-14)
 
 ### Features

package/README.md

@@ -51,6 +51,13 @@ conduct note <item> <file>        post a phase note on the item and record its p
 conduct brief <item> [--json] [--fresh]
                                   the item's status, links, phase notes and approval, from the tracker (see Briefs)
 conduct wait <condition>          wait for an outside event (see Waits)
+conduct state [--repo <repo>]     the worktree's branch, changes and PR, and its other repos' (see Worker verbs)
+conduct branch <type> <slug> [--item <item>]
+                                  rename worktree-ATK-n to <type>/atk-n-<slug>
+conduct checkout <owner>/<repo> <type> <slug> [--item <item>]
+                                  clone another GitHub repo into .scratch/repos/<repo> for the item
+conduct pr create --title <title> --body-file <file> [--repo <repo>] [--item <item>] [--dry-run]
+                                  check, push and open the worker's PR (see Worker verbs)
 conduct train [<project>] [--dry-run]
                                   merge the waiting skill publishes into one registry PR (see Skill trains)
 conduct ports [<path>] [--prefer <slot>] [--json]
@@ -124,6 +131,13 @@ A brief is kept for 30 seconds. Anything the daemon sees happen to the item drop
 | 3 | no daemon, one without the brief API, or one that couldn't read the tracker (no key, the tracker down) | reads the item from the tracker itself (the Linear MCP, or the work skill's helper) |
 | 1 | refused: no project tracks the item, or the tracker has no such item | reads the message |
 
+## Worker verbs
+
+Protocol 2's verbs on git and the code host (providers design note, section 4), run in the item's worktree. They come beside the work-item helper's `state`, `rename`, `checkout` and `pr-create`, which stay until the cutover (ATK-457). Each prints one JSON object with `via`: `daemon` when the daemon wrote for the worker that owns the checkout, `local` when it ran in the `conduct` process (no daemon, or one without the route). Exit codes: 0 done, 1 refused or failed (the message says why), 5 a lost login (run `conduct wait login <provider>` and end the turn).
+
+- `conduct state`, `conduct branch` and `conduct checkout` are git in the worktree, so they always run here. `state` reads the branch's PR as the project's account (see Accounts). `checkout` clones another GitHub repo into `.scratch/repos/<repo>`, keeps it out of the worktree's git status, and retire checks it for unpushed or uncommitted work (ATK-429).
+- `conduct pr create` checks everything before it pushes, `--dry-run` included: the title carries the item key, the branch carries it too and isn't the base, the description fits the host (ADO 4,000 characters, GitHub 65,536), no PR is open from the branch yet, nothing is uncommitted, the branch is ahead of its base, and commitlint passes (skipped in a clone without it installed, whose own CI lints the PR). Then it pushes from the checkout and has the daemon open the PR (`POST /workers/:id/prs`). The daemon checks ownership again from its own records and the worktree, never from the request: the worker is live, the branch the worktree is on now (or the `--repo` checkout's) carries the worker's item, and the title carries it. It records the PR on the worker (`pr`; another repo's only while the worker has none) and logs `code-host.pr-created`. `conduct branch` renames only the item's own branch, never the base, `main` or another item's. `--repo` takes `github:<owner>/<repo>` (from its `.scratch/repos` checkout, into its default branch) or `ado:<repository>`; the profile's `codeHost` is the default.
+
 ## Inbox
 
 The `inbox` table holds everything that waits on Jason, across projects. Each item records:
@@ -456,8 +470,9 @@ Everything lives in `~/.conductor` (`CONDUCTOR_HOME` overrides it):
 - `POST /console/cache` with `{ "action": "warm" | "cold" | "failed", "contextTokens", "usage": { "cacheRead", "cacheWrite", "input", "output" } | null, "warms" }` or `{ "action": "clear", "contextTokens", "reason" }`: the mod's report on the idle console's prompt cache (see Mod); 201 with the `console.cache` event's id.
 - `GET /fleet`: the workers in flight, with session activity, phase, PR, waits and spend (today, total).
 - `POST /workers` with `{ "item": "ATK-309", "project"?, "probe"?, "prompt"?, "conductor"? }`: launch; answers 202 with the `launching` worker. `GET /workers/:id` shows it with its latest events.
-- `DELETE /workers/:id` (`?force=true`): retire; 409 with the unfinished work when it refuses.
+- `DELETE /workers/:id` (`?force=true`): retire; 409 with the unfinished work (the worktree's, and each `.scratch/repos` checkout's under `checkouts`) when it refuses.
 - `POST /workers/:id/attach`: wake if parked, mark attached, open the tab.
+- `POST /workers/:id/prs` with `{ "title", "body", "repo"? }`: open the worker's PR after the ownership checks (see Worker verbs); 201 with the PR, 409 refused, 503 a lost login (with `login.provider` and `login.command`), 502 the host failed.
 - `POST /items/:id/notes` with `{ "body": "## work-issue · …", "worker"?: 1 }`: post a phase note (see Notes); 201 with the note and the worker. 409 when it won't post it; 502 when the tracker didn't take it, with `posted: "no"` or `"unknown"`.
 - `GET /items/:id/brief` (`?fresh=true`): the item's brief (see Briefs), as `{ "brief": … }`. 404 when the tracker has no such item, 409 when no project tracks it, 502 when the tracker couldn't be read.
 - `GET /inbox`: the open inbox items, oldest first.

package/build/checkout.js

@@ -0,0 +1,139 @@
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { stripVTControlCharacters } from 'node:util';
+import { ConductorError } from "./errors.js";
+import { githubRepoRef } from "./lib/providers/index.js";
+import { outputOf, run } from "./run.js";
+// Git in a worker's checkouts, for the worker verbs and retire: the item's worktree and the other
+// repos it cloned under .scratch/repos/<repo> (`conduct checkout`).
+// Other repos a worker clones into its worktree (`conduct checkout`), each at
+// <worktree>/.scratch/repos/<repo>.
+export const REPOS_DIR = join('.scratch', 'repos');
+export const runGit = (args, cwd) => run('git', args, { cwd, timeoutMs: 120_000 });
+// The commits on HEAD that aren't on origin/<base>, and the ones on origin/<base> that aren't on
+// HEAD, after fetching the base.
+export async function aheadBehind(git, dir, base) {
+    await git(['fetch', '--quiet', 'origin', base], dir);
+    const count = async (range) => Number((await out(git, ['rev-list', '--count', range], dir)) ?? 0);
+    return { ahead: await count(`origin/${base}..HEAD`), behind: await count(`HEAD..origin/${base}`) };
+}
+// The branch a checkout is on now, or null (detached, or not a checkout).
+export async function branchOf(git, dir) {
+    return (await out(git, ['branch', '--show-current'], dir)) || null;
+}
+// A checkout's base: its origin's default branch (refs/remotes/origin/HEAD, which a clone sets).
+export async function checkoutBase(git, dir) {
+    const head = await out(git, ['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'], dir);
+    if (!head)
+        throw new ConductorError(`${dir} has no origin/HEAD`, ['run git remote set-head origin --auto there']);
+    return head.replace(/^origin\//, '');
+}
+// commitlint over every commit the PR will carry, from the checkout's root where its config lives:
+// 'passed', or 'skipped' without a commitlint config. Throws with its output when it fails.
+export async function commitlint(dir, base) {
+    if (!hasCommitlint(dir))
+        return 'skipped (no commitlint config)';
+    // npx is a .cmd on Windows; its arguments are constants and the base branch's name.
+    const result = await run('npx', ['--no-install', 'commitlint', '--from', `origin/${base}`, '--to', 'HEAD'], {
+        cwd: dir,
+        shell: process.platform === 'win32',
+        timeoutMs: 120_000,
+    });
+    if (result.code === 0)
+        return 'passed';
+    const text = stripVTControlCharacters(`${result.stdout}\n${result.stderr}`);
+    // A clone that was never installed (`conduct checkout` doesn't) has the config but not the tool:
+    // its own CI lints the PR.
+    if (/could not determine executable|commitlint: (?:command )?not found|is not recognized/i.test(text)) {
+        return 'skipped (commitlint is not installed here)';
+    }
+    const said = text
+        .split(/\r?\n/)
+        .filter((line) => line.trim() && !line.startsWith('npm notice'))
+        .slice(-30);
+    throw new ConductorError(`commitlint failed over origin/${base}..HEAD`, said);
+}
+// Whether HEAD has commits its upstream hasn't (or it has no upstream yet).
+export async function needsPush(git, dir) {
+    const upstream = await out(git, ['rev-parse', '--abbrev-ref', '@{upstream}'], dir);
+    if (!upstream)
+        return true;
+    return (await out(git, ['rev-list', '--count', `${upstream}..HEAD`], dir)) !== '0';
+}
+// The other repos checked out under the worktree's .scratch/repos/, with the repo each origin names.
+export async function otherCheckouts(git, worktree) {
+    return Promise.all(scratchClones(worktree).map(async (dir) => ({
+        dir,
+        repo: githubRepoRef(await out(git, ['remote', 'get-url', 'origin'], dir)),
+    })));
+}
+// `git status --porcelain=v1 -z` as { code, path }. A rename or copy carries its source path as the
+// next NUL-separated field.
+export function parsePorcelain(text) {
+    const fields = text.split('\0');
+    const entries = [];
+    for (let i = 0; i < fields.length; i++) {
+        const field = fields[i] ?? '';
+        if (field.length < 4)
+            continue;
+        const code = field.slice(0, 2);
+        entries.push({ code, path: field.slice(3) });
+        if (code[0] === 'R' || code[0] === 'C')
+            i++;
+    }
+    return entries;
+}
+// Pushes the branch with an upstream, once more after a failure: a push has failed on a connection
+// reset before.
+export async function push(git, dir, branch, sleep = (ms) => new Promise((done) => setTimeout(done, ms))) {
+    const args = ['push', '--quiet', '-u', 'origin', branch];
+    const first = await git(args, dir);
+    if (first.code === 0)
+        return { attempts: 1 };
+    await sleep(5_000);
+    const second = await git(args, dir);
+    if (second.code === 0)
+        return { attempts: 2, firstError: outputOf(first, 300) };
+    throw new ConductorError(`git push of ${branch} failed twice`, [outputOf(second, 500)]);
+}
+// Uncommitted changes, without files whose only difference from HEAD is their line endings (a
+// checkout with core.autocrlf can show those as modified).
+export async function realDirty(git, dir) {
+    const status = await git(['status', '--porcelain=v1', '-z'], dir);
+    if (status.code !== 0)
+        throw new ConductorError(`git status failed in ${dir}`, [outputOf(status, 300)]);
+    const dirty = [];
+    const lineEndingOnly = [];
+    for (const entry of parsePorcelain(status.stdout)) {
+        const same = /^[ M][ M]$/.test(entry.code) &&
+            (await git(['diff', '--quiet', '--ignore-cr-at-eol', 'HEAD', '--', entry.path], dir)).code === 0;
+        (same ? lineEndingOnly : dirty).push(entry.path);
+    }
+    return { dirty, lineEndingOnly };
+}
+// The clones under the worktree's .scratch/repos/, by directory.
+export function scratchClones(worktree) {
+    const root = join(worktree, REPOS_DIR);
+    if (!existsSync(root))
+        return [];
+    return readdirSync(root, { withFileTypes: true })
+        .filter((entry) => entry.isDirectory() && existsSync(join(root, entry.name, '.git')))
+        .map((entry) => join(root, entry.name));
+}
+function hasCommitlint(dir) {
+    const configured = readdirSync(dir).some((name) => /^(?:commitlint\.config\.[cm]?[jt]s|\.commitlintrc(?:\.(?:json|ya?ml|[cm]?[jt]s))?)$/.test(name));
+    if (configured)
+        return true;
+    try {
+        return 'commitlint' in JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
+    }
+    catch {
+        return false;
+    }
+}
+// A git command's output, trimmed, or null when it failed.
+async function out(git, args, dir) {
+    const result = await git(args, dir);
+    return result.code === 0 ? result.stdout.trim() : null;
+}
+//# sourceMappingURL=checkout.js.map

package/build/checkout.js.map

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

package/build/cli.js

@@ -8,6 +8,7 @@ import { z } from 'zod';
 import { briefCommand } from "./brief-cli.js";
 import { heldLocks, lockCommand, lockLine, portsCommand } from "./broker-cli.js";
 import { callApi, NotRunningError, ping, readEndpoint } from "./client.js";
+import { branchCommand, checkoutCommand, prCreateCommand, stateCommand } from "./code-host-cli.js";
 import { configSchema, loadConfig } from "./config.js";
 import { claimConsole, CONSOLE_ARGS, CONSOLE_WINDOW, consoleProject, consoleTabArgs, escalationLines, escalationSchema, handledSchema, } from "./console.js";
 import { AlreadyRunningError, logCrashes, startDaemon } from "./daemon.js";
@@ -63,15 +64,18 @@ const workerDetailBody = z.object({
     events: z.array(z.object({ data: z.record(z.string(), z.unknown()), kind: z.string() })),
     worker: workerSchema,
 });
+const workSchema = z.object({
+    dirty: z.array(z.string()).optional(),
+    unknown: z.string().optional(),
+    unpushed: z.number().optional(),
+});
 const retireBody = z.object({
     outcome: z.enum(['partial', 'refused', 'retired']),
     reason: z.string().optional(),
     steps: z
         .array(z.object({ error: z.string().optional(), note: z.string().optional(), ok: z.boolean(), step: z.string() }))
         .optional(),
-    work: z
-        .object({ dirty: z.array(z.string()).optional(), unknown: z.string().optional(), unpushed: z.number().optional() })
-        .optional(),
+    work: workSchema.extend({ checkouts: z.record(z.string(), workSchema).optional() }).optional(),
     worker: workerSchema,
 });
 const attachBody = z.object({ resumed: z.boolean(), tab: z.string().nullable(), worker: workerSchema });
@@ -421,6 +425,7 @@ async function main(argv) {
         args: argv,
         options: {
             'allow-downgrade': { type: 'boolean' },
+            'body-file': { type: 'string' },
             channel: { type: 'string' },
             conductor: { type: 'string' },
             console: { type: 'boolean' },
@@ -431,6 +436,7 @@ async function main(argv) {
             fresh: { type: 'boolean' },
             help: { short: 'h', type: 'boolean' },
             here: { type: 'boolean' },
+            item: { type: 'string' },
             json: { type: 'boolean' },
             kind: { type: 'string' },
             owner: { type: 'string' },
@@ -440,10 +446,12 @@ async function main(argv) {
             prompt: { type: 'string' },
             raise: { type: 'boolean' },
             remove: { type: 'boolean' },
+            repo: { type: 'string' },
             since: { type: 'string' },
             slots: { type: 'string' },
             tag: { type: 'string' },
             text: { type: 'string' },
+            title: { type: 'string' },
             until: { type: 'string' },
             version: { short: 'v', type: 'boolean' },
             wait: { type: 'string' },
@@ -452,7 +460,9 @@ async function main(argv) {
         },
     }));
     const paths = conductorPaths();
-    const [command, sub, arg] = positionals;
+    const [command, sub, arg, fourth] = positionals;
+    const item = values.item === undefined ? {} : { item: values.item };
+    const repo = values.repo === undefined ? {} : { repo: values.repo };
     if (values.version)
         return out(version());
     if (command === undefined || command === 'help')
@@ -470,6 +480,11 @@ async function main(argv) {
             if (sub === undefined)
                 throw usageError('attach');
             return attach(paths, sub);
+        case 'branch':
+            if (sub === undefined || arg === undefined)
+                throw usageError('branch');
+            process.exitCode = await branchCommand(sub, arg, item, verbIo());
+            return;
         case 'brief':
             if (sub === undefined)
                 throw usageError('brief');
@@ -478,6 +493,11 @@ async function main(argv) {
                 out,
             });
             return;
+        case 'checkout':
+            if (sub === undefined || arg === undefined || fourth === undefined)
+                throw usageError('checkout');
+            process.exitCode = await checkoutCommand(sub, arg, fourth, item, verbIo());
+            return;
         case 'console':
             return consoleCommand(paths, {
                 force: values.force === true,
@@ -496,6 +516,16 @@ async function main(argv) {
             // CONDUCTOR_CONSOLE as well: a console still running a mod from before --console (until
             // /reload-plugins after an upgrade) starts this package's new build, in the console's env.
             return events(paths, values.follow === true, values.since, values.console === true || process.env.CONDUCTOR_CONSOLE === '1');
+        case 'focus':
+            if (sub === undefined || values.until === undefined)
+                throw usageError('focus');
+            return override(paths, {
+                action: 'focus',
+                project: sub,
+                ...(values.slots === undefined ? {} : { slots: wholeNumber('--slots', values.slots) }),
+                until: untilOf(values.until),
+                ...(values.weight === undefined ? {} : { weight: wholeNumber('--weight', values.weight) }),
+            });
         case 'history':
         case 'retro':
             return history(paths, command, sub, {
@@ -547,22 +577,11 @@ async function main(argv) {
             if (sub === 'test')
                 return notifyTest(paths, { channel: values.channel, kind: values.kind, raise: values.raise === true });
             throw usageError('notify');
-        case 'project':
-            if (sub === 'add' && arg !== undefined)
-                return addProject(paths, arg);
-            if (sub === 'list')
-                return listProjects(paths, values.json === true);
-            throw usageError('project');
-        case 'focus':
-            if (sub === undefined || values.until === undefined)
-                throw usageError('focus');
-            return override(paths, {
-                action: 'focus',
-                project: sub,
-                ...(values.slots === undefined ? {} : { slots: wholeNumber('--slots', values.slots) }),
-                until: untilOf(values.until),
-                ...(values.weight === undefined ? {} : { weight: wholeNumber('--weight', values.weight) }),
-            });
+        case 'pr':
+            if (sub !== 'create' || values.title === undefined || values['body-file'] === undefined)
+                throw usageError('pr');
+            process.exitCode = await prCreateCommand(paths, { bodyFile: values['body-file'], dryRun: values['dry-run'] === true, title: values.title, ...item, ...repo }, verbIo());
+            return;
         case 'pause':
             return override(paths, {
                 action: 'pause',
@@ -575,6 +594,12 @@ async function main(argv) {
                 ...(values.prefer === undefined ? {} : { prefer: wholeNumber('--prefer', values.prefer) }),
             }, brokerIo());
             return;
+        case 'project':
+            if (sub === 'add' && arg !== undefined)
+                return addProject(paths, arg);
+            if (sub === 'list')
+                return listProjects(paths, values.json === true);
+            throw usageError('project');
         case 'queue':
             return queue(paths, values.json === true, values.fresh === true);
         case 'rules':
@@ -591,6 +616,11 @@ async function main(argv) {
             return serve(paths);
         case 'start':
             return start(paths);
+        case 'state':
+            if (sub !== undefined)
+                throw usageError('state');
+            process.exitCode = await stateCommand(paths, repo, verbIo());
+            return;
         case 'status':
             return status(paths, values.json === true);
         case 'stop':
@@ -814,10 +844,14 @@ async function retire(paths, ref, force) {
     const result = parsed.data;
     const steps = (result.steps ?? []).map((s) => `${s.step}: ${s.ok ? `ok${s.note ? ` (${s.note})` : ''}` : `failed (${s.error ?? '?'})`}`);
     if (result.outcome === 'refused') {
+        const lines = (w, where = '') => [
+            ...(w?.unpushed ? [`${where}${w.unpushed} unpushed commit(s)`] : []),
+            ...(w?.dirty ? [`${where}uncommitted: ${w.dirty.join(', ')}`] : []),
+            ...(w?.unknown ? [`${where}not checked: ${w.unknown}`] : []),
+        ];
         const work = [
-            ...(result.work?.unpushed ? [`${result.work.unpushed} unpushed commit(s)`] : []),
-            ...(result.work?.dirty ? [`uncommitted: ${result.work.dirty.join(', ')}`] : []),
-            ...(result.work?.unknown ? [`not checked: ${result.work.unknown}`] : []),
+            ...lines(result.work),
+            ...Object.entries(result.work?.checkouts ?? {}).flatMap(([name, w]) => lines(w, `.scratch/repos/${name}: `)),
         ];
         throw new ConductorError(`refused to retire ${worker.name}: ${result.reason ?? ''}`, work);
     }
@@ -1146,6 +1180,9 @@ async function upgradeCommand(paths, tag, allowDowngrade) {
         stopDaemon: () => stopDaemon(paths),
     });
 }
+function verbIo() {
+    return { cwd: process.cwd(), err: (line) => process.stderr.write(`${line}\n`), out };
+}
 // Read from disk each time: upgrade asks again after npm has replaced the package.
 function version() {
     const file = fileURLToPath(new URL('../package.json', import.meta.url));