[Init] Initial commit - NetMesh terminal manager
Some checks failed
build-packages / resolve bundled mosh-client (push) Has been cancelled
build-packages / resolve bundled et-client (push) Has been cancelled
build-packages / build-macos (push) Has been cancelled
build-packages / build-windows (push) Has been cancelled
build-packages / build-linux-x64 (push) Has been cancelled
build-packages / build-linux-arm64 (push) Has been cancelled
build-packages / release (push) Has been cancelled
build-packages / update Nix release metadata (push) Has been cancelled
build-packages / bump homebrew tap (push) Has been cancelled
test / lint-and-test (push) Has been cancelled
AI automation / Route event (push) Has been cancelled
AI automation / Hand reopened issue to maintainers (push) Has been cancelled
AI automation / Clean source issue state (push) Has been cancelled
AI automation / Reconcile handoffs (push) Has been cancelled
AI automation / Classify issue (push) Has been cancelled
AI automation / Claude Code smoke (push) Has been cancelled
AI automation / Review issue follow-up (push) Has been cancelled
AI automation / Publish issue follow-up (push) Has been cancelled
AI automation / Implement with Claude Code (push) Has been cancelled
AI automation / Publish implement PR (push) Has been cancelled
AI automation / Continue queued issue comments (push) Has been cancelled
AI automation / Codex review loop (push) Has been cancelled
AI automation / Publish Codex fix (push) Has been cancelled
AI automation / Clear Codex dispatch marker (push) Has been cancelled
AI automation / Own PR re-request Codex (push) Has been cancelled
AI automation / External PR re-request Codex (push) Has been cancelled
AI automation / Poll Codex reaction / retry (push) Has been cancelled
build-et-binaries / build-linux-x64 (push) Has been cancelled
build-et-binaries / build-linux-arm64 (push) Has been cancelled
build-et-binaries / build-macos-universal (push) Has been cancelled
build-et-binaries / build-windows-x64 (push) Has been cancelled
build-et-binaries / release (push) Has been cancelled
Some checks failed
build-packages / resolve bundled mosh-client (push) Has been cancelled
build-packages / resolve bundled et-client (push) Has been cancelled
build-packages / build-macos (push) Has been cancelled
build-packages / build-windows (push) Has been cancelled
build-packages / build-linux-x64 (push) Has been cancelled
build-packages / build-linux-arm64 (push) Has been cancelled
build-packages / release (push) Has been cancelled
build-packages / update Nix release metadata (push) Has been cancelled
build-packages / bump homebrew tap (push) Has been cancelled
test / lint-and-test (push) Has been cancelled
AI automation / Route event (push) Has been cancelled
AI automation / Hand reopened issue to maintainers (push) Has been cancelled
AI automation / Clean source issue state (push) Has been cancelled
AI automation / Reconcile handoffs (push) Has been cancelled
AI automation / Classify issue (push) Has been cancelled
AI automation / Claude Code smoke (push) Has been cancelled
AI automation / Review issue follow-up (push) Has been cancelled
AI automation / Publish issue follow-up (push) Has been cancelled
AI automation / Implement with Claude Code (push) Has been cancelled
AI automation / Publish implement PR (push) Has been cancelled
AI automation / Continue queued issue comments (push) Has been cancelled
AI automation / Codex review loop (push) Has been cancelled
AI automation / Publish Codex fix (push) Has been cancelled
AI automation / Clear Codex dispatch marker (push) Has been cancelled
AI automation / Own PR re-request Codex (push) Has been cancelled
AI automation / External PR re-request Codex (push) Has been cancelled
AI automation / Poll Codex reaction / retry (push) Has been cancelled
build-et-binaries / build-linux-x64 (push) Has been cancelled
build-et-binaries / build-linux-arm64 (push) Has been cancelled
build-et-binaries / build-macos-universal (push) Has been cancelled
build-et-binaries / build-windows-x64 (push) Has been cancelled
build-et-binaries / release (push) Has been cancelled
This commit is contained in:
73
infrastructure/ai/harness/agentStop.ts
Normal file
73
infrastructure/ai/harness/agentStop.ts
Normal file
@@ -0,0 +1,73 @@
|
||||
import { clearAllPendingApprovals } from '../shared/approvalGate';
|
||||
import { globalTraceStore } from './traceStore';
|
||||
import type { AgentBackend } from './types';
|
||||
|
||||
export type StopAgentTurnReason = 'user' | 'slash';
|
||||
|
||||
export interface AgentStopBridge {
|
||||
aiCattyCancelExec?(chatSessionId: string): Promise<unknown>;
|
||||
aiSdkAgentCancel?(requestId: string, chatSessionId?: string): Promise<{ ok: boolean; error?: string }>;
|
||||
aiSetChatSessionCancelled?(chatSessionId: string, cancelled?: boolean): Promise<{ ok: boolean; error?: string }>;
|
||||
}
|
||||
|
||||
export interface StopAgentTurnParams {
|
||||
chatSessionId: string;
|
||||
abortController?: AbortController | null;
|
||||
bridge?: AgentStopBridge | null;
|
||||
reason?: StopAgentTurnReason;
|
||||
backend?: AgentBackend;
|
||||
}
|
||||
|
||||
let stopEventCounter = 0;
|
||||
|
||||
function nextStopEventId(): string {
|
||||
stopEventCounter += 1;
|
||||
return `turn-end-${Date.now()}-${stopEventCounter}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unified stop entry for Catty, external SDK, and MCP tool surfaces.
|
||||
*/
|
||||
export async function stopAgentTurn({
|
||||
chatSessionId,
|
||||
abortController,
|
||||
bridge,
|
||||
reason = 'user',
|
||||
backend = 'catty',
|
||||
}: StopAgentTurnParams): Promise<void> {
|
||||
abortController?.abort();
|
||||
clearAllPendingApprovals(chatSessionId);
|
||||
|
||||
const tasks: Array<Promise<unknown>> = [];
|
||||
if (bridge?.aiCattyCancelExec) {
|
||||
tasks.push(bridge.aiCattyCancelExec(chatSessionId).catch(() => {}));
|
||||
}
|
||||
if (bridge?.aiSdkAgentCancel) {
|
||||
tasks.push(bridge.aiSdkAgentCancel('', chatSessionId).catch(() => {}));
|
||||
}
|
||||
if (bridge?.aiSetChatSessionCancelled) {
|
||||
tasks.push(bridge.aiSetChatSessionCancelled(chatSessionId, true).catch(() => {}));
|
||||
}
|
||||
await Promise.all(tasks);
|
||||
|
||||
globalTraceStore.append({
|
||||
id: nextStopEventId(),
|
||||
type: 'turn_end',
|
||||
sessionId: chatSessionId,
|
||||
chatSessionId,
|
||||
backend,
|
||||
timestamp: Date.now(),
|
||||
reason: 'aborted',
|
||||
...(reason === 'slash' ? { backendLabel: 'slash-stop' } : {}),
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear the main-process cancelled flag when a new agent turn begins.
|
||||
*/
|
||||
export async function clearChatSessionCancelled(
|
||||
chatSessionId: string,
|
||||
bridge?: AgentStopBridge | null,
|
||||
): Promise<void> {
|
||||
await bridge?.aiSetChatSessionCancelled?.(chatSessionId, false).catch(() => {});
|
||||
}
|
||||
Reference in New Issue
Block a user