mirror of
https://github.com/max-sixty/worktrunk.git
synced 2026-11-21 02:02:55 +08:00
OpenCode 2.3 stopped emitting `session.status` and `session.idle`, the two events the plugin's OpenCode 2 watcher sets markers from, so `wt list` never shows 🤖 or 💬 there. The watcher now also handles `session.execution.started` (🤖) and `succeeded` / `failed` / `interrupted` (💬). Those events carry only a `sessionID`, so the plugin looks the session up with `context.session.get` and marks only when the session's `location.directory` is this instance's worktree and the session has no `parentID`. Without the `parentID` check, a subagent finishing would flip a still-working parent to 💬. The old `session.status` / `session.idle` cases stay for earlier OpenCode 2 hosts, and the OpenCode 1 `server` path is unchanged. The event names and shapes come from OpenCode v2.3.2's source: `packages/schema/src/session-event.ts` defines the four execution events with only `sessionID`, its e2e helper maps `busy`/`idle` onto `execution.started`/`succeeded`, and `Session.Info` carries `location` and `parentID`. I drove `setup()` under Node with a fake context and a fake `wt` that logs its calls. Before this change the event sequence produced only the teardown `clear`. After it, the parent session sets 🤖 then 💬, and execution events from a subagent, from a session in another worktree, and for a deleted session set nothing. The existing OpenCode integration tests pass. Not verified: the plugin running inside a live OpenCode 2.3 host. The reporter tested a near-identical patch live on 2.3.2. What this leaves from #4849: finding 3, the duplicate plugin instances per directory racing on `git config`. That isn't addressed. Both instances write the same marker, the losing write's error is already swallowed, and whether a module-level refcount would even be shared across OpenCode's two loaders isn't something I could check here. Refs #4849 — automated triage Co-authored-by: worktrunk-bot <254187624+worktrunk-bot@users.noreply.github.com>
327 lines
13 KiB
TypeScript
327 lines
13 KiB
TypeScript
// Worktrunk plugin for OpenCode.
|
|
//
|
|
// Tracks OpenCode session activity per branch, showing status markers in `wt list`:
|
|
// 🤖 — agent is working
|
|
// 💬 — agent is waiting for input
|
|
//
|
|
// Under OpenCode 2 it also registers a worktree strategy, so worktrees OpenCode
|
|
// creates and removes go through `wt switch --create` and `wt remove`.
|
|
//
|
|
// Installed globally via: wt config plugins opencode install
|
|
// Or manually: copy to ~/.config/opencode/plugins/worktrunk.ts
|
|
//
|
|
// One file, two plugin runtimes. OpenCode 2 decodes the default export as
|
|
// `{ id, setup }` and loads nothing else — the bare default-exported function
|
|
// this file used to be is rejected without a message. OpenCode 1 reads
|
|
// `{ id, server }` and never looks at `setup`; 1.16 is the floor that matters,
|
|
// where the host began filtering events per plugin instance (the object shape
|
|
// itself loads as far back as 1.14.19). Both ignore the other's key, so
|
|
// a single installed file works either side of the version boundary.
|
|
//
|
|
// The types below are declared locally rather than imported from
|
|
// `@opencode-ai/plugin`: its `Plugin` type means different things in the two
|
|
// versions, and a lone file in the config directory has no package to resolve.
|
|
|
|
import { execFile } from "node:child_process";
|
|
import { existsSync, lstatSync } from "node:fs";
|
|
import { basename, delimiter, join } from "node:path";
|
|
import { promisify } from "node:util";
|
|
|
|
const execute = promisify(execFile);
|
|
|
|
const WORKING = "🤖";
|
|
const WAITING = "💬";
|
|
|
|
// The worktrunk binary, chosen as `plugins/worktrunk/hooks/wt.sh` chooses it.
|
|
// On Windows, `wt` is usually Windows Terminal's app-execution alias, which
|
|
// accepts any arguments, exits 0, and reports the unknown program in a popup
|
|
// window. So prefer `git-wt.exe` there, and never run a `wt` from WindowsApps.
|
|
// `lstat` rather than `exists`: the alias is a reparse point, and it has to be
|
|
// seen for the lookup to stop where Windows' own PATH search would.
|
|
// `undefined` means no worktrunk binary was found.
|
|
function worktrunkBin(): string | undefined {
|
|
if (process.env.WORKTRUNK_BIN) return process.env.WORKTRUNK_BIN;
|
|
if (process.platform !== "win32") return "wt";
|
|
const dirs = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
|
|
const find = (name: string) =>
|
|
dirs
|
|
.map((dir) => join(dir, name))
|
|
.find((path) => {
|
|
try {
|
|
lstatSync(path);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
});
|
|
if (find("git-wt.exe")) return "git-wt.exe";
|
|
const wt = find("wt.exe");
|
|
return wt && !/[\\/]WindowsApps[\\/]/i.test(wt) ? "wt" : undefined;
|
|
}
|
|
|
|
/**
|
|
* Run `wt config state marker …` in this plugin instance's worktree.
|
|
*
|
|
* `cwd` is load-bearing: the marker belongs to the worktree the session is in,
|
|
* not to whatever directory the host process happens to sit in.
|
|
*/
|
|
async function marker(directory: string, args: string[]): Promise<void> {
|
|
const bin = worktrunkBin();
|
|
if (!bin) return;
|
|
try {
|
|
await execute(bin, ["config", "state", "marker", ...args], { cwd: directory });
|
|
} catch {
|
|
// `wt` may be off PATH, or the directory may no longer be a worktree. An
|
|
// activity marker is not worth raising an error into the session over.
|
|
}
|
|
}
|
|
|
|
// --- OpenCode 2 -------------------------------------------------------------
|
|
|
|
type SessionEvent = {
|
|
type: string;
|
|
location?: { directory: string };
|
|
data?: { sessionID?: string; status?: { type?: string } };
|
|
};
|
|
|
|
type Signal = { signal: AbortSignal };
|
|
|
|
type WorktreeDefinition = {
|
|
id: string;
|
|
create(
|
|
input: { sourceDirectory: string; directory: string; branch?: string },
|
|
context: Signal,
|
|
): Promise<{ directory: string }>;
|
|
remove(input: { directory: string; force: boolean }, context: Signal): Promise<void>;
|
|
list(
|
|
sourceDirectory: string,
|
|
context: Signal,
|
|
): Promise<{ directory: string; type: "root" | "worktree" }[]>;
|
|
};
|
|
|
|
type SetupContext = {
|
|
location?: { directory: string };
|
|
session?: {
|
|
get(input: { sessionID: string }): Promise<{ parentID?: string; location?: { directory?: string } }>;
|
|
};
|
|
event?: { subscribe(options?: { signal?: AbortSignal }): AsyncIterable<SessionEvent> };
|
|
worktree?: {
|
|
transform(callback: (editor: { add(definition: WorktreeDefinition): void }) => void): Promise<unknown>;
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Run `wt` and return its stdout, surfacing its stderr as the error message.
|
|
*
|
|
* OpenCode reports a strategy's error to the user, and wt's own message (a
|
|
* dirty worktree, a branch that already exists) says more than the exit code.
|
|
*/
|
|
async function wt(args: string[], { signal }: Signal): Promise<string> {
|
|
const bin = worktrunkBin();
|
|
if (!bin) {
|
|
throw new Error(
|
|
"worktrunk not found on PATH: install it as git-wt.exe, or set WORKTRUNK_BIN; a `wt` from WindowsApps is Windows Terminal",
|
|
);
|
|
}
|
|
try {
|
|
const { stdout } = await execute(bin, args, { signal, maxBuffer: 16 * 1024 * 1024 });
|
|
return stdout;
|
|
} catch (error) {
|
|
const stderr = (error as { stderr?: string }).stderr?.trim();
|
|
throw new Error(stderr || (error instanceof Error ? error.message : String(error)));
|
|
}
|
|
}
|
|
|
|
// OpenCode's own `git` strategy creates a detached checkout at a generated
|
|
// path. This one keeps worktrunk's model instead: each worktree gets a branch,
|
|
// named after the directory OpenCode suggests (the name the user typed, or a
|
|
// generated slug), at the path the `worktree-path` template picks. OpenCode
|
|
// accepts a strategy returning a different directory than it suggested.
|
|
//
|
|
// A dirty worktree fails removal with wt's message. OpenCode only offers to
|
|
// force when the error is its own `Worktree.OperationError` class, which a lone
|
|
// plugin file has no package to import from.
|
|
const strategy: WorktreeDefinition = {
|
|
id: "worktrunk",
|
|
async create({ sourceDirectory, directory, branch }, context) {
|
|
const name = basename(directory);
|
|
// `branch` is the starting ref, not the new branch's name. Reopen a branch
|
|
// that already exists, as the Claude Code hook does, but refuse a starting
|
|
// ref for one rather than silently ignore it.
|
|
let exists = true;
|
|
try {
|
|
await execute("git", ["-C", sourceDirectory, "rev-parse", "--verify", "--quiet", `refs/heads/${name}`], context);
|
|
} catch {
|
|
exists = false;
|
|
}
|
|
if (exists && branch) {
|
|
throw new Error(`Branch ${name} already exists, so it can't start from ${branch}`);
|
|
}
|
|
const args = ["-C", sourceDirectory, "switch", name, "--no-cd", "--format=json"];
|
|
if (!exists) args.push("--create");
|
|
if (branch) args.push("--base", branch);
|
|
const { path } = JSON.parse(await wt(args, context)) as { path: string };
|
|
return { directory: path };
|
|
},
|
|
async remove({ directory, force }, context) {
|
|
// Already gone, whether removed by hand or by `wt remove` itself.
|
|
if (!existsSync(join(directory, ".git"))) return;
|
|
await wt(["-C", directory, "remove", "--foreground", ...(force ? ["--force"] : []), directory], context);
|
|
},
|
|
async list(sourceDirectory, context) {
|
|
const { stdout } = await execute("git", ["-C", sourceDirectory, "worktree", "list", "--porcelain", "-z"], context);
|
|
// Records are NUL-separated fields, each record ending in an empty field.
|
|
// The first record is the main worktree, or the bare repository, which has
|
|
// no checkout to report.
|
|
const entries: { directory: string; type: "root" | "worktree" }[] = [];
|
|
let fields: string[] = [];
|
|
let first = true;
|
|
for (const field of stdout.split("\0")) {
|
|
if (field) {
|
|
fields.push(field);
|
|
continue;
|
|
}
|
|
if (fields.length === 0) continue;
|
|
const path = fields[0].startsWith("worktree ") ? fields[0].slice("worktree ".length) : undefined;
|
|
const skip = fields.some((f) => f === "bare" || f === "prunable" || f.startsWith("prunable "));
|
|
if (path && !skip) entries.push({ directory: path, type: first ? "root" : "worktree" });
|
|
first = false;
|
|
fields = [];
|
|
}
|
|
return entries;
|
|
},
|
|
};
|
|
|
|
// The marker each `session.execution.*` event sets. OpenCode 2.3 replaced
|
|
// `session.status` and `session.idle` with these.
|
|
const EXECUTION_MARKERS = new Map([
|
|
["session.execution.started", WORKING],
|
|
["session.execution.succeeded", WAITING],
|
|
["session.execution.failed", WAITING],
|
|
["session.execution.interrupted", WAITING],
|
|
]);
|
|
|
|
/**
|
|
* Whether an execution event belongs to a top-level session in `directory`.
|
|
*
|
|
* Execution events carry only a session ID, so the session record supplies the
|
|
* worktree. A subagent's session runs its own executions, and its finishing
|
|
* must not mark the worktree as waiting while the parent still works.
|
|
*/
|
|
async function ownsExecution(context: SetupContext, event: SessionEvent, directory: string): Promise<boolean> {
|
|
const sessionID = event.data?.sessionID;
|
|
if (!sessionID || !context.session) return false;
|
|
try {
|
|
const session = await context.session.get({ sessionID });
|
|
return !session.parentID && session.location?.directory === directory;
|
|
} catch {
|
|
// A session deleted in the meantime has nothing left to mark.
|
|
return false;
|
|
}
|
|
}
|
|
|
|
async function setup(context: SetupContext) {
|
|
// A host without worktree strategies passes no `worktree`, including the
|
|
// OpenCode 1.18 loader noted below; activity tracking doesn't depend on it.
|
|
await context.worktree?.transform((editor) => editor.add(strategy));
|
|
|
|
const directory = context.location?.directory;
|
|
const events = context.event;
|
|
// OpenCode 1.18 also calls `setup`, from a second loader that passes neither
|
|
// of these. Its `server` hook below drives the marker there, so bail quietly
|
|
// rather than throwing out of a plugin the host did load.
|
|
if (!directory || !events) return;
|
|
|
|
const controller = new AbortController();
|
|
|
|
const watcher = (async () => {
|
|
for await (const event of events.subscribe({ signal: controller.signal })) {
|
|
const execution = EXECUTION_MARKERS.get(event.type);
|
|
if (execution) {
|
|
if (await ownsExecution(context, event, directory)) await marker(directory, ["set", execution]);
|
|
continue;
|
|
}
|
|
// The event envelope makes `location` optional; the session events below
|
|
// carry one, and skipping the rest keeps each instance to its own worktree.
|
|
if (event.location?.directory !== directory) continue;
|
|
|
|
switch (event.type) {
|
|
// Earlier OpenCode 2 releases emit these instead of `session.execution.*`.
|
|
case "session.status":
|
|
// Status is `idle | busy | retry`. OpenCode 2 marks `session.idle`
|
|
// deprecated in favor of this, so read the status, not the event name.
|
|
await marker(directory, ["set", event.data?.status?.type === "idle" ? WAITING : WORKING]);
|
|
break;
|
|
case "session.idle":
|
|
await marker(directory, ["set", WAITING]);
|
|
break;
|
|
case "session.deleted":
|
|
await marker(directory, ["clear"]);
|
|
break;
|
|
}
|
|
}
|
|
})().catch((error: unknown) => {
|
|
if (!controller.signal.aborted) {
|
|
console.error("Worktrunk activity tracking stopped", error);
|
|
}
|
|
});
|
|
|
|
// Awaiting the watcher before clearing keeps an in-flight `set` from landing
|
|
// after the `clear` and leaving a marker behind.
|
|
return async () => {
|
|
controller.abort();
|
|
await watcher;
|
|
await marker(directory, ["clear"]);
|
|
};
|
|
}
|
|
|
|
// --- OpenCode 1 (1.16+) -----------------------------------------------------
|
|
|
|
type ServerInput = { directory: string };
|
|
type HookInput = { event: { type: string } };
|
|
|
|
function server({ directory }: ServerInput) {
|
|
// The host dispatches `event` without awaiting it, so a `set` can still be
|
|
// running when the teardown below clears. Chaining every call onto one
|
|
// promise is what puts the `clear` last; `disposed` drops the events the
|
|
// host can still deliver, since it unsubscribes after calling `dispose`.
|
|
let pending: Promise<void> = Promise.resolve();
|
|
let disposed = false;
|
|
const enqueue = (args: string[]): Promise<void> => {
|
|
pending = pending.then(() => marker(directory, args));
|
|
return pending;
|
|
};
|
|
|
|
return {
|
|
// The host runs this when it tears the plugin instance down, which is what
|
|
// a normal session exit does. `session.deleted` below only fires when a
|
|
// session is explicitly deleted, so without `dispose` the last `set` stays
|
|
// the final state and `wt list` shows a finished session as still active.
|
|
// Part of the hook interface since 1.16, the floor the `server` path targets.
|
|
dispose: async () => {
|
|
disposed = true;
|
|
await enqueue(["clear"]);
|
|
},
|
|
// OpenCode 1.16+ filters events to this plugin's directory before calling
|
|
// the hook, so there is nothing to match on here. 1.15.x does not — it fans
|
|
// every bus event to every plugin instance — so the marker there follows the
|
|
// worktree the instance was created for, whichever session is active.
|
|
event: async ({ event }: HookInput) => {
|
|
if (disposed) return;
|
|
switch (event.type) {
|
|
case "session.status":
|
|
await enqueue(["set", WORKING]);
|
|
break;
|
|
case "session.idle":
|
|
await enqueue(["set", WAITING]);
|
|
break;
|
|
case "session.deleted":
|
|
await enqueue(["clear"]);
|
|
break;
|
|
}
|
|
},
|
|
};
|
|
}
|
|
|
|
export default { id: "worktrunk", setup, server };
|