@downcity/agent 1.1.259 → 1.1.261

package/scripts/shell-sandbox-env.test.mjs

@@ -1,93 +1,80 @@
 /**
- * @file 验证 shell safe sandbox 注入的临时目录环境变量。
- *
- * 关键点（中文）
- * - 测试编译后的 shell 包导出，确保最终 package 产物包含一致行为。
- * - zsh heredoc 会读取 `TMPPREFIX` 创建临时文件，因此必须指向 sandbox tmp。
+ * @file 验证 Safe Sandbox 环境变量收敛与临时目录映射。
  */
 
 import test from "node:test";
 import assert from "node:assert/strict";
 import path from "node:path";
 
-import { buildMacOsSeatbeltSandboxEnv } from "@downcity/shell/sandbox/MacOsSeatbeltSandbox.js";
-import { buildLinuxBubblewrapSandboxEnv } from "@downcity/shell/sandbox/LinuxBubblewrapSandbox.js";
-import {
-  resolveSandboxEnvAllowlist,
-} from "@downcity/shell/sandbox/SandboxConfigResolver.js";
-
-function createParams() {
-  const rootPath = "/tmp/downcity-shell-env/project";
-  const sandboxDir = path.join(rootPath, ".downcity", "sandbox");
-  const tmpDir = path.join(sandboxDir, "tmp");
-  const cacheDir = path.join(sandboxDir, ".cache");
+import { build_macos_sandbox_env } from "@downcity/shell/sandbox/MacOsSeatbelt.js";
+import { build_linux_sandbox_env } from "@downcity/shell/sandbox/LinuxBubblewrap.js";
+import { resolve_sandbox_policy } from "@downcity/shell/sandbox/SandboxPolicy.js";
 
+function create_request() {
+  const root_path = "/tmp/downcity-shell-env/project";
+  const sandbox_dir = path.join(root_path, ".downcity", "sandbox");
   return {
-    executionId: "sh_test",
-    executionDir: path.join(rootPath, ".downcity", "shell", "sh_test"),
+    execution_id: "sh_test",
+    execution_dir: path.join(root_path, ".downcity", "shell", "sh_test"),
     cmd: "printf hello",
-    cwd: rootPath,
-    shellPath: "/bin/zsh",
+    cwd: root_path,
+    shell_path: "/bin/zsh",
     login: true,
-    baseEnv: {
+    base_env: {
       PATH: "/usr/bin:/bin",
       LANG: "C.UTF-8",
       DC_SESSION_ID: "session_test",
     },
-    config: {
+    policy: {
       backend: "macos-seatbelt",
-      rootPath,
-      sandboxDir,
-      homeDir: sandboxDir,
-      tmpDir,
-      cacheDir,
-      envAllowlist: ["PATH", "LANG"],
-      writablePaths: [rootPath, sandboxDir],
-      networkMode: "full",
+      root_path,
+      sandbox_dir,
+      home_dir: sandbox_dir,
+      tmp_dir: path.join(sandbox_dir, "tmp"),
+      cache_dir: path.join(sandbox_dir, ".cache"),
+      env_allowlist: ["PATH", "LANG"],
+      read_only_paths: ["/usr", "/bin"],
+      read_write_paths: [root_path],
+      network_mode: "full",
+      fingerprint: "policy_test",
     },
   };
 }
 
-function assertSandboxTmpEnv(env, tmpDir) {
-  assert.equal(env.TMPDIR, tmpDir);
-  assert.equal(env.TMP, tmpDir);
-  assert.equal(env.TEMP, tmpDir);
-  assert.equal(env.TEMPDIR, tmpDir);
-  assert.equal(env.TMPPREFIX, path.join(tmpDir, "zsh"));
-  assert.equal(env.DC_SANDBOX_TMP, tmpDir);
+function assert_sandbox_tmp_env(env, tmp_dir) {
+  assert.equal(env.TMPDIR, tmp_dir);
+  assert.equal(env.TMP, tmp_dir);
+  assert.equal(env.TEMP, tmp_dir);
+  assert.equal(env.TEMPDIR, tmp_dir);
+  assert.equal(env.TMPPREFIX, path.join(tmp_dir, "zsh"));
+  assert.equal(env.DC_SANDBOX_TMP, tmp_dir);
 }
 
-test("macOS seatbelt sandbox env points zsh TMPPREFIX at sandbox tmp", () => {
-  const params = createParams();
-  const env = buildMacOsSeatbeltSandboxEnv(params);
-
-  assertSandboxTmpEnv(env, params.config.tmpDir);
+test("macOS safe env points temporary variables at sandbox tmp", () => {
+  const request = create_request();
+  const env = build_macos_sandbox_env(request);
+  assert_sandbox_tmp_env(env, request.policy.tmp_dir);
 });
 
-test("Linux bubblewrap sandbox env points zsh TMPPREFIX at sandbox tmp", () => {
-  const params = createParams();
-  const env = buildLinuxBubblewrapSandboxEnv({
-    ...params,
-    config: {
-      ...params.config,
-      backend: "linux-bubblewrap",
-    },
+test("Linux safe env points temporary variables at sandbox tmp", () => {
+  const request = create_request();
+  const env = build_linux_sandbox_env({
+    ...request,
+    policy: { ...request.policy, backend: "linux-bubblewrap" },
   });
-
-  assertSandboxTmpEnv(env, params.config.tmpDir);
+  assert_sandbox_tmp_env(env, request.policy.tmp_dir);
 });
 
-test("safe sandbox env allowlist includes explicit agent env keys only", () => {
-  const allowlist = resolveSandboxEnvAllowlist({
+test("safe policy exports explicit agent env keys only", async () => {
+  const policy = await resolve_sandbox_policy({
     rootPath: "/tmp/downcity-shell-env/project",
     env: {
       DYNAMIC_ENV_REPRO: "dynamic_value",
       DC_DYNAMIC_REPRO: "dc_value",
     },
-  });
-
-  assert.equal(allowlist.includes("PATH"), true);
-  assert.equal(allowlist.includes("DYNAMIC_ENV_REPRO"), true);
-  assert.equal(allowlist.includes("DC_DYNAMIC_REPRO"), true);
-  assert.equal(allowlist.includes("HOST_ONLY_ENV_REPRO"), false);
+  }, {});
+  assert.equal(policy.env_allowlist.includes("PATH"), true);
+  assert.equal(policy.env_allowlist.includes("DYNAMIC_ENV_REPRO"), true);
+  assert.equal(policy.env_allowlist.includes("DC_DYNAMIC_REPRO"), true);
+  assert.equal(policy.env_allowlist.includes("HOST_ONLY_ENV_REPRO"), false);
 });

package/src/agent/AgentModel.ts

@@ -3,51 +3,24 @@
  *
  * 关键点（中文）
  * - Agent 与 Session 对外统一接收 AgentModel，executor 内部只处理 AI SDK LanguageModel。
- * - CityModel 保留模型目录信息；运行时连接信息通过隐藏协议提供。
- * - 这里直接创建 OpenAI-compatible LanguageModel，不再保留旧的 text/stream 反向适配。
+ * - CityModel 自身实现 LanguageModelV3，executor 可以直接调用。
  * - 这里不依赖 @downcity/city，只依赖 @downcity/type 的共享协议。
  */
 
-import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import {
-  CITY_MODEL_INVOKER,
   isCityModel,
-  type CityModel,
 } from "@downcity/type";
 import type { LanguageModel } from "ai";
 
-/** 已完成转换的 CityModel 与 LanguageModel 对应关系。 */
-const normalized_models = new WeakMap<object, LanguageModel>();
-
 /**
  * Agent SDK 可接受的模型输入。
  */
-export type AgentModel = LanguageModel | CityModel;
-
-/**
- * 将 CityModel 的 hidden connection 转换为 AI SDK LanguageModel。
- */
-function cityModelToLanguageModel(model: CityModel): LanguageModel {
-  const connection = model[CITY_MODEL_INVOKER].connection();
-  const provider = createOpenAICompatible({
-    name: "downcity",
-    baseURL: connection.base_url,
-    apiKey: connection.api_key,
-  });
-  return provider.languageModel(connection.model_id) as LanguageModel;
-}
+export type AgentModel = LanguageModel;
 
 /**
  * 将 Agent 可接受的模型输入归一为 AI SDK LanguageModel。
  */
 export function normalizeAgentModel(model: AgentModel): LanguageModel {
-  if (isCityModel(model)) {
-    const cached = normalized_models.get(model);
-    if (cached) return cached;
-    const normalized = cityModelToLanguageModel(model);
-    normalized_models.set(model, normalized);
-    return normalized;
-  }
   return model;
 }