@downcity/agent 1.1.10 → 1.1.11

package/src/plugin/builtins/voice/Dependency.ts

@@ -8,7 +8,7 @@
 
 import { execFile as execFileCb } from "node:child_process";
 import { promisify } from "node:util";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
+import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { PluginCommandContext } from "@/plugin/types/Plugin.js";
 import type {
   VoicePluginConfig,

package/src/plugin/builtins/voice/InboundAugment.ts

@@ -0,0 +1,59 @@
+/**
+ * Voice 入站消息增强 hook。
+ *
+ * 关键点（中文）
+ * - 只处理 voice/audio 附件，转写结果作为 plugin section 注入。
+ * - 转写失败不阻塞主链路，保持 best-effort。
+ */
+
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { ChatInboundAugmentInput } from "@/service/builtins/chat/types/ChatPlugin.js";
+import type { JsonValue } from "@/types/common/Json.js";
+import { transcribeWithVoiceDependency } from "@/plugin/builtins/voice/Dependency.js";
+
+/**
+ * 自动转写入站语音附件。
+ */
+export async function augmentVoiceInboundMessage(params: {
+  context: AgentContext;
+  value: JsonValue;
+}): Promise<JsonValue> {
+  const input = params.value as unknown as ChatInboundAugmentInput;
+  const voiceAttachments = (Array.isArray(input.attachments) ? input.attachments : []).filter(
+    (item) =>
+      (item.kind === "voice" || item.kind === "audio") &&
+      typeof item.path === "string" &&
+      item.path.trim(),
+  );
+  if (voiceAttachments.length === 0) {
+    return input as unknown as JsonValue;
+  }
+
+  const pluginSections = Array.isArray(input.pluginSections)
+    ? [...input.pluginSections]
+    : [];
+
+  for (const attachment of voiceAttachments) {
+    try {
+      const result = await transcribeWithVoiceDependency({
+        context: params.context,
+        audioPath: String(attachment.path || "").trim(),
+      });
+      const text = typeof result.text === "string" ? result.text.trim() : "";
+      if (!text) continue;
+
+      const absPath = String(attachment.path || "").trim();
+      const rel = absPath.startsWith(`${params.context.rootPath}/`)
+        ? absPath.slice(params.context.rootPath.length + 1)
+        : absPath;
+      pluginSections.push(`【语音转写 ${attachment.kind}: ${rel}】\n${text}`);
+    } catch {
+      // 关键点（中文）：转写失败不阻塞主链路，保持 best-effort。
+    }
+  }
+
+  return {
+    ...input,
+    pluginSections,
+  } as unknown as JsonValue;
+}

package/src/plugin/builtins/voice/Plugin.ts

@@ -8,15 +8,19 @@
  */
 
 import type { Plugin } from "@/plugin/types/Plugin.js";
-import type { ChatInboundAugmentInput } from "@/service/builtins/chat/types/ChatPlugin.js";
-import type { VoicePluginConfig } from "@/plugin/builtins/voice/types/VoicePlugin.js";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
-import type { AgentPluginConfigRuntime } from "@/host/types/AgentHost.js";
 import { CHAT_PLUGIN_POINTS } from "@/service/builtins/chat/runtime/PluginPoints.js";
 import {
   listVoiceModels,
   resolveVoicePluginModelId,
 } from "@/plugin/builtins/voice/ModelCatalog.js";
+import {
+  getBooleanOpt,
+  getStringOpt,
+  readVoicePluginConfig,
+  toJsonObject,
+  writeVoicePluginConfig,
+} from "@/plugin/builtins/voice/Config.js";
+import { augmentVoiceInboundMessage } from "@/plugin/builtins/voice/InboundAugment.js";
 import {
   checkVoiceTranscriber,
   installVoiceTranscriber,
@@ -25,122 +29,6 @@ import {
   writeVoiceTranscriberConfig,
 } from "@/plugin/builtins/voice/Dependency.js";
 
-function toJsonObject(input: Record<string, unknown> | null | undefined): JsonObject | null {
-  if (!input) return null;
-  const out: JsonObject = {};
-  for (const [key, value] of Object.entries(input)) {
-    if (value === undefined) continue;
-    if (
-      value === null ||
-      typeof value === "string" ||
-      typeof value === "number" ||
-      typeof value === "boolean"
-    ) {
-      out[key] = value;
-      continue;
-    }
-    if (Array.isArray(value)) {
-      out[key] = value
-        .filter((item) => item !== undefined)
-        .map((item) => item as JsonValue);
-      continue;
-    }
-    if (typeof value === "object") {
-      out[key] = toJsonObject(value as Record<string, unknown>) || {};
-    }
-  }
-  return out;
-}
-
-function getStringOpt(
-  opts: Record<string, JsonValue>,
-  key: string,
-): string | undefined {
-  const value = opts[key];
-  if (typeof value !== "string") return undefined;
-  const trimmed = value.trim();
-  return trimmed || undefined;
-}
-
-function getBooleanOpt(
-  opts: Record<string, JsonValue>,
-  key: string,
-  defaultValue: boolean,
-): boolean {
-  const value = opts[key];
-  if (typeof value === "boolean") return value;
-  if (typeof value === "string") {
-    const normalized = value.trim().toLowerCase();
-    if (["1", "true", "yes", "y", "on"].includes(normalized)) return true;
-    if (["0", "false", "no", "n", "off"].includes(normalized)) return false;
-  }
-  return defaultValue;
-}
-
-/**
- * 读取 Voice Plugin 配置。
- *
- * 关键点（中文）
- * - 行为配置与转写依赖配置统一收敛到 `plugins.voice`。
- */
-function readVoicePluginConfig(runtime: {
-  config: {
-    plugins?: Record<string, unknown>;
-  };
-}): VoicePluginConfig {
-  const current = runtime.config.plugins?.voice;
-  const normalized =
-    current && typeof current === "object" && !Array.isArray(current)
-      ? (current as VoicePluginConfig)
-      : {};
-  return {
-    enabled: normalized.enabled === true,
-    injectPrompt:
-      typeof normalized.injectPrompt === "boolean"
-        ? normalized.injectPrompt
-        : true,
-    augmentMessage:
-      typeof normalized.augmentMessage === "boolean"
-        ? normalized.augmentMessage
-        : true,
-    provider:
-      normalized.provider === "command" || normalized.provider === "local"
-        ? normalized.provider
-        : "local",
-    ...(typeof normalized.modelId === "string" ? { modelId: normalized.modelId } : {}),
-    ...(typeof normalized.modelsDir === "string" ? { modelsDir: normalized.modelsDir } : {}),
-    ...(typeof normalized.pythonBin === "string" ? { pythonBin: normalized.pythonBin } : {}),
-    ...(typeof normalized.command === "string" ? { command: normalized.command } : {}),
-    ...(typeof normalized.language === "string" ? { language: normalized.language } : {}),
-    ...(typeof normalized.timeoutMs === "number" ? { timeoutMs: normalized.timeoutMs } : {}),
-    ...(typeof normalized.strategy === "string" ? { strategy: normalized.strategy } : {}),
-    ...(Array.isArray(normalized.installedModels)
-      ? { installedModels: normalized.installedModels }
-      : {}),
-  };
-}
-
-/**
- * 写入完整 voice plugin 配置。
- */
-async function writeVoicePluginConfig(params: {
-  agentState: {
-    config: {
-      plugins?: Record<string, unknown>;
-    };
-    pluginConfig: AgentPluginConfigRuntime;
-  };
-  value: VoicePluginConfig;
-}): Promise<void> {
-  if (!params.agentState.config.plugins) {
-    params.agentState.config.plugins = {};
-  }
-  params.agentState.config.plugins.voice = (toJsonObject(params.value) || {}) as JsonObject;
-  await params.agentState.pluginConfig.persistProjectPlugins(
-    params.agentState.config.plugins as Record<string, JsonObject>,
-  );
-}
-
 /**
  * voicePlugin：声明式插件定义。
  */
@@ -201,44 +89,7 @@ export const voicePlugin: Plugin = {
     pipeline: {
       [CHAT_PLUGIN_POINTS.augmentInbound]: [
         async ({ context, value }) => {
-          const input = value as unknown as ChatInboundAugmentInput;
-          const voiceAttachments = (Array.isArray(input.attachments) ? input.attachments : []).filter(
-            (item) =>
-              (item.kind === "voice" || item.kind === "audio") &&
-              typeof item.path === "string" &&
-              item.path.trim(),
-          );
-          if (voiceAttachments.length === 0) {
-            return input as unknown as JsonValue;
-          }
-
-          const pluginSections = Array.isArray(input.pluginSections)
-            ? [...input.pluginSections]
-            : [];
-
-          for (const attachment of voiceAttachments) {
-            try {
-              const result = await transcribeWithVoiceDependency({
-                context,
-                audioPath: String(attachment.path || "").trim(),
-              });
-              const text = typeof result.text === "string" ? result.text.trim() : "";
-              if (!text) continue;
-
-              const absPath = String(attachment.path || "").trim();
-              const rel = absPath.startsWith(`${context.rootPath}/`)
-                ? absPath.slice(context.rootPath.length + 1)
-                : absPath;
-              pluginSections.push(`【语音转写 ${attachment.kind}: ${rel}】\n${text}`);
-            } catch {
-              // 关键点（中文）：转写失败不阻塞主链路，保持 best-effort。
-            }
-          }
-
-          return {
-            ...input,
-            pluginSections,
-          } as unknown as JsonValue;
+          return await augmentVoiceInboundMessage({ context, value });
         },
       ],
     },

package/src/plugin/builtins/voice/types/VoicePlugin.ts

@@ -6,7 +6,7 @@
  * - 这里的类型名直接反映 plugin 自身能力，不再保留 asset 心智。
  */
 
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 
 /**
  * Voice Plugin 行为配置。

package/src/plugin/builtins/web/Plugin.ts

@@ -6,7 +6,7 @@
  * - 真正的联网逻辑直接交给外部实现：`web-access` 或 `agent-browser`。
  */
 import type { Plugin } from "@/plugin/types/Plugin.js";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
+import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { WebPluginConfig, WebPluginInstallInput } from "@/plugin/builtins/web/types/WebPlugin.js";
 import { WEB_PLUGIN_DEFAULT_REPOSITORY_URL } from "@/plugin/builtins/web/types/WebPlugin.js";
 import { isPluginEnabled } from "@/plugin/core/Activation.js";

package/src/plugin/builtins/web/runtime/Config.ts

@@ -6,7 +6,7 @@
  * - 只有当用户显式改动时，才把 `plugins.web` 持久化到项目配置。
  */
 
-import type { JsonObject } from "@/utils/types/Json.js";
+import type { JsonObject } from "@/types/common/Json.js";
 import type { PluginCommandContext } from "@/plugin/types/Plugin.js";
 import type { ResolvedWebPluginConfig, WebPluginConfig } from "@/plugin/builtins/web/types/WebPlugin.js";
 import { WEB_PLUGIN_DEFAULT_REPOSITORY_URL } from "@/plugin/builtins/web/types/WebPlugin.js";

package/src/plugin/builtins/web/runtime/Source.ts

@@ -11,7 +11,7 @@ import os from "node:os";
 import fsp from "node:fs/promises";
 import { execa } from "execa";
 import fse from "fs-extra";
-import type { JsonObject } from "@/utils/types/Json.js";
+import type { JsonObject } from "@/types/common/Json.js";
 import type { PluginCommandContext } from "@/plugin/types/Plugin.js";
 import type {
   WebPluginDependencyCheckResult,

package/src/plugin/builtins/web/types/WebPlugin.ts

@@ -6,7 +6,7 @@
  * - 联网能力本身由外部实现承担：`web-access` 或 `agent-browser`。
  */
 
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 
 /**
  * Web plugin 默认依赖仓库地址。

package/src/plugin/builtins/workboard/runtime/Collector.ts

@@ -8,8 +8,8 @@
 
 import { listTaskDefinitions } from "@/service/builtins/task/Action.js";
 import { listServiceStates } from "@/service/core/Manager.js";
-import { listControlSessionSummaries } from "@/host/http/control/SessionSummaryStore.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import { listControlSessionSummaries } from "@/server/http/control/SessionSummaryStore.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { WorkboardSnapshot } from "@/plugin/builtins/workboard/types/Workboard.js";
 import {
   buildIdleActivity,

package/src/plugin/builtins/workboard/runtime/Normalizer.ts

@@ -6,7 +6,7 @@
  * - 所有会泄漏上下文的字段都必须在这里截断或抽象。
  */
 
-import type { ControlSessionSummary } from "@/host/http/control/types/ControlViewData.js";
+import type { ControlSessionSummary } from "@/server/http/control/types/ControlViewData.js";
 import type { ServiceStateSnapshot } from "@/service/types/ServiceState.js";
 import type { TaskListResponse } from "@/service/builtins/task/types/TaskCommand.js";
 import type {
@@ -15,7 +15,7 @@ import type {
   WorkboardSignalItem,
   WorkboardSummary,
 } from "@/plugin/builtins/workboard/types/Workboard.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 
 function toIsoString(timestamp?: number): string {
   if (!timestamp || !Number.isFinite(timestamp)) {

package/src/plugin/builtins/workboard/runtime/Store.ts

@@ -6,7 +6,7 @@
  * - route 与 action 共享同一份快照，确保 workboard 展示一致。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { WorkboardSnapshot } from "@/plugin/builtins/workboard/types/Workboard.js";
 import { collectWorkboardSnapshot } from "@/plugin/builtins/workboard/runtime/Collector.js";
 

package/src/plugin/core/Activation.ts

@@ -7,8 +7,8 @@
  */
 
 import type { Plugin } from "@/plugin/types/Plugin.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { AgentRuntimeBase } from "@/agent/AgentRuntimeTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentRuntimeBase } from "@/runtime/AgentRuntimeTypes.js";
 
 /**
  * 读取当前 city 配置下的 plugin 启用态。

package/src/plugin/core/HookRegistry.ts

@@ -6,14 +6,14 @@
  * - service 只依赖固定执行语义，不再自己拼装扩展调度逻辑。
  */
 
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 import type {
   PluginEffectHook,
   PluginGuardHook,
   PluginPipelineHook,
   PluginResolveHook,
 } from "@/plugin/types/Plugin.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 
 type ContextResolver = () => AgentContext;
 type PluginEnabledChecker = (pluginName: string, context: AgentContext) => boolean;

package/src/plugin/core/HttpRoutes.ts

@@ -8,8 +8,8 @@
 
 import type { Hono } from "hono";
 import { PLUGINS } from "@/plugin/core/Plugins.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { AuthRoutePolicy } from "@/host/http/auth/types/AuthRoute.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AuthRoutePolicy } from "@/types/auth/AuthRoute.js";
 
 function dedupeAuthPolicies(policies: AuthRoutePolicy[]): AuthRoutePolicy[] {
   const records = new Map<string, AuthRoutePolicy>();

package/src/plugin/core/LocalExecution.ts

@@ -16,8 +16,8 @@ import {
   createAgentPathRuntime,
   createAgentPluginConfigRuntime,
 } from "@/host/runtime/AgentHostRuntime.js";
-import { getAgentRuntimeBase } from "@/agent/AgentRuntimeState.js";
-import type { JsonValue } from "@/utils/types/Json.js";
+import { getAgentRuntimeBase } from "@/runtime/AgentRuntimeState.js";
+import type { JsonValue } from "@/types/common/Json.js";
 import type {
   PluginActionResult,
   PluginAvailability,

package/src/plugin/core/PluginCommand.ts

@@ -8,7 +8,7 @@
 
 import path from "node:path";
 import type { Command } from "commander";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
+import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import { PLUGINS } from "@/plugin/core/Plugins.js";
 import type { Plugin, PluginAction } from "@/plugin/types/Plugin.js";
 import { runLocalPluginAction } from "@/plugin/core/LocalExecution.js";

package/src/plugin/core/PluginManager.ts

@@ -2,9 +2,9 @@
  * PluginManager 单例。
  *
  * 关键点（中文）
- * - `main/plugin/*` 是 plugin 的管理层，不是具体 plugin 实现层。
+ * - `plugin/core/*` 是 plugin 的管理层，不是具体 plugin 实现层。
  * - plugin hook / resolve / system 注入所依赖的注册与调度统一收口到这里。
- * - PluginManager 属于 city runtime，不直接反向依赖 agent AgentContext 单例。
+ * - PluginManager 属于 agent runtime，不直接反向依赖 AgentContext 单例。
  * - agent 只是通过 AgentContext 调用统一 plugin manager。
  * - 具体 plugin 实现位于 `src/plugin/builtins/*`，CLI plugin 命令则直接走本地命令执行器。
  */

package/src/plugin/core/PluginRegistry.ts

@@ -14,8 +14,8 @@ import type {
   PluginAvailability,
   PluginView,
 } from "@/plugin/types/Plugin.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { JsonValue } from "@/types/common/Json.js";
 
 type ContextResolver = () => AgentContext;
 

package/src/plugin/core/ProjectConfigStore.ts

@@ -9,7 +9,7 @@
 
 import fs from "node:fs/promises";
 import path from "node:path";
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
 
 type PersistableSections = {
   /**

package/src/plugin/types/Plugin.ts

@@ -13,15 +13,15 @@ import type {
   AgentPathRuntime,
   AgentPlatformRuntime,
   AgentPluginConfigRuntime,
-} from "@/host/types/AgentHost.js";
+} from "@/types/host/AgentHost.js";
 import type {
   AgentContext,
   StructuredConfig,
-} from "@/agent/AgentContextTypes.js";
+} from "@/runtime/AgentContextTypes.js";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
-import type { AuthRoutePolicy } from "@/host/http/auth/types/AuthRoute.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
+import type { JsonObject, JsonValue } from "@/types/common/Json.js";
+import type { AuthRoutePolicy } from "@/types/auth/AuthRoute.js";
 
 /**
  * Plugin 命令执行上下文。

package/src/plugin/types/PluginApi.ts

@@ -6,7 +6,7 @@
  * - 当前阶段支持 list / availability / action 三类调用。
  */
 
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 
 /**
  * Plugin 概览视图。

package/src/{agent/project → project}/AgentInitializer.ts

@@ -39,10 +39,10 @@ import type {
   AgentProjectChannel,
   AgentProjectInitializationInput,
   AgentProjectInitializationResult,
-} from "@/agent/project/types/AgentProject.js";
-import { assertProjectExecutionTarget } from "@/agent/project/ProjectExecutionBinding.js";
-import type { ExecutionBindingConfig } from "@/config/types/ExecutionBinding.js";
-import type { AgentPlatformRuntime } from "@/host/types/AgentHost.js";
+} from "@/project/types/AgentProject.js";
+import { assertProjectExecutionTarget } from "@/project/ProjectExecutionBinding.js";
+import type { ExecutionBindingConfig } from "@/types/config/ExecutionBinding.js";
+import type { AgentPlatformRuntime } from "@/types/host/AgentHost.js";
 
 /**
  * 平台模型选项。

package/src/{agent/project → project}/ProjectExecutionBinding.ts

@@ -7,8 +7,8 @@
  * - 避免解析逻辑散落在多个模块中。
  */
 
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
-import type { ExecutionBindingConfig } from "@/config/types/ExecutionBinding.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
+import type { ExecutionBindingConfig } from "@/types/config/ExecutionBinding.js";
 
 /**
  * 读取项目执行绑定。

package/src/{agent/project → project}/types/AgentProject.ts

@@ -6,8 +6,8 @@
  * - 所有字段都面向"项目骨架创建"语义，不掺杂 runtime 状态。
  */
 
-import type { ExecutionBindingConfig } from "@/config/types/ExecutionBinding.js";
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
+import type { ExecutionBindingConfig } from "@/types/config/ExecutionBinding.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
 
 /**
  * 可选的 chat channel 标识。

package/src/{agent → runtime}/AgentContext.ts

@@ -12,17 +12,17 @@ import type {
   AgentContext,
   InvokeServicePort,
   SessionCollectionPort,
-} from "@/agent/AgentContextTypes.js";
-import type { JsonValue } from "@/utils/types/Json.js";
+} from "@/runtime/AgentContextTypes.js";
+import type { JsonValue } from "@/types/common/Json.js";
 import type {
   PluginAvailability,
   PluginPort,
   PluginView,
 } from "@/plugin/types/Plugin.js";
-import type { AgentRuntime } from "@/agent/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
 import { runServiceCommand } from "@/service/core/Manager.js";
 import { getPluginManager } from "@/plugin/core/PluginManager.js";
-import { getAgentRuntime } from "@/agent/AgentRuntimeState.js";
+import { getAgentRuntime } from "@/runtime/AgentRuntimeState.js";
 import { appendExecSessionMessage } from "@/service/builtins/chat/runtime/ChatIngressStore.js";
 import { readChatMetaBySessionId } from "@/service/builtins/chat/runtime/ChatMetaStore.js";
 import { resolveChatQueueStore } from "@/service/builtins/chat/runtime/ChatQueue.js";

package/src/{agent → runtime}/AgentContextTypes.ts

@@ -9,14 +9,14 @@
 
 import type { LanguageModel } from "ai";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { AgentRuntime } from "@/agent/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
 import type {
   AgentPathRuntime,
   AgentPlatformRuntime,
   AgentPluginConfigRuntime,
-} from "@/host/types/AgentHost.js";
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
+} from "@/types/host/AgentHost.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
+import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { PluginPort } from "@/plugin/types/Plugin.js";
 import type { ChatMetaV1 } from "@/service/builtins/chat/types/ChatMeta.js";
 import type {

package/src/{agent → runtime}/AgentRuntime.ts

@@ -38,16 +38,16 @@ import {
 } from "@session/composer/system/default/StaticPromptCatalog.js";
 import {
   getAgentContext,
-} from "@/agent/AgentContext.js";
+} from "@/runtime/AgentContext.js";
 import {
   getAgentRuntime,
   getAgentRuntimeBase,
   setAgentRuntime,
   setAgentRuntimeBase,
   type AgentRuntime,
-} from "@/agent/AgentRuntimeState.js";
+} from "@/runtime/AgentRuntimeState.js";
 import { createRegisteredServiceInstances } from "@/service/core/ServiceClassRegistry.js";
-import { readProjectPrimaryModelId } from "@/agent/project/ProjectExecutionBinding.js";
+import { readProjectPrimaryModelId } from "@/project/ProjectExecutionBinding.js";
 import { initializePluginManager, resetPluginManager } from "@/plugin/core/PluginManager.js";
 import {
   clearPluginRuntimeContextResolver,
@@ -57,18 +57,18 @@ import {
   createAgentPathRuntime,
   createAgentPluginConfigRuntime,
 } from "@/host/runtime/AgentHostRuntime.js";
-import { updateAgentRuntimeConfig } from "@/agent/AgentRuntimeState.js";
-import type { AgentPlatformRuntime } from "@/host/types/AgentHost.js";
+import { updateAgentRuntimeConfig } from "@/runtime/AgentRuntimeState.js";
+import type { AgentPlatformRuntime } from "@/types/host/AgentHost.js";
 
-export type { AgentRuntimeBase, AgentRuntime } from "@/agent/AgentRuntimeState.js";
+export type { AgentRuntimeBase, AgentRuntime } from "@/runtime/AgentRuntimeState.js";
 export {
   getAgentRuntime,
   getAgentRuntimeBase,
   setAgentRuntime,
   setAgentRuntimeBase,
   requireAgentModel,
-} from "@/agent/AgentRuntimeState.js";
-export { getAgentContext } from "@/agent/AgentContext.js";
+} from "@/runtime/AgentRuntimeState.js";
+export { getAgentContext } from "@/runtime/AgentContext.js";
 
 let staticPromptCatalog: StaticPromptCatalog | null = null;
 let configWatchPath: string | null = null;

package/src/{agent → runtime}/AgentRuntimeState.ts

@@ -11,15 +11,15 @@ import type { LanguageModel } from "ai";
 import type {
   AgentRuntime,
   AgentRuntimeBase,
-} from "@/agent/AgentRuntimeTypes.js";
-import type { DowncityConfig } from "@/config/types/DowncityConfig.js";
+} from "@/runtime/AgentRuntimeTypes.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
 import type {
   AgentPathRuntime,
   AgentPlatformRuntime,
   AgentPluginConfigRuntime,
-} from "@/host/types/AgentHost.js";
+} from "@/types/host/AgentHost.js";
 import type { ChatChannelName } from "@/service/builtins/chat/types/ChannelStatus.js";
-export type { AgentRuntime, AgentRuntimeBase } from "@/agent/AgentRuntimeTypes.js";
+export type { AgentRuntime, AgentRuntimeBase } from "@/runtime/AgentRuntimeTypes.js";
 
 let baseState: AgentRuntimeBase | null = null;
 let readyState: AgentRuntime | null = null;