refactor(x): the runtime moves under one roof — core/src/runtime/

Everything "model runtime" now lives under core/src/runtime/, whose
five children are the architecture: turns/ (the engine + bridges),
sessions/, assembly/ (what an agent is: registry, composer, workspace
context, message encoding, permission metadata, headless runners,
spawn-agent, copilot/ definition, capabilities/, skills/ — no longer
buried at application/assistant), tools/ (catalog + domains + exec
plumbing + descriptors, which leave turns/bridges and fix the upward
lib→bridges edge), and legacy/ (the quarantined runs engine, with
agents/runtime.ts finally honestly named engine.ts).

Pure moves via git mv (history follows) with mechanical import
rewrites; no durable schema, wire format, or behavior changes — the
golden prompt snapshots and the catalog key-order pin pass unchanged.
di/ stays top-level (whole-app composition root); application/ shrinks
to browser-control/browser-skills/notification and true cross-cutting
lib utils.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

apps/x/apps/main/src/composio-handler.ts

@@ -2,7 +2,7 @@ import { shell, BrowserWindow } from 'electron';
 import { createAuthServer } from './auth-server.js';
 import * as composioClient from '@x/core/dist/composio/client.js';
 import { composioAccountsRepo } from '@x/core/dist/composio/repo.js';
-import { invalidateCopilotInstructionsCache } from '@x/core/dist/application/assistant/instructions.js';
+import { invalidateCopilotInstructionsCache } from '@x/core/dist/runtime/assembly/copilot/instructions.js';
 import { CURATED_TOOLKIT_SLUGS } from '@x/shared/dist/composio.js';
 import type { LocalConnectedAccount, Toolkit } from '@x/core/dist/composio/types.js';
 import { triggerSync as triggerGmailSync } from '@x/core/dist/knowledge/sync_gmail.js';

apps/x/apps/main/src/ipc.ts

@@ -12,8 +12,8 @@ import { watcher as watcherCore, workspace } from '@x/core';
 import { WorkDir } from '@x/core/dist/config/config.js';
 import { workspace as workspaceShared } from '@x/shared';
 import * as mcpCore from '@x/core/dist/mcp/mcp.js';
-import * as runsCore from '@x/core/dist/runs/runs.js';
-import { bus } from '@x/core/dist/runs/bus.js';
+import * as runsCore from '@x/core/dist/runtime/legacy/runs.js';
+import { bus } from '@x/core/dist/runtime/legacy/bus.js';
 import { serviceBus } from '@x/core/dist/services/service_bus.js';
 import type { FSWatcher } from 'chokidar';
 import fs from 'node:fs/promises';
@@ -30,8 +30,8 @@ import { RunEvent } from '@x/shared/dist/runs.js';
 import { ServiceEvent } from '@x/shared/dist/service-events.js';
 import type { SessionBusEvent } from '@x/shared/dist/sessions.js';
 import { isDurableTurnEvent } from '@x/shared/dist/turns.js';
-import type { ISessions, EmitterSessionBus } from '@x/core/dist/sessions/index.js';
-import type { ITurnEventBus } from '@x/core/dist/turns/event-hub.js';
+import type { ISessions, EmitterSessionBus } from '@x/core/dist/runtime/sessions/index.js';
+import type { ITurnEventBus } from '@x/core/dist/runtime/turns/event-hub.js';
 import container from '@x/core/dist/di/container.js';
 import { listOnboardingModels } from '@x/core/dist/models/models-dev.js';
 import { testModelConnection, listModelsForProvider, generateOneShot } from '@x/core/dist/models/models.js';
@@ -55,7 +55,7 @@ import * as codeGit from '@x/core/dist/code-mode/git/service.js';
 import { readProjectDir, readProjectFile } from '@x/core/dist/code-mode/projects/fs.js';
 import { ensureTerminal, writeTerminal, resizeTerminal, disposeTerminal } from './terminal.js';
 import type { CodeSession } from '@x/shared/dist/code-sessions.js';
-import { invalidateCopilotInstructionsCache } from '@x/core/dist/application/assistant/instructions.js';
+import { invalidateCopilotInstructionsCache } from '@x/core/dist/runtime/assembly/copilot/instructions.js';
 import { triggerSync as triggerGranolaSync } from '@x/core/dist/knowledge/granola/sync.js';
 import { ISlackConfigRepo } from '@x/core/dist/slack/repo.js';
 import { IChannelsConfigRepo } from '@x/core/dist/channels/repo.js';

apps/x/apps/main/src/main.ts

@@ -36,7 +36,7 @@ import { init as initEventProcessor, registerConsumer } from "@x/core/dist/event
 import { liveNoteEventConsumer } from "@x/core/dist/knowledge/live-note/event-consumer.js";
 import { init as initBackgroundTaskScheduler } from "@x/core/dist/background-tasks/scheduler.js";
 import { backgroundTaskEventConsumer } from "@x/core/dist/background-tasks/event-consumer.js";
-import { startSkillsWatcher, stopSkillsWatcher } from "@x/core/dist/application/assistant/skills/watcher.js";
+import { startSkillsWatcher, stopSkillsWatcher } from "@x/core/dist/runtime/assembly/skills/watcher.js";
 import { init as initAppsServer, shutdown as shutdownAppsServer } from "@x/core/dist/apps/server.js";
 import { registerAppsHostApi } from "@x/core/dist/apps/host-api.js";
 import { setTokenCipher as setGithubTokenCipher } from "@x/core/dist/apps/github-auth.js";
@@ -52,7 +52,7 @@ import { execFileSync } from "node:child_process";
 import { init as initChromeSync } from "@x/core/dist/knowledge/chrome-extension/server/server.js";
 import container, { registerBrowserControlService, registerNotificationService } from "@x/core/dist/di/container.js";
 import type { CodeModeManager } from "@x/core/dist/code-mode/acp/manager.js";
-import type { ISessions } from "@x/core/dist/sessions/index.js";
+import type { ISessions } from "@x/core/dist/runtime/sessions/index.js";
 import { browserViewManager, BROWSER_PARTITION } from "./browser/view.js";
 import { setupBrowserEventForwarding } from "./browser/ipc.js";
 import { ElectronBrowserControlService } from "./browser/control-service.js";

apps/x/apps/main/src/test-agent.ts

@@ -1,5 +1,5 @@
-import * as runsCore from '@x/core/dist/runs/runs.js';
-import { bus } from '@x/core/dist/runs/bus.js';
+import * as runsCore from '@x/core/dist/runtime/legacy/runs.js';
+import { bus } from '@x/core/dist/runtime/legacy/bus.js';
 
 async function main() {
     const { id } = await runsCore.createRun({

apps/x/packages/core/package.json

@@ -9,8 +9,8 @@
     "dev": "tsc -w -p tsconfig.build.json",
     "test": "vitest run",
     "test:watch": "vitest",
-    "inspect-turn": "node dist/turns/inspect-cli.js",
-    "inspect": "node dist/turns/inspect-cli.js"
+    "inspect-turn": "node dist/runtime/turns/inspect-cli.js",
+    "inspect": "node dist/runtime/turns/inspect-cli.js"
   },
   "dependencies": {
     "@agentclientprotocol/claude-agent-acp": "^0.55.0",

apps/x/packages/core/src/agent-schedule/runner.ts

@@ -4,7 +4,7 @@ import { IAgentScheduleRepo } from "./repo.js";
 import { IAgentScheduleStateRepo } from "./state-repo.js";
 import { AgentScheduleConfig, AgentScheduleEntry } from "@x/shared/dist/agent-schedule.js";
 import { AgentScheduleState, AgentScheduleStateEntry } from "@x/shared/dist/agent-schedule-state.js";
-import { startWhenPossible } from "../agents/headless-app.js";
+import { startWhenPossible } from "../runtime/assembly/headless-app.js";
 import { withUseCase } from "../analytics/use_case.js";
 import z from "zod";
 

apps/x/packages/core/src/application/lib/command-executor.ts

@@ -1,7 +1,7 @@
 import { exec, execSync, spawn, ChildProcess } from 'child_process';
 import { promisify } from 'util';
 import { getSecurityAllowList } from '../../config/security.js';
-import { getExecutionShell } from '../assistant/runtime-context.js';
+import { getExecutionShell } from '../../runtime/assembly/copilot/runtime-context.js';
 
 const execPromise = promisify(exec);
 

apps/x/packages/core/src/apps/host-api.ts

@@ -26,8 +26,8 @@ import { createProvider } from '../models/models.js';
 import { captureLlmUsage } from '../analytics/usage.js';
 import { withUseCase } from '../analytics/use_case.js';
 import { isSignedIn } from '../account/account.js';
-import { createRun, createMessage } from '../runs/runs.js';
-import { extractAgentResponse, waitForRunCompletion } from '../agents/utils.js';
+import { createRun, createMessage } from '../runtime/legacy/runs.js';
+import { extractAgentResponse, waitForRunCompletion } from '../runtime/legacy/utils.js';
 import { getBackgroundTaskAgentModel } from '../models/defaults.js';
 
 // Host API — M2 endpoints (spec §7.4–§7.7): Composio tools, SSRF-guarded fetch

apps/x/packages/core/src/background-tasks/agent.ts

@@ -1,6 +1,6 @@
 import z from 'zod';
 import { Agent, ToolAttachment } from '@x/shared/dist/agent.js';
-import { BuiltinTools } from '../application/lib/builtin-tools.js';
+import { BuiltinTools } from '../runtime/tools/catalog.js';
 import { KNOWLEDGE_NOTE_STYLE_GUIDE } from '../application/lib/knowledge-note-style.js';
 import { WorkDir } from '../config/config.js';
 

apps/x/packages/core/src/background-tasks/code-sessions.ts

@@ -5,7 +5,7 @@ import container from '../di/container.js';
 import type { CodeSessionService } from '../code-mode/sessions/service.js';
 import type { ICodeProjectsRepo } from '../code-mode/projects/repo.js';
 import * as gitService from '../code-mode/git/service.js';
-import { extractAgentResponse } from '../agents/utils.js';
+import { extractAgentResponse } from '../runtime/legacy/utils.js';
 import { withFileLock } from '../knowledge/file-lock.js';
 import { fetchTask, taskIndexPath } from './fileops.js';
 

apps/x/packages/core/src/background-tasks/runner.ts

@@ -2,8 +2,8 @@ import type { BackgroundTask, BackgroundTaskTriggerType } from '@x/shared/dist/b
 import { PrefixLogger } from '@x/shared/dist/prefix-logger.js';
 import { fetchTask, patchTask, prependRunId } from './fileops.js';
 import { getBackgroundTaskAgentModel } from '../models/defaults.js';
-import { startHeadlessAgent, startWhenPossible } from '../agents/headless-app.js';
-import { buildTriggerBlock } from '../agents/build-trigger-block.js';
+import { startHeadlessAgent, startWhenPossible } from '../runtime/assembly/headless-app.js';
+import { buildTriggerBlock } from '../runtime/assembly/build-trigger-block.js';
 import { backgroundTaskBus } from './bus.js';
 import { withUseCase } from '../analytics/use_case.js';
 

apps/x/packages/core/src/channels/bridge.test.ts

@@ -1,9 +1,9 @@
 import { describe, expect, it, vi } from "vitest";
 import type { SessionIndexEntry } from "@x/shared/dist/sessions.js";
 import type { TurnStreamEvent } from "@x/shared/dist/turns.js";
-import { TurnEventHub } from "../turns/event-hub.js";
-import { TurnInputError } from "../turns/api.js";
-import type { ISessions } from "../sessions/api.js";
+import { TurnEventHub } from "../runtime/turns/event-hub.js";
+import { TurnInputError } from "../runtime/turns/api.js";
+import type { ISessions } from "../runtime/sessions/api.js";
 import { ChannelBridge, type ModelChoice } from "./bridge.js";
 
 const SENDER = "test:1";

apps/x/packages/core/src/channels/bridge.ts

@@ -1,10 +1,10 @@
 import type { SessionIndexEntry } from "@x/shared/dist/sessions.js";
 import { reduceTurn, type TurnStreamEvent } from "@x/shared/dist/turns.js";
-import { assistantText, lastAssistantText } from "../agents/headless.js";
-import { TurnInputError } from "../turns/api.js";
-import { ASK_HUMAN_TOOL } from "../turns/bridges/real-agent-resolver.js";
-import { TurnNotSettledError, type ISessions } from "../sessions/api.js";
-import type { ITurnEventBus } from "../turns/event-hub.js";
+import { assistantText, lastAssistantText } from "../runtime/assembly/headless.js";
+import { TurnInputError } from "../runtime/turns/api.js";
+import { ASK_HUMAN_TOOL } from "../runtime/turns/bridges/real-agent-resolver.js";
+import { TurnNotSettledError, type ISessions } from "../runtime/sessions/api.js";
+import type { ITurnEventBus } from "../runtime/turns/event-hub.js";
 
 // Transport-agnostic command layer: inbound texts from a messaging channel
 // are parsed into commands (list / resume / new / stop / status) or forwarded

apps/x/packages/core/src/channels/service.ts

@@ -4,8 +4,8 @@ import type { z } from "zod";
 import type { ChannelsConfig, ChannelsStatus } from "@x/shared/dist/channels.js";
 import container from "../di/container.js";
 import { WorkDir } from "../config/config.js";
-import type { ISessions } from "../sessions/api.js";
-import type { ITurnEventBus } from "../turns/event-hub.js";
+import type { ISessions } from "../runtime/sessions/api.js";
+import type { ITurnEventBus } from "../runtime/turns/event-hub.js";
 import { isSignedIn } from "../account/account.js";
 import { listGatewayModels } from "../models/gateway.js";
 import { listOnboardingModels } from "../models/models-dev.js";

apps/x/packages/core/src/code-mode/sessions/service.ts

@@ -5,11 +5,11 @@ import { WorkDir } from '../../config/config.js';
 import type { CodeSession, CodeSessionMode } from '@x/shared/dist/code-sessions.js';
 import type { CodingAgent, ApprovalPolicy } from '@x/shared/dist/code-mode.js';
 import { RunEvent, MessageEvent } from '@x/shared/dist/runs.js';
-import type { IRunsRepo } from '../../runs/repo.js';
-import type { IRunsLock } from '../../runs/lock.js';
+import type { IRunsRepo } from '../../runtime/legacy/repo.js';
+import type { IRunsLock } from '../../runtime/legacy/lock.js';
 import type { IBus } from '../../application/lib/bus.js';
 import type { IMonotonicallyIncreasingIdGenerator } from '../../application/lib/id-gen.js';
-import type { IAbortRegistry } from '../../turns/abort-registry.js';
+import type { IAbortRegistry } from '../../runtime/turns/abort-registry.js';
 import type { CodeModeManager } from '../acp/manager.js';
 import type { CodePermissionRegistry } from '../acp/permission-registry.js';
 import type { ICodeSessionsRepo } from './repo.js';
@@ -114,7 +114,7 @@ export class CodeSessionService {
 
         // The session is a real run so Rowboat mode (agent runtime) works on it
         // directly and the existing runs plumbing (fetch/events/stop) applies.
-        const { createRun } = await import('../../runs/runs.js');
+        const { createRun } = await import('../../runtime/legacy/runs.js');
         const run = await createRun({
             agentId: 'copilot',
             useCase: 'code_session',

apps/x/packages/core/src/di/container.ts

@@ -3,18 +3,18 @@ import { asClass, asFunction, asValue, createContainer, InjectionMode } from "aw
 import { WorkDir } from "../config/config.js";
 import { FSModelConfigRepo, IModelConfigRepo } from "../models/repo.js";
 import { FSMcpConfigRepo, IMcpConfigRepo } from "../mcp/repo.js";
-import { FSAgentsRepo, IAgentsRepo } from "../agents/repo.js";
-import { FSRunsRepo, IRunsRepo } from "../runs/repo.js";
+import { FSAgentsRepo, IAgentsRepo } from "../runtime/assembly/repo.js";
+import { FSRunsRepo, IRunsRepo } from "../runtime/legacy/repo.js";
 import { IMonotonicallyIncreasingIdGenerator, IdGen } from "../application/lib/id-gen.js";
 import { IMessageQueue, InMemoryMessageQueue } from "../application/lib/message-queue.js";
 import { IBus, InMemoryBus } from "../application/lib/bus.js";
-import { IRunsLock, InMemoryRunsLock } from "../runs/lock.js";
-import { IAgentRuntime, AgentRuntime } from "../agents/runtime.js";
+import { IRunsLock, InMemoryRunsLock } from "../runtime/legacy/lock.js";
+import { IAgentRuntime, AgentRuntime } from "../runtime/legacy/engine.js";
 import { FSOAuthRepo, IOAuthRepo } from "../auth/repo.js";
 import { FSClientRegistrationRepo, IClientRegistrationRepo } from "../auth/client-repo.js";
 import { FSGranolaConfigRepo, IGranolaConfigRepo } from "../knowledge/granola/repo.js";
 import { FSCodeModeConfigRepo, ICodeModeConfigRepo } from "../code-mode/repo.js";
-import { IAbortRegistry, InMemoryAbortRegistry } from "../turns/abort-registry.js";
+import { IAbortRegistry, InMemoryAbortRegistry } from "../runtime/turns/abort-registry.js";
 import { FSAgentScheduleRepo, IAgentScheduleRepo } from "../agent-schedule/repo.js";
 import { FSAgentScheduleStateRepo, IAgentScheduleStateRepo } from "../agent-schedule/state-repo.js";
 import { FSSlackConfigRepo, ISlackConfigRepo } from "../slack/repo.js";
@@ -28,33 +28,33 @@ import { CodeSessionService } from "../code-mode/sessions/service.js";
 import { CodeSessionStatusTracker } from "../code-mode/sessions/status-tracker.js";
 import type { IBrowserControlService } from "../application/browser-control/service.js";
 import type { INotificationService } from "../application/notification/service.js";
-import { SystemClock, type IClock } from "../turns/clock.js";
-import { FSTurnRepo } from "../turns/fs-repo.js";
-import type { ITurnRepo } from "../turns/repo.js";
-import type { IContextResolver } from "../turns/context-resolver.js";
-import { createContextResolver } from "../turns/context-elision.js";
-import { EmitterTurnLifecycleBus, type ITurnLifecycleBus } from "../turns/bus.js";
-import { TurnEventHub, type ITurnEventBus } from "../turns/event-hub.js";
-import { RealUsageReporter } from "../turns/bridges/real-usage-reporter.js";
-import type { IUsageReporter } from "../turns/usage-reporter.js";
-import { TurnRuntime } from "../turns/runtime.js";
-import type { ITurnRuntime } from "../turns/api.js";
-import type { IAgentResolver } from "../turns/agent-resolver.js";
-import type { IModelRegistry } from "../turns/model-registry.js";
-import type { IToolRegistry } from "../turns/tool-registry.js";
-import type { IPermissionChecker, IPermissionClassifier } from "../turns/permission.js";
-import { RealAgentResolver } from "../turns/bridges/real-agent-resolver.js";
-import { InlineAgentResolver } from "../turns/bridges/inline-agent-resolver.js";
-import { DispatchingAgentResolver } from "../turns/bridges/agent-resolver-dispatch.js";
-import { RealModelRegistry } from "../turns/bridges/real-model-registry.js";
-import { RealToolRegistry } from "../turns/bridges/real-tool-registry.js";
-import { RealPermissionChecker } from "../turns/bridges/real-permission-checker.js";
-import { RealPermissionClassifier } from "../turns/bridges/real-permission-classifier.js";
-import { FSSessionRepo } from "../sessions/fs-repo.js";
-import type { ISessionRepo } from "../sessions/repo.js";
-import { EmitterSessionBus, type ISessionBus } from "../sessions/bus.js";
-import { SessionsImpl } from "../sessions/sessions.js";
-import type { ISessions } from "../sessions/api.js";
+import { SystemClock, type IClock } from "../runtime/turns/clock.js";
+import { FSTurnRepo } from "../runtime/turns/fs-repo.js";
+import type { ITurnRepo } from "../runtime/turns/repo.js";
+import type { IContextResolver } from "../runtime/turns/context-resolver.js";
+import { createContextResolver } from "../runtime/turns/context-elision.js";
+import { EmitterTurnLifecycleBus, type ITurnLifecycleBus } from "../runtime/turns/bus.js";
+import { TurnEventHub, type ITurnEventBus } from "../runtime/turns/event-hub.js";
+import { RealUsageReporter } from "../runtime/turns/bridges/real-usage-reporter.js";
+import type { IUsageReporter } from "../runtime/turns/usage-reporter.js";
+import { TurnRuntime } from "../runtime/turns/runtime.js";
+import type { ITurnRuntime } from "../runtime/turns/api.js";
+import type { IAgentResolver } from "../runtime/turns/agent-resolver.js";
+import type { IModelRegistry } from "../runtime/turns/model-registry.js";
+import type { IToolRegistry } from "../runtime/turns/tool-registry.js";
+import type { IPermissionChecker, IPermissionClassifier } from "../runtime/turns/permission.js";
+import { RealAgentResolver } from "../runtime/turns/bridges/real-agent-resolver.js";
+import { InlineAgentResolver } from "../runtime/turns/bridges/inline-agent-resolver.js";
+import { DispatchingAgentResolver } from "../runtime/turns/bridges/agent-resolver-dispatch.js";
+import { RealModelRegistry } from "../runtime/turns/bridges/real-model-registry.js";
+import { RealToolRegistry } from "../runtime/turns/bridges/real-tool-registry.js";
+import { RealPermissionChecker } from "../runtime/turns/bridges/real-permission-checker.js";
+import { RealPermissionClassifier } from "../runtime/turns/bridges/real-permission-classifier.js";
+import { FSSessionRepo } from "../runtime/sessions/fs-repo.js";
+import type { ISessionRepo } from "../runtime/sessions/repo.js";
+import { EmitterSessionBus, type ISessionBus } from "../runtime/sessions/bus.js";
+import { SessionsImpl } from "../runtime/sessions/sessions.js";
+import type { ISessions } from "../runtime/sessions/api.js";
 import {
     DefaultModelResolver,
     type IDefaultModelResolver,
@@ -62,7 +62,7 @@ import {
 import {
     HeadlessAgentRunner,
     type IHeadlessAgentRunner,
-} from "../agents/headless.js";
+} from "../runtime/assembly/headless.js";
 
 const container = createContainer({
     injectionMode: InjectionMode.PROXY,

apps/x/packages/core/src/knowledge/agent_notes.ts

@@ -2,9 +2,9 @@ import fs from 'fs';
 import path from 'path';
 import { google } from 'googleapis';
 import { WorkDir } from '../config/config.js';
-import { runWhenPossible } from '../agents/headless-app.js';
+import { runWhenPossible } from '../runtime/assembly/headless-app.js';
 import { getKgModel } from '../models/defaults.js';
-import { getErrorDetails } from '../agents/utils.js';
+import { getErrorDetails } from '../runtime/legacy/utils.js';
 import { serviceLogger } from '../services/service_logger.js';
 import { loadUserConfig, updateUserEmail } from '../config/user_config.js';
 import { GoogleClientFactory } from './google-client-factory.js';

apps/x/packages/core/src/knowledge/build_graph.ts

@@ -2,8 +2,8 @@ import fs from 'fs';
 import path from 'path';
 import { WorkDir } from '../config/config.js';
 import { getKgModel } from '../models/defaults.js';
-import { runWhenPossible, toolInputPaths } from '../agents/headless-app.js';
-import { getErrorDetails } from '../agents/utils.js';
+import { runWhenPossible, toolInputPaths } from '../runtime/assembly/headless-app.js';
+import { getErrorDetails } from '../runtime/legacy/utils.js';
 import { serviceLogger, type ServiceRunContext } from '../services/service_logger.js';
 import {
     loadState,

apps/x/packages/core/src/knowledge/inline_task_agent.ts

@@ -1,4 +1,4 @@
-import { BuiltinTools } from '../application/lib/builtin-tools.js';
+import { BuiltinTools } from '../runtime/tools/catalog.js';
 
 export function getRaw(): string {
   // code_agent_run needs an interactive UI to answer its permission asks; exclude it

apps/x/packages/core/src/knowledge/inline_tasks.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import { CronExpressionParser } from 'cron-parser';
 import { generateText } from 'ai';
 import { WorkDir } from '../config/config.js';
-import { runWhenPossible } from '../agents/headless-app.js';
+import { runWhenPossible } from '../runtime/assembly/headless-app.js';
 import { getKgModel } from '../models/defaults.js';
 import container from '../di/container.js';
 import type { IModelConfigRepo } from '../models/repo.js';

apps/x/packages/core/src/knowledge/label_emails.ts

@@ -1,9 +1,9 @@
 import fs from 'fs';
 import path from 'path';
 import { WorkDir } from '../config/config.js';
-import { runWhenPossible, toolInputPaths } from '../agents/headless-app.js';
+import { runWhenPossible, toolInputPaths } from '../runtime/assembly/headless-app.js';
 import { getKgModel } from '../models/defaults.js';
-import { getErrorDetails } from '../agents/utils.js';
+import { getErrorDetails } from '../runtime/legacy/utils.js';
 import { serviceLogger } from '../services/service_logger.js';
 import { limitEventItems } from './limit_event_items.js';
 import {

apps/x/packages/core/src/knowledge/live-note/agent.ts

@@ -1,6 +1,6 @@
 import z from 'zod';
 import { Agent, ToolAttachment } from '@x/shared/dist/agent.js';
-import { BuiltinTools } from '../../application/lib/builtin-tools.js';
+import { BuiltinTools } from '../../runtime/tools/catalog.js';
 import { KNOWLEDGE_NOTE_STYLE_GUIDE } from '../../application/lib/knowledge-note-style.js';
 import { WorkDir } from '../../config/config.js';
 

apps/x/packages/core/src/knowledge/live-note/runner.ts

@@ -1,9 +1,9 @@
 import type { LiveNote, LiveNoteTriggerType } from '@x/shared/dist/live-note.js';
 import { fetchLiveNote, patchLiveNote, readNoteBody } from './fileops.js';
 import { getLiveNoteAgentModel } from '../../models/defaults.js';
-import { startHeadlessAgent, startWhenPossible } from '../../agents/headless-app.js';
+import { startHeadlessAgent, startWhenPossible } from '../../runtime/assembly/headless-app.js';
 import { withUseCase } from '../../analytics/use_case.js';
-import { buildTriggerBlock } from '../../agents/build-trigger-block.js';
+import { buildTriggerBlock } from '../../runtime/assembly/build-trigger-block.js';
 import { liveNoteBus } from './bus.js';
 import { PrefixLogger } from '@x/shared/dist/prefix-logger.js';
 

apps/x/packages/core/src/knowledge/tag_notes.ts

@@ -1,9 +1,9 @@
 import fs from 'fs';
 import path from 'path';
 import { WorkDir } from '../config/config.js';
-import { runWhenPossible, toolInputPaths } from '../agents/headless-app.js';
+import { runWhenPossible, toolInputPaths } from '../runtime/assembly/headless-app.js';
 import { getKgModel } from '../models/defaults.js';
-import { getErrorDetails } from '../agents/utils.js';
+import { getErrorDetails } from '../runtime/legacy/utils.js';
 import { serviceLogger } from '../services/service_logger.js';
 import { limitEventItems } from './limit_event_items.js';
 import {

apps/x/packages/core/src/migrations/runs/migrate.test.ts

@@ -5,8 +5,8 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { reduceTurn } from "@x/shared/dist/turns.js";
 import { reduceSession } from "@x/shared/dist/sessions.js";
-import { FSTurnRepo } from "../../turns/fs-repo.js";
-import { FSSessionRepo } from "../../sessions/fs-repo.js";
+import { FSTurnRepo } from "../../runtime/turns/fs-repo.js";
+import { FSSessionRepo } from "../../runtime/sessions/fs-repo.js";
 import { migrateRuns } from "./migrate.js";
 
 const fixturesDir = path.join(

apps/x/packages/core/src/pre_built/runner.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { WorkDir } from '../config/config.js';
-import { runWhenPossible } from '../agents/headless-app.js';
+import { runWhenPossible } from '../runtime/assembly/headless-app.js';
 import { getKgModel } from '../models/defaults.js';
 import {
     loadConfig,

apps/x/packages/core/src/runs/bus.ts

@@ -1,4 +0,0 @@
-import container from "../di/container.js";
-import { IBus } from "../application/lib/bus.js";
-
-export const bus = container.resolve<IBus>('bus');

apps/x/packages/core/src/runtime/assembly/compose-instructions.ts

@@ -1,12 +1,12 @@
-import { MODE_CAPABILITIES } from "../application/assistant/capabilities/modes.js";
+import { MODE_CAPABILITIES } from "./capabilities/modes.js";
 import {
     AGENT_NOTES_CAPABILITY,
     WORK_DIRECTORY_CAPABILITY,
-} from "../application/assistant/capabilities/workspace.js";
+} from "./capabilities/workspace.js";
 import type {
     CapabilityContext,
     ModeFlags,
-} from "../application/assistant/capabilities/types.js";
+} from "./capabilities/types.js";
 
 // Everything that composes into the system prompt, in composition order.
 const PROMPT_CAPABILITIES = [

apps/x/packages/core/src/runtime/assembly/copilot/instructions.ts

@@ -1,16 +1,16 @@
-import { buildAvailableSkillCatalog } from "./skills/index.js";
+import { buildAvailableSkillCatalog } from "../skills/index.js";
 import { getRuntimeContext, getRuntimeContextPrompt } from "./runtime-context.js";
 import {
     isCodeModeAvailable,
     isComposioAvailable,
     isGoogleConnected,
     isSlackAvailable,
-} from "./connections.js";
-import { composioAccountsRepo } from "../../composio/repo.js";
-import { isConfigured as isComposioConfigured } from "../../composio/client.js";
+} from "../connections.js";
+import { composioAccountsRepo } from "../../../composio/repo.js";
+import { isConfigured as isComposioConfigured } from "../../../composio/client.js";
 import { CURATED_TOOLKITS } from "@x/shared/dist/composio.js";
-import { knowledgeSourcesRepo } from "../../knowledge/sources/repo.js";
-import { listApps } from "../../apps/indexer.js";
+import { knowledgeSourcesRepo } from "../../../knowledge/sources/repo.js";
+import { listApps } from "../../../apps/indexer.js";
 
 const runtimeContextPrompt = getRuntimeContextPrompt(getRuntimeContext());
 

apps/x/packages/core/src/runtime/assembly/headless-app.ts

@@ -1,6 +1,6 @@
-import container from "../di/container.js";
-import { chatActivity } from "../application/lib/chat-activity.js";
-import { shouldDeferBackgroundTasks } from "../models/defaults.js";
+import container from "../../di/container.js";
+import { chatActivity } from "../../application/lib/chat-activity.js";
+import { shouldDeferBackgroundTasks } from "../../models/defaults.js";
 import {
     type HeadlessAgentHandle,
     type HeadlessAgentOptions,

apps/x/packages/core/src/runtime/assembly/headless.test.ts

@@ -14,7 +14,7 @@ import {
     lastAssistantText,
     toolInputPaths,
 } from "./headless.js";
-import type { IDefaultModelResolver } from "../models/default-model-resolver.js";
+import type { IDefaultModelResolver } from "../../models/default-model-resolver.js";
 
 type TEvent = z.infer<typeof TurnEvent>;
 

apps/x/packages/core/src/runtime/assembly/headless.ts

@@ -6,7 +6,7 @@ import {
     type TurnState,
 } from "@x/shared/dist/turns.js";
 import type { ITurnRuntime, TurnOutcome } from "../turns/api.js";
-import type { IDefaultModelResolver } from "../models/default-model-resolver.js";
+import type { IDefaultModelResolver } from "../../models/default-model-resolver.js";
 
 // Drop-in replacement for the old headless runs pattern
 // (createRun → createMessage → waitForRunCompletion → extractAgentResponse):

apps/x/packages/core/src/runtime/assembly/permission-metadata.ts

@@ -4,14 +4,14 @@
 // engine file so the turn-runtime bridges no longer depend on it.
 
 import path from "path";
-import { WorkDir } from "../config/config.js";
+import { WorkDir } from "../../config/config.js";
 import { ToolAttachment } from "@x/shared/dist/agent.js";
 import { ToolCallPart } from "@x/shared/dist/message.js";
 import { z } from "zod";
 import { ToolPermissionMetadata } from "@x/shared/dist/runs.js";
-import { isBlocked, extractCommandNames } from "../application/lib/command-executor.js";
-import { getFileAccessAllowList, type FileAccessGrant, type FileAccessOperation } from "../config/security.js";
-import { resolveFilePathForPermission } from "../filesystem/files.js";
+import { isBlocked, extractCommandNames } from "../../application/lib/command-executor.js";
+import { getFileAccessAllowList, type FileAccessGrant, type FileAccessOperation } from "../../config/security.js";
+import { resolveFilePathForPermission } from "../../filesystem/files.js";
 
 type ToolPermissionMetadataValue = z.infer<typeof ToolPermissionMetadata>;
 

apps/x/packages/core/src/runtime/assembly/registry.ts

@@ -1,16 +1,16 @@
 import type { z } from "zod";
 import { Agent } from "@x/shared/dist/agent.js";
-import { parseFrontmatter } from "../application/lib/parse-frontmatter.js";
-import { buildCopilotAgent } from "../application/assistant/agent.js";
-import { buildBackgroundTaskAgent } from "../background-tasks/agent.js";
-import { buildLiveNoteAgent } from "../knowledge/live-note/agent.js";
-import { getRaw as getNoteCreationRaw } from "../knowledge/note_creation.js";
-import { getRaw as getNoteCurationRaw } from "../knowledge/note_curation.js";
-import { getRaw as getLabelingAgentRaw } from "../knowledge/labeling_agent.js";
-import { getRaw as getNoteTaggingAgentRaw } from "../knowledge/note_tagging_agent.js";
-import { getRaw as getInlineTaskAgentRaw } from "../knowledge/inline_task_agent.js";
-import { getRaw as getAgentNotesAgentRaw } from "../knowledge/agent_notes_agent.js";
-import { lazyResolve } from "../di/lazy-resolve.js";
+import { parseFrontmatter } from "../../application/lib/parse-frontmatter.js";
+import { buildCopilotAgent } from "./copilot/agent.js";
+import { buildBackgroundTaskAgent } from "../../background-tasks/agent.js";
+import { buildLiveNoteAgent } from "../../knowledge/live-note/agent.js";
+import { getRaw as getNoteCreationRaw } from "../../knowledge/note_creation.js";
+import { getRaw as getNoteCurationRaw } from "../../knowledge/note_curation.js";
+import { getRaw as getLabelingAgentRaw } from "../../knowledge/labeling_agent.js";
+import { getRaw as getNoteTaggingAgentRaw } from "../../knowledge/note_tagging_agent.js";
+import { getRaw as getInlineTaskAgentRaw } from "../../knowledge/inline_task_agent.js";
+import { getRaw as getAgentNotesAgentRaw } from "../../knowledge/agent_notes_agent.js";
+import { lazyResolve } from "../../di/lazy-resolve.js";
 import type { IAgentsRepo } from "./repo.js";
 
 // The registry of built-in agents: one table instead of the historical

apps/x/packages/core/src/runtime/assembly/repo.ts

@@ -1,11 +1,11 @@
-import { WorkDir } from "../config/config.js";
+import { WorkDir } from "../../config/config.js";
 import fs from "fs/promises";
 import { glob } from "node:fs/promises";
 import path from "path";
 import z from "zod";
 import { Agent } from "@x/shared/dist/agent.js";
 import { stringify } from "yaml";
-import { parseFrontmatter } from "../application/lib/parse-frontmatter.js";
+import { parseFrontmatter } from "../../application/lib/parse-frontmatter.js";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const UpdateAgentSchema = Agent.omit({ name: true });

apps/x/packages/core/src/runtime/assembly/skills/disk-loader.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 import { homedir } from "node:os";
 import { WorkDir } from "../../../config/config.js";
 import type { ModelCapability } from "../capabilities/types.js";
-import { splitFrontmatter } from "../../lib/parse-frontmatter.js";
+import { splitFrontmatter } from "../../../application/lib/parse-frontmatter.js";
 
 /**
  * A skill discovered on disk: structurally the model-activated capability

apps/x/packages/core/src/runtime/assembly/skills/doc-collab/skill.ts

@@ -1,4 +1,4 @@
-import { KNOWLEDGE_NOTE_STYLE_GUIDE } from '../../../lib/knowledge-note-style.js';
+import { KNOWLEDGE_NOTE_STYLE_GUIDE } from '../../../../application/lib/knowledge-note-style.js';
 
 export const skill = String.raw`
 # Document Collaboration Skill

apps/x/packages/core/src/runtime/assembly/skills/watcher.ts

@@ -2,7 +2,7 @@ import chokidar, { type FSWatcher } from "chokidar";
 import fs from "node:fs";
 import { SKILL_ROOTS } from "./disk-loader.js";
 import { refreshDiskSkills } from "./index.js";
-import { invalidateCopilotInstructionsCache } from "../instructions.js";
+import { invalidateCopilotInstructionsCache } from "../copilot/instructions.js";
 
 // The skills CLI writes many files per install (~13 paths for one skill), so we
 // coalesce a burst of events into a single refresh.

apps/x/packages/core/src/runtime/assembly/spawn-agent.ts

@@ -230,7 +230,7 @@ export async function runSpawnedAgent(
 async function resolveServices(): Promise<
     NonNullable<SpawnedAgentCallbacks["services"]>
 > {
-    const { lazyResolve } = await import("../di/lazy-resolve.js");
+    const { lazyResolve } = await import("../../di/lazy-resolve.js");
     return {
         turnRuntime:
             await lazyResolve<import("../turns/api.js").ITurnRuntime>(

apps/x/packages/core/src/runtime/assembly/workspace-context.ts

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { WorkDir } from "../config/config.js";
+import { WorkDir } from "../../config/config.js";
 import { hasWorkspaceContext } from "./registry.js";
 
 // Workspace context for agent assembly: agent notes (global) and the user's

apps/x/packages/core/src/runtime/legacy/bus.ts

@@ -0,0 +1,4 @@
+import container from "../../di/container.js";
+import { IBus } from "../../application/lib/bus.js";
+
+export const bus = container.resolve<IBus>('bus');

apps/x/packages/core/src/runtime/legacy/engine.ts

@@ -4,32 +4,32 @@ import { AssistantContentPart, AssistantMessage, MessageList, ProviderOptions, T
 import { LanguageModel, stepCountIs, streamText, tool, Tool, ToolSet } from "ai";
 import { z } from "zod";
 import { LlmStepStreamEvent } from "@x/shared/dist/llm-step-events.js";
-import { execTool } from "../application/lib/exec-tool.js";
-import { TOOL_ADDITIONS_KEY } from "../application/lib/tool-additions.js";
+import { execTool } from "../tools/exec-tool.js";
+import { TOOL_ADDITIONS_KEY } from "../tools/tool-additions.js";
 import { AskHumanRequestEvent, RunEvent, ToolPermissionRequestEvent } from "@x/shared/dist/runs.js";
-import { BuiltinTools } from "../application/lib/builtin-tools.js";
-import { hasWorkspaceContext, loadAgent } from "./registry.js";
-import { composeSystemInstructions } from "./compose-instructions.js";
-import { convertFromMessages } from "./message-encoding.js";
-import { getToolPermissionMetadata } from "./permission-metadata.js";
-import { loadWorkspaceContext } from "./workspace-context.js";
-import { extractCommandNames } from "../application/lib/command-executor.js";
-import { type FileAccessGrant } from "../config/security.js";
-import { notifyIfEnabled } from "../application/notification/notifier.js";
-import { IModelConfigRepo } from "../models/repo.js";
-import { createLanguageModel } from "../models/models.js";
-import { chatActivity } from "../application/lib/chat-activity.js";
-import { resolveProviderConfig } from "../models/defaults.js";
-import { IMonotonicallyIncreasingIdGenerator } from "../application/lib/id-gen.js";
-import { IBus } from "../application/lib/bus.js";
-import { IMessageQueue, type MiddlePaneContext } from "../application/lib/message-queue.js";
-import { IRunsRepo } from "../runs/repo.js";
-import { IRunsLock } from "../runs/lock.js";
+import { BuiltinTools } from "../tools/catalog.js";
+import { hasWorkspaceContext, loadAgent } from "../assembly/registry.js";
+import { composeSystemInstructions } from "../assembly/compose-instructions.js";
+import { convertFromMessages } from "../assembly/message-encoding.js";
+import { getToolPermissionMetadata } from "../assembly/permission-metadata.js";
+import { loadWorkspaceContext } from "../assembly/workspace-context.js";
+import { extractCommandNames } from "../../application/lib/command-executor.js";
+import { type FileAccessGrant } from "../../config/security.js";
+import { notifyIfEnabled } from "../../application/notification/notifier.js";
+import { IModelConfigRepo } from "../../models/repo.js";
+import { createLanguageModel } from "../../models/models.js";
+import { chatActivity } from "../../application/lib/chat-activity.js";
+import { resolveProviderConfig } from "../../models/defaults.js";
+import { IMonotonicallyIncreasingIdGenerator } from "../../application/lib/id-gen.js";
+import { IBus } from "../../application/lib/bus.js";
+import { IMessageQueue, type MiddlePaneContext } from "../../application/lib/message-queue.js";
+import { IRunsRepo } from "./repo.js";
+import { IRunsLock } from "./lock.js";
 import { IAbortRegistry } from "../turns/abort-registry.js";
 import { PrefixLogger } from "@x/shared";
-import { captureLlmUsage } from "../analytics/usage.js";
-import { enterUseCase, withUseCase, type UseCase } from "../analytics/use_case.js";
-import { classifyToolPermissions, type AutoPermissionCandidate } from "../security/auto-permission-classifier.js";
+import { captureLlmUsage } from "../../analytics/usage.js";
+import { enterUseCase, withUseCase, type UseCase } from "../../analytics/use_case.js";
+import { classifyToolPermissions, type AutoPermissionCandidate } from "../../security/auto-permission-classifier.js";
 
 function formatCurrentDateTime(now: Date): string {
     return now.toLocaleString('en-US', {

apps/x/packages/core/src/runtime/legacy/repo.ts

@@ -1,12 +1,12 @@
 import z from "zod";
-import { IMonotonicallyIncreasingIdGenerator } from "../application/lib/id-gen.js";
-import { WorkDir } from "../config/config.js";
+import { IMonotonicallyIncreasingIdGenerator } from "../../application/lib/id-gen.js";
+import { WorkDir } from "../../config/config.js";
 import path from "path";
 import fsp from "fs/promises";
 import fs from "fs";
 import readline from "readline";
 import { Run, RunEvent, StartEvent, ListRunsResponse, MessageEvent, UseCase } from "@x/shared/dist/runs.js";
-import { getDefaultModelAndProvider } from "../models/defaults.js";
+import { getDefaultModelAndProvider } from "../../models/defaults.js";
 
 /**
  * Reading-only schemas: extend the canonical `StartEvent` / `RunEvent` to

apps/x/packages/core/src/runtime/legacy/runs.ts

@@ -1,18 +1,18 @@
 import z from "zod";
-import container from "../di/container.js";
-import { IMessageQueue, UserMessageContentType, VoiceOutputMode, MiddlePaneContext } from "../application/lib/message-queue.js";
+import container from "../../di/container.js";
+import { IMessageQueue, UserMessageContentType, VoiceOutputMode, MiddlePaneContext } from "../../application/lib/message-queue.js";
 import { AskHumanResponseEvent, ToolPermissionRequestEvent, ToolPermissionResponseEvent, CreateRunOptions, Run, ListRunsResponse, ToolPermissionAuthorizePayload, AskHumanResponsePayload } from "@x/shared/dist/runs.js";
 import { IRunsRepo } from "./repo.js";
-import { ICodeSessionsRepo } from "../code-mode/sessions/repo.js";
-import { IAgentRuntime } from "../agents/runtime.js";
-import { IBus } from "../application/lib/bus.js";
+import { ICodeSessionsRepo } from "../../code-mode/sessions/repo.js";
+import { IAgentRuntime } from "./engine.js";
+import { IBus } from "../../application/lib/bus.js";
 import { IAbortRegistry } from "../turns/abort-registry.js";
 import { IRunsLock } from "./lock.js";
-import { forceCloseAllMcpClients } from "../mcp/mcp.js";
-import { extractCommandNames } from "../application/lib/command-executor.js";
-import { addFileAccessGrant, addToSecurityConfig } from "../config/security.js";
-import { loadAgent } from "../agents/registry.js";
-import { getDefaultModelAndProvider } from "../models/defaults.js";
+import { forceCloseAllMcpClients } from "../../mcp/mcp.js";
+import { extractCommandNames } from "../../application/lib/command-executor.js";
+import { addFileAccessGrant, addToSecurityConfig } from "../../config/security.js";
+import { loadAgent } from "../assembly/registry.js";
+import { getDefaultModelAndProvider } from "../../models/defaults.js";
 
 export async function createRun(opts: z.infer<typeof CreateRunOptions>): Promise<z.infer<typeof Run>> {
     const repo = container.resolve<IRunsRepo>('runsRepo');

apps/x/packages/core/src/runtime/legacy/utils.ts

@@ -1,5 +1,5 @@
-import { bus } from "../runs/bus.js";
-import { fetchRun } from "../runs/runs.js";
+import { bus } from "./bus.js";
+import { fetchRun } from "./runs.js";
 
 type RunRecord = Awaited<ReturnType<typeof fetchRun>>;
 

apps/x/packages/core/src/runtime/sessions/sessions.ts

@@ -19,8 +19,8 @@ import {
     isInlineAgentRequest,
     reduceTurn,
 } from "@x/shared/dist/turns.js";
-import type { IMonotonicallyIncreasingIdGenerator } from "../application/lib/id-gen.js";
-import { chatActivity } from "../application/lib/chat-activity.js";
+import type { IMonotonicallyIncreasingIdGenerator } from "../../application/lib/id-gen.js";
+import { chatActivity } from "../../application/lib/chat-activity.js";
 import type {
     ITurnRuntime,
     Turn,

apps/x/packages/core/src/runtime/tools/catalog.test.ts

@@ -2,8 +2,8 @@ import * as os from "os";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { CodeRunEvent } from "@x/shared/dist/code-mode.js";
 import container from "../../di/container.js";
-import { InMemoryAbortRegistry } from "../../turns/abort-registry.js";
-import { BuiltinTools, coalesceCodeRunEvents } from "./builtin-tools.js";
+import { InMemoryAbortRegistry } from "../turns/abort-registry.js";
+import { BuiltinTools, coalesceCodeRunEvents } from "./catalog.js";
 import type { ToolContext } from "./exec-tool.js";
 
 // A real directory: code_agent_run validates the cwd exists before spawning.

apps/x/packages/core/src/runtime/tools/catalog.ts

@@ -1,29 +1,29 @@
 import { z } from "zod";
-import { resolveSkill, availableSkills, skillToolNames, setBuiltinToolsSkillTools } from "../assistant/skills/index.js";
-import { COPILOT_BASE_TOOLS } from "../assistant/base-tools.js";
-import { builtinToolDescriptor } from "../../turns/bridges/builtin-descriptors.js";
+import { resolveSkill, availableSkills, skillToolNames, setBuiltinToolsSkillTools } from "../assembly/skills/index.js";
+import { COPILOT_BASE_TOOLS } from "../assembly/copilot/base-tools.js";
+import { builtinToolDescriptor } from "./descriptors.js";
 import { TOOL_ADDITIONS_KEY } from "./tool-additions.js";
 import type { ToolDescriptor } from "@x/shared/dist/turns.js";
 import { SPAWN_AGENT_TOOL_NAME } from "@x/shared/dist/turns.js";
-import { SPAWN_AGENT_DESCRIPTION, SpawnAgentInput } from "../../agents/spawn-agent.js";
+import { SPAWN_AGENT_DESCRIPTION, SpawnAgentInput } from "../assembly/spawn-agent.js";
 import type { ToolContext } from "./exec-tool.js";
-import { fileTools } from "./builtin-tools/files.js";
-import { parsingTools } from "./builtin-tools/parsing.js";
-import { agentAnalysisTools } from "./builtin-tools/agent-analysis.js";
-import { mcpTools } from "./builtin-tools/mcp.js";
-import { shellTools } from "./builtin-tools/shell.js";
-import { codeAgentRunTools, codeTaskTools } from "./builtin-tools/code.js";
-import { browserTools } from "./builtin-tools/browser.js";
-import { appNavigationTools, appDataTools } from "./builtin-tools/app.js";
-import { webSearchTools, fetchUrlTools } from "./builtin-tools/web.js";
-import { memoryTools } from "./builtin-tools/memory.js";
-import { composioTools } from "./builtin-tools/composio.js";
-import { modelTools } from "./builtin-tools/models.js";
-import { liveNoteTools } from "./builtin-tools/live-note.js";
-import { backgroundTaskTools } from "./builtin-tools/background-tasks.js";
-import { notificationTools } from "./builtin-tools/notifications.js";
-import { BuiltinToolsSchema } from "./builtin-tools/support.js";
-export { coalesceCodeRunEvents } from "./builtin-tools/support.js";
+import { fileTools } from "./domains/files.js";
+import { parsingTools } from "./domains/parsing.js";
+import { agentAnalysisTools } from "./domains/agent-analysis.js";
+import { mcpTools } from "./domains/mcp.js";
+import { shellTools } from "./domains/shell.js";
+import { codeAgentRunTools, codeTaskTools } from "./domains/code.js";
+import { browserTools } from "./domains/browser.js";
+import { appNavigationTools, appDataTools } from "./domains/app.js";
+import { webSearchTools, fetchUrlTools } from "./domains/web.js";
+import { memoryTools } from "./domains/memory.js";
+import { composioTools } from "./domains/composio.js";
+import { modelTools } from "./domains/models.js";
+import { liveNoteTools } from "./domains/live-note.js";
+import { backgroundTaskTools } from "./domains/background-tasks.js";
+import { notificationTools } from "./domains/notifications.js";
+import { BuiltinToolsSchema } from "./domains/support.js";
+export { coalesceCodeRunEvents } from "./domains/support.js";
 
 // The builtin-tool catalog, assembled from domain modules
 // (./builtin-tools/*). SPREAD ORDER IS LOAD-BEARING: catalog key order is
@@ -101,7 +101,7 @@ export const BuiltinTools: z.infer<typeof BuiltinToolsSchema> = {
         // builtin:spawn-agent in RealToolRegistry with a dedicated handler
         // that also records the parent→child link as durable tool progress.
         execute: async (input: unknown, ctx?: ToolContext) => {
-            const { runSpawnedAgent } = await import("../../agents/spawn-agent.js");
+            const { runSpawnedAgent } = await import("../assembly/spawn-agent.js");
             const result = await runSpawnedAgent(input, {
                 parentTurnId: ctx?.runId ?? "",
                 signal: ctx?.signal ?? new AbortController().signal,

apps/x/packages/core/src/runtime/tools/descriptors.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import type { JsonValue, ToolDescriptor } from "@x/shared/dist/turns.js";
-import type { BuiltinTools } from "../../application/lib/builtin-tools.js";
+import type { BuiltinTools } from "./catalog.js";
 
 type BuiltinToolDef = (typeof BuiltinTools)[string];
 

apps/x/packages/core/src/runtime/tools/domains/agent-analysis.ts

@@ -4,7 +4,7 @@
 
 import { z } from "zod";
 import container from "../../../di/container.js";
-import { IAgentsRepo } from "../../../agents/repo.js";
+import { IAgentsRepo } from "../../assembly/repo.js";
 import {
     BuiltinToolsSchema,
 } from "./support.js";

apps/x/packages/core/src/runtime/tools/domains/app.ts

@@ -12,7 +12,7 @@ import { RowboatAppManifestSchema } from "@x/shared/dist/rowboat-app.js";
 import { listApps } from "../../../apps/indexer.js";
 import { listImportantThreads, searchThreads } from "../../../knowledge/sync_gmail.js";
 import { listTasks as listBackgroundTasks } from "../../../background-tasks/fileops.js";
-import type { ISessions } from "../../../sessions/api.js";
+import type { ISessions } from "../../sessions/api.js";
 import {
     BuiltinToolsSchema,
 } from "./support.js";

apps/x/packages/core/src/runtime/tools/domains/browser.ts

@@ -5,9 +5,9 @@
 import { z } from "zod";
 import container from "../../../di/container.js";
 import { BrowserControlInputSchema, type BrowserControlInput } from "@x/shared/dist/browser-control.js";
-import { ensureLoaded as ensureBrowserSkillsLoaded, readSkillContent as readBrowserSkillContent, refreshFromRemote as refreshBrowserSkills } from "../../browser-skills/index.js";
+import { ensureLoaded as ensureBrowserSkillsLoaded, readSkillContent as readBrowserSkillContent, refreshFromRemote as refreshBrowserSkills } from "../../../application/browser-skills/index.js";
 import type { ToolContext } from "../exec-tool.js";
-import type { IBrowserControlService } from "../../browser-control/service.js";
+import type { IBrowserControlService } from "../../../application/browser-control/service.js";
 import {
     BuiltinToolsSchema,
 } from "./support.js";