@downcity/city 1.1.4 → 1.1.5

package/src/rpc/Client.ts

@@ -1,110 +0,0 @@
-/**
- * Local RPC 客户端。
- *
- * 关键点（中文）
- * - 只用于本机受信任 IPC，不附加 HTTP Bearer 鉴权。
- * - 返回结构与 HTTP `callServer()` 对齐，便于上层透明切换 transport。
- */
-
-import net from "node:net";
-import { nanoid } from "nanoid";
-import type { DaemonJsonApiCallParams, DaemonJsonApiCallResult } from "@/daemon/Api.js";
-import type { LocalRpcRequest, LocalRpcResponse } from "@downcity/agent/shared/types/LocalRpc.js";
-import { getLocalRpcEndpoint } from "./Paths.js";
-
-const LOCAL_RPC_TIMEOUT_MS = 5_000;
-
-function toLocalRpcRequest(params: DaemonJsonApiCallParams): LocalRpcRequest {
-  return {
-    requestId: nanoid(),
-    path: String(params.path || "").trim(),
-    method: params.method || "GET",
-    ...(params.body !== undefined ? { body: params.body } : {}),
-  };
-}
-
-/**
- * 通过本地 IPC 调用 agent runtime。
- */
-export async function callLocalServer<T>(
-  params: DaemonJsonApiCallParams,
-): Promise<DaemonJsonApiCallResult<T>> {
-  const endpoint = getLocalRpcEndpoint(params.projectRoot);
-  const request = toLocalRpcRequest(params);
-  const timeoutMs =
-    typeof params.timeoutMs === "number" &&
-    Number.isFinite(params.timeoutMs) &&
-    params.timeoutMs > 0
-      ? Math.floor(params.timeoutMs)
-      : LOCAL_RPC_TIMEOUT_MS;
-
-  return await new Promise<DaemonJsonApiCallResult<T>>((resolve) => {
-    const socket = net.createConnection(endpoint);
-    let settled = false;
-    let buffered = "";
-
-    const finish = (result: DaemonJsonApiCallResult<T>): void => {
-      if (settled) return;
-      settled = true;
-      socket.destroy();
-      resolve(result);
-    };
-
-    socket.setEncoding("utf8");
-    socket.setTimeout(timeoutMs);
-
-    socket.on("connect", () => {
-      socket.write(`${JSON.stringify(request)}\n`);
-    });
-
-    socket.on("data", (chunk) => {
-      buffered += String(chunk || "");
-      const newlineIndex = buffered.indexOf("\n");
-      if (newlineIndex < 0) return;
-      const raw = buffered.slice(0, newlineIndex).trim();
-      if (!raw) {
-        finish({
-          success: false,
-          error: `Local RPC returned empty payload from ${endpoint}`,
-        });
-        return;
-      }
-      try {
-        const response = JSON.parse(raw) as LocalRpcResponse;
-        finish({
-          success: response.success,
-          status: response.status,
-          ...(response.data !== undefined ? { data: response.data as T } : {}),
-          ...(response.error ? { error: response.error } : {}),
-        });
-      } catch (error) {
-        finish({
-          success: false,
-          error: `Local RPC returned invalid JSON from ${endpoint}: ${String(error)}`,
-        });
-      }
-    });
-
-    socket.on("timeout", () => {
-      finish({
-        success: false,
-        error: `Local RPC timed out after ${timeoutMs}ms (${endpoint})`,
-      });
-    });
-
-    socket.on("error", (error) => {
-      finish({
-        success: false,
-        error: `Local RPC unavailable at ${endpoint}: ${String(error)}`,
-      });
-    });
-
-    socket.on("end", () => {
-      if (settled) return;
-      finish({
-        success: false,
-        error: `Local RPC closed without response (${endpoint})`,
-      });
-    });
-  });
-}

package/src/rpc/Paths.ts

@@ -1,43 +0,0 @@
-/**
- * Local RPC 路径工具。
- *
- * 关键点（中文）
- * - 本地受信任进程之间统一通过 IPC socket/pipe 通信。
- * - Unix 平台使用 city 全局 runtime 目录下的稳定 socket 文件，避免不同启动上下文
- *   的 `TMPDIR` 不一致，导致同一个 agent 被解析到两个不同 socket 路径。
- * - Windows 平台使用命名 pipe，并基于项目路径 hash 保证稳定唯一。
- */
-
-import crypto from "node:crypto";
-import path from "node:path";
-import { getCityRuntimeDirPath } from "@/registry/CityPaths.js";
-
-function buildProjectDigest(projectRoot: string): string {
-  return crypto
-    .createHash("sha1")
-    .update(path.resolve(projectRoot))
-    .digest("hex")
-    .slice(0, 16);
-}
-
-function buildWindowsPipeName(projectRoot: string): string {
-  const digest = buildProjectDigest(projectRoot);
-  return `\\\\.\\pipe\\downcity-local-${digest}`;
-}
-
-function getLocalRpcUnixDirPath(): string {
-  return path.join(getCityRuntimeDirPath(), "local-rpc");
-}
-
-/**
- * 返回本地 RPC endpoint。
- */
-export function getLocalRpcEndpoint(projectRoot: string): string {
-  if (process.platform === "win32") {
-    return buildWindowsPipeName(projectRoot);
-  }
-  return path.join(
-    getLocalRpcUnixDirPath(),
-    `downcity-local-${buildProjectDigest(projectRoot)}.sock`,
-  );
-}

package/src/sandbox/MacOsSeatbeltSandbox.ts

@@ -1,196 +0,0 @@
-/**
- * macOS Seatbelt sandbox backend。
- *
- * 关键点（中文）
- * - 当前最小实现直接基于系统自带 `sandbox-exec`。
- * - 目标不是抽象完整 provider 体系，而是先把 shell 命令从“宿主机直跑”收敛成“带边界执行”。
- * - 边界只保留四类：路径、环境变量、网络、隔离后的 HOME/TMPDIR。
- */
-
-import { spawn } from "node:child_process";
-import path from "node:path";
-import fs from "fs-extra";
-import type {
-  SandboxSpawnParams,
-  SandboxSpawnResult,
-} from "@/types/sandbox/SandboxRuntime.js";
-
-const DEFAULT_PATH_VALUE =
-  "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
-
-function escapeSeatbeltString(value: string): string {
-  return String(value || "").replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-}
-
-function dedupePaths(values: string[]): string[] {
-  const seen = new Set<string>();
-  const result: string[] = [];
-  for (const value of values) {
-    const normalized = path.resolve(String(value || "").trim());
-    if (!normalized || seen.has(normalized)) continue;
-    seen.add(normalized);
-    result.push(normalized);
-  }
-  return result;
-}
-
-function buildReadablePaths(params: {
-  rootPath: string;
-  shellPath: string;
-  shellHomeDir: string;
-  shellTmpDir: string;
-}): string[] {
-  return dedupePaths([
-    "/bin",
-    "/usr",
-    "/System",
-    "/etc",
-    "/dev",
-    "/Library",
-    "/opt/homebrew",
-    "/usr/local",
-    params.rootPath,
-    params.shellHomeDir,
-    params.shellTmpDir,
-    path.dirname(params.shellPath),
-  ]);
-}
-
-function buildWritablePaths(params: SandboxSpawnParams & {
-  shellHomeDir: string;
-  shellTmpDir: string;
-}): string[] {
-  return dedupePaths([
-    ...params.config.writablePaths,
-    params.shellDir,
-    params.shellHomeDir,
-    params.shellTmpDir,
-  ]);
-}
-
-function buildNetworkRules(networkMode: SandboxSpawnParams["config"]["networkMode"]): string[] {
-  if (networkMode === "restricted" || networkMode === "full") {
-    return ["(allow network-outbound)", "(allow network-inbound)"];
-  }
-  return [];
-}
-
-function buildSeatbeltProfile(params: SandboxSpawnParams & {
-  actualCwd: string;
-  shellHomeDir: string;
-  shellTmpDir: string;
-}): string {
-  const readablePaths = buildReadablePaths({
-    rootPath: params.config.rootPath,
-    shellPath: params.shellPath,
-    shellHomeDir: params.shellHomeDir,
-    shellTmpDir: params.shellTmpDir,
-  });
-  const writablePaths = buildWritablePaths({
-    ...params,
-    shellHomeDir: params.shellHomeDir,
-    shellTmpDir: params.shellTmpDir,
-  });
-  const lines = [
-    "(version 1)",
-    "(deny default)",
-    '(import "system.sb")',
-    "(allow process*)",
-    "(allow sysctl-read)",
-    "(allow file-read-metadata)",
-    ...readablePaths.map(
-      (value) => `(allow file-read* (subpath "${escapeSeatbeltString(value)}"))`,
-    ),
-    ...writablePaths.map(
-      (value) => `(allow file-write* (subpath "${escapeSeatbeltString(value)}"))`,
-    ),
-    ...buildNetworkRules(params.config.networkMode),
-  ];
-
-  // 关键点（中文）
-  // - `cwd` 需要显式出现在读集合里，否则很多命令刚启动时就会因为工作目录不可见而失败。
-  // - 这里单独追加，避免未来 rootPath 与 cwd 的关系变化时被遗漏。
-  if (!readablePaths.includes(params.actualCwd)) {
-    lines.push(`(allow file-read* (subpath "${escapeSeatbeltString(params.actualCwd)}"))`);
-  }
-  return `${lines.join("\n")}\n`;
-}
-
-function buildSandboxEnv(params: SandboxSpawnParams & {
-  shellHomeDir: string;
-  shellTmpDir: string;
-}): NodeJS.ProcessEnv {
-  const env: NodeJS.ProcessEnv = {};
-  for (const key of params.config.envAllowlist) {
-    const value = params.baseEnv[key];
-    if (typeof value !== "string" || !value.trim()) continue;
-    env[key] = value;
-  }
-
-  for (const [key, value] of Object.entries(params.baseEnv)) {
-    if (!key.startsWith("DC_")) continue;
-    if (typeof value !== "string" || !value.trim()) continue;
-    env[key] = value;
-  }
-
-  env.PATH = String(env.PATH || params.baseEnv.PATH || DEFAULT_PATH_VALUE);
-  env.HOME = params.shellHomeDir;
-  env.ZDOTDIR = params.shellHomeDir;
-  env.TMPDIR = params.shellTmpDir;
-  env.SHELL = params.shellPath;
-
-  return env;
-}
-
-/**
- * 在 macOS seatbelt sandbox 中启动 shell 子进程。
- */
-export async function spawnMacOsSeatbeltSandbox(
-  params: SandboxSpawnParams & { actualCwd: string },
-): Promise<SandboxSpawnResult> {
-  const sandboxRootDir = path.join(params.shellDir, "sandbox");
-  const shellHomeDir = path.join(sandboxRootDir, "home");
-  const shellTmpDir = path.join(sandboxRootDir, "tmp");
-  const profilePath = path.join(sandboxRootDir, "profile.sb");
-
-  await fs.ensureDir(shellHomeDir);
-  await fs.ensureDir(shellTmpDir);
-
-  const profile = buildSeatbeltProfile({
-    ...params,
-    shellHomeDir,
-    shellTmpDir,
-  });
-  await fs.writeFile(profilePath, profile, "utf-8");
-
-  const child = spawn(
-    "sandbox-exec",
-    [
-      "-f",
-      profilePath,
-      params.shellPath,
-      params.login ? "-lc" : "-c",
-      params.cmd,
-    ],
-    {
-      cwd: params.actualCwd,
-      stdio: "pipe",
-      env: buildSandboxEnv({
-        ...params,
-        shellHomeDir,
-        shellTmpDir,
-      }),
-    },
-  );
-
-  child.stdout.setEncoding("utf8");
-  child.stderr.setEncoding("utf8");
-
-  return {
-    child,
-    cwd: params.actualCwd,
-    sandboxed: true,
-    backend: "macos-seatbelt",
-    networkMode: params.config.networkMode,
-  };
-}

package/src/sandbox/SandboxConfigResolver.ts

@@ -1,134 +0,0 @@
-/**
- * Sandbox 配置解析器。
- *
- * 关键点（中文）
- * - 这里负责把 `downcity.json` 中面向用户的最小配置，收敛成运行时可直接执行的绝对路径配置。
- * - 当前版本只服务 shell / CLI 这条命令执行链，不引入审批、profile 绑定或用户权限系统。
- * - 解析结果只回答一个问题：这次命令执行的 sandbox 边界是什么。
- */
-
-import path from "node:path";
-import type { AgentContext } from "@downcity/agent/types/agent/AgentContext.js";
-import type { ResolvedSandboxConfig } from "@/types/sandbox/SandboxRuntime.js";
-
-const DEFAULT_ENV_ALLOWLIST = [
-  "PATH",
-  "LANG",
-  "TERM",
-  "COLORTERM",
-  "LC_ALL",
-  "LC_CTYPE",
-  "SHELL",
-  "USER",
-  "LOGNAME",
-];
-
-function normalizeEnvAllowlist(values?: string[]): string[] {
-  const seen = new Set<string>();
-  const result: string[] = [];
-  for (const value of values || DEFAULT_ENV_ALLOWLIST) {
-    const normalized = String(value || "").trim();
-    if (!normalized || seen.has(normalized)) continue;
-    seen.add(normalized);
-    result.push(normalized);
-  }
-  return result;
-}
-
-/**
- * 判断目标路径是否位于根目录内，或与根目录本身相同。
- */
-export function isPathInsideRoot(rootPath: string, targetPath: string): boolean {
-  const normalizedRoot = path.resolve(rootPath);
-  const normalizedTarget = path.resolve(targetPath);
-  if (normalizedRoot === normalizedTarget) return true;
-  const relative = path.relative(normalizedRoot, normalizedTarget);
-  return Boolean(relative) && !relative.startsWith("..") && !path.isAbsolute(relative);
-}
-
-function normalizeWritablePaths(params: {
-  rootPath: string;
-  writablePaths?: string[];
-  context: AgentContext;
-}): string[] {
-  const { rootPath, writablePaths, context } = params;
-  const rawValues =
-    Array.isArray(writablePaths) && writablePaths.length > 0
-      ? writablePaths
-      : [rootPath];
-  const seen = new Set<string>();
-  const result: string[] = [];
-
-  for (const rawValue of rawValues) {
-    const normalizedValue = String(rawValue || "").trim();
-    if (!normalizedValue) continue;
-    const resolvedPath = path.resolve(
-      path.isAbsolute(normalizedValue) ? normalizedValue : path.join(rootPath, normalizedValue),
-    );
-    if (!isPathInsideRoot(rootPath, resolvedPath)) {
-      context.logger.warn("[sandbox] writable path ignored because it escapes project root", {
-        rootPath,
-        ignoredPath: normalizedValue,
-        resolvedPath,
-      });
-      continue;
-    }
-    if (seen.has(resolvedPath)) continue;
-    seen.add(resolvedPath);
-    result.push(resolvedPath);
-  }
-
-  if (result.length === 0) {
-    result.push(path.resolve(rootPath));
-  }
-  return result;
-}
-
-/**
- * 解析当前请求最终使用的 sandbox 配置。
- */
-export function resolveSandboxConfig(context: AgentContext): ResolvedSandboxConfig {
-  const rootPath = path.resolve(context.rootPath);
-  const projectConfig = context.config?.sandbox;
-
-  if (process.platform !== "darwin") {
-    throw new Error(
-      `sandbox backend is required for shell execution, but current platform is unsupported: ${process.platform}`,
-    );
-  }
-
-  return {
-    backend: "macos-seatbelt",
-    rootPath,
-    envAllowlist: normalizeEnvAllowlist(projectConfig?.envAllowlist),
-    writablePaths: normalizeWritablePaths({
-      rootPath,
-      writablePaths: projectConfig?.writablePaths,
-      context,
-    }),
-    networkMode: projectConfig?.networkMode || "full",
-  };
-}
-
-/**
- * 归一化 sandbox 内实际使用的工作目录。
- *
- * 说明（中文）
- * - sandbox 启用时，工作目录必须收敛在 `rootPath` 范围内。
- * - 超出项目根目录的 `cwd` 会被强制拉回 `rootPath`，避免宿主目录通过 `cwd` 泄漏回去。
- */
-export function resolveSandboxCwd(params: {
-  rootPath: string;
-  requestedCwd: string;
-  context: AgentContext;
-}): string {
-  const normalizedCwd = path.resolve(params.requestedCwd);
-  if (isPathInsideRoot(params.rootPath, normalizedCwd)) {
-    return normalizedCwd;
-  }
-  params.context.logger.warn("[sandbox] cwd escapes project root and was reset to rootPath", {
-    rootPath: params.rootPath,
-    requestedCwd: normalizedCwd,
-  });
-  return params.rootPath;
-}

package/src/sandbox/SandboxRunner.ts

@@ -1,101 +0,0 @@
-/**
- * SandboxRunner 入口。
- *
- * 关键点（中文）
- * - 这里不实现完整的 session/read/write 协议，只负责 shell 子进程创建时统一进入 sandbox backend。
- * - 当前版本只接入 macOS seatbelt backend。
- * - shell 命令不再允许回退到宿主机普通子进程执行。
- */
-
-import type { AgentContext } from "@downcity/agent/types/agent/AgentContext.js";
-import type { SandboxSpawnResult } from "@/types/sandbox/SandboxRuntime.js";
-import { resolveSandboxConfig, resolveSandboxCwd } from "@/sandbox/SandboxConfigResolver.js";
-import { spawnMacOsSeatbeltSandbox } from "@/sandbox/MacOsSeatbeltSandbox.js";
-
-/**
- * 启动 shell 子进程。
- */
-export async function spawnShellProcess(params: {
-  context: AgentContext;
-  shellId: string;
-  shellDir: string;
-  cmd: string;
-  cwd: string;
-  shellPath: string;
-  login: boolean;
-  baseEnv: NodeJS.ProcessEnv;
-}): Promise<SandboxSpawnResult> {
-  const config = resolveSandboxConfig(params.context);
-  const actualCwd = resolveSandboxCwd({
-    rootPath: config.rootPath,
-    requestedCwd: params.cwd,
-    context: params.context,
-  });
-  return spawnMacOsSeatbeltSandbox({
-    shellId: params.shellId,
-    shellDir: params.shellDir,
-    cmd: params.cmd,
-    cwd: params.cwd,
-    shellPath: params.shellPath,
-    login: params.login,
-    baseEnv: params.baseEnv,
-    config,
-    actualCwd,
-  });
-}
-
-/**
- * 执行一次 one-shot sandbox 命令并等待结束。
- *
- * 关键点（中文）
- * - 供 task script 这类“直接执行命令但不需要 shell session 管理”的路径复用。
- * - 非零退出码会直接抛错，行为与原先 `execa(..., { reject: true })` 保持一致。
- */
-export async function runSandboxCommand(params: {
-  context: AgentContext;
-  shellId: string;
-  shellDir: string;
-  cmd: string;
-  cwd: string;
-  shellPath: string;
-  login: boolean;
-  baseEnv: NodeJS.ProcessEnv;
-}): Promise<{
-  stdout: string;
-  stderr: string;
-  exitCode: number;
-  spawn: SandboxSpawnResult;
-}> {
-  const spawn = await spawnShellProcess(params);
-  const stdoutChunks: string[] = [];
-  const stderrChunks: string[] = [];
-
-  spawn.child.stdout.on("data", (chunk: string | Buffer) => {
-    stdoutChunks.push(String(chunk ?? ""));
-  });
-  spawn.child.stderr.on("data", (chunk: string | Buffer) => {
-    stderrChunks.push(String(chunk ?? ""));
-  });
-
-  const exitCode = await new Promise<number>((resolve, reject) => {
-    spawn.child.on("error", (error) => reject(error));
-    spawn.child.on("close", (code) => resolve(typeof code === "number" ? code : -1));
-  });
-
-  const stdout = stdoutChunks.join("");
-  const stderr = stderrChunks.join("");
-  if (exitCode !== 0) {
-    const message = [stdout.trim(), stderr.trim()]
-      .filter(Boolean)
-      .join("\n")
-      .trim();
-    throw new Error(message || `Sandbox command failed with exit code ${exitCode}`);
-  }
-
-  return {
-    stdout,
-    stderr,
-    exitCode,
-    spawn,
-  };
-}