@antelopejs/dms-ai 0.1.6 → 0.2.1

package/sidecar/dist/server/turns.js

@@ -0,0 +1,335 @@
+import { extractEditedFilePath } from "../agent/edit-tracker.js";
+import { isEditTool } from "../agent/tool-kinds.js";
+import { effectiveGenerationMode } from "../builder/capability.js";
+import { MAX_AUTO_HEAL_ATTEMPTS } from "../constants/safety-net.js";
+import { WS_LOG_PREFIX } from "../constants/ws.js";
+import { EVENT_TYPES } from "../protocol/events.js";
+import { truncateTitle } from "../state/conversations.js";
+import { broadcastConversationList, emitNotice } from "./chat-events.js";
+import { cancelCallRequests, cancelTurnRequests } from "./permission-events.js";
+import { inspectBuild } from "./safety-net.js";
+import { endToolCall, startToolCall, stopOpenCalls } from "./tool-calls.js";
+import { startTurnProgress } from "./turn-progress.js";
+const AUTO_FIX_TITLE_PREFIX = "Auto-fix: ";
+function dispatch(services, conversationId, event, isTerminal) {
+    if (isTerminal) {
+        services.liveTurns.end(conversationId);
+    }
+    else {
+        services.liveTurns.append(conversationId, event);
+    }
+    services.chatSocketRegistry.send(conversationId, event);
+}
+function dispatchAll(services, conversationId, events) {
+    for (const event of events)
+        dispatch(services, conversationId, event, false);
+}
+function recordEditIfAny(services, conversationId, ev) {
+    if (ev.type !== "tool_use" || !isEditTool(ev.toolName))
+        return;
+    const filePath = extractEditedFilePath(ev.args);
+    if (filePath !== undefined)
+        services.editTracker.record(conversationId, filePath);
+}
+function endTurnEvents(services, conversationId) {
+    cancelTurnRequests(services, conversationId);
+    dispatchAll(services, conversationId, stopOpenCalls(services, conversationId));
+}
+const TURN_EVENT_HANDLERS = {
+    assistant_text: (services, conversationId, ev) => {
+        services.conversationStore.appendMessage(conversationId, {
+            role: "assistant",
+            content: ev.text,
+            timestampMs: Date.now(),
+        });
+        return null;
+    },
+    assistant_text_delta: (_services, conversationId, ev) => ({
+        type: EVENT_TYPES.ASSISTANT_MESSAGE_CHUNK,
+        conversationId,
+        text: ev.text,
+    }),
+    tool_use: (services, conversationId, ev) => {
+        startToolCall(services, conversationId, ev);
+        return {
+            type: EVENT_TYPES.TOOL_CALL_START,
+            conversationId,
+            callId: ev.callId,
+            toolName: ev.toolName,
+            args: ev.args,
+        };
+    },
+    tool_result: (services, conversationId, ev) => {
+        cancelCallRequests(services, conversationId, ev.callId);
+        return endToolCall(services, conversationId, ev);
+    },
+    done: (services, conversationId) => {
+        endTurnEvents(services, conversationId);
+        return { type: EVENT_TYPES.RUN_DONE, conversationId };
+    },
+    error: (services, conversationId, ev) => {
+        endTurnEvents(services, conversationId);
+        services.turns.recordError(ev.message);
+        services.conversationStore.appendMessage(conversationId, {
+            role: "error",
+            content: ev.message,
+            isRetryable: ev.isRetryable,
+            timestampMs: Date.now(),
+        });
+        return {
+            type: EVENT_TYPES.RUN_ERROR,
+            conversationId,
+            error: ev.message,
+            isRetryable: ev.isRetryable,
+        };
+    },
+    activity: () => null,
+};
+export function handleTurnEvent(services, conversationId, ev) {
+    recordEditIfAny(services, conversationId, ev);
+    const handler = TURN_EVENT_HANDLERS[ev.type];
+    const wireEvent = handler(services, conversationId, ev);
+    if (wireEvent === null)
+        return;
+    const isTerminal = ev.type === "done" || ev.type === "error";
+    dispatch(services, conversationId, wireEvent, isTerminal);
+}
+function sumUsage(a, b) {
+    return {
+        inputTokens: a.inputTokens + b.inputTokens,
+        outputTokens: a.outputTokens + b.outputTokens,
+        totalTokens: a.totalTokens + b.totalTokens,
+    };
+}
+function addTurnUsage(services, conversationId, usage) {
+    const turn = services.turns.get(conversationId);
+    if (turn !== undefined) {
+        turn.usage = sumUsage(turn.usage, usage);
+        return;
+    }
+    services.conversationStore.recordTurnUsage(conversationId, usage, Date.now());
+}
+function buildRunnerContext(services, request) {
+    const { conversationId } = request;
+    return {
+        conversationId,
+        hostProjectRoot: services.hostProjectRoot,
+        getCurrentPage: () => services.hostState.getCurrentPage(),
+        attachments: request.attachments,
+        includePageContext: request.includePageContext,
+        permissionBus: services.permissionBus,
+        createMcpServer: () => services.createMcpServer(conversationId),
+        onToolDecision: (decision) => {
+            if (decision.callId === undefined || decision.callId === "")
+                return;
+            services.callAudit.record(conversationId, decision.callId, {
+                allowedBy: decision.allowedBy,
+                isPrompted: false,
+            });
+        },
+        onToolAnnounced: (callId, toolName, args) => services.callLedger.announce(conversationId, callId, toolName, args),
+        beforeMutation: async () => {
+            await services.turns.get(conversationId)?.checkpoint.ready();
+        },
+        onTokenUsage: (usage) => addTurnUsage(services, conversationId, usage),
+    };
+}
+function beginTurn(services, request) {
+    const { conversationId } = request;
+    services.liveTurns.begin(conversationId);
+    services.conversationStore.markProvider(conversationId, services.settingsStore.get().provider);
+    services.conversationModes.pinDefaults(conversationId);
+    services.turns.begin({
+        conversationId,
+        request: request.request,
+        isAutoFix: request.isAutoFix,
+        askedBy: services.askers.get(conversationId),
+        pagePath: services.hostState.getCurrentPage().path,
+        checkpoint: services.checkpoints.beginTurn(conversationId),
+    });
+    broadcastConversationList(services);
+}
+function publishChangeSet(services, record, callIds) {
+    const { conversationId } = record;
+    services.conversationStore.patchMessages(conversationId, (m) => (m.role === "tool_use" || m.role === "tool_result") &&
+        m.callId !== undefined &&
+        callIds.includes(m.callId), { changeSetId: record.id });
+    services.conversationStore.appendMessage(conversationId, {
+        role: "change_set",
+        content: "",
+        changeSetId: record.id,
+        timestampMs: record.createdAtMs,
+    });
+    sendChangeSet(services, record);
+}
+export function sendChangeSet(services, record) {
+    const changeSet = services.checkpoints
+        .forConversation(record.conversationId)
+        .find((c) => c.id === record.id);
+    if (changeSet === undefined)
+        return;
+    services.chatSocketRegistry.send(record.conversationId, {
+        type: EVENT_TYPES.CHANGE_SET,
+        conversationId: record.conversationId,
+        changeSet,
+    });
+}
+export function turnTypecheck(turn) {
+    const isBuilderOnly = turn.builderOps > 0 && turn.builderOps >= turn.mutatingCallIds.length;
+    return turn.typecheck === "skipped" && isBuilderOnly
+        ? "passed"
+        : turn.typecheck;
+}
+async function recordChangeSet(services, conversationId) {
+    const turn = services.turns.get(conversationId);
+    if (turn === undefined)
+        return null;
+    const mode = services.conversationModes.state(conversationId);
+    const record = await turn.checkpoint.finish({
+        conversationId,
+        title: truncateTitle(turn.isAutoFix ? `${AUTO_FIX_TITLE_PREFIX}${turn.request}` : turn.request),
+        agent: services.settingsStore.get().provider,
+        scope: effectiveGenerationMode(mode.generationMode),
+        isAutoFix: turn.isAutoFix,
+        askedBy: turn.askedBy,
+        approvalsNeeded: turn.approvalsNeeded,
+        builderOps: turn.builderOps,
+        typecheck: turnTypecheck(turn),
+        pagePath: turn.pagePath,
+    });
+    if (record !== null)
+        publishChangeSet(services, record, turn.mutatingCallIds);
+    return record;
+}
+function recordUsage(services, conversationId) {
+    const usage = services.turns.get(conversationId)?.usage;
+    if (usage !== undefined && usage.totalTokens > 0) {
+        services.conversationStore.recordTurnUsage(conversationId, usage, Date.now());
+    }
+    const total = services.conversationStore.get(conversationId)?.tokenUsage?.totalTokens ??
+        0;
+    services.chatSocketRegistry.send(conversationId, {
+        type: EVENT_TYPES.USAGE,
+        conversationId,
+        totalTokens: total,
+    });
+}
+async function finishTurn(services, conversationId) {
+    endTurnEvents(services, conversationId);
+    services.liveTurns.end(conversationId);
+    try {
+        return await recordChangeSet(services, conversationId);
+    }
+    finally {
+        recordUsage(services, conversationId);
+        services.turns.end(conversationId);
+        services.conversationModes.endTurn(conversationId);
+        broadcastConversationList(services);
+    }
+}
+async function streamTurn(services, request) {
+    const { conversationId } = request;
+    beginTurn(services, request);
+    const progress = startTurnProgress({
+        conversationId,
+        send: (event) => services.chatSocketRegistry.send(conversationId, event),
+    });
+    try {
+        const stream = services.runner.start(request.content, buildRunnerContext(services, request));
+        for await (const ev of stream) {
+            progress.observe(ev);
+            handleTurnEvent(services, conversationId, ev);
+        }
+    }
+    finally {
+        progress.stop();
+    }
+    return finishTurn(services, conversationId);
+}
+async function streamTurnOrFail(services, request) {
+    try {
+        return await streamTurn(services, request);
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.warn(`${WS_LOG_PREFIX} turn setup failed: ${message}`);
+        await finishTurn(services, request.conversationId).catch(() => null);
+        handleTurnEvent(services, request.conversationId, {
+            type: "error",
+            message,
+        });
+        return undefined;
+    }
+}
+function applyTypecheck(services, changeSet, typecheck) {
+    if (changeSet === null || typecheck === "skipped")
+        return;
+    const updated = services.checkpoints.setTypecheck(changeSet.id, typecheck);
+    if (updated !== null)
+        sendChangeSet(services, updated);
+}
+async function runSafetyNet(services, conversationId, pass) {
+    if (pass.attempt >= MAX_AUTO_HEAL_ATTEMPTS)
+        return;
+    if (services.turns.isAutoFixStopped(conversationId))
+        return;
+    const editedFiles = services.editTracker.getEditedFiles(conversationId);
+    if (editedFiles.length === 0)
+        return;
+    const report = await inspectBuild({
+        editedFiles,
+        knownRoots: [services.hostProjectRoot, ...services.moduleRoots],
+        logsClient: services.logsClient,
+        sinceMs: pass.sinceMs,
+    });
+    applyTypecheck(services, pass.changeSet, report.typecheck);
+    if (report.healPrompt === null)
+        return;
+    if (services.turns.isAutoFixStopped(conversationId))
+        return;
+    services.editTracker.clear(conversationId);
+    const nextSinceMs = Date.now();
+    emitNotice(services, conversationId, {
+        kind: "autofix",
+        attempt: pass.attempt + 1,
+        maxAttempts: MAX_AUTO_HEAL_ATTEMPTS,
+        errors: report.errors,
+        timestampMs: nextSinceMs,
+    });
+    const changeSet = await streamTurnOrFail(services, {
+        conversationId,
+        content: report.healPrompt,
+        request: pass.request,
+        isAutoFix: true,
+    });
+    if (changeSet === undefined)
+        return;
+    await runSafetyNet(services, conversationId, {
+        request: pass.request,
+        sinceMs: nextSinceMs,
+        attempt: pass.attempt + 1,
+        changeSet,
+    });
+}
+export async function runTurnWithHealing(services, request) {
+    const { conversationId } = request;
+    services.turns.resetAutoFix(conversationId);
+    services.editTracker.clear(conversationId);
+    const sinceMs = Date.now();
+    const changeSet = await streamTurnOrFail(services, request);
+    if (changeSet === undefined)
+        return;
+    try {
+        await runSafetyNet(services, conversationId, {
+            request: request.request,
+            sinceMs,
+            attempt: 0,
+            changeSet,
+        });
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.warn(`${WS_LOG_PREFIX} safety net failed: ${message}`);
+    }
+}
+//# sourceMappingURL=turns.js.map

package/sidecar/dist/server/turns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turns.js","sourceRoot":"","sources":["../../src/server/turns.ts"],"names":[],"mappings":"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"}

package/sidecar/dist/server/ws.d.ts

@@ -1,5 +1,6 @@
 import type { Server } from "node:http";
 import { type PermissionBus } from "../agent/permission-bus.js";
+import { type Checkpoints } from "../checkpoints/checkpoints.js";
 import type { AiMcpServerStaticDeps } from "../mcp/types.js";
 import type { ProviderHostRuntime } from "../providers/types.js";
 import type { SkillSource } from "../skills/types.js";
@@ -7,7 +8,7 @@ import type { ConversationStore } from "../state/conversations.js";
 import type { HostState } from "../state/host-state.js";
 import type { SettingsStore } from "../state/settings-store.js";
 import type { HostSocketRegistry } from "./host-socket-registry.js";
-import type { SettingsApplier } from "./http.js";
+import type { SettingsApplier, SidecarBridge } from "./http.js";
 import type { IdleShutdownController } from "./idle-shutdown.js";
 import { type ChatSocketRegistry } from "./chat-socket-registry.js";
 import type { NavigationCompleter } from "./navigation-completer.js";
@@ -27,6 +28,8 @@ export interface AttachWsServerOptions {
     permissionBus?: PermissionBus;
     chatSocketRegistry?: ChatSocketRegistry;
     settingsApplier?: SettingsApplier;
+    checkpoints?: Checkpoints;
+    bridge?: SidecarBridge;
 }
 interface AttachWsServerResult {
     close: () => Promise<void>;

package/sidecar/dist/server/ws.js

@@ -1,26 +1,33 @@
 import { WebSocketServer } from "ws";
+import { createCallAudit } from "../audit/call-audit.js";
+import { createCallLedger } from "../agent/call-ledger.js";
+import { createConversationModes } from "../agent/conversation-modes.js";
 import { createEditTracker } from "../agent/edit-tracker.js";
-import { effectiveChatMode } from "../agent/effective-mode.js";
 import { createPermissionBus, } from "../agent/permission-bus.js";
 import { createQuestionBus, } from "../agent/question-bus.js";
-import { createAgentRunner } from "../agent/runner.js";
+import { createAgentRunner, } from "../agent/runner.js";
 import { createSwitchingRunner, } from "../agent/switching-runner.js";
-import { buildToolSummary } from "../agent/tool-summary.js";
 import { TURN_RESTARTED_REASON } from "../agent/turn-end-reasons.js";
+import { createCheckpoints, } from "../checkpoints/checkpoints.js";
+import { createShadowGit } from "../checkpoints/shadow-git.js";
 import { WS_MAX_PAYLOAD_BYTES } from "../constants/attachments.js";
+import { ASK_USER_TOOL_NAME } from "../constants/mcp.js";
 import { DEFAULT_SETTINGS } from "../constants/settings.js";
 import { WS_CLIENT_CLOSE_GRACE_MS, WS_GOING_AWAY_CODE, WS_LOG_PREFIX, WS_PATH, } from "../constants/ws.js";
 import { createAiMcpServer } from "../mcp/sdk-binding.js";
-import { EVENT_TYPES, } from "../protocol/events.js";
 import { PROVIDER_MODULES } from "../providers/registry.js";
+import { createChangeSetStore } from "../state/change-sets.js";
 import { PROVIDER_NAMES } from "../state/types.js";
+import { broadcastConversationList, emitNotice, sendConversationMode, } from "./chat-events.js";
 import { isClientAuthorized } from "./client-auth.js";
 import { createHostCommandRouter, } from "./host-command-router.js";
 import { createChatSocketRegistry, } from "./chat-socket-registry.js";
 import { createLiveTurnStore } from "./live-turns.js";
 import { createPendingQueueStore } from "./pending-queue.js";
+import { buildBuilderGate, interruptConversation, onPermissionDecided, onPermissionPrompt, onQuestionAnswered, onQuestionExpired, onQuestionPrompt, onRulesChanged, permissionPolicy, } from "./permission-events.js";
 import { rawDataToText } from "./raw-data.js";
 import { applySettings, buildConnectionContext, dispatchMessage, } from "./routing.js";
+import { createTurnRegistry } from "./turn-registry.js";
 const NOOP_IDLE_CONTROLLER = {
     increment: () => { },
     decrement: () => { },
@@ -39,18 +46,15 @@ function buildBaseOptions(options, settings) {
         skillDirs: options.skillDirs ?? [],
     };
 }
-function buildRunnerFactories(options, runtime) {
+function buildRunnerFactories(options, runtime, resolveSettings) {
     const factories = PROVIDER_NAMES.map((name) => [
         name,
-        (settings) => createAgentRunner(PROVIDER_MODULES[name].create(buildBaseOptions(options, settings), runtime), { settings }),
+        (settings) => createAgentRunner(PROVIDER_MODULES[name].create(buildBaseOptions(options, settings), runtime), { settings, resolveSettings }),
     ]);
     return Object.fromEntries(factories);
 }
-function buildRunner(options, settings, createMcpDeps) {
-    return createSwitchingRunner(buildRunnerFactories(options, {
-        ...options.providerRuntime,
-        createMcpDeps,
-    }), settings);
+function buildRunner(options, settings, createMcpDeps, holder) {
+    return createSwitchingRunner(buildRunnerFactories(options, { ...options.providerRuntime, createMcpDeps }, (conversationId, global) => services(holder).conversationModes.settingsFor(conversationId, global)), settings);
 }
 function bindConnection(socket, config) {
     const ctx = buildConnectionContext(config);
@@ -69,47 +73,20 @@ function bindConnection(socket, config) {
         console.log(`${WS_LOG_PREFIX} close code=${code}`);
     });
 }
-function buildPermissionRequestEvent(event) {
-    return {
-        type: EVENT_TYPES.PERMISSION_REQUEST,
-        conversationId: event.conversationId,
-        requestId: event.requestId,
-        toolName: event.toolName,
-        args: event.args,
-        summary: buildToolSummary(event.toolName, event.args),
-    };
-}
-function buildSharedPermissionBus(chatSocketRegistry) {
-    return createPermissionBus({
-        onPromptChat: (event) => {
-            chatSocketRegistry.send(event.conversationId, buildPermissionRequestEvent(event));
-        },
-    });
-}
-function buildAskQuestionEvent(event) {
-    return {
-        type: EVENT_TYPES.ASK_QUESTION,
-        conversationId: event.conversationId,
-        requestId: event.requestId,
-        questions: event.questions,
-    };
-}
-function buildSharedQuestionBus(chatSocketRegistry) {
-    return createQuestionBus({
-        onPromptChat: (event) => {
-            chatSocketRegistry.send(event.conversationId, buildAskQuestionEvent(event));
-        },
-    });
-}
-function buildMcpDepsFactory(staticDeps, questionBus, editTracker, hostCommandsOf) {
+function buildMcpDepsFactory(staticDeps, holder, hostCommandsOf) {
     return (conversationId) => ({
         ...staticDeps,
         conversationId,
         sendToHost: hostCommandsOf(conversationId),
-        requestQuestion: questionBus.requestQuestion,
-        getLastEditedFile: () => editTracker.getLastEditedFile(conversationId),
+        requestQuestion: (req) => askUser(services(holder), req),
+        getLastEditedFile: () => services(holder).editTracker.getLastEditedFile(conversationId),
+        gateBuilderOp: (toolName, args) => buildBuilderGate(services(holder), conversationId)(toolName, args),
     });
 }
+function askUser(current, req) {
+    const callId = current.callLedger.claim(req.conversationId, ASK_USER_TOOL_NAME, { questions: req.questions });
+    return current.questionBus.requestQuestion({ ...req, callId });
+}
 function buildMcpServerFactory(createMcpDeps) {
     const byConversation = new Map();
     return (conversationId) => {
@@ -163,35 +140,98 @@ async function closeWss(wss) {
     closeClients(wss);
     await closed;
 }
-export function attachWsServer(httpServer, options) {
-    const chatSocketRegistry = options.chatSocketRegistry ?? createChatSocketRegistry();
-    const permissionBus = options.permissionBus ?? buildSharedPermissionBus(chatSocketRegistry);
-    const questionBus = buildSharedQuestionBus(chatSocketRegistry);
-    const editTracker = createEditTracker();
-    const createMcpDeps = buildMcpDepsFactory(options.mcpDeps, questionBus, editTracker, createHostCommandRouter(options.hostSocketRegistry, chatSocketRegistry));
-    const createMcpServer = buildMcpServerFactory(createMcpDeps);
-    const settingsStore = options.settingsStore ?? NOOP_SETTINGS_STORE;
-    const initialSettings = settingsStore.get();
-    permissionBus.setAutoApprove(effectiveChatMode(initialSettings) === "auto");
-    const config = {
+function services(holder) {
+    if (holder.current === null)
+        throw new Error("sidecar services not ready");
+    return holder.current;
+}
+function buildPermissionBus(options, holder) {
+    if (options.permissionBus !== undefined)
+        return options.permissionBus;
+    return createPermissionBus({
+        getPolicy: (conversationId) => permissionPolicy(services(holder), conversationId),
+        onPromptChat: (request) => onPermissionPrompt(services(holder), request),
+        onDecided: (record) => onPermissionDecided(services(holder), record),
+        onRulesChanged: (conversationId) => onRulesChanged(services(holder), conversationId),
+        onDenyAll: (conversationId) => interruptConversation(services(holder), conversationId),
+    });
+}
+function buildQuestionBus(holder) {
+    return createQuestionBus({
+        onPromptChat: (question) => onQuestionPrompt(services(holder), question),
+        onAnswered: (question, reply) => onQuestionAnswered(services(holder), question, reply),
+        onExpired: (question) => onQuestionExpired(services(holder), question),
+        onSettled: () => broadcastConversationList(services(holder)),
+    });
+}
+function createDisabledCheckpoints() {
+    return createCheckpoints({
+        git: createShadowGit({ gitDir: "", workTree: "", extraExcludes: [] }),
+        store: createChangeSetStore(""),
+    });
+}
+function onModeChanged(holder, conversationId, hasFullAutoEnded) {
+    const current = services(holder);
+    current.runner.refreshSession(conversationId);
+    if (hasFullAutoEnded) {
+        emitNoticeSafely(current, conversationId);
+    }
+    sendConversationMode(current, conversationId);
+    broadcastConversationList(current);
+}
+function emitNoticeSafely(current, conversationId) {
+    if (current.conversationStore.get(conversationId) === null)
+        return;
+    emitNotice(current, conversationId, {
+        kind: "full_auto_ended",
+        timestampMs: Date.now(),
+    });
+}
+function buildServices(parts) {
+    const { options, holder, chatSocketRegistry, settingsStore } = parts;
+    const createMcpDeps = buildMcpDepsFactory(options.mcpDeps, holder, createHostCommandRouter(options.hostSocketRegistry, chatSocketRegistry));
+    return {
         hostProjectRoot: options.hostProjectRoot,
         conversationStore: options.conversationStore,
         settingsStore,
-        createMcpServer,
-        questionBus,
-        editTracker,
+        createMcpServer: buildMcpServerFactory(createMcpDeps),
+        questionBus: buildQuestionBus(holder),
+        editTracker: parts.editTracker,
         logsClient: options.mcpDeps.logsClient,
         moduleRoots: options.moduleRoots ?? [],
         hostState: options.hostState,
         hostSocketRegistry: options.hostSocketRegistry,
         chatSocketRegistry,
-        permissionBus,
+        permissionBus: buildPermissionBus(options, holder),
         navigationCompleter: options.navigationCompleter,
         idleController: options.idleController ?? NOOP_IDLE_CONTROLLER,
-        runner: buildRunner(options, initialSettings, createMcpDeps),
+        runner: buildRunner(options, settingsStore.get(), createMcpDeps, holder),
         liveTurns: createLiveTurnStore(),
         pendingQueue: createPendingQueueStore(),
+        conversationModes: createConversationModes({
+            conversationStore: options.conversationStore,
+            settingsStore,
+            onChanged: (conversationId, hasEnded) => onModeChanged(holder, conversationId, hasEnded),
+        }),
+        checkpoints: options.checkpoints ?? createDisabledCheckpoints(),
+        callAudit: createCallAudit(),
+        callLedger: createCallLedger(),
+        turns: createTurnRegistry(),
+        askers: new Map(),
     };
+}
+export function attachWsServer(httpServer, options) {
+    const holder = { current: null };
+    const config = buildServices({
+        options,
+        holder,
+        chatSocketRegistry: options.chatSocketRegistry ?? createChatSocketRegistry(),
+        settingsStore: options.settingsStore ?? NOOP_SETTINGS_STORE,
+        editTracker: createEditTracker(),
+    });
+    holder.current = config;
+    if (options.bridge !== undefined)
+        options.bridge.services = config;
     if (options.settingsApplier) {
         options.settingsApplier.apply = (next) => applySettings(config, next);
     }

package/sidecar/dist/server/ws.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/server/ws.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/server/ws.ts"],"names":[],"mappings":"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"}

package/sidecar/dist/skills/build-catalog.d.ts

@@ -14,4 +14,5 @@ export interface SkillCatalog {
     duplicateNames: string[];
 }
 export declare function findDuplicateSkillNames(items: readonly SkillCatalogItem[]): string[];
+export declare function withoutIdenticalCopies(items: readonly SkillCatalogItem[]): SkillCatalogItem[];
 export declare function buildSkillCatalog(sources: readonly SkillSource[]): Promise<SkillCatalog>;