The Co-Founder beforeToolCall hook (introduced in 77f81a7) gated every
non-readonly pi tool call as a `dangerous_command` approval. Because
agents call `POST /api/companies/:id/messages`, `/agents` (hire), and
every other company mutation via bash→node/curl, the first bash call in
every Co-Founder run got parked on a 30-minute approval timeout. Users
observed it as "agents never talk to each other" and "every bash command
waits for approval"; both symptoms are the same bug.
The business-level approval flow (`hire_agent`, `document_review`,
`plan_review`, etc. in execution-policy.ts) already gates the events
users actually care about, at the HTTP route layer where the event
originates (routes-agents.ts:368 for hiring, document routes for
deliverables). Stacking a pi-level hook on top was duplicate gating with
the wrong taxonomy.
Removed:
- src/main/agent-runtime/approval-hook.ts (entire file, 137 LOC)
- `beforeToolCall` conditional in worker-runner.ts and the
corresponding RPC method in worker-types.ts and runtime-bridge.ts
- `approvalHook` field + `resolveApproval` callback + shutdown
`cancelAll` in runtime-bridge.ts / service-graph-pi-runtime.ts /
wire-api-server.ts
Unchanged:
- `dangerous_command` approval type itself (still used by automation
workflows and routes-misc.ts)
- CEO mode (already never attached the hook)
- All business-level approval types and their wiring
209 lines
7.6 KiB
TypeScript
209 lines
7.6 KiB
TypeScript
import { Agent } from "@mariozechner/pi-agent-core";
|
|
import type { AgentMessage } from "@mariozechner/pi-agent-core";
|
|
import { streamSimple } from "@mariozechner/pi-ai";
|
|
import { createCodingTools } from "@mariozechner/pi-coding-agent";
|
|
import { resolveModel, resolveExtraStreamHeaders } from "../model-resolver";
|
|
import type { RunStatus } from "@shared/types";
|
|
import type { ChildMessage, RunJob } from "./worker-helpers";
|
|
import { applyEnvOverrides, buildRedactor } from "./worker-helpers";
|
|
import type { WorkerRpcClient } from "./worker-rpc";
|
|
|
|
interface PrepareRunResult {
|
|
provider: string;
|
|
apiKey: string;
|
|
extraEnv: Record<string, string>;
|
|
priorMessages: AgentMessage[];
|
|
}
|
|
|
|
interface RunnerDeps {
|
|
post: (message: ChildMessage) => void;
|
|
rpc: WorkerRpcClient;
|
|
isCancelled: (runId: string) => boolean;
|
|
}
|
|
|
|
export class WorkerRunner {
|
|
private readonly abortControllers = new Map<string, AbortController>();
|
|
private readonly runPromises = new Map<string, Promise<void>>();
|
|
|
|
constructor(private readonly deps: RunnerDeps) {}
|
|
|
|
cancel(runId: string): void {
|
|
const controller = this.abortControllers.get(runId);
|
|
if (controller) controller.abort();
|
|
}
|
|
|
|
/**
|
|
* Aborts every in-flight run and returns a promise that resolves once
|
|
* each `run()` has settled (success, failure, or abort). Callers (the
|
|
* worker shutdown handler) must `await` this before `process.exit` so
|
|
* pending `persistMessage` RPCs and the final `run-finished` post reach
|
|
* the parent before the worker dies.
|
|
*/
|
|
async cancelAll(): Promise<void> {
|
|
for (const controller of this.abortControllers.values()) {
|
|
controller.abort();
|
|
}
|
|
const pending = [...this.runPromises.values()];
|
|
this.abortControllers.clear();
|
|
await Promise.allSettled(pending);
|
|
}
|
|
|
|
run(job: RunJob): Promise<void> {
|
|
const promise = this.runImpl(job).finally(() => {
|
|
this.runPromises.delete(job.runId);
|
|
});
|
|
this.runPromises.set(job.runId, promise);
|
|
return promise;
|
|
}
|
|
|
|
private async runImpl(job: RunJob): Promise<void> {
|
|
const { post, rpc, isCancelled } = this.deps;
|
|
const redact = buildRedactor(job.env);
|
|
const abortController = new AbortController();
|
|
this.abortControllers.set(job.runId, abortController);
|
|
|
|
post({ type: "run-status", runId: job.runId, status: "running", message: `Running agent ${job.agentName}.` });
|
|
|
|
let resolvedModelId: string | null = job.model;
|
|
let finalUsage: { inputTokens: number | null; outputTokens: number | null } = {
|
|
inputTokens: null,
|
|
outputTokens: null,
|
|
};
|
|
let errorMessage: string | null = null;
|
|
|
|
// Inject the AgentCompany job env (AGENT_COMPANY_API_URL / API_KEY /
|
|
// AGENT_ID / COMPANY_ID / RUN_ID / TASK_ID / WAKE_REASON + provider
|
|
// secret bindings) into the worker's process.env BEFORE Agent
|
|
// construction, so the agent's bash-tool children can call back into
|
|
// our HTTP API via fetch(process.env.AGENT_COMPANY_API_URL). Restored
|
|
// in the outer finally regardless of success / abort / throw.
|
|
const restoreJobEnv = applyEnvOverrides(job.env);
|
|
|
|
try {
|
|
if (!job.model) {
|
|
throw new Error(`Run ${job.runId} has no model selected.`);
|
|
}
|
|
|
|
const prepareResponse = await rpc.invoke(job.runId, "prepareRun", {
|
|
connectorId: job.connectorId,
|
|
taskSessionId: job.taskSessionId,
|
|
agentId: job.agentId,
|
|
companyId: job.companyId,
|
|
taskId: job.taskId,
|
|
modelId: job.model,
|
|
});
|
|
if (!prepareResponse.ok) {
|
|
throw new Error(prepareResponse.error);
|
|
}
|
|
const prepared = prepareResponse.result as PrepareRunResult;
|
|
|
|
const restoreProviderEnv = applyEnvOverrides(prepared.extraEnv);
|
|
try {
|
|
const model = resolveModel(prepared.provider, job.model);
|
|
if (!model) {
|
|
throw new Error(`Unknown model ${job.model} for provider ${prepared.provider}.`);
|
|
}
|
|
resolvedModelId = model.id;
|
|
const extraHeaders = resolveExtraStreamHeaders(prepared.provider, prepared.apiKey);
|
|
|
|
const cwd = job.workspacePath ?? process.cwd();
|
|
const tools = createCodingTools(cwd) as never;
|
|
|
|
const agent = new Agent({
|
|
initialState: {
|
|
systemPrompt: job.systemPrompt ?? "",
|
|
model,
|
|
tools,
|
|
messages: prepared.priorMessages,
|
|
},
|
|
streamFn: (m, messages, options) =>
|
|
streamSimple(m, messages, {
|
|
...options,
|
|
apiKey: prepared.apiKey,
|
|
headers: { ...(options?.headers ?? {}), ...(extraHeaders ?? {}) },
|
|
}),
|
|
});
|
|
|
|
const unsubscribe = agent.subscribe(async (event) => {
|
|
const timestamp = new Date().toISOString();
|
|
post({
|
|
type: "agent-event",
|
|
runId: job.runId,
|
|
agentId: job.agentId,
|
|
companyId: job.companyId,
|
|
taskId: job.taskId,
|
|
emittedAt: timestamp,
|
|
event: event as { type: string } & Record<string, unknown>,
|
|
});
|
|
|
|
if (event.type === "message_end" && event.message) {
|
|
await rpc.invoke(job.runId, "persistMessage", {
|
|
taskSessionId: job.taskSessionId,
|
|
message: event.message,
|
|
});
|
|
const maybeAssistant = event.message as { role?: string; usage?: { input?: number; output?: number; cost?: { total?: number } } };
|
|
if (maybeAssistant.role === "assistant" && maybeAssistant.usage) {
|
|
finalUsage = {
|
|
inputTokens: typeof maybeAssistant.usage.input === "number" ? maybeAssistant.usage.input : finalUsage.inputTokens,
|
|
outputTokens: typeof maybeAssistant.usage.output === "number" ? maybeAssistant.usage.output : finalUsage.outputTokens,
|
|
};
|
|
}
|
|
}
|
|
});
|
|
|
|
try {
|
|
const userMessage = job.taskTitle
|
|
? `${job.taskTitle}\n\n${job.taskDescription ?? ""}`.trim()
|
|
: (job.taskDescription ?? "");
|
|
const promptContent = userMessage.length > 0 ? userMessage : "Continue.";
|
|
const promptMessage: AgentMessage = {
|
|
role: "user",
|
|
content: [{ type: "text", text: promptContent }],
|
|
timestamp: Date.now(),
|
|
};
|
|
const runPromise = agent.prompt(promptMessage);
|
|
abortController.signal.addEventListener("abort", () => agent.abort(), { once: true });
|
|
await runPromise;
|
|
} finally {
|
|
unsubscribe();
|
|
}
|
|
} finally {
|
|
restoreProviderEnv();
|
|
}
|
|
} catch (error) {
|
|
errorMessage = error instanceof Error ? error.message : String(error);
|
|
post({ type: "run-log", runId: job.runId, stream: "stderr", chunk: redact(errorMessage) });
|
|
} finally {
|
|
this.abortControllers.delete(job.runId);
|
|
restoreJobEnv();
|
|
}
|
|
|
|
const status: RunStatus = isCancelled(job.runId)
|
|
? "cancelled"
|
|
: errorMessage
|
|
? "failed"
|
|
: "succeeded";
|
|
|
|
post({
|
|
type: "run-finished",
|
|
runId: job.runId,
|
|
status,
|
|
summary: null,
|
|
errorMessage,
|
|
exitCode: null,
|
|
signal: null,
|
|
model: resolvedModelId,
|
|
sessionParams: job.sessionParams,
|
|
sessionDisplayId: null,
|
|
// Worker no longer owns cost attribution — CostWriter (main-side)
|
|
// writes per-message rows, finishRun sums them. This flag stays true
|
|
// only for run paths that never had a chance to emit usage (errors
|
|
// before the first message_end); per-message drift detection belongs
|
|
// elsewhere.
|
|
unattributedCost: finalUsage.inputTokens === null,
|
|
inputTokens: finalUsage.inputTokens,
|
|
outputTokens: finalUsage.outputTokens,
|
|
});
|
|
}
|
|
}
|