Reorganize worker entry layer into worker/entry/ (M8 part 1/3)

Pulls the worker process entry point, parent<->worker IPC plumbing, message validation schema, and crash-recovery handler into a single src/main/worker/entry/ module. No runtime behavior changes — only directory + file-name renames plus import-path updates: worker-entry.ts -> entry/index.ts, worker-message-handler.ts -> entry/message-handler.ts, worker-rpc.ts -> entry/rpc.ts, worker-crash-recovery.ts -> entry/crash-recovery.ts, worker-types.ts -> entry/types.ts. electron.vite.config.ts, worker-service.ts, handlers/*.ts, pi-agent-factory.ts, and worker-runner.ts updated to point at the new locations.
This commit is contained in:
ZacharyZhang-NY committed 2026-04-20 11:38:46 -04:00
1 parent 0e6cad7f4c
commit 76d9031a41
11 files changed
+26 -26

No files matched your search

+159
View File
@@ -0,0 +1,159 @@
import type { ChildMessage, ParentMessage, RunJob } from "../worker-helpers";
import { WorkerRpcClient } from "./rpc";
import { WorkerRunner } from "../worker-runner";
const parentPort = process.parentPort;
if (!parentPort) {
throw new Error("AgentCompany worker requires process.parentPort");
}
interface ActiveRun {
runId: string;
agentId: string;
workspaceKey: string | null;
}
/**
* Single source of truth for scheduling invariants: "one agent at a time"
* and "one exclusive-workspace lock at a time". Prior layout kept three
* parallel structures (`activeByAgent`, `activeByWorkspace`, queue) that
* had to be updated in lockstep. The Map-of-ActiveRun keyed by runId is
* the only authoritative record; agent/workspace busy checks iterate it.
*/
const active = new Map<string, ActiveRun>();
const queue: RunJob[] = [];
const cancelledRuns = new Set<string>();
function post(message: ChildMessage) {
parentPort.postMessage(message);
}
const rpc = new WorkerRpcClient(post);
const runner = new WorkerRunner({
post,
rpc,
isCancelled: (runId) => cancelledRuns.has(runId),
});
function workspaceKey(job: RunJob): string | null {
if (job.workspaceMode !== "exclusive") return null;
return job.workspaceId ?? job.workspacePath ?? `task:${job.taskId}`;
}
function isAgentBusy(agentId: string): boolean {
for (const run of active.values()) {
if (run.agentId === agentId) return true;
}
return false;
}
function isWorkspaceBusy(lockKey: string): boolean {
for (const run of active.values()) {
if (run.workspaceKey === lockKey) return true;
}
return false;
}
function enqueue(job: RunJob) {
queue.push(job);
post({
type: "run-status",
runId: job.runId,
status: "queued",
message: "Run queued in orchestration worker.",
});
tickQueue();
}
/**
* Claim-before-dispatch: for each queued job whose agent + workspace are
* free, register the claim in `active` synchronously *before* calling
* `startRun`. No async window between claim and dispatch.
*/
function tickQueue() {
let i = 0;
while (i < queue.length) {
const job = queue[i];
if (isAgentBusy(job.agentId)) { i += 1; continue; }
const lockKey = workspaceKey(job);
if (lockKey && isWorkspaceBusy(lockKey)) { i += 1; continue; }
active.set(job.runId, { runId: job.runId, agentId: job.agentId, workspaceKey: lockKey });
queue.splice(i, 1);
void startRun(job);
}
}
async function startRun(job: RunJob) {
try {
await runner.run(job);
} finally {
cancelledRuns.delete(job.runId);
active.delete(job.runId);
tickQueue();
}
}
function cancelRun(runId: string) {
const queuedIndex = queue.findIndex((entry) => entry.runId === runId);
if (queuedIndex >= 0) {
queue.splice(queuedIndex, 1);
post({
type: "run-finished",
runId,
status: "cancelled",
summary: "Cancelled before execution.",
errorMessage: null,
exitCode: null,
signal: null,
model: null,
unattributedCost: true,
inputTokens: null,
outputTokens: null,
});
return;
}
cancelledRuns.add(runId);
runner.cancel(runId);
}
parentPort.on("message", (event) => {
const message = event.data as ParentMessage;
if (message.type === "enqueue-run") {
enqueue(message.payload);
return;
}
if (message.type === "cancel-run") {
cancelRun(message.runId);
return;
}
if (message.type === "steer-run") {
const accepted = runner.steer(message.runId, message.message);
post({
type: "steer-ack",
runId: message.runId,
correlationId: message.correlationId,
accepted,
});
return;
}
if (message.type === "rpc-response") {
rpc.resolve(message.rpcId, message.response);
return;
}
if (message.type === "shutdown") {
void (async () => {
// Graceful drain: abort every active run and await its promise
// settlement so that final `run-finished` messages and
// `persistMessage` RPCs reach the parent before we exit. Bounded by
// a 5s budget so a stuck run does not wedge the shutdown handshake
// (the parent has its own kill-timer as a safety net).
const drainBudgetMs = 5_000;
const timeout = new Promise<void>((resolve) => setTimeout(resolve, drainBudgetMs));
await Promise.race([runner.cancelAll(), timeout]);
rpc.cancelAll("Worker shutting down.");
process.exit(0);
})();
}
});