@mycadet/assistant 0.13.0-dev.202610311714.d661ca6 → 0.13.0-dev.202611012320.cea2f8a

package/Dockerfile

@@ -26,6 +26,7 @@ COPY --parents clients/*/package.json ./
 COPY cli/package.json ./cli/
 COPY gateway/package.json ./gateway/
 COPY credential-executor/package.json ./credential-executor/
+COPY qa/package.json ./qa/
 COPY assistant/package.json ./assistant/
 COPY assistant/src/api/package.json ./assistant/src/api/
 COPY --parents packages/*/package.json ./

package/eslint.config.mjs

@@ -1,3 +1,4 @@
+import { noReExports } from "@mycadet/shared/eslint/no-re-exports";
 import { defineConfig, globalIgnores } from "eslint/config";
 import simpleImportSort from "eslint-plugin-simple-import-sort";
 import tseslint from "typescript-eslint";
@@ -129,6 +130,13 @@ const eslintConfig = defineConfig([
     },
     rules: { "cli/no-daemon-internals": "error" },
   },
+  {
+    // Re-export shims are outlawed: consumers import from the defining
+    // module, and only index files aggregate a public surface. Warning
+    // level with a pinned count — each PR chips away at the remainder.
+    plugins: { "@mycadet": { rules: { "no-re-exports": noReExports } } },
+    rules: { "@mycadet/no-re-exports": "error" },
+  },
 ]);
 
 export default eslintConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mycadet/assistant",
-  "version": "0.13.0-dev.202610311714.d661ca6",
+  "version": "0.13.0-dev.202611012320.cea2f8a",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vargasjr-dev/mycadet-temp.git"
@@ -24,7 +24,7 @@
     "probe:skill-retrieval": "bun run scripts/probe-skill-retrieval.ts",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "lint": "bun run lint:skills && bun run lint:openapi && eslint --max-warnings 2688",
+    "lint": "bun run lint:skills && bun run lint:openapi && eslint --max-warnings 2678",
     "lint:unused": "knip --include files,dependencies,unlisted",
     "lint:circular": "bun run scripts/check-circular-deps.ts",
     "lint:unused:production": "knip --production --include exports",

package/src/__tests__/add-message-preassigned-id.test.ts

@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, test } from "bun:test";
 import { addMessage, getMessages } from "../persistence/conversation-crud.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
-import { conversations } from "../persistence/schema.js";
+import { conversations } from "../persistence/schema/index.js";
 
 await initializeDb();
 

package/src/__tests__/agent-loop-compacted-history-transform.test.ts

@@ -14,7 +14,7 @@ import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import type { PostCompactContext } from "@mycadet/plugin-api";
 
 import { AgentLoop } from "../agent/loop.js";
-import type { ContextWindowConfig } from "../config/types.js";
+import { ContextWindowConfig } from "../config/schemas/inference.js";
 import { stripAgedSightFrames } from "../daemon/conversation-sight-frames.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import { HOOKS } from "../plugin-api/constants.js";

package/src/__tests__/agent-loop-compaction-events.test.ts

@@ -14,7 +14,7 @@ import type { PostCompactContext } from "@mycadet/plugin-api";
 
 import type { AgentEvent } from "../agent/loop.js";
 import { AgentLoop } from "../agent/loop.js";
-import type { ContextWindowConfig } from "../config/types.js";
+import { ContextWindowConfig } from "../config/schemas/inference.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import { HOOKS } from "../plugin-api/constants.js";
 import {
@@ -31,8 +31,8 @@ import type {
   Provider,
   ProviderResponse,
   SendMessageOptions,
-  ToolDefinition,
 } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 
 // Identity post-compact hook: keeps the history the loop handed in, standing
 // in for the daemon-level re-injector these unit tests do not run.

package/src/__tests__/agent-loop-compaction-strip.test.ts

@@ -15,7 +15,7 @@ import type { PostCompactContext } from "@mycadet/plugin-api";
 
 import type { AgentEvent } from "../agent/loop.js";
 import { AgentLoop } from "../agent/loop.js";
-import type { ContextWindowConfig } from "../config/types.js";
+import { ContextWindowConfig } from "../config/schemas/inference.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import { HOOKS } from "../plugin-api/constants.js";
 import {

package/src/__tests__/agent-loop-exit-reason.test.ts

@@ -23,7 +23,7 @@ import type {
   CheckpointInfo,
 } from "../agent/loop.js";
 import { AgentLoop } from "../agent/loop.js";
-import type { ContextWindowConfig } from "../config/types.js";
+import { ContextWindowConfig } from "../config/schemas/inference.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import { HOOKS } from "../plugin-api/constants.js";
 import {
@@ -41,8 +41,8 @@ import type {
   Provider,
   ProviderResponse,
   SendMessageOptions,
-  ToolDefinition,
 } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 
 // The agent loop runs the default post-compaction re-injection through the
 // `post-compact` hook chain when it compacts in place. Register a test hook on

package/src/__tests__/agent-loop-mutable-latest-user-message.test.ts

@@ -15,8 +15,8 @@ import type {
   Provider,
   ProviderResponse,
   SendMessageOptions,
-  ToolDefinition,
 } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 
 const pointerText = wrapMemoryPointerBlock(
   "Already in context above, relevant again this turn:\nmemory/concepts/plans.md § Alpha",

package/src/__tests__/agent-loop-output-hooks.test.ts

@@ -8,18 +8,16 @@ import { beforeEach, describe, expect, test } from "bun:test";
 
 import type { AgentEvent, PreparedModelCall } from "../agent/loop.js";
 import { AgentLoop } from "../agent/loop.js";
-import type {
-  PostModelCallContext,
-  PreModelCallContext,
-} from "../plugin-api/types.js";
+import { PostModelCallContext } from "../hooks/types.js";
+import { PreModelCallContext } from "../hooks/types.js";
 import { resetPluginRegistryAndRegisterDefaults } from "../plugins/defaults/index.js";
 import { registerPlugin } from "../plugins/registry.js";
 import type {
   ContentBlock,
   Message,
   ProviderResponse,
-  ToolDefinition,
 } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 import {
   createMockProvider,
   textResponse,

package/src/__tests__/agent-loop-override-profile.test.ts

@@ -27,8 +27,8 @@ import type {
   Provider,
   ProviderResponse,
   SendMessageOptions,
-  ToolDefinition,
 } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 import { setConfig } from "./helpers/set-config.js";
 
 const userMessage: Message = {

package/src/__tests__/agent-loop-provider-error-recording.test.ts

@@ -32,8 +32,8 @@ import type {
   Provider,
   ProviderResponse,
   SendMessageOptions,
-  ToolDefinition,
 } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 import { ProviderError } from "../util/errors.js";
 
 /**

package/src/__tests__/agent-loop-regrowth-guard.test.ts

@@ -17,7 +17,7 @@ import type { PostCompactContext } from "@mycadet/plugin-api";
 
 import type { AgentEvent } from "../agent/loop.js";
 import { AgentLoop } from "../agent/loop.js";
-import type { ContextWindowConfig } from "../config/types.js";
+import { ContextWindowConfig } from "../config/schemas/inference.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import { HOOKS } from "../plugin-api/constants.js";
 import {

package/src/__tests__/agent-loop-resume-interrupted.test.ts

@@ -24,8 +24,8 @@ import type {
   Provider,
   ProviderResponse,
   SendMessageOptions,
-  ToolDefinition,
 } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 import { ProviderError } from "../util/errors.js";
 
 const tools: ToolDefinition[] = [

package/src/__tests__/agent-loop.test.ts

@@ -1,13 +1,15 @@
 import { beforeEach, describe, expect, test } from "bun:test";
 
+import { REFUSAL_FALLBACK_TEXT } from "@mycadet/plugin-api";
+
 import type {
   AgentEvent,
   CheckpointDecision,
   CheckpointInfo,
 } from "../agent/loop.js";
 import { AgentLoop } from "../agent/loop.js";
-import type { PostToolUseContext, StopContext } from "../plugin-api/types.js";
-import { REFUSAL_FALLBACK_TEXT } from "../plugins/defaults/empty-response/hooks/post-model-call.js";
+import { PostToolUseContext } from "../hooks/types.js";
+import { StopContext } from "../hooks/types.js";
 import { resetPluginRegistryAndRegisterDefaults } from "../plugins/defaults/index.js";
 import { registerPlugin } from "../plugins/registry.js";
 import type {
@@ -15,13 +17,13 @@ import type {
   Message,
   Provider,
   ProviderResponse,
-  ToolDefinition,
 } from "../providers/types.js";
 import { ContextOverflowError } from "../providers/types.js";
 import {
   CANCELLED_TOOL_RESULT,
   CANCELLED_UNSETTLED_TOOL_RESULT,
 } from "../tools/execution-timeout.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 import {
   createMockProvider,
   textResponse,

package/src/__tests__/anthropic-provider.test.ts

@@ -2,11 +2,8 @@ import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 import type { Anthropic } from "@anthropic-ai/sdk";
 
-import type {
-  ContentBlock,
-  Message,
-  ToolDefinition,
-} from "../providers/types.js";
+import type { ContentBlock, Message } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 
 // ---------------------------------------------------------------------------
 // Mock Anthropic SDK — must be before importing the provider

package/src/__tests__/approval-message-composer.test.ts

@@ -1,13 +1,11 @@
 import { describe, expect, test } from "bun:test";
 
-import type {
-  ApprovalMessageContext,
-  ApprovalMessageScenario,
-} from "../runtime/approval-message-composer.js";
 import {
   composeApprovalMessage,
   getFallbackMessage,
 } from "../runtime/approval-message-composer.js";
+import { ApprovalMessageContext } from "../runtime/message-composer-types.js";
+import { ApprovalMessageScenario } from "../runtime/message-composer-types.js";
 
 // ---------------------------------------------------------------------------
 // Every scenario must produce a non-empty string

package/src/__tests__/ask-question-resolver.test.ts

@@ -8,13 +8,14 @@
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
+import { GuardianRequestWire } from "@mycadet/gateway-client";
+
 import type {
   ActorContext,
   ResolverContext,
   ResolverDecision,
 } from "../approvals/guardian-request-resolvers.js";
 import { getResolver } from "../approvals/guardian-request-resolvers.js";
-import type { GuardianRequestWire } from "../channels/gateway-guardian-requests.js";
 import type { QuestionPromptResult } from "../permissions/question-prompter.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
 

package/src/__tests__/assistant-attachments.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, test } from "bun:test";
 
+import { inferMimeType } from "@mycadet/service-contracts/attachment-naming";
+import { resolveAttachmentFilename } from "@mycadet/service-contracts/attachment-naming";
+
 import {
   type AssistantAttachmentDraft,
   classifyKind,
@@ -10,9 +13,7 @@ import {
   estimateBase64Bytes,
   extractCadetLinks,
   incompleteCadetLinkSuffixLength,
-  inferMimeType,
   MAX_ASSISTANT_ATTACHMENT_BYTES,
-  resolveAttachmentFilename,
   stripCadetLinks,
   validateDrafts,
 } from "../daemon/assistant-attachments.js";

package/src/__tests__/assistant-event-targeting.test.ts

@@ -8,7 +8,7 @@
 import { beforeEach, describe, expect, test } from "bun:test";
 
 import type { AssistantEventEnvelope } from "../api/index.js";
-import type { HostProxyCapability, InterfaceId } from "../channels/types.js";
+import type { InterfaceId } from "../channels/types.js";
 import { AssistantEventHub } from "../runtime/assistant-event-hub.js";
 import type { AssistantEventPublishOptions } from "../runtime/assistant-event-publish-options.js";
 import { matchesTargeting } from "../runtime/assistant-event-targeting.js";
@@ -17,6 +17,7 @@ import {
   getReplayWindow,
   stampAndBuffer,
 } from "../runtime/assistant-stream-state.js";
+import { HostProxyCapability } from "../types/host-capabilities.js";
 
 const CONV = "conv-targeting";
 

package/src/__tests__/attachments-store.test.ts

@@ -29,7 +29,7 @@ import {
   createConversation,
   deleteMessageById,
 } from "../persistence/conversation-crud.js";
-import { getConversationDirPath } from "../persistence/conversation-disk-view.js";
+import { getConversationDirPath } from "../persistence/conversation-directories.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { rawGet, rawRun } from "../persistence/raw-query.js";

package/src/__tests__/browser-identifier-parity-guard.test.ts

@@ -14,7 +14,7 @@
 
 import { describe, expect, test } from "bun:test";
 
-import { BROWSER_OPERATION_META } from "../browser/operations.js";
+import { BROWSER_OPERATION_META } from "../browser/operation-meta.js";
 import { BROWSER_OPERATIONS } from "../browser/types.js";
 
 // ── Helpers ──────────────────────────────────────────────────────────

package/src/__tests__/browser-skill-endstate.test.ts

@@ -6,7 +6,7 @@
  */
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 
-import { BROWSER_OPERATION_META } from "../browser/operations.js";
+import { BROWSER_OPERATION_META } from "../browser/operation-meta.js";
 import { BROWSER_OPERATIONS } from "../browser/types.js";
 import {
   projectSkillTools,

package/src/__tests__/call-domain.test.ts

@@ -95,7 +95,7 @@ import {
   resolveCallerIdentity,
   startCall,
 } from "../calls/call-domain.js";
-import type { AssistantConfig } from "../config/types.js";
+import { AssistantConfig } from "../config/schema.js";
 import { getMessages } from "../persistence/conversation-crud.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";

package/src/__tests__/call-setup-flow-name-capture.test.ts

@@ -1,5 +1,7 @@
 import { describe, expect, test } from "bun:test";
 
+import { TrustClass } from "@mycadet/gateway-client";
+
 import {
   CallSetupFlow,
   type CallSetupFlowDeps,
@@ -21,7 +23,6 @@ import type {
 import type { CallSession } from "../calls/types.js";
 import type { ChannelStatus } from "../contacts/types.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
-import type { TrustClass } from "../runtime/trust-class.js";
 
 // ---------------------------------------------------------------------------
 // Fixtures

package/src/__tests__/call-setup-flow-verification.test.ts

@@ -1,5 +1,7 @@
 import { describe, expect, test } from "bun:test";
 
+import { TrustClass } from "@mycadet/gateway-client";
+
 import {
   CallSetupFlow,
   type CallSetupFlowDeps,
@@ -14,7 +16,6 @@ import type {
 } from "../calls/call-setup-router.js";
 import type { CallSession } from "../calls/types.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
-import type { TrustClass } from "../runtime/trust-class.js";
 
 // ---------------------------------------------------------------------------
 // Fixtures

package/src/__tests__/call-setup-flow.test.ts

@@ -1,5 +1,7 @@
 import { describe, expect, test } from "bun:test";
 
+import { TrustClass } from "@mycadet/gateway-client";
+
 import {
   CallSetupFlow,
   type CallSetupFlowDeps,
@@ -16,7 +18,6 @@ import type {
 } from "../calls/call-setup-router.js";
 import type { MediaStreamOutput } from "../calls/media-stream-output.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
-import type { TrustClass } from "../runtime/trust-class.js";
 
 // ---------------------------------------------------------------------------
 // Fixtures

package/src/__tests__/call-site-routing-provider.test.ts

@@ -18,7 +18,7 @@
 import { beforeEach, describe, expect, test } from "bun:test";
 
 import { CallSiteRoutingProvider } from "../providers/call-site-routing.js";
-import { ConnectionResolutionError } from "../providers/connection-resolution.js";
+import { ConnectionResolutionError } from "../providers/routing-identity.js";
 import type {
   Message,
   Provider,

package/src/__tests__/call-start-guardian-guard.test.ts

@@ -60,7 +60,8 @@ mock.module("../channels/gateway-verification-sessions.js", () => ({
   },
 }));
 
-const { executeCallStart } = await import("../tools/calls/call-start.js");
+const { run: executeCallStart } =
+  await import("../config/bundled-skills/phone-calls/tools/call-start.js");
 
 function makeContext(): ToolContext {
   return {

package/src/__tests__/ces-rpc-credential-backend.test.ts

@@ -17,7 +17,8 @@ const isReadyFn = mock((): boolean => true);
 // ---------------------------------------------------------------------------
 
 // Import after mocking
-import type { CesClient } from "../credential-execution/client.js";
+import { CesRpcClient as CesClient } from "@mycadet/ces-client/rpc-client";
+
 import { CesRpcCredentialBackend } from "../security/ces-rpc-credential-backend.js";
 
 // ---------------------------------------------------------------------------

package/src/__tests__/ces-startup-timeout.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, mock, test } from "bun:test";
 
-import type { CesClient } from "../credential-execution/client.js";
+import { CesRpcClient as CesClient } from "@mycadet/ces-client/rpc-client";
+
 import {
   awaitCesClientWithTimeout,
   DEFAULT_CES_STARTUP_TIMEOUT_MS,

package/src/__tests__/channel-approval-routes.test.ts

@@ -74,13 +74,11 @@ import * as gatewayClient from "../runtime/gateway-client.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
 import { _setTestPollMaxWait } from "../runtime/routes/channel-route-shared.js";
 import { resetDbForTesting } from "./db-test-helpers.js";
-import {
-  handleChannelInbound,
-  seedContactChannel,
-} from "./helpers/channel-test-adapter.js";
+import { handleChannelInbound } from "./helpers/channel-test-adapter.js";
 import { createGuardianBinding } from "./helpers/create-guardian-binding.js";
 import { resetGatewayAclStore } from "./helpers/gateway-acl-store.js";
 import { bridgeState } from "./helpers/gateway-guardian-requests-store-bridge.js";
+import { seedContactChannel } from "./helpers/seed-contact-channel.js";
 
 await initializeDb();
 

package/src/__tests__/channel-inbound-disk-pressure.test.ts

@@ -2,7 +2,7 @@ import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
 
 import { eq } from "drizzle-orm";
 
-import type { DiskPressureStatus } from "../daemon/disk-pressure-guard.js";
+import { DiskPressureStatus } from "../api/events/disk-pressure-status-changed.js";
 
 const deliverChannelReplyMock = mock(
   async (_callbackUrl: string, _payload: Record<string, unknown>) => {},
@@ -59,11 +59,11 @@ import { channelInboundEvents, messages } from "../persistence/schema/index.js";
 import { sweepFailedEvents } from "../runtime/channel-retry-sweep.js";
 import {
   handleChannelInbound,
-  seedContactChannel,
   setAdapterProcessMessage,
 } from "./helpers/channel-test-adapter.js";
 import { createGuardianBinding } from "./helpers/create-guardian-binding.js";
 import { bridgeState } from "./helpers/gateway-guardian-requests-store-bridge.js";
+import { seedContactChannel } from "./helpers/seed-contact-channel.js";
 
 await initializeDb();
 

package/src/__tests__/channel-invite-transport.test.ts

@@ -10,12 +10,12 @@
 import { describe, expect, test } from "bun:test";
 
 import {
-  type ChannelInviteAdapter,
   createInviteAdapterRegistry,
   getInviteAdapterRegistry,
   InviteAdapterRegistry,
   resolveAdapterHandle,
 } from "../runtime/channel-invite-transport.js";
+import type { ChannelInviteAdapter } from "../runtime/channel-invite-types.js";
 
 describe("resolveAdapterHandle", () => {
   test("returns sync handle when only resolveChannelHandle is defined", async () => {

package/src/__tests__/channel-policy.test.ts

@@ -8,6 +8,9 @@
 
 import { describe, expect, test } from "bun:test";
 
+import type { ChannelId } from "@mycadet/service-contracts/channels";
+import { CHANNEL_IDS } from "@mycadet/service-contracts/channels";
+
 import {
   type ConversationStrategy,
   getChannelPolicy,
@@ -15,7 +18,6 @@ import {
   getDeliverableChannels,
   isNotificationDeliverable,
 } from "../channels/config.js";
-import { CHANNEL_IDS, type ChannelId } from "../channels/types.js";
 import { getTransportForChannel } from "../messaging/providers/index.js";
 
 describe("channel policy registry", () => {

package/src/__tests__/channel-readiness-service.test.ts

@@ -47,7 +47,8 @@ mock.module("../runtime/channel-invite-transports/whatsapp.js", () => ({
   resolveWhatsAppDisplayNumber: () => "",
 }));
 
-import type { ChannelId } from "../channels/types.js";
+import { ChannelId } from "@mycadet/service-contracts/channels";
+
 import {
   ChannelReadinessService,
   createReadinessService,

package/src/__tests__/channel-setup-panel-ack.test.ts

@@ -12,6 +12,7 @@ import { describe, expect, test } from "bun:test";
 
 import type { OpenPanelEvent } from "../api/events/open-panel.js";
 import type { AssistantEvent } from "../api/index.js";
+import { SurfaceType } from "../api/surfaces.js";
 import type { Conversation } from "../daemon/conversation.js";
 import {
   createSurfaceMutex,
@@ -19,7 +20,6 @@ import {
   openChannelSetupPanel,
   surfaceProxyResolver,
 } from "../daemon/conversation-surfaces.js";
-import type { SurfaceType } from "../daemon/message-protocol.js";
 import { asConversation } from "./helpers/mock-conversation.js";
 
 function makeContext(

package/src/__tests__/checker.test.ts

@@ -71,8 +71,8 @@ import {
   SCOPE_AWARE_TOOLS,
 } from "../permissions/checker.js";
 import { _clearGlobalCacheForTesting } from "../permissions/gateway-threshold-reader.js";
-import { RiskLevel } from "../permissions/types.js";
 import { registerSkillTools, registerTool } from "../tools/registry.js";
+import { RiskLevel } from "../tools/tool-types.js";
 import type { Tool } from "../tools/types.js";
 import * as platformModule from "../util/layout.js";
 

package/src/__tests__/computer-use-screenshot-attachments.test.ts

@@ -17,10 +17,8 @@ import {
   getMessageById,
   parseMessageMetadata,
 } from "../persistence/conversation-crud.js";
-import {
-  getConversationDirPath,
-  syncMessageToDisk,
-} from "../persistence/conversation-disk-view.js";
+import { getConversationDirPath } from "../persistence/conversation-directories.js";
+import { syncMessageToDisk } from "../persistence/conversation-disk-view.js";
 import { computerUseScreenshotAttachmentIdsFromMetadata } from "../persistence/conversation-types.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";

package/src/__tests__/computer-use-skill-manifest-regression.test.ts

@@ -2,7 +2,6 @@ import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { afterAll, describe, expect, test } from "bun:test";
 
-import { RiskLevel } from "../permissions/types.js";
 import {
   __resetRegistryForTesting,
   getTool,
@@ -10,6 +9,7 @@ import {
   registerSkillTools,
   unregisterSkillTools,
 } from "../tools/registry.js";
+import { RiskLevel } from "../tools/tool-types.js";
 import type { Tool } from "../tools/types.js";
 import {
   COMPUTER_USE_TOOL_COUNT,

package/src/__tests__/config-schema.test.ts

@@ -31,13 +31,11 @@ function ensureTestDir(): void {
 }
 
 import { getConfig, invalidateConfigCache } from "../config/loader.js";
-import {
-  AssistantConfigSchema,
-  DEFAULT_ELEVENLABS_VOICE_ID,
-} from "../config/schema.js";
+import { AssistantConfigSchema } from "../config/schema.js";
+import { AssistantConfig } from "../config/schema.js";
+import { DEFAULT_ELEVENLABS_VOICE_ID } from "../config/schemas/elevenlabs.js";
 import { SttServiceSchema } from "../config/schemas/stt.js";
 import { TtsServiceSchema } from "../config/schemas/tts.js";
-import type { AssistantConfig } from "../config/types.js";
 import { listCatalogProviderIds } from "../tts/provider-catalog.js";
 import { resolveTtsConfig } from "../tts/tts-config-resolver.js";
 import { TTS_PROVIDER_IDS } from "../tts/types.js";
@@ -2683,8 +2681,8 @@ describe("Call entrypoint gating", () => {
     // Force config reload
     getConfig();
 
-    const { executeCallStart: _executeCallStart } =
-      await import("../tools/calls/call-start.js");
+    const { run: _runCallStartModule } =
+      await import("../config/bundled-skills/phone-calls/tools/call-start.js");
 
     // The tool is registered via side effect. We need to test the gating logic directly.
     // Since the module registers itself, we test by loading config and checking behavior.

package/src/__tests__/context-window-manager-overflow-rung.test.ts

@@ -85,7 +85,8 @@ mock.module(
 );
 
 import { ContextWindowManager } from "../plugins/defaults/compaction/window-manager.js";
-import type { Message, Provider, ToolDefinition } from "../providers/types.js";
+import type { Message, Provider } from "../providers/types.js";
+import { ToolDefinition } from "../tools/tool-types.js";
 
 function makeProvider(): Provider {
   return {