@downcity/city 1.1.4 → 1.1.6

package/bin/process/rpc/Paths.js

@@ -0,0 +1,36 @@
+/**
+ * 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 "../../process/registry/CityPaths.js";
+function buildProjectDigest(projectRoot) {
+    return crypto
+        .createHash("sha1")
+        .update(path.resolve(projectRoot))
+        .digest("hex")
+        .slice(0, 16);
+}
+function buildWindowsPipeName(projectRoot) {
+    const digest = buildProjectDigest(projectRoot);
+    return `\\\\.\\pipe\\downcity-local-${digest}`;
+}
+function getLocalRpcUnixDirPath() {
+    return path.join(getCityRuntimeDirPath(), "local-rpc");
+}
+/**
+ * 返回本地 RPC endpoint。
+ */
+export function getLocalRpcEndpoint(projectRoot) {
+    if (process.platform === "win32") {
+        return buildWindowsPipeName(projectRoot);
+    }
+    return path.join(getLocalRpcUnixDirPath(), `downcity-local-${buildProjectDigest(projectRoot)}.sock`);
+}
+//# sourceMappingURL=Paths.js.map

package/bin/process/rpc/Paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Paths.js","sourceRoot":"","sources":["../../../src/process/rpc/Paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,OAAO,MAAM;SACV,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACjC,MAAM,CAAC,KAAK,CAAC;SACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAmB;IAC/C,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC/C,OAAO,+BAA+B,MAAM,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,sBAAsB;IAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,WAAW,CAAC,CAAC;AACzD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAmB;IACrD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CACd,sBAAsB,EAAE,EACxB,kBAAkB,kBAAkB,CAAC,WAAW,CAAC,OAAO,CACzD,CAAC;AACJ,CAAC"}

package/bin/utils/cli/CliOutput.d.ts

@@ -6,7 +6,7 @@
  * - asJson=true → 结构化 JSON（脚本友好）；asJson=false → 委托 CliReporter 渲染人类可读文本。
  * - 支持三种输出类型：block（单段落）、list（列表分组）、payload（旧版键值对，兼容过渡）。
  */
-import type { CliReportFact, CliReportListItem, CliReportTone } from "../../types/cli/CliReporter.js";
+import type { CliReportFact, CliReportListItem, CliReportTone } from "../../cli/shared/CliReporterTypes.js";
 /**
  * printResult 统一参数。
  *

package/bin/utils/cli/CliOutput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CliOutput.d.ts","sourceRoot":"","sources":["../../../src/utils/cli/CliOutput.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,KAAK,EAEV,aAAa,EAEb,iBAAiB,EACjB,aAAa,EACd,MAAM,4BAA4B,CAAC;AAEpC;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,qCAAqC;IACrC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IAEd,YAAY;IACZ,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAGxB,YAAY;IACZ,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,gBAAgB;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,aAAa;IACb,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,YAAY;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,WAAW;IACX,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAG5B,mBAAmB;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AA+CF;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAoD3D"}
+{"version":3,"file":"CliOutput.d.ts","sourceRoot":"","sources":["../../../src/utils/cli/CliOutput.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,KAAK,EAEV,aAAa,EAEb,iBAAiB,EACjB,aAAa,EACd,MAAM,kCAAkC,CAAC;AAE1C;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,qCAAqC;IACrC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IAEd,YAAY;IACZ,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAGxB,YAAY;IACZ,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,gBAAgB;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,aAAa;IACb,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,YAAY;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,WAAW;IACX,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAG5B,mBAAmB;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AA+CF;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAoD3D"}

package/bin/utils/cli/CliOutput.js

@@ -6,7 +6,7 @@
  * - asJson=true → 结构化 JSON（脚本友好）；asJson=false → 委托 CliReporter 渲染人类可读文本。
  * - 支持三种输出类型：block（单段落）、list（列表分组）、payload（旧版键值对，兼容过渡）。
  */
-import { emitCliBlock, emitCliList, } from "../../cli/CliReporter.js";
+import { emitCliBlock, emitCliList, } from "../../cli/shared/CliReporter.js";
 /**
  * 判断值是否为 plain object。
  */

package/bin/utils/cli/CliOutput.js.map

@@ -1 +1 @@
-{"version":3,"file":"CliOutput.js","sourceRoot":"","sources":["../../../src/utils/cli/CliOutput.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CliOutput.js","sourceRoot":"","sources":["../../../src/utils/cli/CliOutput.ts"],"names":[],"mappings":"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"}

package/bin/utils/storage.d.ts

@@ -1,4 +1,4 @@
-import type { JsonValue } from "@downcity/agent/shared/types/Json.js";
+import type { JsonValue } from "@downcity/agent";
 export declare function ensureDir(dir: string): Promise<void>;
 export declare function saveJson(filePath: string, data: JsonValue | object): Promise<void>;
 export declare function loadJson<T>(filePath: string): Promise<T | null>;

package/bin/utils/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/utils/storage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEtE,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1D;AAED,wBAAsB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAExF;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAKrE"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/utils/storage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1D;AAED,wBAAsB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAExF;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAKrE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@downcity/city",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "type": "module",
   "description": "Downcity City 平台 — CLI、daemon 管理、Console 网关、能力平台",
   "bin": {
@@ -36,7 +36,7 @@
     "prompts": "^2.4.0",
     "ws": "^8.19.0",
     "zod": "^3.24.0",
-    "@downcity/agent": "^1.1.1"
+    "@downcity/agent": "^1.1.6"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",

package/scripts/lint-import-boundaries.mjs

@@ -3,11 +3,12 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 /**
- * Import 边界检查（扁平化后）。
+ * city import 边界检查。
  *
  * 规则（中文）
- * - services 层禁止依赖 agent/config/http/rpc/service/plugin/daemon/registry 等上层模块。
- * - services 之间禁止横向直接依赖（除 BaseService 外）。
+ * - city 包内禁止直接依赖 `@downcity/agent/*` 子路径。
+ * - city 只能从 `@downcity/agent` 根入口消费 agent 公共能力。
+ * - 这样可以把 agent 内部目录树继续视为实现细节，避免控制面反向耦合。
  */
 
 const __filename = fileURLToPath(import.meta.url);
@@ -15,58 +16,10 @@ const __dirname = path.dirname(__filename);
 
 const packageRoot = path.resolve(__dirname, "..");
 const srcRoot = path.join(packageRoot, "src");
-const servicesRoot = path.join(srcRoot, "services");
 
 const IMPORT_RE =
   /(?:import\s+[^"'`]*?from\s*|export\s+[^"'`]*?from\s*|import\s*\()\s*["']([^"']+)["']/g;
 
-function toPosix(inputPath) {
-  return inputPath.split(path.sep).join("/");
-}
-
-function isRelativeSpecifier(specifier) {
-  return specifier.startsWith("./") || specifier.startsWith("../");
-}
-
-// 扁平化后的别名解析
-function resolveAliasToSrcRelative(specifier) {
-  if (specifier.startsWith("@/")) return specifier.slice(2);
-  if (specifier.startsWith("@session/")) return `session/${specifier.slice("@session/".length)}`;
-  if (specifier.startsWith("@services/")) return `services/${specifier.slice("@services/".length)}`;
-  if (specifier.startsWith("@shared/")) return `shared/${specifier.slice("@shared/".length)}`;
-  return null;
-}
-
-function resolveToSrcRelative(filePath, specifier) {
-  const absolute = path.resolve(path.dirname(filePath), specifier);
-  const relative = path.relative(srcRoot, absolute);
-  return toPosix(relative);
-}
-
-function getServiceName(srcRelativePath) {
-  const seg = srcRelativePath.split("/");
-  if (seg.length < 2 || seg[0] !== "services") return "";
-  return seg[1] || "";
-}
-
-// 扁平化后 services 禁止依赖的上层模块
-const BLOCKED_PREFIXES = [
-  "agent/",
-  "config/",
-  "http/",
-  "rpc/",
-  "service/",
-  "plugin/",
-  "daemon/",
-  "registry/",
-  "cli/",
-  "console/",
-  "model/",
-  "runtime/",
-  "sandbox/",
-  "session/",
-];
-
 async function collectTsFiles(dirPath) {
   const items = await fs.readdir(dirPath);
   const out = [];
@@ -82,56 +35,35 @@ async function collectTsFiles(dirPath) {
   return out;
 }
 
+function toPosix(inputPath) {
+  return inputPath.split(path.sep).join("/");
+}
+
 async function run() {
-  const files = await collectTsFiles(servicesRoot);
+  const files = await collectTsFiles(srcRoot);
   const violations = [];
 
   for (const filePath of files) {
     const source = await fs.readFile(filePath, "utf-8");
     const srcRelativeFilePath = toPosix(path.relative(srcRoot, filePath));
-    const currentServiceName = getServiceName(srcRelativeFilePath);
 
     for (const match of source.matchAll(IMPORT_RE)) {
       const specifier = String(match[1] || "").trim();
-      if (!specifier) continue;
-
-      const target = isRelativeSpecifier(specifier)
-        ? resolveToSrcRelative(filePath, specifier)
-        : resolveAliasToSrcRelative(specifier);
-      if (!target) continue;
-
-      // 规则 1：services 禁止依赖上层模块
-      const blocked = BLOCKED_PREFIXES.find((p) => target.startsWith(p));
-      if (blocked) {
-        violations.push({
-          file: srcRelativeFilePath,
-          specifier,
-          reason: `services 层禁止直接依赖 ${blocked}，请通过依赖注入访问运行时能力`,
-        });
-      }
-
-      // 规则 2：services 之间禁止横向直接依赖（BaseService 除外）
-      if (target.startsWith("services/")) {
-        const targetServiceName = getServiceName(target);
-        const isSameService = currentServiceName && targetServiceName === currentServiceName;
-        const isBaseService = target === "services/BaseService.js";
-        if (!isSameService && !isBaseService) {
-          violations.push({
-            file: srcRelativeFilePath,
-            specifier,
-            reason: "services/* 禁止直接依赖其他 service 模块",
-          });
-        }
-      }
+      if (!specifier.startsWith("@downcity/agent/")) continue;
+      violations.push({
+        file: srcRelativeFilePath,
+        specifier,
+        reason: "city 必须只从 @downcity/agent 根入口导入，禁止依赖 agent 内部子路径",
+      });
     }
   }
 
   if (violations.length === 0) {
-    console.log("✅ import boundaries passed");
+    console.log("✅ city import boundaries passed");
     return;
   }
 
-  console.error(`❌ import boundaries failed (${violations.length})`);
+  console.error(`❌ city import boundaries failed (${violations.length})`);
   for (const item of violations) {
     console.error(`- ${item.file}: ${item.specifier}`);
     console.error(`  ${item.reason}`);

package/src/cli/Index.ts

@@ -13,17 +13,17 @@ import { readFileSync } from "fs";
 import { basename, dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { Command, Option } from "commander";
-import { registerAllPluginsForCli } from "@downcity/agent/plugin/PluginCommand.js";
-import { registerServicesCommand } from "./Services.js";
-import { registerPluginsCommand } from "./Plugins.js";
-import { registerAllServicesForCli } from "./ServiceActionCommands.js";
-import { registerConsoleCommands } from "./IndexConsoleCommand.js";
-import { registerAgentCommands } from "./IndexAgentCommand.js";
-import { registerEnvCommand } from "./Env.js";
-import { registerTokenCommand } from "./Token.js";
-import { registerResetCommand } from "./Reset.js";
-import { registerChatCommand } from "./Chat.js";
-import { setCliVerbosity } from "./CliReporter.js";
+import { registerAllPluginsForCli } from "@downcity/agent";
+import { registerServicesCommand } from "./service/Services.js";
+import { registerPluginsCommand } from "./shared/Plugins.js";
+import { registerAllServicesForCli } from "./service/ServiceActionCommands.js";
+import { registerControlPlaneCommands } from "./control-plane/ControlPlaneCommand.js";
+import { registerAgentCommands } from "./shared/IndexAgentCommand.js";
+import { registerEnvCommand } from "./shared/Env.js";
+import { registerTokenCommand } from "./shared/Token.js";
+import { registerResetCommand } from "./shared/Reset.js";
+import { registerChatCommand } from "./shared/Chat.js";
+import { setCliVerbosity } from "./shared/CliReporter.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -45,7 +45,7 @@ program.helpOption("--help", "display help for command");
 program.option("-q, --quiet", "仅输出错误信息");
 program.option("--verbose", "输出详细进度");
 
-registerConsoleCommands(program, {
+registerControlPlaneCommands(program, {
   version: packageJson.version,
   cliPath,
 });