chapterhouse 0.3.12 → 0.3.14

package/dist/copilot/orchestrator.js

@@ -1,7 +1,6 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomUUID } from "node:crypto";
 import { approveAll } from "@github/copilot-sdk";
-import { initHookPipeline, createSessionHooks } from "./hooks.js";
 import { createTools } from "./tools.js";
 import { getOrchestratorSystemMessage } from "./system-message.js";
 import { CHAPTERHOUSE_VERSION } from "../version.js";
@@ -9,16 +8,14 @@ import { config, DEFAULT_MODEL } from "../config.js";
 import { loadMcpConfig } from "./mcp-config.js";
 import { getSkillDirectories } from "./skills.js";
 import { resetClient } from "./client.js";
-import { logConversation, getState, setState, deleteState, getCopilotSession, upsertCopilotSession, getTaskSessionKey, getDb, bumpProjectLastUsed, appendTaskEvent } from "../store/db.js";
+import { logConversation, getState, setState, deleteState, getCopilotSession, upsertCopilotSession, getTaskSessionKey, getDb, appendTaskEvent } from "../store/db.js";
 import { maybeWriteEpisode } from "./episode-writer.js";
 import { getWikiSummary } from "../wiki/context.js";
 import { SESSIONS_DIR } from "../paths.js";
 import { resolveModel } from "./router.js";
 import { loadAgents, ensureDefaultAgents, clearActiveTasks, getAgentRegistry, setActiveAgent, parseAtMention, buildAgentRoster, getActiveTasks, } from "./agents.js";
-import { normalizeProjectPath, setChannelProject } from "../squad/context.js";
-import { getSquadCoordinatorSystemMessage } from "../squad/charter.js";
 import { childLogger } from "../util/logger.js";
-import { squadEventBus } from "./squad-event-bus.js";
+import { agentEventBus } from "./agent-event-bus.js";
 import { initTaskEventLog } from "./task-event-log.js";
 import { emitTurnEvent, persistTurnEvents, scheduleClearTurnLog, } from "./turn-event-log.js";
 import { SessionManager, SessionRegistry, SESSION_IDLE_TTL_MS, SESSION_MAX_ACTIVE, } from "./session-manager.js";
@@ -56,7 +53,7 @@ export function getLastRouteResult() {
     return lastRouteResult;
 }
 export function subscribeTaskEvents(taskId, listener) {
-    return squadEventBus.subscribe("session:tool_call", (event) => {
+    return agentEventBus.subscribe("session:tool_call", (event) => {
         if (event.sessionId !== taskId)
             return;
         const p = event.payload;
@@ -70,7 +67,7 @@ export function subscribeTaskEvents(taskId, listener) {
     });
 }
 function emitTaskEvent(taskId, event) {
-    void squadEventBus.emit({
+    void agentEventBus.emit({
         type: "session:tool_call",
         sessionId: taskId,
         payload: {
@@ -140,11 +137,11 @@ function getSessionConfig() {
     const skillDirectories = getSkillDirectories();
     return { tools, mcpServers, skillDirectories };
 }
-function getSystemMessageOptions(memorySummary, projectRoot) {
+function getSystemMessageOptions(memorySummary) {
     return {
         selfEditEnabled: config.selfEditEnabled,
         memorySummary: memorySummary || undefined,
-        agentRoster: buildAgentRoster(projectRoot),
+        agentRoster: buildAgentRoster(),
         userContext: currentUserContext,
     };
 }
@@ -152,7 +149,7 @@ function sameUserContext(a, b) {
     return a?.name === b?.name && a?.role === b?.role;
 }
 function updateUserContext(source) {
-    if (source.type !== "web")
+    if (source.type !== "web" && source.type !== "sse-web")
         return;
     const nextContext = source.user
         ? { name: source.user.name, role: source.user.role }
@@ -164,7 +161,7 @@ function updateUserContext(source) {
     registry?.get("default")?.invalidateSession();
 }
 function updateRequestContext(source) {
-    if (source.type !== "web") {
+    if (source.type !== "web" && source.type !== "sse-web") {
         currentAuthenticatedUser = undefined;
         currentAuthorizationHeader = undefined;
         return;
@@ -234,17 +231,11 @@ async function createOrResumeSession(sessionKey, projectRoot) {
         backgroundCompactionThreshold: 0.80,
         bufferExhaustionThreshold: 0.95,
     };
-    let systemMessageContent;
-    if (isProjectSession && projectRoot) {
-        systemMessageContent = await getSquadCoordinatorSystemMessage(projectRoot);
-    }
-    else {
-        const memorySummary = getWikiSummary();
-        systemMessageContent = getOrchestratorSystemMessage({
-            ...getSystemMessageOptions(memorySummary, isProjectSession ? projectRoot : undefined),
-            version: CHAPTERHOUSE_VERSION,
-        });
-    }
+    const memorySummary = getWikiSummary();
+    const systemMessageContent = getOrchestratorSystemMessage({
+        ...getSystemMessageOptions(memorySummary),
+        version: CHAPTERHOUSE_VERSION,
+    });
     const stored = getCopilotSession(sessionKey);
     const savedSessionId = stored?.copilotSessionId ?? (sessionKey === "default" ? getState(ORCHESTRATOR_SESSION_KEY) : undefined);
     if (savedSessionId) {
@@ -259,7 +250,6 @@ async function createOrResumeSession(sessionKey, projectRoot) {
                 mcpServers,
                 skillDirectories,
                 onPermissionRequest: approveAll,
-                hooks: createSessionHooks("orchestrator"),
                 infiniteSessions,
             });
             log.info({ sessionKey }, "Session resumed successfully");
@@ -285,7 +275,6 @@ async function createOrResumeSession(sessionKey, projectRoot) {
         mcpServers,
         skillDirectories,
         onPermissionRequest: approveAll,
-        hooks: createSessionHooks("orchestrator"),
         infiniteSessions,
     });
     log.info({ sessionKey, sessionId: session.sessionId.slice(0, 8) }, "Session created");
@@ -299,9 +288,7 @@ async function createOrResumeSession(sessionKey, projectRoot) {
 }
 export async function initOrchestrator(client) {
     copilotClient = client;
-    // Initialize governance hook pipeline before any session is created.
-    initHookPipeline();
-    // Initialize per-task ring buffer — subscribes to squadEventBus for session:tool_call events.
+    // Initialize per-task ring buffer — subscribes to agentEventBus for session:tool_call events.
     initTaskEventLog();
     // (Re-)create the registry — supports multiple initOrchestrator calls in tests
     if (registry) {
@@ -450,7 +437,7 @@ async function executeOnSession(manager, item) {
                     .replace(/\s+/g, "-");
                 const resolvedDescription = (typeof spawnArgs?.description === "string"
                     ? spawnArgs.description
-                    : data.agentDescription || data.agentDisplayName || `Squad dispatch: ${agentSlug}`).slice(0, 500);
+                    : data.agentDescription || data.agentDisplayName || `Agent dispatch: ${agentSlug}`).slice(0, 500);
                 item.onActivity({
                     kind: "subagent_started",
                     toolCallId: data.toolCallId,
@@ -521,10 +508,10 @@ async function executeOnSession(manager, item) {
                     .replace(/\s+/g, "-");
                 const description = (typeof spawnArgs?.description === "string"
                     ? spawnArgs.description
-                    : data.agentDescription || data.agentDisplayName || `Squad dispatch: ${agentSlug}`).slice(0, 500);
-                db.prepare(`INSERT OR IGNORE INTO agent_tasks (task_id, agent_slug, description, status, origin_channel, session_key, source) VALUES (?, ?, ?, 'running', ?, ?, 'squad')`).run(data.toolCallId, agentSlug, description, item.sourceChannel || null, sessionKey);
+                    : data.agentDescription || data.agentDisplayName || `Agent dispatch: ${agentSlug}`).slice(0, 500);
+                db.prepare(`INSERT OR IGNORE INTO agent_tasks (task_id, agent_slug, description, status, origin_channel, session_key, source) VALUES (?, ?, ?, 'running', ?, ?, 'adhoc')`).run(data.toolCallId, agentSlug, description, item.sourceChannel || null, sessionKey);
                 activeSubagentTaskIds.add(data.toolCallId);
-                void squadEventBus.emit({
+                void agentEventBus.emit({
                     type: "session:created",
                     sessionId: data.toolCallId,
                     agentName: agentSlug,
@@ -552,7 +539,7 @@ async function executeOnSession(manager, item) {
                 db.prepare(`UPDATE agent_tasks SET status = 'completed', completed_at = CURRENT_TIMESTAMP WHERE task_id = ?`).run(event.data.toolCallId);
                 const taskId = event.data.toolCallId;
                 const taskRow = db.prepare(`SELECT agent_slug FROM agent_tasks WHERE task_id = ?`).get(taskId);
-                void squadEventBus.emit({
+                void agentEventBus.emit({
                     type: "session:destroyed",
                     sessionId: taskId,
                     agentName: taskRow?.agent_slug,
@@ -580,7 +567,7 @@ async function executeOnSession(manager, item) {
                 activeSubagentTaskIds.delete(data.toolCallId);
                 db.prepare(`UPDATE agent_tasks SET status = 'error', result = ?, completed_at = CURRENT_TIMESTAMP WHERE task_id = ?`).run(data.error || "Subagent failed", data.toolCallId);
                 const taskRow = db.prepare(`SELECT agent_slug FROM agent_tasks WHERE task_id = ?`).get(data.toolCallId);
-                void squadEventBus.emit({
+                void agentEventBus.emit({
                     type: "session:error",
                     sessionId: data.toolCallId,
                     agentName: taskRow?.agent_slug,
@@ -749,30 +736,23 @@ function isRecoverableError(err) {
         return false;
     return /disconnect|connection|EPIPE|ECONNRESET|ECONNREFUSED|socket|closed|ENOENT|spawn|not found|expired|stale/i.test(msg);
 }
-export async function sendToOrchestrator(prompt, source, callback, attachments, onActivity, onQueued, onAdvance) {
+export async function sendToOrchestrator(prompt, source, callback, attachments, onActivity, onQueued, onAdvance, externalTurnId) {
     updateUserContext(source);
     updateRequestContext(source);
-    // Generate a unique ID for this orchestrator turn.  Every SSE event emitted
-    // during this turn carries this ID so the frontend can detect turn boundaries
-    // and create a new assistant bubble when it changes (fixes #92).
-    const turnId = randomUUID();
-    const sourceLabel = source.type === "web" ? "web" : "background";
+    // Use the externally-supplied turnId if provided (POST→SSE path needs the ID
+    // returned to the client to match every emitted event — Fix 1 root cause).
+    const turnId = externalTurnId ?? randomUUID();
+    const sourceLabel = source.type === "background" ? "background" : "web";
     logMessage("in", sourceLabel, prompt);
     let sessionKey;
-    if (source.type === "web" && source.projectPath && config.squadEnabled) {
-        sessionKey = "project:" + normalizeProjectPath(source.projectPath);
-        setChannelProject(source.connectionId, normalizeProjectPath(source.projectPath));
-        bumpProjectLastUsed(normalizeProjectPath(source.projectPath));
-    }
-    else if (source.type === "background" && source.sessionKey) {
+    if ((source.type === "background" || source.type === "sse-web") && source.sessionKey) {
         sessionKey = source.sessionKey;
     }
     else {
         sessionKey = "default";
     }
     const channelKey = source.type === "web" ? source.connectionId : "default";
-    const projectRoot = sessionKey.startsWith("project:") ? sessionKey.slice("project:".length) : undefined;
-    const mention = parseAtMention(prompt, projectRoot);
+    const mention = parseAtMention(prompt);
     const targetAgent = mention?.agentSlug;
     const routedPrompt = mention ? mention.message : prompt;
     const taggedPrompt = source.type === "background"
@@ -782,8 +762,9 @@ export async function sendToOrchestrator(prompt, source, callback, attachments,
     const sourceChannel = source.type === "web" ? "web" : undefined;
     // Capture auth context at enqueue time — prevents cross-session contamination
     // when concurrent sessions are processing simultaneously.
-    const authUser = source.type === "web" ? source.user : undefined;
-    const authHeader = source.type === "web" ? source.authorizationHeader?.trim() || undefined : undefined;
+    // sse-web carries user identity just like web (Fix 3).
+    const authUser = (source.type === "web" || source.type === "sse-web") ? source.user : undefined;
+    const authHeader = (source.type === "web" || source.type === "sse-web") ? source.authorizationHeader?.trim() || undefined : undefined;
     const manager = registry.getOrCreate(sessionKey);
     void (async () => {
         for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -797,9 +778,10 @@ export async function sendToOrchestrator(prompt, source, callback, attachments,
                         // type dependencies. orchestrator.ts always passes valid ActivityEvent objects.
                         onActivity: onActivity,
                         turnId,
-                        // Background messages skip queue visibility — only web/user messages need it.
-                        onQueued: source.type === "web" ? onQueued : undefined,
-                        onAdvance: source.type === "web" ? onAdvance : undefined,
+                        // Background messages skip queue visibility — only user-initiated messages need it.
+                        // sse-web is user-initiated (Fix 2).
+                        onQueued: source.type !== "background" ? onQueued : undefined,
+                        onAdvance: source.type !== "background" ? onAdvance : undefined,
                         sourceChannel,
                         targetAgent,
                         channelKey,
@@ -864,19 +846,19 @@ export async function sendToOrchestrator(prompt, source, callback, attachments,
  *   replacement turn starts. Use to emit a `turn-interrupted` SSE event so the
  *   frontend can drop the partial in-flight bubble.
  */
-export async function interruptCurrentTurn(sessionKey, newPrompt, source, callback, attachments, onActivity, onInterrupted) {
+export async function interruptCurrentTurn(sessionKey, newPrompt, source, callback, attachments, onActivity, onInterrupted, externalTurnId) {
     const manager = registry?.get(sessionKey);
     // If no session exists or it isn't processing, fall back to a normal send.
     if (!manager || !manager.isProcessing) {
-        return sendToOrchestrator(newPrompt, source, callback, attachments, onActivity);
+        return sendToOrchestrator(newPrompt, source, callback, attachments, onActivity, undefined, undefined, externalTurnId);
     }
     updateUserContext(source);
     updateRequestContext(source);
-    const turnId = randomUUID();
-    const sourceLabel = source.type === "web" ? "web" : "background";
+    const turnId = externalTurnId ?? randomUUID();
+    const sourceLabel = source.type === "background" ? "background" : "web";
     const sourceChannel = source.type === "web" ? "web" : undefined;
-    const authUser = source.type === "web" ? source.user : undefined;
-    const authHeader = source.type === "web" ? source.authorizationHeader?.trim() || undefined : undefined;
+    const authUser = (source.type === "web" || source.type === "sse-web") ? source.user : undefined;
+    const authHeader = (source.type === "web" || source.type === "sse-web") ? source.authorizationHeader?.trim() || undefined : undefined;
     const taggedPrompt = source.type === "background"
         ? newPrompt
         : `[via ${sourceLabel}] ${newPrompt}`;
@@ -965,8 +947,8 @@ export async function interruptCurrentTurn(sessionKey, newPrompt, source, callba
 export function enqueueForSse(opts) {
     const { sessionKey, prompt, attachments, authUser, authHeader, interrupt } = opts;
     const turnId = randomUUID();
-    const source = { type: "background", sessionKey };
-    const taggedPrompt = `[via sse] ${prompt}`;
+    // sse-web carries auth and enables onQueued — unlike "background" (Fixes 2 & 3).
+    const source = { type: "sse-web", sessionKey, user: authUser, authorizationHeader: authHeader };
     // Emit turn:started immediately so the SSE client sees it before any delta
     emitTurnEvent(sessionKey, { type: "turn:started", turnId, sessionKey, prompt, attachments });
     const callback = (text, done, tid) => {
@@ -986,10 +968,12 @@ export function enqueueForSse(opts) {
         scheduleClearTurnLog(abortedTurnId);
     };
     if (interrupt) {
-        void interruptCurrentTurn(sessionKey, taggedPrompt, source, callback, attachments, undefined, onInterrupted);
+        // Pass the outer turnId so the replacement turn uses the same ID (Fix 1).
+        void interruptCurrentTurn(sessionKey, prompt, source, callback, attachments, undefined, onInterrupted, turnId);
     }
     else {
-        void sendToOrchestrator(taggedPrompt, source, callback, attachments, undefined, onQueued);
+        // Pass the outer turnId so sendToOrchestrator uses it instead of generating a new one (Fix 1).
+        void sendToOrchestrator(prompt, source, callback, attachments, undefined, onQueued, undefined, turnId);
     }
     return turnId;
 }
@@ -998,15 +982,26 @@ export async function cancelCurrentMessage() {
     if (!registry)
         return false;
     let drained = 0;
+    // Capture (sessionKey, turnId) before aborting so we can emit terminal events.
     const aborts = [];
-    for (const [, manager] of registry.getAll()) {
+    for (const [sessionKey, manager] of registry.getAll()) {
         drained += manager.cancelQueued();
         if (manager.isProcessing) {
-            aborts.push(manager.abortCurrentTurn());
+            const turnId = manager.currentTurnId;
+            aborts.push({ promise: manager.abortCurrentTurn(), sessionKey, turnId });
         }
     }
-    const results = await Promise.all(aborts);
+    const results = await Promise.all(aborts.map((a) => a.promise));
     const aborted = results.some(Boolean);
+    // Emit turn:interrupted on per-session SSE streams for any turn that was aborted (Fix 4).
+    for (let i = 0; i < aborts.length; i++) {
+        if (results[i] && aborts[i].turnId) {
+            const { sessionKey, turnId } = aborts[i];
+            emitTurnEvent(sessionKey, { type: "turn:interrupted", turnId: turnId, sessionKey });
+            persistTurnEvents(turnId, sessionKey);
+            scheduleClearTurnLog(turnId);
+        }
+    }
     return aborted || drained > 0;
 }
 /** Switch the model on the live default orchestrator session without destroying it. */