@downcity/city 1.1.4 → 1.1.6

package/src/console/EnvApiRoutes.ts

@@ -1,257 +0,0 @@
-/**
- * Console Env 路由。
- *
- * 关键点（中文）
- * - 提供 Console 级与 Agent 级环境变量的统一读写接口。
- * - 所有 value 在 DB 中以密文存储，这里的接口只负责明文读写与删除。
- */
-
-import dotenv from "dotenv";
-import type { Hono } from "hono";
-import { ConsoleStore } from "@/store/index.js";
-
-type EnvScope = "global" | "agent";
-
-function normalizeScope(input: string | undefined): EnvScope {
-  const value = String(input || "").trim().toLowerCase();
-  if (value === "agent") return "agent";
-  return "global";
-}
-
-function normalizeNonEmptyText(value: unknown, fieldName: string): string {
-  const text = String(value || "").trim();
-  if (!text) {
-    throw new Error(`${fieldName} cannot be empty`);
-  }
-  return text;
-}
-
-function normalizeEnvKey(value: unknown): string {
-  const key = String(value || "").trim().toUpperCase();
-  if (!/^[A-Z_][A-Z0-9_]*$/.test(key)) {
-    throw new Error(`invalid env key: ${String(value || "")}`);
-  }
-  return key;
-}
-
-function parseDotenvEntries(raw: unknown): Array<{ key: string; value: string }> {
-  const text = String(raw || "").replace(/^\uFEFF/, "").trim();
-  if (!text) {
-    throw new Error("clipboard env text cannot be empty");
-  }
-
-  /**
-   * 关键点（中文）
-   * - 兼容用户直接复制 `export KEY=value` 形式。
-   * - 仍然复用 `dotenv.parse`，保持 `.env` 解析行为一致。
-   */
-  const normalized = text
-    .split(/\r?\n/)
-    .map((line) => line.replace(/^(\s*)export\s+/, "$1"))
-    .join("\n");
-  const parsed = dotenv.parse(normalized);
-  const entries = Object.entries(parsed).map(([key, value]) => ({
-    key: normalizeEnvKey(key),
-    value: String(value ?? ""),
-  }));
-
-  if (entries.length === 0) {
-    throw new Error("clipboard does not contain valid .env entries");
-  }
-
-  return entries;
-}
-
-/**
- * 注册 Env 管理 API 路由。
- */
-export function registerConsoleEnvRoutes(params: {
-  /**
-   * Hono 应用实例。
-   */
-  app: Hono;
-}): void {
-  const app = params.app;
-
-  app.get("/api/ui/env", async (c) => {
-    const scope = normalizeScope(c.req.query("scope"));
-    const agentIdRaw = c.req.query("agent");
-    const store = new ConsoleStore();
-    try {
-      if (scope === "agent") {
-        const agentId = String(agentIdRaw || "").trim();
-        const rows = agentId
-          ? await store.listAgentEnvEntries(agentId)
-          : await store.listAllAgentEnvEntries();
-        return c.json({
-          success: true,
-          scope,
-          agentId: agentId || undefined,
-          items: rows.map((item) => ({
-            scope: "agent" as const,
-            agentId: item.agentId,
-            key: item.key,
-            description: item.description,
-            value: item.value,
-            createdAt: item.createdAt,
-            updatedAt: item.updatedAt,
-          })),
-        });
-      }
-
-      const rows = await store.listGlobalEnvEntries();
-      return c.json({
-        success: true,
-        scope: "global",
-        items: rows.map((item) => ({
-          scope: "global" as const,
-          key: item.key,
-          description: item.description,
-          value: item.value,
-          createdAt: item.createdAt,
-          updatedAt: item.updatedAt,
-        })),
-      });
-    } catch (error) {
-      return c.json({ success: false, error: String(error) }, 500);
-    } finally {
-      store.close();
-    }
-  });
-
-  app.post("/api/ui/env/upsert", async (c) => {
-    try {
-      const body = (await c.req.json().catch(() => ({}))) as {
-        scope?: string;
-        agentId?: string;
-        key?: string;
-        description?: string;
-        value?: string;
-      };
-      const scope = normalizeScope(body.scope);
-      const key = normalizeNonEmptyText(body.key, "env key");
-      const description = String(body.description || "").trim();
-      const value = String(body.value ?? "");
-      const store = new ConsoleStore();
-      try {
-        if (scope === "agent") {
-          const agentId = normalizeNonEmptyText(body.agentId, "agentId");
-          await store.upsertAgentEnvEntry({
-            agentId,
-            key,
-            description,
-            value,
-          });
-          return c.json({
-            success: true,
-            scope,
-            agentId,
-            key,
-          });
-        }
-
-        await store.upsertGlobalEnvEntry({
-          key,
-          description,
-          value,
-        });
-        return c.json({
-          success: true,
-          scope: "global",
-          key,
-        });
-      } finally {
-        store.close();
-      }
-    } catch (error) {
-      return c.json({ success: false, error: String(error) }, 500);
-    }
-  });
-
-  app.post("/api/ui/env/remove", async (c) => {
-    try {
-      const body = (await c.req.json().catch(() => ({}))) as {
-        scope?: string;
-        agentId?: string;
-        key?: string;
-      };
-      const scope = normalizeScope(body.scope);
-      const key = normalizeNonEmptyText(body.key, "env key");
-      const store = new ConsoleStore();
-      try {
-        if (scope === "agent") {
-          const agentId = normalizeNonEmptyText(body.agentId, "agentId");
-          store.removeAgentEnvEntry(agentId, key);
-          return c.json({
-            success: true,
-            scope,
-            agentId,
-            key,
-          });
-        }
-
-        store.removeGlobalEnvEntry(key);
-        return c.json({
-          success: true,
-          scope: "global",
-          key,
-        });
-      } finally {
-        store.close();
-      }
-    } catch (error) {
-      return c.json({ success: false, error: String(error) }, 500);
-    }
-  });
-
-  app.post("/api/ui/env/import", async (c) => {
-    try {
-      const body = (await c.req.json().catch(() => ({}))) as {
-        scope?: string;
-        agentId?: string;
-        raw?: string;
-      };
-      const scope = normalizeScope(body.scope);
-      const entries = parseDotenvEntries(body.raw);
-      const store = new ConsoleStore();
-      try {
-        if (scope === "agent") {
-          const agentId = normalizeNonEmptyText(body.agentId, "agentId");
-          for (const entry of entries) {
-            await store.upsertAgentEnvEntry({
-              agentId,
-              key: entry.key,
-              description: "",
-              value: entry.value,
-            });
-          }
-          return c.json({
-            success: true,
-            scope,
-            agentId,
-            count: entries.length,
-            keys: entries.map((entry) => entry.key),
-          });
-        }
-
-        for (const entry of entries) {
-          await store.upsertGlobalEnvEntry({
-            key: entry.key,
-            description: "",
-            value: entry.value,
-          });
-        }
-        return c.json({
-          success: true,
-          scope: "global",
-          count: entries.length,
-          keys: entries.map((entry) => entry.key),
-        });
-      } finally {
-        store.close();
-      }
-    } catch (error) {
-      return c.json({ success: false, error: String(error) }, 500);
-    }
-  });
-}

package/src/console/InlineInstantRoutes.ts

@@ -1,74 +0,0 @@
-/**
- * InlineInstantRoutes：Inline Composer 即时模式路由。
- *
- * 关键点（中文）
- * - 统一暴露 `/api/ui/inline/instant-run`，避免扩展直接区分 model/acp 两套后端路径。
- * - 接口层只做轻量参数校验，具体临时 session 执行逻辑下沉到 service。
- */
-
-import type { Hono } from "hono";
-import type { ConsoleAgentOption } from "@downcity/agent/shared/types/Console.js";
-import type {
-  ConsoleInlineInstantRunInput,
-  ConsoleInlineInstantService,
-  InlineInstantExecutorType,
-} from "@downcity/agent/shared/types/InlineInstant.js";
-import { InlineInstantSessionService } from "@/console/InlineInstantSessionService.js";
-
-function normalizeExecutorType(input: unknown): InlineInstantExecutorType | "" {
-  const value = String(input || "").trim();
-  if (value === "model" || value === "acp") return value;
-  return "";
-}
-
-/**
- * 注册 Inline Composer 即时模式路由。
- */
-export function registerConsoleInlineInstantRoutes(params: {
-  app: Hono;
-  resolveAgentById: (requestedAgentId: string) => Promise<ConsoleAgentOption | null>;
-  instantSessionService?: ConsoleInlineInstantService;
-}): void {
-  const service =
-    params.instantSessionService ||
-    new InlineInstantSessionService({
-      resolveAgentById: (agentId) => params.resolveAgentById(agentId),
-    });
-
-  params.app.post("/api/ui/inline/instant-run", async (c) => {
-    try {
-      const body = (await c.req.json().catch(() => ({}))) as Partial<ConsoleInlineInstantRunInput>;
-      const executorType = normalizeExecutorType(body.executorType);
-      if (!executorType) {
-        return c.json({ success: false, error: "Missing or invalid executorType" }, 400);
-      }
-
-      const prompt = String(body.prompt || "").trim();
-      if (!prompt) {
-        return c.json({ success: false, error: "Missing prompt" }, 400);
-      }
-
-      if (executorType === "model" && !String(body.modelId || "").trim()) {
-        return c.json({ success: false, error: "Missing modelId" }, 400);
-      }
-      if (executorType === "acp" && !String(body.agentId || "").trim()) {
-        return c.json({ success: false, error: "Missing agentId" }, 400);
-      }
-
-      const payload = await service.run({
-        executorType,
-        prompt,
-        system: String(body.system || "").trim(),
-        pageContext: String(body.pageContext || "").trim(),
-        modelId: String(body.modelId || "").trim(),
-        agentId: String(body.agentId || "").trim(),
-      });
-      return c.json({
-        success: true,
-        ...payload,
-      });
-    } catch (error) {
-      return c.json({ success: false, error: String(error) }, 500);
-    }
-  });
-}

package/src/console/InlineInstantSessionService.ts

@@ -1,277 +0,0 @@
-/**
- * InlineInstantSessionService：Inline Composer 即时模式执行服务。
- *
- * 关键点（中文）
- * - 统一承接 model 即时 executor。
- * - 每次请求都创建独立临时 session，执行结束后立即清理临时目录与 executor。
- * - 不复用长期 runtime session，也不进入 channel/chat 的普通投递链路。
- */
-
-import fs from "fs-extra";
-import path from "node:path";
-import os from "node:os";
-import { mkdtemp } from "node:fs/promises";
-import { generateId } from "@/utils/Id.js";
-import { getLogger, type Logger } from "@downcity/agent/shared/utils/logger/Logger.js";
-import type { ConsoleAgentOption } from "@downcity/agent/shared/types/Console.js";
-import type {
-  ConsoleInlineInstantRunInput,
-  ConsoleInlineInstantRunResult,
-  ConsoleInlineInstantService,
-} from "@downcity/agent/shared/types/InlineInstant.js";
-import { Session } from "@downcity/agent/session/Session.js";
-import { JsonlSessionHistoryComposer } from "@downcity/agent/session/composer/history/jsonl/JsonlSessionHistoryComposer.js";
-import { JsonlSessionCompactionComposer } from "@downcity/agent/session/composer/compaction/jsonl/JsonlSessionCompactionComposer.js";
-import { LocalSessionExecutor } from "@downcity/agent/session/executors/local/LocalSessionExecutor.js";
-import { InlineInstantSystemComposer } from "@/console/InlineInstantSystemComposer.js";
-import { createModel } from "@downcity/agent";
-import type { Logger as AgentLogger } from "@downcity/agent/shared/utils/logger/Logger.js";
-import { loadStaticSystemPrompts } from "@downcity/agent/session/composer/system/default/StaticPromptCatalog.js";
-import { drainDeferredPersistedUserMessages } from "@downcity/agent/session/SessionRunScope.js";
-import {
-  pickLastSuccessfulChatSendText,
-  resolveAssistantMessageForPersistence,
-} from "@downcity/agent/services/chat/runtime/UserVisibleText.js";
-
-type InlineInstantSessionServiceOptions = {
-  /**
-   * 根据 agentId 解析项目配置。
-   */
-  resolveAgentById?: (agentId: string) => Promise<ConsoleAgentOption | null>;
-
-  /**
-   * 可选统一日志器。
-   */
-  logger?: Logger;
-};
-
-type TempSessionRuntime = {
-  /**
-   * 本次即时执行使用的临时 sessionId。
-   */
-  sessionId: string;
-
-  /**
-   * 临时 session 落盘目录。
-   */
-  tempDirPath: string;
-
-  /**
-   * 当前临时 session 实例。
-   */
-  session: Session;
-};
-
-function buildInstantPrompt(input: {
-  prompt: string;
-  pageContext?: string;
-}): string {
-  const prompt = String(input.prompt || "").trim();
-  const pageContext = String(input.pageContext || "").trim();
-  if (!pageContext) return prompt;
-  return [
-    prompt,
-    "",
-    "以下是补充页面上下文（Markdown）：",
-    "",
-    "```markdown",
-    pageContext,
-    "```",
-  ].join("\n").trim();
-}
-
-
-function readAssistantFallbackText(text: string, resultText: string): string {
-  const picked = String(text || "").trim();
-  if (picked) return picked;
-  return String(resultText || "").trim();
-}
-
-function readAssistantMessageText(result: {
-  assistantMessage?: {
-    parts?: Array<{
-      type?: unknown;
-      text?: unknown;
-    }>;
-  };
-} | null | undefined): string {
-  const parts = Array.isArray(result?.assistantMessage?.parts)
-    ? result.assistantMessage.parts
-    : [];
-  return parts
-    .map((part) =>
-      part?.type === "text" ? String(part.text || "").trim() : "",
-    )
-    .filter(Boolean)
-    .join("\n")
-    .trim();
-}
-
-/**
- * 即时模式服务默认实现。
- */
-export class InlineInstantSessionService implements ConsoleInlineInstantService {
-  private readonly resolveAgentById: InlineInstantSessionServiceOptions["resolveAgentById"];
-  private readonly logger: Logger;
-
-  constructor(options?: InlineInstantSessionServiceOptions) {
-    this.resolveAgentById = options?.resolveAgentById;
-    this.logger = options?.logger || getLogger();
-  }
-
-  async run(
-    input: ConsoleInlineInstantRunInput,
-  ): Promise<ConsoleInlineInstantRunResult> {
-    const executorType = String(input.executorType || "").trim();
-    if (executorType === "model") {
-      return await this.runModelInstant({
-        ...input,
-        executorType: "model",
-      });
-    }
-
-    throw new Error(`Unsupported inline instant executor: ${String(input.executorType || "")}`);
-  }
-
-  private async createTempHistoryComposer(params: {
-    rootPath: string;
-    sessionId: string;
-  }): Promise<{
-    tempDirPath: string;
-    historyComposer: JsonlSessionHistoryComposer;
-  }> {
-    const tempDirPath = await mkdtemp(
-      path.join(os.tmpdir(), "downcity-inline-instant-"),
-    );
-    const historyComposer = new JsonlSessionHistoryComposer({
-      rootPath: params.rootPath,
-      sessionId: params.sessionId,
-      paths: {
-        sessionDirPath: tempDirPath,
-        messagesDirPath: tempDirPath,
-        messagesFilePath: path.join(tempDirPath, "messages.jsonl"),
-        metaFilePath: path.join(tempDirPath, "meta.json"),
-        archiveDirPath: path.join(tempDirPath, "archive"),
-      },
-    });
-    return {
-      tempDirPath,
-      historyComposer,
-    };
-  }
-
-  private async executeTempSession(params: {
-    sessionRuntime: TempSessionRuntime;
-    query: string;
-  }): Promise<{ sessionId: string; text: string }> {
-    const query = String(params.query || "").trim();
-    if (!query) throw new Error("instant prompt cannot be empty");
-
-    const { sessionRuntime } = params;
-    try {
-      await sessionRuntime.session.appendUserMessage({
-        text: query,
-      });
-
-      const result = await sessionRuntime.session.run({
-        query,
-      });
-      const userVisible = pickLastSuccessfulChatSendText(result.assistantMessage).trim();
-      const assistantText = readAssistantMessageText(result);
-      const messageForPersistence = resolveAssistantMessageForPersistence(
-        result.assistantMessage,
-      );
-      if (messageForPersistence) {
-        await sessionRuntime.session.appendAssistantMessage({
-          message: messageForPersistence,
-          fallbackText: readAssistantFallbackText(userVisible, assistantText),
-          extra: {
-            via: "console_inline_instant",
-          },
-        });
-      }
-      const deferredInjectedMessages = drainDeferredPersistedUserMessages(
-        sessionRuntime.sessionId,
-      );
-      for (const message of deferredInjectedMessages) {
-        await sessionRuntime.session.appendUserMessage({
-          message,
-        });
-      }
-      return {
-        sessionId: sessionRuntime.sessionId,
-        text: readAssistantFallbackText(userVisible, assistantText),
-      };
-    } finally {
-      sessionRuntime.session.clearExecutor();
-      await fs.remove(sessionRuntime.tempDirPath).catch(() => undefined);
-    }
-  }
-
-  private buildSessionId(): string {
-    return `inline-instant-model`;
-  }
-
-  private async runModelInstant(
-    input: ConsoleInlineInstantRunInput & { executorType: "model" },
-  ): Promise<ConsoleInlineInstantRunResult> {
-    const modelId = String(input.modelId || "").trim();
-    if (!modelId) throw new Error("modelId is required for inline model executor");
-
-    const sessionId = this.buildSessionId();
-    const rootPath = process.cwd();
-    const { tempDirPath, historyComposer } = await this.createTempHistoryComposer({
-      rootPath,
-      sessionId,
-    });
-    const model = await createModel({
-      config: {
-        name: "console-inline-instant-model",
-        version: "1.0.0",
-        execution: {
-          type: "api",
-          modelId,
-        },
-      },
-    });
-    const compactionComposer = new JsonlSessionCompactionComposer();
-    const systemComposer = new InlineInstantSystemComposer({
-      prompts: [String(input.system || "").trim()].filter(Boolean),
-      projectRoot: rootPath,
-    });
-
-    const session = new Session({
-      sessionId,
-      historyComposer,
-      createExecutor: (sessionHistoryComposer) =>
-        new LocalSessionExecutor({
-          model,
-          logger: this.logger as unknown as AgentLogger,
-          historyComposer: sessionHistoryComposer,
-          compactionComposer,
-          systemComposer,
-          getTools: () => ({}),
-        }),
-    });
-
-    const text = await this.executeTempSession({
-      sessionRuntime: {
-        sessionId,
-        tempDirPath,
-        session,
-      },
-      query: buildInstantPrompt({
-        prompt: String(input.prompt || "").trim(),
-        pageContext: input.pageContext,
-      }),
-    });
-
-    return {
-      sessionId: text.sessionId,
-      executorType: "model",
-      modelId,
-      text: text.text,
-    };
-  }
-
-}

package/src/console/InlineInstantSystemComposer.ts

@@ -1,58 +0,0 @@
-/**
- * InlineInstantSystemComposer：即时模式临时 session 的 system composer。
- *
- * 关键点（中文）
- * - 只负责把传入的静态 prompt 文本转为 system messages。
- * - 不依赖完整 AgentContext，避免为了即时模式拉起正式 runtime。
- * - 支持项目路径与 sessionId 变量替换，保留 PROFILE/SOUL 等静态提示的可用性。
- */
-
-import { getSessionRunScope } from "@downcity/agent/session/SessionRunScope.js";
-import { SessionSystemComposer } from "@downcity/agent/session/composer/system/SessionSystemComposer.js";
-import { transformPromptsIntoSystemMessages } from "@downcity/agent/session/composer/system/default/PromptRenderer.js";
-
-type InlineInstantSystemComposerOptions = {
-  /**
-   * 当前要注入的静态 prompt 文本集合。
-   */
-  prompts: string[];
-
-  /**
-   * 可选项目根目录。
-   *
-   * 说明（中文）
-   * - 用于替换 system prompt 里的项目路径变量。
-   */
-  projectRoot?: string;
-};
-
-/**
- * 即时模式 system composer 默认实现。
- */
-export class InlineInstantSystemComposer extends SessionSystemComposer {
-  readonly name = "inline_instant_system";
-
-  private readonly prompts: string[];
-  private readonly projectRoot: string;
-
-  constructor(options: InlineInstantSystemComposerOptions) {
-    super();
-    this.prompts = Array.isArray(options.prompts)
-      ? options.prompts
-          .map((item) => String(item || "").trim())
-          .filter(Boolean)
-      : [];
-    this.projectRoot = String(options.projectRoot || "").trim();
-  }
-
-  async resolve() {
-    if (this.prompts.length < 1) return [];
-    const scope = getSessionRunScope();
-    return await transformPromptsIntoSystemMessages(this.prompts, {
-      ...(this.projectRoot ? { projectPath: this.projectRoot } : {}),
-      ...(String(scope?.sessionId || "").trim()
-        ? { sessionId: String(scope?.sessionId || "").trim() }
-        : {}),
-    });
-  }
-}