@gajae-code/coding-agent 0.3.2 → 0.4.0

package/src/lsp/client.ts

@@ -61,6 +61,10 @@ function stopIdleChecker(): void {
 	}
 }
 
+export function isIdleCheckerActiveForTests(): boolean {
+	return idleCheckInterval !== null;
+}
+
 // =============================================================================
 // Client Capabilities
 // =============================================================================
@@ -919,6 +923,9 @@ export async function sendNotification(client: LspClient, method: string, params
  * Shutdown all LSP clients.
  */
 export async function shutdownAll(): Promise<void> {
+	stopIdleChecker();
+	clientLocks.clear();
+	fileOperationLocks.clear();
 	const clientsToShutdown = Array.from(clients.values());
 	clients.clear();
 	await Promise.allSettled(clientsToShutdown.map(client => shutdownClientInstance(client)));

package/src/modes/acp/acp-agent.ts

@@ -50,6 +50,7 @@ import { clearPluginRootsAndCaches, resolveActiveProjectRegistryPath } from "../
 import type { ExtensionUIContext, ExtensionUIDialogOptions } from "../../extensibility/extensions";
 import { runExtensionCompact } from "../../extensibility/extensions/compact-handler";
 import { getSessionSlashCommands } from "../../extensibility/extensions/get-commands-handler";
+import { resolveSubskillActivationForSkillInvocation } from "../../extensibility/gjc-plugins";
 import {
 	buildSkillPromptMessage,
 	getSkillSlashCommandNames,
@@ -722,7 +723,18 @@ export class AcpAgent implements Agent {
 			for (let index = 0; index < invocations.length; index += 1) {
 				const invocation = invocations[index];
 				if (!invocation) continue;
-				const built = await buildSkillPromptMessage(invocation.skill, invocation.args);
+				const activationResult = await resolveSubskillActivationForSkillInvocation({
+					cwd: record.session.sessionManager.getCwd(),
+					sessionId: record.session.sessionId,
+					skillName: invocation.skill.name,
+					args: invocation.args,
+				});
+				const built = await buildSkillPromptMessage(invocation.skill, activationResult.cleanedArgs, {
+					subskillActivation: activationResult.activation,
+					subskillActivationSet: activationResult.activeSubskillsToPersist,
+					cwd: record.session.sessionManager.getCwd(),
+					sessionId: record.session.sessionId,
+				});
 				if (index === invocations.length - 1) {
 					await record.session.promptCustomMessage({
 						customType: SKILL_PROMPT_MESSAGE_TYPE,
@@ -757,7 +769,18 @@ export class AcpAgent implements Agent {
 		if (!skill || skill.hide === true) {
 			return false;
 		}
-		const built = await buildSkillPromptMessage(skill, args);
+		const activationResult = await resolveSubskillActivationForSkillInvocation({
+			cwd: record.session.sessionManager.getCwd(),
+			sessionId: record.session.sessionId,
+			skillName: skill.name,
+			args,
+		});
+		const built = await buildSkillPromptMessage(skill, activationResult.cleanedArgs, {
+			subskillActivation: activationResult.activation,
+			subskillActivationSet: activationResult.activeSubskillsToPersist,
+			cwd: record.session.sessionManager.getCwd(),
+			sessionId: record.session.sessionId,
+		});
 		await record.session.promptCustomMessage({
 			customType: SKILL_PROMPT_MESSAGE_TYPE,
 			content: built.message,

package/src/modes/bridge/bridge-mode.ts

@@ -1,10 +1,15 @@
+import * as path from "node:path";
 import type { ExtensionUIContext } from "../../extensibility/extensions";
 import type { AgentSession } from "../../session/agent-session";
 import type { ClientBridgePermissionOutcome } from "../../session/client-bridge";
-import type { RpcCommand, RpcResponse } from "../rpc/rpc-types";
+import type { RpcCommand, RpcResponse, RpcWorkflowGateResponse } from "../rpc/rpc-types";
 import { dispatchRpcCommand } from "../shared/agent-wire/command-dispatch";
 import { isRpcCommand } from "../shared/agent-wire/command-validation";
-import { BridgeFrameSequencer, toBridgeEventFrame } from "../shared/agent-wire/event-envelope";
+import {
+	BridgeFrameSequencer,
+	toBridgeEventFrame,
+	toBridgeWorkflowGateFrame,
+} from "../shared/agent-wire/event-envelope";
 import type { BridgeCapability } from "../shared/agent-wire/handshake";
 import {
 	type BridgeHandshakeRequest,
@@ -23,6 +28,9 @@ import {
 } from "../shared/agent-wire/scopes";
 import { UiRequestBroker } from "../shared/agent-wire/ui-request-broker";
 import type { BridgeUiResult } from "../shared/agent-wire/ui-result";
+import { defaultAuditPath, UnattendedAuditLog } from "../shared/agent-wire/unattended-audit";
+import { UnattendedSessionControlPlane } from "../shared/agent-wire/unattended-session";
+import { FileGateStore } from "../shared/agent-wire/workflow-gate-broker";
 import { assertSafeBridgeBind, isBridgeTokenAuthorized } from "./auth";
 import { type BridgePermissionRequestPayload, createBridgeClientBridge } from "./bridge-client-bridge";
 import { BridgeExtensionUIContext, type BridgeUiRequestPayload } from "./bridge-ui-context";
@@ -39,6 +47,7 @@ const SERVER_CAPABILITIES: readonly BridgeCapability[] = [
 	"ui.declarative",
 	"host_tools",
 	"host_uri",
+	"workflow_gate",
 ];
 
 const DEFAULT_BRIDGE_SCOPES: readonly BridgeCommandScope[] = ["prompt"];
@@ -71,6 +80,7 @@ const SERVER_FRAME_TYPES: readonly BridgeFrameType[] = [
 	"host_tool_call",
 	"host_uri_request",
 	"reset",
+	"workflow_gate",
 	"error",
 ];
 
@@ -86,6 +96,7 @@ interface BridgeFetchHandlerOptions {
 	hostToolBridge?: RpcHostToolBridge;
 	hostUriBridge?: RpcHostUriBridge;
 	endpointMatrix?: Partial<BridgeEndpointMatrix>;
+	unattendedControlPlane?: UnattendedSessionControlPlane;
 }
 
 interface BridgeIdempotencyRecord {
@@ -174,6 +185,15 @@ function bridgeHelpResponse(matrix: BridgeEndpointMatrix): Response {
 	});
 }
 
+function auditOutcomeFor(event: string): "accepted" | "rejected" | "denied" | "exceeded" | "aborted" | "info" {
+	if (event.includes("denied")) return "denied";
+	if (event.includes("exceeded")) return "exceeded";
+	if (event.includes("abort")) return "aborted";
+	if (event.includes("rejected") || event.includes("conflict")) return "rejected";
+	if (event.includes("accepted") || event.includes("negotiated") || event.includes("emitted")) return "accepted";
+	return "info";
+}
+
 function frameTypeForDispatchOutput(obj: RpcResponse | object): BridgeFrameType {
 	const type = typeof obj === "object" && obj !== null && "type" in obj ? (obj as { type?: unknown }).type : undefined;
 	if (type === "host_tool_call" || type === "host_tool_cancel") return "host_tool_call";
@@ -219,6 +239,24 @@ export function createBridgeFetchHandler(options: BridgeFetchHandlerOptions): (r
 			if (!isBridgeHandshakeRequest(payload)) {
 				return jsonResponse(400, { error: "invalid_request" });
 			}
+			let acceptedUnattended = options.unattendedControlPlane?.isUnattended() ? payload.unattended : undefined;
+			if (
+				acceptedUnattended === undefined &&
+				payload.unattended !== undefined &&
+				endpointMatrix.events &&
+				options.unattendedControlPlane
+			) {
+				try {
+					options.unattendedControlPlane.negotiate(payload.unattended);
+					acceptedUnattended = payload.unattended;
+				} catch (err) {
+					const error =
+						err instanceof Error && "code" in err
+							? { code: (err as { code: unknown }).code, message: err.message }
+							: { error: err instanceof Error ? err.message : String(err) };
+					return jsonResponse(403, error);
+				}
+			}
 			return jsonResponse(
 				200,
 				negotiateBridgeHandshake(payload, {
@@ -243,6 +281,7 @@ export function createBridgeFetchHandler(options: BridgeFetchHandlerOptions): (r
 							: "",
 					},
 					frameTypes: endpointMatrix.events ? SERVER_FRAME_TYPES : [],
+					acceptedUnattended,
 				}),
 			);
 		}
@@ -360,6 +399,36 @@ export function createBridgeFetchHandler(options: BridgeFetchHandlerOptions): (r
 			} catch {
 				return jsonResponse(400, { error: "invalid_json" });
 			}
+			if (
+				payload !== null &&
+				typeof payload === "object" &&
+				"gate_id" in payload &&
+				"answer" in payload &&
+				(correlationId === (payload as RpcWorkflowGateResponse).gate_id || correlationId.startsWith("wg_"))
+			) {
+				try {
+					const resolution = await options.unattendedControlPlane?.resolveGate({
+						gate_id: (payload as RpcWorkflowGateResponse).gate_id,
+						answer: (payload as RpcWorkflowGateResponse).answer,
+						idempotency_key: (payload as RpcWorkflowGateResponse).idempotency_key ?? idempotencyKey,
+					});
+					if (resolution) {
+						rememberIdempotencyResponse(options.idempotencyCache, idempotencyKey, {
+							route: url.pathname,
+							ownerToken,
+							body,
+							response: resolution,
+						});
+						return jsonResponse(200, resolution);
+					}
+				} catch (err) {
+					const error =
+						err instanceof Error && "code" in err
+							? { code: (err as { code: unknown }).code, message: err.message }
+							: { error: err instanceof Error ? err.message : String(err) };
+					return jsonResponse(409, error);
+				}
+			}
 			const permissionResult = options.permissionBroker?.respond(
 				correlationId,
 				ownerToken,
@@ -490,6 +559,57 @@ export async function runBridgeMode(
 	const hostToolBridge = new RpcHostToolBridge(output);
 	const hostUriBridge = new RpcHostUriBridge(output);
 	const idempotencyCache: BridgeIdempotencyCache = new Map();
+	const auditLog = new UnattendedAuditLog(defaultAuditPath(session.sessionId, session.sessionManager.getCwd()), {
+		redactAnswers: true,
+	});
+	const recordAudit = (event: { event: string; [key: string]: unknown }) => {
+		const payload =
+			typeof event.payload === "object" && event.payload !== null
+				? (event.payload as Record<string, unknown>)
+				: undefined;
+		const gateId =
+			typeof event.gate_id === "string"
+				? event.gate_id
+				: typeof payload?.gate_id === "string"
+					? payload.gate_id
+					: undefined;
+		auditLog.record({
+			run_id: session.sessionId,
+			session_id: session.sessionId,
+			actor: typeof event.actor === "string" ? event.actor : undefined,
+			event: event.event,
+			outcome: auditOutcomeFor(event.event),
+			dedupe_key: `${event.event}:${gateId ?? "run"}:${JSON.stringify(payload ?? event)}`,
+			gate_id: gateId,
+			stage: typeof event.stage === "string" ? (event.stage as never) : undefined,
+			kind: typeof event.kind === "string" ? (event.kind as never) : undefined,
+			scope: typeof payload?.scope === "string" ? payload.scope : undefined,
+			action: typeof payload?.action === "string" ? payload.action : undefined,
+			budget: event.event === "budget_exceeded" ? (payload as never) : undefined,
+			answer_hash: typeof event.answer_hash === "string" ? event.answer_hash : undefined,
+			error: payload && event.event.endsWith("denied") ? payload : undefined,
+		});
+	};
+	const gateStore = new FileGateStore(
+		path.join(session.sessionManager.getCwd(), ".gjc", "state", "workflow-gates", `${session.sessionId}.json`),
+	);
+	const unattendedControlPlane = new UnattendedSessionControlPlane({
+		runId: session.sessionId,
+		sessionId: session.sessionId,
+		emitFrame: gate => eventStream.publish(toBridgeWorkflowGateFrame(gate, sequencer)),
+		store: gateStore,
+		audit: recordAudit,
+		getUsageSnapshot: () => {
+			const stats = session.getSessionStats();
+			return { tokens: stats.tokens.total, costUsd: stats.cost };
+		},
+	});
+	session.setWorkflowGateEmitter(unattendedControlPlane);
+	unattendedControlPlane
+		.recover()
+		.catch(err =>
+			eventStream.publish(sequencer.next("error", { error: err instanceof Error ? err.message : String(err) })),
+		);
 
 	Bun.serve({
 		hostname,
@@ -505,6 +625,7 @@ export async function runBridgeMode(
 			hostToolBridge,
 			hostUriBridge,
 			commandScopes,
+			unattendedControlPlane,
 			commandDispatcher: command =>
 				dispatchRpcCommand(command, {
 					session,
@@ -512,6 +633,7 @@ export async function runBridgeMode(
 					hostToolRegistry: hostToolBridge,
 					hostUriRegistry: hostUriBridge,
 					createUiContext: () => uiContext,
+					unattendedControlPlane,
 				}),
 		}),
 	});

package/src/modes/controllers/input-controller.ts

@@ -4,6 +4,7 @@ import { type AgentMessage, ThinkingLevel } from "@gajae-code/agent-core";
 import type { AutocompleteProvider, SlashCommand } from "@gajae-code/tui";
 import { $env, sanitizeText } from "@gajae-code/utils";
 import { isSettingsInitialized, settings } from "../../config/settings";
+import { resolveSubskillActivationForSkillInvocation } from "../../extensibility/gjc-plugins";
 import { buildSkillPromptMessage, parseSkillInvocations } from "../../extensibility/skills";
 import { expandEmoticons } from "../../modes/emoji-autocomplete";
 import { createPromptActionAutocompleteProvider } from "../../modes/prompt-action-autocomplete";
@@ -472,9 +473,20 @@ export class InputController {
 			for (let index = 0; index < invocations.length; index += 1) {
 				const invocation = invocations[index];
 				if (!invocation) continue;
-				const built = await buildSkillPromptMessage(invocation.skill, invocation.args);
+				const activationResult = await resolveSubskillActivationForSkillInvocation({
+					cwd: this.ctx.sessionManager.getCwd(),
+					sessionId: this.ctx.session.sessionId,
+					skillName: invocation.skill.name,
+					args: invocation.args,
+				});
+				const built = await buildSkillPromptMessage(invocation.skill, activationResult.cleanedArgs, {
+					subskillActivation: activationResult.activation,
+					subskillActivationSet: activationResult.activeSubskillsToPersist,
+					cwd: this.ctx.sessionManager.getCwd(),
+					sessionId: this.ctx.session.sessionId,
+				});
 				const details: SkillPromptDetails = built.details;
-				const displayText = `/${invocation.commandName}${invocation.args ? ` ${invocation.args}` : ""}`;
+				const displayText = `/${invocation.commandName}${activationResult.cleanedArgs ? ` ${activationResult.cleanedArgs}` : ""}`;
 				// When the agent is streaming, register a compact slash-form text as
 				// the pending-display twin BEFORE dispatching the CustomMessage. The
 				// returned tag is embedded in details so AgentSession.#handleAgentEvent

package/src/modes/prompt-action-autocomplete.ts

@@ -1,11 +1,7 @@
-import {
-	type AutocompleteItem,
-	type AutocompleteProvider,
-	CombinedAutocompleteProvider,
-	getKeybindings,
-	type SlashCommand,
-} from "@gajae-code/tui";
-import { formatKeyHints, type KeybindingsManager } from "../config/keybindings";
+import type { AutocompleteItem, AutocompleteProvider, SlashCommand } from "@gajae-code/tui";
+import { CombinedAutocompleteProvider, getKeybindings, getSlashCommandMatchRank } from "@gajae-code/tui";
+import type { KeybindingsManager } from "../config/keybindings";
+import { formatKeyHints } from "../config/keybindings";
 import { isSettingsInitialized, settings } from "../config/settings";
 import { applyEmojiCompletion, getEmojiSuggestions, isEmojiPrefix, tryEmojiInlineReplace } from "./emoji-autocomplete";
 
@@ -104,6 +100,43 @@ function mergeAutocompleteSuggestions(
 	return { items, prefix: primary.prefix };
 }
 
+function sortSlashCommandSuggestions(
+	suggestions: { items: AutocompleteItem[]; prefix: string } | null,
+	commands: SlashCommand[],
+): { items: AutocompleteItem[]; prefix: string } | null {
+	if (!suggestions) return null;
+	const query = suggestions.prefix.slice(1).toLowerCase();
+	const commandIndexes = new Map(commands.map((command, index) => [command.name, index]));
+	const commandByName = new Map(commands.map(command => [command.name, command]));
+	const items = suggestions.items
+		.map((item, index) => {
+			const command = commandByName.get(item.value);
+			const commandIndex = commandIndexes.get(item.value) ?? index;
+			const lowerName = item.value.toLowerCase();
+			const lowerDesc = command?.description?.toLowerCase() ?? item.description?.toLowerCase() ?? "";
+			const nameScore = fuzzyMatch(query, lowerName) ? fuzzyScore(query, lowerName) : 0;
+			const descScore = fuzzyMatch(query, lowerDesc) ? fuzzyScore(query, lowerDesc) * 0.5 : 0;
+			return {
+				item,
+				index,
+				commandIndex,
+				matchRank: getSlashCommandMatchRank(query, lowerName),
+				priority: command?.priority ?? 0,
+				score: Math.max(nameScore, descScore),
+			};
+		})
+		.sort(
+			(a, b) =>
+				a.matchRank - b.matchRank ||
+				b.priority - a.priority ||
+				b.score - a.score ||
+				a.commandIndex - b.commandIndex ||
+				a.index - b.index,
+		)
+		.map(({ item }) => item);
+	return { ...suggestions, items };
+}
+
 function withoutSkillCommandSuggestions(
 	suggestions: { items: AutocompleteItem[]; prefix: string } | null,
 ): { items: AutocompleteItem[]; prefix: string } | null {
@@ -182,7 +215,10 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 				await this.#baseProvider.getSuggestions(lines, cursorLine, cursorCol),
 			);
 			const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor);
-			return mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions);
+			return sortSlashCommandSuggestions(
+				mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions),
+				this.#commands,
+			);
 		}
 
 		if (!isSettingsInitialized() || settings.get("emojiAutocomplete")) {
@@ -253,7 +289,10 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 			this.#baseProvider.trySyncSlashCompletion?.(textBeforeCursor) ?? null,
 		);
 		const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor);
-		return mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions);
+		return sortSlashCommandSuggestions(
+			mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions),
+			this.#commands,
+		);
 	}
 	trySyncInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
 		if (isSettingsInitialized() && !settings.get("emojiAutocomplete")) return null;

package/src/modes/rpc/rpc-client.ts

@@ -20,6 +20,9 @@ import type {
 	RpcHostToolUpdate,
 	RpcResponse,
 	RpcSessionState,
+	RpcWorkflowGate,
+	RpcWorkflowGateResolution,
+	RpcWorkflowGateResponse,
 } from "./rpc-types";
 
 /** Distributive Omit that works with union types */
@@ -97,7 +100,7 @@ function isRpcResponse(value: unknown): value is RpcResponse {
 	if (typeof value.success !== "boolean") return false;
 	if (value.id !== undefined && typeof value.id !== "string") return false;
 	if (value.success === false) {
-		return typeof value.error === "string";
+		return typeof value.error === "string" || isRecord(value.error);
 	}
 	return true;
 }
@@ -130,6 +133,21 @@ function isRpcExtensionUiRequest(value: unknown): value is RpcExtensionUIRequest
 	return value.type === "extension_ui_request" && typeof value.id === "string" && typeof value.method === "string";
 }
 
+function isRpcWorkflowGate(value: unknown): value is RpcWorkflowGate {
+	if (!isRecord(value)) return false;
+	return (
+		value.type === "workflow_gate" &&
+		typeof value.gate_id === "string" &&
+		typeof value.stage === "string" &&
+		typeof value.kind === "string" &&
+		isRecord(value.schema) &&
+		typeof value.schema_hash === "string" &&
+		isRecord(value.context) &&
+		typeof value.created_at === "string" &&
+		value.required === true
+	);
+}
+
 function normalizeToolResult<TDetails>(result: RpcClientToolResult<TDetails>): AgentToolResult<TDetails> {
 	if (typeof result === "string") {
 		return {
@@ -152,6 +170,7 @@ export class RpcClient {
 	#pendingHostToolCalls = new Map<string, { controller: AbortController }>();
 	#requestId = 0;
 	#extensionUiListeners: Set<(req: RpcExtensionUIRequest) => void> = new Set();
+	#workflowGateListeners: Set<(gate: RpcWorkflowGate) => void> = new Set();
 	#abortController = new AbortController();
 
 	constructor(private options: RpcClientOptions = {}) {
@@ -299,6 +318,29 @@ export class RpcClient {
 		};
 	}
 
+	/**
+	 * Subscribe to workflow lifecycle gates emitted by RPC mode.
+	 */
+	onWorkflowGate(listener: (gate: RpcWorkflowGate) => void): () => void {
+		this.#workflowGateListeners.add(listener);
+		return () => {
+			this.#workflowGateListeners.delete(listener);
+		};
+	}
+
+	/**
+	 * Answer a workflow lifecycle gate and wait for the server resolution envelope.
+	 */
+	async respondGate(gateId: string, answer: unknown, idempotencyKey?: string): Promise<RpcWorkflowGateResolution> {
+		const response = await this.#send({
+			type: "workflow_gate_response",
+			gate_id: gateId,
+			answer,
+			idempotency_key: idempotencyKey,
+		});
+		return this.#getData(response);
+	}
+
 	/**
 	 * Get collected stderr output (useful for debugging).
 	 */
@@ -687,6 +729,13 @@ export class RpcClient {
 			return;
 		}
 
+		if (isRpcWorkflowGate(data)) {
+			for (const listener of this.#workflowGateListeners) {
+				listener(data);
+			}
+			return;
+		}
+
 		if (isRpcHostToolCancelRequest(data)) {
 			this.#pendingHostToolCalls.get(data.targetId)?.controller.abort();
 			return;
@@ -798,7 +847,10 @@ export class RpcClient {
 		}
 	}
 
-	#writeFrame(frame: RpcCommand | RpcHostToolResult | RpcHostToolUpdate, onError?: (error: Error) => void): void {
+	#writeFrame(
+		frame: RpcCommand | RpcWorkflowGateResponse | RpcHostToolResult | RpcHostToolUpdate,
+		onError?: (error: Error) => void,
+	): void {
 		if (!this.#process?.stdin) {
 			throw new Error("Client not started");
 		}
@@ -815,7 +867,9 @@ export class RpcClient {
 	#getData<T>(response: RpcResponse): T {
 		if (!response.success) {
 			const errorResponse = response as Extract<RpcResponse, { success: false }>;
-			throw new Error(errorResponse.error);
+			throw new Error(
+				typeof errorResponse.error === "string" ? errorResponse.error : JSON.stringify(errorResponse.error),
+			);
 		}
 		// Type assertion: we trust response.data matches T based on the command sent.
 		// This is safe because each public method specifies the correct T for its command.

package/src/modes/rpc/rpc-mode.ts

@@ -10,6 +10,7 @@
  * - Events: AgentSessionEvent objects streamed as they occur
  * - Extension UI: Extension UI requests are emitted, client responds with extension_ui_response
  */
+import * as path from "node:path";
 import { $env, readJsonl, Snowflake } from "@gajae-code/utils";
 import type {
 	ExtensionUIContext,
@@ -21,6 +22,9 @@ import type { AgentSession } from "../../session/agent-session";
 import { initializeExtensions } from "../runtime-init";
 import { dispatchRpcCommand } from "../shared/agent-wire/command-dispatch";
 import { rpcError as error } from "../shared/agent-wire/responses";
+import { defaultAuditPath, UnattendedAuditLog } from "../shared/agent-wire/unattended-audit";
+import { UnattendedSessionControlPlane } from "../shared/agent-wire/unattended-session";
+import { FileGateStore } from "../shared/agent-wire/workflow-gate-broker";
 import { isRpcHostToolResult, isRpcHostToolUpdate, RpcHostToolBridge } from "./host-tools";
 import { isRpcHostUriResult, RpcHostUriBridge } from "./host-uris";
 import type {
@@ -72,6 +76,15 @@ function shouldEmitRpcTitles(): boolean {
 	return normalized === "1" || normalized === "true" || normalized === "yes" || normalized === "on";
 }
 
+function auditOutcomeFor(event: string): "accepted" | "rejected" | "denied" | "exceeded" | "aborted" | "info" {
+	if (event.includes("denied")) return "denied";
+	if (event.includes("exceeded")) return "exceeded";
+	if (event.includes("abort")) return "aborted";
+	if (event.includes("rejected") || event.includes("conflict")) return "rejected";
+	if (event.includes("accepted") || event.includes("negotiated") || event.includes("emitted")) return "accepted";
+	return "info";
+}
+
 export function requestRpcEditor(
 	pendingRequests: Map<string, PendingExtensionRequest>,
 	output: RpcOutput,
@@ -159,6 +172,59 @@ export async function runRpcMode(
 	const pendingExtensionRequests = new Map<string, PendingExtensionRequest>();
 	const hostToolBridge = new RpcHostToolBridge(output);
 	const hostUriBridge = new RpcHostUriBridge(output);
+	const auditLog = new UnattendedAuditLog(defaultAuditPath(session.sessionId, session.sessionManager.getCwd()), {
+		redactAnswers: true,
+	});
+	const recordAudit = (event: { event: string; [key: string]: unknown }) => {
+		const payload =
+			typeof event.payload === "object" && event.payload !== null
+				? (event.payload as Record<string, unknown>)
+				: undefined;
+		const gateId =
+			typeof event.gate_id === "string"
+				? event.gate_id
+				: typeof payload?.gate_id === "string"
+					? payload.gate_id
+					: undefined;
+		auditLog.record({
+			run_id: session.sessionId,
+			session_id: session.sessionId,
+			actor: typeof event.actor === "string" ? event.actor : undefined,
+			event: event.event,
+			outcome: auditOutcomeFor(event.event),
+			dedupe_key: `${event.event}:${gateId ?? "run"}:${JSON.stringify(payload ?? event)}`,
+			gate_id: gateId,
+			stage: typeof event.stage === "string" ? (event.stage as never) : undefined,
+			kind: typeof event.kind === "string" ? (event.kind as never) : undefined,
+			scope: typeof payload?.scope === "string" ? payload.scope : undefined,
+			action: typeof payload?.action === "string" ? payload.action : undefined,
+			budget: event.event === "budget_exceeded" ? (payload as never) : undefined,
+			answer_hash: typeof event.answer_hash === "string" ? event.answer_hash : undefined,
+			error: payload && event.event.endsWith("denied") ? payload : undefined,
+		});
+	};
+	// Unattended control plane (#318/#319/#323/G011): routes negotiate_unattended +
+	// workflow_gate_response and lets skill runtimes emit gates over RPC.
+	const gateStore = new FileGateStore(
+		path.join(session.sessionManager.getCwd(), ".gjc", "state", "workflow-gates", `${session.sessionId}.json`),
+	);
+	const unattendedControlPlane = new UnattendedSessionControlPlane({
+		runId: session.sessionId,
+		sessionId: session.sessionId,
+		emitFrame: gate => output(gate),
+		store: gateStore,
+		audit: recordAudit,
+		getUsageSnapshot: () => {
+			const stats = session.getSessionStats();
+			return { tokens: stats.tokens.total, costUsd: stats.cost };
+		},
+	});
+	unattendedControlPlane
+		.recover()
+		.catch(err =>
+			output(error(undefined, "workflow_gate_recover", err instanceof Error ? err.message : String(err))),
+		);
+	session.setWorkflowGateEmitter(unattendedControlPlane);
 
 	// Shutdown request flag (wrapped in object to allow mutation with const)
 	const shutdownState = { requested: false };
@@ -419,6 +485,7 @@ export async function runRpcMode(
 			hostToolRegistry: hostToolBridge,
 			hostUriRegistry: hostUriBridge,
 			createUiContext: () => new RpcExtensionUIContext(pendingExtensionRequests, output),
+			unattendedControlPlane,
 		});
 
 	/**