downcity 1.0.405 → 1.0.406
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.
- package/bin/main/auth/AgentTokenService.d.ts.map +1 -0
- package/bin/main/auth/AgentTokenService.js +146 -0
- package/bin/main/auth/AgentTokenService.js.map +1 -0
- package/bin/main/auth/RoutePolicy.d.ts.map +1 -1
- package/bin/main/auth/RoutePolicy.js +0 -6
- package/bin/main/auth/RoutePolicy.js.map +1 -1
- package/bin/main/commands/Run.d.ts.map +1 -1
- package/bin/main/commands/Run.js +6 -2
- package/bin/main/commands/Run.js.map +1 -1
- package/bin/main/daemon/Manager.d.ts.map +1 -1
- package/bin/main/daemon/Manager.js +5 -0
- package/bin/main/daemon/Manager.js.map +1 -1
- package/bin/main/plugin/Plugins.d.ts.map +1 -1
- package/bin/main/plugin/Plugins.js +3 -2
- package/bin/main/plugin/Plugins.js.map +1 -1
- package/bin/plugins/web/Dependency.d.ts.map +1 -0
- package/bin/plugins/web/Dependency.js +10 -0
- package/bin/plugins/web/Dependency.js.map +1 -0
- package/bin/plugins/web/PROMPT.agent-browser.txt +17 -0
- package/bin/plugins/web/PROMPT.txt +33 -0
- package/bin/plugins/web/PROMPT.web-access.txt +13 -0
- package/bin/plugins/web/Plugin.d.ts.map +1 -0
- package/bin/plugins/web/Plugin.js +458 -0
- package/bin/plugins/web/Plugin.js.map +1 -0
- package/bin/plugins/web/runtime/Config.d.ts.map +1 -0
- package/bin/plugins/web/runtime/Config.js +85 -0
- package/bin/plugins/web/runtime/Config.js.map +1 -0
- package/bin/plugins/web/runtime/Source.d.ts.map +1 -0
- package/bin/plugins/web/runtime/Source.js +217 -0
- package/bin/plugins/web/runtime/Source.js.map +1 -0
- package/bin/services/chat/runtime/ChatQueueWorker.d.ts.map +1 -1
- package/bin/services/chat/runtime/ChatQueueWorker.js +26 -0
- package/bin/services/chat/runtime/ChatQueueWorker.js.map +1 -1
- package/bin/services/shell/runtime/SessionStoreSupport.d.ts.map +1 -1
- package/bin/services/shell/runtime/SessionStoreSupport.js +7 -3
- package/bin/services/shell/runtime/SessionStoreSupport.js.map +1 -1
- package/bin/sessions/SessionCore.d.ts.map +1 -1
- package/bin/sessions/SessionCore.js +21 -1
- package/bin/sessions/SessionCore.js.map +1 -1
- package/bin/sessions/acp/AcpSessionRuntime.d.ts.map +1 -1
- package/bin/sessions/acp/AcpSessionRuntime.js +54 -0
- package/bin/sessions/acp/AcpSessionRuntime.js.map +1 -1
- package/bin/sessions/runtime/SessionCoreLoop.d.ts.map +1 -1
- package/bin/sessions/runtime/SessionCoreLoop.js +10 -0
- package/bin/sessions/runtime/SessionCoreLoop.js.map +1 -1
- package/bin/sessions/tools/shell/ShellHelpers.d.ts.map +1 -1
- package/bin/sessions/tools/shell/ShellHelpers.js +6 -2
- package/bin/sessions/tools/shell/ShellHelpers.js.map +1 -1
- package/bin/types/ExecutionContext.d.ts.map +1 -1
- package/bin/types/SessionCoreLoop.d.ts.map +1 -1
- package/bin/types/SessionRuntime.d.ts.map +1 -1
- package/bin/types/WebPlugin.d.ts.map +1 -0
- package/bin/types/WebPlugin.js +12 -0
- package/bin/types/WebPlugin.js.map +1 -0
- package/bin/utils/store/index.d.ts.map +1 -1
- package/bin/utils/store/index.js +26 -1
- package/bin/utils/store/index.js.map +1 -1
- package/package.json +1 -1
- package/public/app.js +1 -1
- package/src/plugins/web/PROMPT.agent-browser.txt +17 -0
- package/src/plugins/web/PROMPT.txt +33 -0
- package/src/plugins/web/PROMPT.web-access.txt +13 -0
- package/src/types/README.md +3 -0
- package/test/chat/chat-queue-worker-acp-cancel.test.mjs +194 -0
- package/test/core/session-core-loop.test.mjs +22 -1
- package/test/fixtures/acp-agent-fixture.mjs +26 -0
- package/test/plugin/web-plugin.test.mjs +302 -0
- package/test/sessions/acp-session-runtime.test.mjs +23 -0
- package/bin/main/auth/InternalRuntimeAuth.d.ts.map +0 -1
- package/bin/main/auth/InternalRuntimeAuth.js +0 -59
- package/bin/main/auth/InternalRuntimeAuth.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AgentTokenService.d.ts","sourceRoot":"","sources":["../../../src/main/auth/AgentTokenService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AA4BD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,cAAc,CAuCpE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAqB7D;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,KAAK,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,CAmBD"}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent 专用 Token 服务。
|
|
3
|
+
*
|
|
4
|
+
* 关键点(中文)
|
|
5
|
+
* - 为每个 Agent 项目签发独立的 service token,用于 shell 内调用 city 命令。
|
|
6
|
+
* - Token 关联到统一账户系统,但使用特殊的 "agent-service" 用户。
|
|
7
|
+
* - 支持追溯、吊销、权限控制。
|
|
8
|
+
*/
|
|
9
|
+
import { AuthStore } from "./AuthStore.js";
|
|
10
|
+
import { generateAccessToken, hashAccessToken } from "./TokenService.js";
|
|
11
|
+
const AGENT_SERVICE_USERNAME = "agent-service";
|
|
12
|
+
const AGENT_SERVICE_DISPLAY_NAME = "Agent Service Account";
|
|
13
|
+
/**
|
|
14
|
+
* 确保 agent-service 用户存在。
|
|
15
|
+
*/
|
|
16
|
+
function ensureAgentServiceUser(store) {
|
|
17
|
+
const existing = store.findUserByUsername(AGENT_SERVICE_USERNAME);
|
|
18
|
+
if (existing) {
|
|
19
|
+
return { userId: existing.id, isNew: false };
|
|
20
|
+
}
|
|
21
|
+
// 创建 service 账户(无密码,不能登录)
|
|
22
|
+
const user = store.createUser({
|
|
23
|
+
username: AGENT_SERVICE_USERNAME,
|
|
24
|
+
passwordHash: "[service-account-no-password]",
|
|
25
|
+
displayName: AGENT_SERVICE_DISPLAY_NAME,
|
|
26
|
+
status: "active",
|
|
27
|
+
});
|
|
28
|
+
// 分配 admin 角色(或创建专门的 agent-service 角色)
|
|
29
|
+
store.assignRoleToUser({
|
|
30
|
+
userId: user.id,
|
|
31
|
+
roleName: "admin",
|
|
32
|
+
});
|
|
33
|
+
return { userId: user.id, isNew: true };
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* 为指定 Agent 项目签发或复用 token。
|
|
37
|
+
*
|
|
38
|
+
* 策略(中文)
|
|
39
|
+
* 1. 检查是否已有该项目的有效 token(未吊销、未过期)
|
|
40
|
+
* 2. 有则复用,无则创建新 token
|
|
41
|
+
* 3. token 名称包含项目路径摘要,便于识别
|
|
42
|
+
*/
|
|
43
|
+
export function ensureAgentToken(projectRoot) {
|
|
44
|
+
const store = new AuthStore();
|
|
45
|
+
try {
|
|
46
|
+
const { userId } = ensureAgentServiceUser(store);
|
|
47
|
+
const tokenName = buildAgentTokenName(projectRoot);
|
|
48
|
+
// 查找该项目现有的有效 token
|
|
49
|
+
const existingTokens = store.listTokensByUserId(userId);
|
|
50
|
+
const now = new Date().toISOString();
|
|
51
|
+
for (const record of existingTokens) {
|
|
52
|
+
if (record.name !== tokenName)
|
|
53
|
+
continue;
|
|
54
|
+
if (record.revokedAt)
|
|
55
|
+
continue;
|
|
56
|
+
if (record.expiresAt && record.expiresAt <= now)
|
|
57
|
+
continue;
|
|
58
|
+
// 找到有效 token,但无法获取明文(已丢失),需要吊销并重建
|
|
59
|
+
// 注意:这里只能吊销,无法复用,因为明文 token 只在签发时存在
|
|
60
|
+
store.revokeToken(record.id);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
// 创建新 token
|
|
64
|
+
const plainToken = generateAccessToken();
|
|
65
|
+
const record = store.createToken({
|
|
66
|
+
userId,
|
|
67
|
+
name: tokenName,
|
|
68
|
+
tokenHash: hashAccessToken(plainToken),
|
|
69
|
+
// Agent token 默认 1 年有效期
|
|
70
|
+
expiresAt: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).toISOString(),
|
|
71
|
+
});
|
|
72
|
+
return {
|
|
73
|
+
token: plainToken,
|
|
74
|
+
tokenId: record.id,
|
|
75
|
+
projectRoot,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
finally {
|
|
79
|
+
store.close();
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* 吊销指定 Agent 项目的 token。
|
|
84
|
+
*/
|
|
85
|
+
export function revokeAgentToken(projectRoot) {
|
|
86
|
+
const store = new AuthStore();
|
|
87
|
+
try {
|
|
88
|
+
const user = store.findUserByUsername(AGENT_SERVICE_USERNAME);
|
|
89
|
+
if (!user)
|
|
90
|
+
return false;
|
|
91
|
+
const tokenName = buildAgentTokenName(projectRoot);
|
|
92
|
+
const tokens = store.listTokensByUserId(user.id);
|
|
93
|
+
let revoked = false;
|
|
94
|
+
for (const record of tokens) {
|
|
95
|
+
if (record.name === tokenName && !record.revokedAt) {
|
|
96
|
+
store.revokeToken(record.id);
|
|
97
|
+
revoked = true;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return revoked;
|
|
101
|
+
}
|
|
102
|
+
finally {
|
|
103
|
+
store.close();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* 列出所有 Agent token。
|
|
108
|
+
*/
|
|
109
|
+
export function listAgentTokens() {
|
|
110
|
+
const store = new AuthStore();
|
|
111
|
+
try {
|
|
112
|
+
const user = store.findUserByUsername(AGENT_SERVICE_USERNAME);
|
|
113
|
+
if (!user)
|
|
114
|
+
return [];
|
|
115
|
+
const tokens = store.listTokensByUserId(user.id);
|
|
116
|
+
return tokens
|
|
117
|
+
.filter((t) => t.name.startsWith("agent:"))
|
|
118
|
+
.map((t) => ({
|
|
119
|
+
tokenId: t.id,
|
|
120
|
+
projectRoot: extractProjectRootFromTokenName(t.name),
|
|
121
|
+
createdAt: t.createdAt,
|
|
122
|
+
expiresAt: t.expiresAt,
|
|
123
|
+
revokedAt: t.revokedAt,
|
|
124
|
+
}));
|
|
125
|
+
}
|
|
126
|
+
finally {
|
|
127
|
+
store.close();
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
* 构建 agent token 名称。
|
|
132
|
+
*/
|
|
133
|
+
function buildAgentTokenName(projectRoot) {
|
|
134
|
+
// 使用项目路径的 hash 作为标识,避免路径过长
|
|
135
|
+
const normalized = projectRoot.replace(/\/+$/, "").replace(/\\/g, "/");
|
|
136
|
+
return `agent:${normalized}`;
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* 从 token 名称提取项目路径。
|
|
140
|
+
*/
|
|
141
|
+
function extractProjectRootFromTokenName(name) {
|
|
142
|
+
if (!name.startsWith("agent:"))
|
|
143
|
+
return "";
|
|
144
|
+
return name.slice(6); // 去掉 "agent:" 前缀
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=AgentTokenService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AgentTokenService.js","sourceRoot":"","sources":["../../../src/main/auth/AgentTokenService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutePolicy.d.ts","sourceRoot":"","sources":["../../../src/main/auth/RoutePolicy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAGjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAA8B,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"RoutePolicy.d.ts","sourceRoot":"","sources":["../../../src/main/auth/RoutePolicy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAGjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAA8B,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE/F;;GAEG;AACH,eAAO,MAAM,0BAA0B,EAAE,eAAe,EAoEvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B,EAAE,eAAe,EA8D3D,CAAC;AAEF;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,EAAE,GAC1B,eAAe,GAAG,IAAI,CASxB;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,WAAW,EACxB,QAAQ,GAAE,eAAe,EAA+B,GACvD,iBAAiB,CAAC;IAAE,SAAS,EAAE,uBAAuB,CAAA;CAAE,CAAC,CA4B3D"}
|
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { isAuthError as isAuthDomainError } from "./AuthError.js";
|
|
9
9
|
import { AUTH_PRINCIPAL_CONTEXT_KEY } from "./AuthMiddleware.js";
|
|
10
|
-
import { createInternalRuntimeAuthPrincipal, isInternalRuntimeBearerHeader, } from "./InternalRuntimeAuth.js";
|
|
11
10
|
/**
|
|
12
11
|
* Server 侧路由权限矩阵。
|
|
13
12
|
*/
|
|
@@ -171,11 +170,6 @@ export function createRouteAuthGuardMiddleware(authService, policies = SERVER_AU
|
|
|
171
170
|
await next();
|
|
172
171
|
return;
|
|
173
172
|
}
|
|
174
|
-
if (isInternalRuntimeBearerHeader(c.req.header("authorization"))) {
|
|
175
|
-
c.set(AUTH_PRINCIPAL_CONTEXT_KEY, createInternalRuntimeAuthPrincipal());
|
|
176
|
-
await next();
|
|
177
|
-
return;
|
|
178
|
-
}
|
|
179
173
|
if (!authService.hasUsers()) {
|
|
180
174
|
await next();
|
|
181
175
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutePolicy.js","sourceRoot":"","sources":["../../../src/main/auth/RoutePolicy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,EAAE,0BAA0B,EAAgC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"RoutePolicy.js","sourceRoot":"","sources":["../../../src/main/auth/RoutePolicy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Run.d.ts","sourceRoot":"","sources":["../../../src/main/commands/Run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"Run.d.ts","sourceRoot":"","sources":["../../../src/main/commands/Run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAYH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAWrD;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,YAAM,EACjB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAwGf"}
|
package/bin/main/commands/Run.js
CHANGED
|
@@ -9,8 +9,9 @@
|
|
|
9
9
|
* - 后台常驻启动请使用 `downcity agent start`,并用
|
|
10
10
|
* `downcity agent restart` 管理。
|
|
11
11
|
*/
|
|
12
|
+
import path from "node:path";
|
|
12
13
|
import { startServer } from "../../main/index.js";
|
|
13
|
-
import {
|
|
14
|
+
import { ensureAgentToken } from "../../main/auth/AgentTokenService.js";
|
|
14
15
|
import { getExecutionContext, initAgentState, stopAgentHotReload, } from "../../agent/AgentState.js";
|
|
15
16
|
import { logger } from "../../utils/logger/Logger.js";
|
|
16
17
|
import { startAllServices, stopAllServices, } from "../../main/service/Manager.js";
|
|
@@ -53,7 +54,10 @@ export async function runCommand(cwd = ".", options) {
|
|
|
53
54
|
const host = (options.host ?? "0.0.0.0").trim();
|
|
54
55
|
process.env.DC_SERVER_PORT = String(port);
|
|
55
56
|
process.env.DC_SERVER_HOST = host;
|
|
56
|
-
|
|
57
|
+
// 为当前 Agent 签发专用 token(前台模式)
|
|
58
|
+
const agentRoot = path.resolve(cwd);
|
|
59
|
+
const agentToken = ensureAgentToken(agentRoot);
|
|
60
|
+
process.env.DC_AGENT_TOKEN = agentToken.token;
|
|
57
61
|
// Create and start server
|
|
58
62
|
const server = await startServer({
|
|
59
63
|
port,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Run.js","sourceRoot":"","sources":["../../../src/main/commands/Run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Run.js","sourceRoot":"","sources":["../../../src/main/commands/Run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../../src/main/daemon/Manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../../src/main/daemon/Manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAa3B;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,KAAG,MACe,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,KAAG,MACe,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,aAAa,MAAM,KAAG,MACe,CAAC;AAExE;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,KAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAQvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,KAAG,OAO5C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GACzB,aAAa,MAAM,KAClB,OAAO,CAAC,UAAU,GAAG,IAAI,CAoB3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,aAAa,MAAM,EACnB,KAAK,MAAM,KACV,OAAO,CAAC,iBAAiB,EAAE,CAqD7B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAClC,aAAa,MAAM,KAClB,OAAO,CAAC,IAAI,CAcd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,aAAa,MAAM,EACnB,MAAM,UAAU,KACf,OAAO,CAAC,IAAI,CAId,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAAU,QAAQ;IAC/C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,KAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAwE3C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAAU,QAAQ;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,KAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAwC7C,CAAC"}
|
|
@@ -17,6 +17,7 @@ import { spawn } from "child_process";
|
|
|
17
17
|
import { getDowncityDebugDirPath } from "../../main/env/Paths.js";
|
|
18
18
|
import { DAEMON_LOG_FILENAME, DAEMON_META_FILENAME, DAEMON_PID_FILENAME, } from "../../types/Daemon.js";
|
|
19
19
|
import { markConsoleAgentStopped, upsertConsoleAgentEntry, } from "../../main/runtime/ConsoleRegistry.js";
|
|
20
|
+
import { ensureAgentToken } from "../../main/auth/AgentTokenService.js";
|
|
20
21
|
/**
|
|
21
22
|
* 异步睡眠工具。
|
|
22
23
|
*/
|
|
@@ -189,6 +190,8 @@ export const startDaemonProcess = async (params) => {
|
|
|
189
190
|
}
|
|
190
191
|
const logPath = getDaemonLogPath(projectRoot);
|
|
191
192
|
const logFd = fs.openSync(logPath, "a");
|
|
193
|
+
// 为当前 Agent 签发专用 token
|
|
194
|
+
const agentToken = ensureAgentToken(projectRoot);
|
|
192
195
|
// 关键注释:daemon 进程必须 detached + unref 才能在父进程退出后继续运行。
|
|
193
196
|
const child = spawn(process.execPath, [cliPath, ...args], {
|
|
194
197
|
cwd: projectRoot,
|
|
@@ -197,6 +200,8 @@ export const startDaemonProcess = async (params) => {
|
|
|
197
200
|
env: {
|
|
198
201
|
...process.env,
|
|
199
202
|
DOWNCITY_DAEMON: "1",
|
|
203
|
+
// 注入 Agent 专用 token,供 shell 子进程使用
|
|
204
|
+
DC_AGENT_TOKEN: agentToken.token,
|
|
200
205
|
},
|
|
201
206
|
});
|
|
202
207
|
child.unref();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../../src/main/daemon/Manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,GAGpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../../src/main/daemon/Manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Plugins.d.ts","sourceRoot":"","sources":["../../../src/main/plugin/Plugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"Plugins.d.ts","sourceRoot":"","sources":["../../../src/main/plugin/Plugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAOhD;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,MAAM,EAA+D,CAAC;AAE5F;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,IAAI,CAIP"}
|
|
@@ -4,16 +4,17 @@
|
|
|
4
4
|
* 关键点(中文)
|
|
5
5
|
* - 统一维护全部内建 plugin,避免 CLI / agent / docs 各自硬编码。
|
|
6
6
|
* - 同时提供统一注册入口,减少额外跳转层级。
|
|
7
|
-
* - 当前阶段注册 auth / skill / asr / tts
|
|
7
|
+
* - 当前阶段注册 auth / skill / web / asr / tts 五个内建 plugin。
|
|
8
8
|
*/
|
|
9
9
|
import { authPlugin } from "../../plugins/auth/Plugin.js";
|
|
10
10
|
import { skillPlugin } from "../../plugins/skill/Plugin.js";
|
|
11
|
+
import { webPlugin } from "../../plugins/web/Plugin.js";
|
|
11
12
|
import { asrPlugin } from "../../plugins/asr/Plugin.js";
|
|
12
13
|
import { ttsPlugin } from "../../plugins/tts/Plugin.js";
|
|
13
14
|
/**
|
|
14
15
|
* 全部内建 Plugin。
|
|
15
16
|
*/
|
|
16
|
-
export const PLUGINS = [authPlugin, skillPlugin, asrPlugin, ttsPlugin];
|
|
17
|
+
export const PLUGINS = [authPlugin, skillPlugin, webPlugin, asrPlugin, ttsPlugin];
|
|
17
18
|
/**
|
|
18
19
|
* 注册全部内建插件体系对象。
|
|
19
20
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Plugins.js","sourceRoot":"","sources":["../../../src/main/plugin/Plugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAa,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Plugins.js","sourceRoot":"","sources":["../../../src/main/plugin/Plugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAa,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAE5F;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAEtC;IACC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Dependency.d.ts","sourceRoot":"","sources":["../../../src/plugins/web/Dependency.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,iCAAiC,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Web Plugin 兼容导出层。
|
|
3
|
+
*
|
|
4
|
+
* 关键点(中文)
|
|
5
|
+
* - `web` plugin 只保留薄适配层。
|
|
6
|
+
* - 真正的联网/浏览器能力由外部 provider 项目负责。
|
|
7
|
+
*/
|
|
8
|
+
export { readWebPluginConfig, writeWebPluginConfig, } from "../../plugins/web/runtime/Config.js";
|
|
9
|
+
export { inspectWebPluginDependency, installWebPluginDependency, doctorWebPluginDependency, } from "../../plugins/web/runtime/Source.js";
|
|
10
|
+
//# sourceMappingURL=Dependency.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Dependency.js","sourceRoot":"","sources":["../../../src/plugins/web/Dependency.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,iCAAiC,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# Web Plugin / agent-browser
|
|
2
|
+
|
|
3
|
+
当前 provider 是 `agent-browser`。
|
|
4
|
+
|
|
5
|
+
你应直接使用 `agent-browser` 项目的浏览器自动化方法,而不是在本项目里自己实现浏览器交互。
|
|
6
|
+
|
|
7
|
+
工作原则:
|
|
8
|
+
|
|
9
|
+
- 浏览器交互、打开页面、点击、填写、截图、滚动等操作优先交给 `agent-browser`
|
|
10
|
+
- 严格遵循 `agent-browser` 的基本工作流:
|
|
11
|
+
1. `open`
|
|
12
|
+
2. `snapshot -i`
|
|
13
|
+
3. 使用元素引用交互
|
|
14
|
+
4. 页面变化后重新 snapshot
|
|
15
|
+
- 如果 `agent-browser` 命令不可用,应先报告依赖缺失
|
|
16
|
+
|
|
17
|
+
你在处理需要浏览器操作的任务时,应以外部 `agent-browser` 项目为准。
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
# Web Plugin
|
|
2
|
+
|
|
3
|
+
此 plugin 已内化 `web-access` 的核心联网策略。只要 plugin 启用,就应把联网任务当作一等能力处理。
|
|
4
|
+
|
|
5
|
+
## 总原则
|
|
6
|
+
|
|
7
|
+
- 目标驱动:像人一样思考,先定义成功标准,再选择最可能直达的起点。
|
|
8
|
+
- 过程校验:每一步结果都是证据。路径不推进时,及时切换方法,不在错误方式上反复重试。
|
|
9
|
+
- 一手来源优先:搜索引擎用于发现线索,结论尽量回到官网、官方平台、原始页面、官方文档或源码。
|
|
10
|
+
- 完成即停止:达到目标后不要为了“看起来更完整”继续消耗额外步骤。
|
|
11
|
+
|
|
12
|
+
## 工具选择
|
|
13
|
+
|
|
14
|
+
- 需要发现信息来源、查关键词脉络:优先 `WebSearch`
|
|
15
|
+
- 已知 URL,需要定向提取页面正文或答案:优先 `WebFetch`
|
|
16
|
+
- 已知 URL,需要原始 HTML、meta、JSON-LD 等结构化内容:优先 `curl`
|
|
17
|
+
- 需要登录态、动态渲染、站内导航、复杂交互或反爬站点:直接使用浏览器/CDP 能力
|
|
18
|
+
- 页面正文导向内容可优先考虑 Jina 类 markdown 预处理,以节省 token;但数据面板、商品页、复杂布局页面不要盲信预处理结果
|
|
19
|
+
|
|
20
|
+
## 浏览器策略
|
|
21
|
+
|
|
22
|
+
- 进入浏览器层后,先理解页面结构,再决定下一步动作
|
|
23
|
+
- 程序化手段快但更容易触发反爬;GUI 交互更慢但确定性更高。程序化受阻时,回退到 GUI
|
|
24
|
+
- 优先使用页面自身生成的链接,不要手工猜测或裁剪站内 URL 参数
|
|
25
|
+
- 只操作自己创建的标签页,不打扰用户已有标签页;任务结束后关闭自己创建的标签页
|
|
26
|
+
- 遇到登录墙时,先判断它是否真的阻挡目标;只有目标确实拿不到时再要求用户登录
|
|
27
|
+
|
|
28
|
+
## 并行与核实
|
|
29
|
+
|
|
30
|
+
- 多个独立调研目标可并行拆分;有依赖关系的目标不要盲目并行
|
|
31
|
+
- 核实类任务要回到一手来源,不要用多个二手报道互相循环印证
|
|
32
|
+
|
|
33
|
+
来源说明:该内化策略参考 `https://github.com/eze-is/web-access`,并按 Downcity plugin 体系进行了收敛与改写。
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
# Web Plugin / web-access
|
|
2
|
+
|
|
3
|
+
当前 provider 是 `web-access`。
|
|
4
|
+
|
|
5
|
+
你应直接遵循已安装的 `web-access` skill/project 逻辑,而不是在本项目里重新实现一套联网框架。
|
|
6
|
+
|
|
7
|
+
工作原则:
|
|
8
|
+
|
|
9
|
+
- 优先沿用 `web-access` 自己的联网策略、工具选择和浏览哲学
|
|
10
|
+
- 把 Downcity 的 `web` plugin 视为 provider 选择器与接入层
|
|
11
|
+
- 如果 `web-access` 不可用,先指出依赖缺失,而不是自行退回到本项目里的临时实现
|
|
12
|
+
|
|
13
|
+
你在处理联网任务时,应以外部 `web-access` 项目为准。
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/web/Plugin.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAwFhD;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,MAoYvB,CAAC"}
|