downcity 1.0.494 → 1.0.498

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/bin/services/contact/ContactService.d.ts.map +1 -1
  2. package/bin/services/contact/ContactService.js +14 -8
  3. package/bin/services/contact/ContactService.js.map +1 -1
  4. package/bin/services/contact/PROMPT.txt +2 -0
  5. package/bin/services/contact/runtime/EndpointNotice.d.ts.map +1 -1
  6. package/bin/services/contact/runtime/EndpointNotice.js +2 -1
  7. package/bin/services/contact/runtime/EndpointNotice.js.map +1 -1
  8. package/bin/services/contact/runtime/RemoteClient.d.ts.map +1 -1
  9. package/bin/services/contact/runtime/RemoteClient.js +14 -1
  10. package/bin/services/contact/runtime/RemoteClient.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/services/contact/PROMPT.txt +2 -0
  13. package/test/contact/contact-runtime.test.mjs +281 -0
package/bin/services/contact/ContactService.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ContactService.d.ts","sourceRoot":"","sources":["../../../src/services/contact/ContactService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AA+IvD;;GAEG;AACH,qBAAa,cAAe,SAAQ,WAAW;IAC7C;;OAEG;IACH,QAAQ,CAAC,IAAI,aAAa;IAE1B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;gBAErB,KAAK,EAAE,YAAY,GAAG,IAAI;IA+QtC;;OAEG;IACH,MAAM,IAAI,MAAM;YAIF,IAAI;YAsCJ,OAAO;YAmDP,KAAK;YAwCL,IAAI;YAmCJ,KAAK;YA4BL,UAAU;YAqBV,aAAa;YAmEb,WAAW;CA0B1B"}
1
+ {"version":3,"file":"ContactService.d.ts","sourceRoot":"","sources":["../../../src/services/contact/ContactService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAuJvD;;GAEG;AACH,qBAAa,cAAe,SAAQ,WAAW;IAC7C;;OAEG;IACH,QAAQ,CAAC,IAAI,aAAa;IAE1B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;gBAErB,KAAK,EAAE,YAAY,GAAG,IAAI;IA+QtC;;OAEG;IACH,MAAM,IAAI,MAAM;YAIF,IAAI;YAsCJ,OAAO;YAmDP,KAAK;YAwCL,IAAI;YAmCJ,KAAK;YA4BL,UAAU;YAqBV,aAAa;YAmEb,WAAW;CA0B1B"}
package/bin/services/contact/ContactService.js CHANGED
@@ -18,6 +18,7 @@ import { receiveContactChatMessage } from "./runtime/ChatRuntime.js";
18
18
  import { buildContactServiceSystemText } from "./runtime/SystemProvider.js";
19
19
  import { resolveContactSelfEndpoint } from "./runtime/EndpointResolver.js";
20
20
  import { buildContactApproveNotes, buildContactLinkNotes, classifyContactEndpoint, } from "./runtime/EndpointNotice.js";
21
+ const CONTACT_LINK_NOT_FOUND_ERROR = "Contact link not found. This runtime does not have that link record. This usually means the approve request reached the wrong endpoint or port, the link was generated by another agent/project, or the local link store was cleared. If the code is expired, the remote agent returns Contact link expired instead.";
21
22
  function readObject(value) {
22
23
  return value && typeof value === "object" && !Array.isArray(value)
23
24
  ? value
@@ -48,14 +49,19 @@ async function resolveSelfEndpoint(context, endpointOverride) {
48
49
  if (explicit)
49
50
  return normalizeContactEndpoint(explicit);
50
51
  const start = context.config.start || {};
52
+ const env = {
53
+ ...process.env,
54
+ ...context.globalEnv,
55
+ ...context.env,
56
+ };
57
+ const runtimePort = Number(process.env.DC_SERVER_PORT || env.DC_SERVER_PORT || "");
58
+ // 关键点（中文）：link code 必须写入当前 runtime 的真实监听端口，不能使用可能已经过期的配置端口。
59
+ const port = Number.isFinite(runtimePort) && runtimePort > 0 ? runtimePort : start.port;
60
+ const runtimeHost = String(process.env.DC_SERVER_HOST || env.DC_SERVER_HOST || "").trim();
51
61
  return normalizeContactEndpoint(await resolveContactSelfEndpoint({
52
- host: start.host,
53
- port: start.port,
54
- env: {
55
- ...context.globalEnv,
56
- ...context.env,
57
- ...process.env,
58
- },
62
+ host: runtimeHost || start.host,
63
+ port,
64
+ env,
59
65
  }));
60
66
  }
61
67
  function hasConfiguredPublicEndpointEnv(context) {
@@ -566,7 +572,7 @@ export class ContactService extends BaseService {
566
572
  agentName: getAgentName(context),
567
573
  endpoint: await resolveSelfEndpoint(context),
568
574
  tokenForOwner: "",
569
- error: "Contact link not found",
575
+ error: CONTACT_LINK_NOT_FOUND_ERROR,
570
576
  };
571
577
  }
572
578
  if (link.usedAt) {
package/bin/services/contact/ContactService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ContactService.js","sourceRoot":"","sources":["../../../src/services/contact/ContactService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ContactService.js","sourceRoot":"","sources":["../../../src/services/contact/ContactService.ts"],"names":[],"mappings":"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"}
package/bin/services/contact/PROMPT.txt CHANGED
@@ -15,6 +15,8 @@ contact service 用来管理和其他 agent 的联系方式。一个 contact 代
15
15
  边界：
16
16
  - chat 用于对话，share 用于资料交接。
17
17
  - `city contact link` 返回中的 notes 会说明联系码适合本机、局域网还是公网 agent 使用；本地 localhost 联系码不能交给 server agent approve。
18
+ - public-looking endpoint 仍可能被防火墙/NAT 阻断；以返回的 notes 为准，不要承诺公网一定可达。
18
19
  - `city contact approve` 返回中的 notes 会说明建联结果是 outbound-only 还是 bidirectional。
20
+ - `Contact link not found` 表示请求打到的 agent runtime 没有这条 link 记录，优先检查 endpoint/端口/agent 是否一致；过期会明确返回 `Contact link expired`。
19
21
  - receive 只接收内容，不自动执行、不安装 skill、不修改项目业务文件。
20
22
  - 不自动 approve 或 receive，除非用户明确要求。
package/bin/services/contact/runtime/EndpointNotice.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EndpointNotice.d.ts","sourceRoot":"","sources":["../../../../src/services/contact/runtime/EndpointNotice.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAsBtF;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,GACf,2BAA2B,CAY7B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAC5C;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,EAAE,CAqBX;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAC/C;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,GAAG,MAAM,EAAE,CAuBX"}
1
+ {"version":3,"file":"EndpointNotice.d.ts","sourceRoot":"","sources":["../../../../src/services/contact/runtime/EndpointNotice.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAsBtF;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,GACf,2BAA2B,CAY7B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAC5C;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,EAAE,CAsBX;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAC/C;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,GAAG,MAAM,EAAE,CAuBX"}
package/bin/services/contact/runtime/EndpointNotice.js CHANGED
@@ -65,6 +65,7 @@ export function buildContactLinkNotes(params) {
65
65
  if (reachability === "public") {
66
66
  return [
67
67
  "This link can be approved by agents that can reach this endpoint before the code expires.",
68
+ "Downcity cannot verify firewall or NAT reachability from here; if approval cannot connect, use a reachable server, domain, or tunnel in DOWNCITY_PUBLIC_URL / DOWNCITY_PUBLIC_HOST.",
68
69
  ];
69
70
  }
70
71
  return [
@@ -84,7 +85,7 @@ export function buildContactApproveNotes(params) {
84
85
  notes.push("The approved link points to a private-network endpoint. This only works when this agent can reach that LAN/VPN address.");
85
86
  }
86
87
  if (params.requesterEndpoint) {
87
- notes.push("This contact is bidirectional: this agent sent its public endpoint during approve, so both agents can initiate check, chat, and share.");
88
+ notes.push("This contact is bidirectional if the sent endpoint is reachable from the peer; this agent sent its public endpoint during approve, so both agents can initiate check, chat, and share when firewall/NAT allows it.");
88
89
  }
89
90
  else {
90
91
  notes.push("This contact is outbound-only from this side: this agent can call the peer, but the peer cannot call back unless this agent has DOWNCITY_PUBLIC_URL or DOWNCITY_PUBLIC_HOST configured.");
package/bin/services/contact/runtime/EndpointNotice.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EndpointNotice.js","sourceRoot":"","sources":["../../../../src/services/contact/runtime/EndpointNotice.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EndpointNotice.js","sourceRoot":"","sources":["../../../../src/services/contact/runtime/EndpointNotice.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,SAAS,YAAY,CAAC,QAAgB;IACpC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,QAAgB;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3E,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACjF,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IACjC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;QAAE,OAAO,IAAI,CAAC;IACtE,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACtD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACtD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB,CACrC,QAAgB;IAEhB,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,IACE,QAAQ,KAAK,WAAW;QACxB,QAAQ,KAAK,KAAK;QAClB,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAC3B,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,IAAI,aAAa,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAKrC;IACC,MAAM,YAAY,GAAG,uBAAuB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO;YACL,yJAAyJ;YACzJ,wHAAwH;SACzH,CAAC;IACJ,CAAC;IACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO;YACL,kJAAkJ;SACnJ,CAAC;IACJ,CAAC;IACD,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO;YACL,2FAA2F;YAC3F,qLAAqL;SACtL,CAAC;IACJ,CAAC;IACD,OAAO;QACL,8GAA8G;KAC/G,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,MASxC;IACC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC1E,IAAI,kBAAkB,KAAK,UAAU,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CACR,8GAA8G,CAC/G,CAAC;IACJ,CAAC;SAAM,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC5C,KAAK,CAAC,IAAI,CACR,yHAAyH,CAC1H,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CACR,oNAAoN,CACrN,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CACR,yLAAyL,CAC1L,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
package/bin/services/contact/runtime/RemoteClient.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RemoteClient.d.ts","sourceRoot":"","sources":["../../../../src/services/contact/runtime/RemoteClient.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAwCxD;;GAEG;AACH,wBAAsB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,CAAC,CAAC,CAMb;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;CACjB,GAAG,OAAO,CAAC,CAAC,CAAC,CAMb;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,CAAC;CACjB,GAAG,OAAO,CAAC,CAAC,CAAC,CAOb;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,CAAC;CACjB,GAAG,OAAO,CAAC,CAAC,CAAC,CAOb"}
1
+ {"version":3,"file":"RemoteClient.d.ts","sourceRoot":"","sources":["../../../../src/services/contact/runtime/RemoteClient.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAwDxD;;GAEG;AACH,wBAAsB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,CAAC,CAAC,CAMb;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;CACjB,GAAG,OAAO,CAAC,CAAC,CAAC,CAMb;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,CAAC;CACjB,GAAG,OAAO,CAAC,CAAC,CAAC,CAOb;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,CAAC;CACjB,GAAG,OAAO,CAAC,CAAC,CAAC,CAOb"}
package/bin/services/contact/runtime/RemoteClient.js CHANGED
@@ -5,6 +5,9 @@
5
5
  * - contact 的 agent-to-agent 调用走独立轻量路由，不依赖用户 CLI auth。
6
6
  * - 已建联后的敏感调用必须携带 contact token。
7
7
  */
8
+ function isRecord(value) {
9
+ return Boolean(value && typeof value === "object" && !Array.isArray(value));
10
+ }
8
11
  function normalizeEndpoint(endpoint) {
9
12
  const raw = String(endpoint || "").trim();
10
13
  if (!raw)
@@ -16,6 +19,16 @@ function normalizeEndpoint(endpoint) {
16
19
  url.hash = "";
17
20
  return url.toString().replace(/\/$/, "");
18
21
  }
22
+ function unwrapServiceActionEnvelope(value) {
23
+ if (!isRecord(value))
24
+ return value;
25
+ const inner = value.data;
26
+ if (typeof value.success === "boolean" && isRecord(inner)) {
27
+ // 关键点（中文）：远端 contact API 挂在统一 service action route 下，HTTP 返回会包一层 { success, data }。
28
+ return inner;
29
+ }
30
+ return value;
31
+ }
19
32
  async function postJson(params) {
20
33
  const url = new URL(params.path, normalizeEndpoint(params.endpoint)).toString();
21
34
  const headers = {
@@ -32,7 +45,7 @@ async function postJson(params) {
32
45
  if (!response.ok) {
33
46
  throw new Error(data?.error || data?.message || `HTTP ${response.status}`);
34
47
  }
35
- return data;
48
+ return unwrapServiceActionEnvelope(data);
36
49
  }
37
50
  /**
38
51
  * 调用远端 ping。
package/bin/services/contact/runtime/RemoteClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RemoteClient.js","sourceRoot":"","sources":["../../../../src/services/contact/runtime/RemoteClient.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,SAAS,iBAAiB,CAAC,QAAgB;IACzC,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,GAAG,EAAE,CAAC;IACvE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAC;IAClB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;IAChB,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;IACd,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,QAAQ,CAAI,MAK1B;IACC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAChF,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IACF,IAAI,MAAM,CAAC,KAAK;QAAE,OAAO,CAAC,0BAA0B,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;IAErE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;KACxC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAGpD,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,OAAO,IAAI,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAI,MAGxC;IACC,OAAO,MAAM,QAAQ,CAAI;QACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAI,MAG3C;IACC,OAAO,MAAM,QAAQ,CAAI;QACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAI,MAIxC;IACC,OAAO,MAAM,QAAQ,CAAI;QACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAI,MAIzC;IACC,OAAO,MAAM,QAAQ,CAAI;QACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,oBAAoB;QAC1B,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"RemoteClient.js","sourceRoot":"","sources":["../../../../src/services/contact/runtime/RemoteClient.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "downcity",
3
- "version": "1.0.494",
3
+ "version": "1.0.498",
4
4
  "type": "module",
5
5
  "description": "每一个文件仓库都是一个Agent，搭建你的Agent City",
6
6
  "bin": {
package/src/services/contact/PROMPT.txt CHANGED
@@ -15,6 +15,8 @@ contact service 用来管理和其他 agent 的联系方式。一个 contact 代
15
15
  边界：
16
16
  - chat 用于对话，share 用于资料交接。
17
17
  - `city contact link` 返回中的 notes 会说明联系码适合本机、局域网还是公网 agent 使用；本地 localhost 联系码不能交给 server agent approve。
18
+ - public-looking endpoint 仍可能被防火墙/NAT 阻断；以返回的 notes 为准，不要承诺公网一定可达。
18
19
  - `city contact approve` 返回中的 notes 会说明建联结果是 outbound-only 还是 bidirectional。
20
+ - `Contact link not found` 表示请求打到的 agent runtime 没有这条 link 记录，优先检查 endpoint/端口/agent 是否一致；过期会明确返回 `Contact link expired`。
19
21
  - receive 只接收内容，不自动执行、不安装 skill、不修改项目业务文件。
20
22
  - 不自动 approve 或 receive，除非用户明确要求。
package/test/contact/contact-runtime.test.mjs CHANGED
@@ -32,6 +32,7 @@ import {
32
32
  } from "../../bin/services/contact/runtime/InboxStore.js";
33
33
  import {
34
34
  listContacts,
35
+ saveContact,
35
36
  } from "../../bin/services/contact/runtime/ContactStore.js";
36
37
  import {
37
38
  saveContactLinkRecord,
@@ -173,6 +174,108 @@ test("contact link resolves endpoint from context global env", async () => {
173
174
  }
174
175
  });
175
176
 
177
+ test("contact link prefers actual runtime port over configured start port", async () => {
178
+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-runtime-port-"));
179
+ const previousServerPort = process.env.DC_SERVER_PORT;
180
+ const previousPublicUrl = process.env.DOWNCITY_PUBLIC_URL;
181
+ const previousPublicHost = process.env.DOWNCITY_PUBLIC_HOST;
182
+ try {
183
+ process.env.DC_SERVER_PORT = "7777";
184
+ delete process.env.DOWNCITY_PUBLIC_URL;
185
+ delete process.env.DOWNCITY_PUBLIC_HOST;
186
+ const service = new ContactService(null);
187
+ const result = await service.actions.link.execute({
188
+ context: {
189
+ rootPath: root,
190
+ env: {},
191
+ globalEnv: {
192
+ DOWNCITY_PUBLIC_HOST: "203.0.113.10",
193
+ },
194
+ config: {
195
+ name: "server-agent",
196
+ start: {
197
+ host: "0.0.0.0",
198
+ port: 5314,
199
+ },
200
+ },
201
+ },
202
+ payload: {},
203
+ });
204
+
205
+ assert.equal(result.success, true);
206
+ assert.equal(result.data.endpoint, "http://203.0.113.10:7777");
207
+ assert.equal(parseContactLinkCode(result.data.code).endpoint, "http://203.0.113.10:7777");
208
+ } finally {
209
+ if (previousServerPort === undefined) {
210
+ delete process.env.DC_SERVER_PORT;
211
+ } else {
212
+ process.env.DC_SERVER_PORT = previousServerPort;
213
+ }
214
+ if (previousPublicUrl === undefined) {
215
+ delete process.env.DOWNCITY_PUBLIC_URL;
216
+ } else {
217
+ process.env.DOWNCITY_PUBLIC_URL = previousPublicUrl;
218
+ }
219
+ if (previousPublicHost === undefined) {
220
+ delete process.env.DOWNCITY_PUBLIC_HOST;
221
+ } else {
222
+ process.env.DOWNCITY_PUBLIC_HOST = previousPublicHost;
223
+ }
224
+ await fs.rm(root, { recursive: true, force: true });
225
+ }
226
+ });
227
+
228
+ test("contact link prefers context public host while keeping actual runtime port", async () => {
229
+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-env-precedence-"));
230
+ const previousServerPort = process.env.DC_SERVER_PORT;
231
+ const previousPublicHost = process.env.DOWNCITY_PUBLIC_HOST;
232
+ const previousPublicUrl = process.env.DOWNCITY_PUBLIC_URL;
233
+ try {
234
+ process.env.DC_SERVER_PORT = "7777";
235
+ process.env.DOWNCITY_PUBLIC_HOST = "198.51.100.50";
236
+ delete process.env.DOWNCITY_PUBLIC_URL;
237
+ const service = new ContactService(null);
238
+ const result = await service.actions.link.execute({
239
+ context: {
240
+ rootPath: root,
241
+ env: {},
242
+ globalEnv: {
243
+ DOWNCITY_PUBLIC_HOST: "203.0.113.10",
244
+ },
245
+ config: {
246
+ name: "server-agent",
247
+ start: {
248
+ host: "0.0.0.0",
249
+ port: 5314,
250
+ },
251
+ },
252
+ },
253
+ payload: {},
254
+ });
255
+
256
+ assert.equal(result.success, true);
257
+ assert.equal(result.data.endpoint, "http://203.0.113.10:7777");
258
+ assert.equal(parseContactLinkCode(result.data.code).endpoint, "http://203.0.113.10:7777");
259
+ } finally {
260
+ if (previousServerPort === undefined) {
261
+ delete process.env.DC_SERVER_PORT;
262
+ } else {
263
+ process.env.DC_SERVER_PORT = previousServerPort;
264
+ }
265
+ if (previousPublicHost === undefined) {
266
+ delete process.env.DOWNCITY_PUBLIC_HOST;
267
+ } else {
268
+ process.env.DOWNCITY_PUBLIC_HOST = previousPublicHost;
269
+ }
270
+ if (previousPublicUrl === undefined) {
271
+ delete process.env.DOWNCITY_PUBLIC_URL;
272
+ } else {
273
+ process.env.DOWNCITY_PUBLIC_URL = previousPublicUrl;
274
+ }
275
+ await fs.rm(root, { recursive: true, force: true });
276
+ }
277
+ });
278
+
176
279
  test("contact link warns when endpoint is local-only", async () => {
177
280
  const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-local-link-"));
178
281
  try {
@@ -205,6 +308,38 @@ test("contact link warns when endpoint is local-only", async () => {
205
308
  }
206
309
  });
207
310
 
311
+ test("contact link notes that public-looking endpoints may still be blocked", async () => {
312
+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-public-link-"));
313
+ try {
314
+ const service = new ContactService(null);
315
+ const result = await service.actions.link.execute({
316
+ context: {
317
+ rootPath: root,
318
+ env: {},
319
+ globalEnv: {},
320
+ config: {
321
+ name: "server-agent",
322
+ start: {
323
+ host: "0.0.0.0",
324
+ port: 5314,
325
+ },
326
+ },
327
+ },
328
+ payload: {
329
+ endpoint: "203.0.113.10:5314",
330
+ },
331
+ });
332
+
333
+ assert.equal(result.success, true);
334
+ assert.equal(result.data.endpointReachability, "public");
335
+ assert.ok(
336
+ result.data.notes.some((item) => /firewall|NAT/i.test(item)),
337
+ );
338
+ } finally {
339
+ await fs.rm(root, { recursive: true, force: true });
340
+ }
341
+ });
342
+
208
343
  test("contact endpoint resolver discovers public ip before falling back to localhost", async () => {
209
344
  const endpoint = await resolveContactSelfEndpoint({
210
345
  host: "0.0.0.0",
@@ -266,6 +401,41 @@ test("remote approve allows an inbound-only contact without requester endpoint",
266
401
  }
267
402
  });
268
403
 
404
+ test("remote approve explains missing link records separately from expiration", async () => {
405
+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-missing-link-"));
406
+ try {
407
+ const service = new ContactService(null);
408
+ const result = await service.actions.remoteapprove.execute({
409
+ context: {
410
+ rootPath: root,
411
+ env: {
412
+ DOWNCITY_PUBLIC_URL: "https://agent-a.example.com",
413
+ },
414
+ config: {
415
+ name: "server-agent",
416
+ start: {
417
+ host: "0.0.0.0",
418
+ port: 5314,
419
+ },
420
+ },
421
+ },
422
+ payload: {
423
+ linkId: "link_missing",
424
+ secret: "secret-token",
425
+ agentName: "local-agent",
426
+ },
427
+ });
428
+
429
+ assert.equal(result.success, true);
430
+ assert.equal(result.data.success, false);
431
+ assert.match(result.data.error, /Contact link not found/);
432
+ assert.match(result.data.error, /wrong endpoint or port/);
433
+ assert.match(result.data.error, /Contact link expired/);
434
+ } finally {
435
+ await fs.rm(root, { recursive: true, force: true });
436
+ }
437
+ });
438
+
269
439
  test("approve without endpoint creates an outbound-only local contact", async () => {
270
440
  const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-approve-"));
271
441
  const originalFetch = globalThis.fetch;
@@ -331,6 +501,62 @@ test("approve without endpoint creates an outbound-only local contact", async ()
331
501
  }
332
502
  });
333
503
 
504
+ test("approve unwraps remote service action envelope", async () => {
505
+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-approve-envelope-"));
506
+ const originalFetch = globalThis.fetch;
507
+ try {
508
+ const service = new ContactService(null);
509
+ const code = createContactLinkCode({
510
+ version: 1,
511
+ linkId: "link_server",
512
+ agentName: "server-agent",
513
+ endpoint: "https://agent-a.example.com",
514
+ secret: "secret-token",
515
+ createdAt: Date.now(),
516
+ expiresAt: Date.now() + 600_000,
517
+ });
518
+ globalThis.fetch = async () =>
519
+ new Response(JSON.stringify({
520
+ success: true,
521
+ data: {
522
+ success: true,
523
+ agentName: "server-agent",
524
+ endpoint: "https://agent-a.example.com",
525
+ tokenForOwner: "local-can-call-server",
526
+ },
527
+ }), {
528
+ status: 200,
529
+ headers: {
530
+ "Content-Type": "application/json",
531
+ },
532
+ });
533
+
534
+ const result = await service.actions.approve.execute({
535
+ context: {
536
+ rootPath: root,
537
+ config: {
538
+ name: "local-agent",
539
+ start: {
540
+ host: "127.0.0.1",
541
+ port: 5314,
542
+ },
543
+ },
544
+ },
545
+ payload: {
546
+ code,
547
+ },
548
+ });
549
+
550
+ assert.equal(result.success, true);
551
+ const contacts = await listContacts(root);
552
+ assert.equal(contacts.length, 1);
553
+ assert.equal(contacts[0].outboundToken, "local-can-call-server");
554
+ } finally {
555
+ globalThis.fetch = originalFetch;
556
+ await fs.rm(root, { recursive: true, force: true });
557
+ }
558
+ });
559
+
334
560
  test("approve sends requester endpoint from global public host", async () => {
335
561
  const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-bidirectional-"));
336
562
  const originalFetch = globalThis.fetch;
@@ -397,6 +623,61 @@ test("approve sends requester endpoint from global public host", async () => {
397
623
  }
398
624
  });
399
625
 
626
+ test("share unwraps remote service action envelope", async () => {
627
+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-share-envelope-"));
628
+ const originalFetch = globalThis.fetch;
629
+ try {
630
+ const service = new ContactService(null);
631
+ await saveContact(root, {
632
+ id: "contact_server_agent",
633
+ name: "server-agent",
634
+ endpoint: "https://agent-a.example.com",
635
+ reachability: "outbound",
636
+ status: "trusted",
637
+ outboundToken: "local-can-call-server",
638
+ inboundTokenHash: null,
639
+ createdAt: Date.now(),
640
+ lastSeenAt: Date.now(),
641
+ });
642
+ globalThis.fetch = async () =>
643
+ new Response(JSON.stringify({
644
+ success: true,
645
+ data: {
646
+ success: true,
647
+ shareId: "remote_share_123",
648
+ },
649
+ }), {
650
+ status: 200,
651
+ headers: {
652
+ "Content-Type": "application/json",
653
+ },
654
+ });
655
+
656
+ const result = await service.actions.share.execute({
657
+ context: {
658
+ rootPath: root,
659
+ config: {
660
+ name: "local-agent",
661
+ start: {
662
+ host: "127.0.0.1",
663
+ port: 5314,
664
+ },
665
+ },
666
+ },
667
+ payload: {
668
+ to: "server-agent",
669
+ text: "hello",
670
+ },
671
+ });
672
+
673
+ assert.equal(result.success, true);
674
+ assert.equal(result.data.shareId, "remote_share_123");
675
+ } finally {
676
+ globalThis.fetch = originalFetch;
677
+ await fs.rm(root, { recursive: true, force: true });
678
+ }
679
+ });
680
+
400
681
  test("inbox stores each share as a directory with lightweight meta and files", async () => {
401
682
  const root = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-contact-inbox-"));
402
683
  try {