paseo-agy-acp 2.2.1 → 2.3.1
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/CHANGELOG.md +50 -0
- package/README.md +189 -517
- package/README.zh-CN.md +153 -472
- package/dist/ACP Connector/official-kernel/context.d.ts +1 -0
- package/dist/ACP Connector/official-kernel/context.js +7 -0
- package/dist/ACP Connector/official-kernel/context.js.map +1 -1
- package/dist/ACP Connector/official-kernel/login.d.ts +2 -1
- package/dist/ACP Connector/official-kernel/login.js +73 -3
- package/dist/ACP Connector/official-kernel/login.js.map +1 -1
- package/dist/ACP Connector/official-kernel/proxy.js +67 -1
- package/dist/ACP Connector/official-kernel/proxy.js.map +1 -1
- package/dist/ACP Connector/official-kernel/skill-commands.d.ts +12 -0
- package/dist/ACP Connector/official-kernel/skill-commands.js +219 -0
- package/dist/ACP Connector/official-kernel/skill-commands.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export declare function injectPaseoContext(params: unknown, environment?: NodeJS.ProcessEnv): Promise<unknown>;
|
|
2
2
|
export declare function extractPromptText(params: unknown): string;
|
|
3
3
|
export declare function extractSessionId(params: unknown): string | undefined;
|
|
4
|
+
export declare function extractCwd(params: unknown): string | undefined;
|
|
@@ -49,4 +49,11 @@ export function extractSessionId(params) {
|
|
|
49
49
|
? params.session_id
|
|
50
50
|
: undefined;
|
|
51
51
|
}
|
|
52
|
+
export function extractCwd(params) {
|
|
53
|
+
if (!isRecord(params))
|
|
54
|
+
return undefined;
|
|
55
|
+
return typeof params.cwd === "string" && params.cwd.trim().length > 0
|
|
56
|
+
? params.cwd.trim()
|
|
57
|
+
: undefined;
|
|
58
|
+
}
|
|
52
59
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EACL,iCAAiC,EACjC,2BAA2B,EAC5B,MAAM,iCAAiC,CAAC;AAEzC,SAAS,gBAAgB,CAAC,MAAe,EAAE,IAAY;IACrD,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACrC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC;IACrD,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,GAAG,IAAI,OAAO,MAAM,EAAE,CAAC;IAC9D,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAe,EACf,WAAW,GAAsB,OAAO,CAAC,GAAG;IAE5C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,iCAAiC,CAAC,WAAW,CAAC,CAAC;IACpE,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAC3B,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,MAAM,CAAC,CAAC;KAC7E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAe;IAC/C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC;IAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAChC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC,IAAI,CAAC;QACtD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACjG,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACjC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAe;IAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,OAAO,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;QACzC,CAAC,CAAC,MAAM,CAAC,SAAS;QAClB,CAAC,CAAC,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;YACrC,CAAC,CAAC,MAAM,CAAC,UAAU;YACnB,CAAC,CAAC,SAAS,CAAC;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EACL,iCAAiC,EACjC,2BAA2B,EAC5B,MAAM,iCAAiC,CAAC;AAEzC,SAAS,gBAAgB,CAAC,MAAe,EAAE,IAAY;IACrD,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACrC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC;IACrD,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,GAAG,IAAI,OAAO,MAAM,EAAE,CAAC;IAC9D,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAe,EACf,WAAW,GAAsB,OAAO,CAAC,GAAG;IAE5C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,iCAAiC,CAAC,WAAW,CAAC,CAAC;IACpE,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAC3B,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,MAAM,CAAC,CAAC;KAC7E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAe;IAC/C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC;IAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAChC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC,IAAI,CAAC;QACtD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACjG,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACjC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAe;IAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,OAAO,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;QACzC,CAAC,CAAC,MAAM,CAAC,SAAS;QAClB,CAAC,CAAC,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;YACrC,CAAC,CAAC,MAAM,CAAC,UAAU;YACnB,CAAC,CAAC,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAe;IACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,OAAO,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QACnE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACnB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import type { Readable } from "node:stream";
|
|
2
|
+
export declare function runOfficialLogin(environment?: NodeJS.ProcessEnv, version?: string, input?: Readable): Promise<number>;
|
|
@@ -1,12 +1,19 @@
|
|
|
1
|
+
import { get } from "node:http";
|
|
2
|
+
import { createInterface } from "node:readline/promises";
|
|
1
3
|
import { isJsonRpcFailure, isJsonRpcSuccess } from "./json-rpc.js";
|
|
2
4
|
import { createNdjsonParser, encodeNdjson } from "./ndjson.js";
|
|
3
5
|
import { spawnOfficialKernel } from "./spawn.js";
|
|
4
6
|
const AUTHENTICATE_TIMEOUT_MS = 10 * 60_000;
|
|
5
|
-
export async function runOfficialLogin(environment = process.env, version = "0.0.0") {
|
|
7
|
+
export async function runOfficialLogin(environment = process.env, version = "0.0.0", input = process.stdin) {
|
|
6
8
|
process.stderr.write("Starting official Antigravity ACP login (authenticate methodId=oauth-personal).\n");
|
|
7
|
-
|
|
9
|
+
// The official kernel prints the OAuth URL as ordinary stdout text. Its
|
|
10
|
+
// stdout is a pipe here, so force Python to flush that prompt immediately.
|
|
11
|
+
const child = spawnOfficialKernel({ ...environment, PYTHONUNBUFFERED: "1" });
|
|
8
12
|
const pending = new Map();
|
|
9
13
|
let nextId = 1;
|
|
14
|
+
let authenticationStarted = false;
|
|
15
|
+
let promptCallback;
|
|
16
|
+
let rejectLogin;
|
|
10
17
|
const parse = createNdjsonParser((message) => {
|
|
11
18
|
if ("method" in message && !("id" in message)) {
|
|
12
19
|
const params = "params" in message ? message.params : undefined;
|
|
@@ -18,6 +25,13 @@ export async function runOfficialLogin(environment = process.env, version = "0.0
|
|
|
18
25
|
pending.delete(message.id);
|
|
19
26
|
settle?.(message);
|
|
20
27
|
}
|
|
28
|
+
}, (line) => {
|
|
29
|
+
process.stderr.write(`${formatLoginOutput(line)}\n`);
|
|
30
|
+
if (authenticationStarted && !promptCallback && extractUrl(line)) {
|
|
31
|
+
promptCallback = promptForCallbackUrl(input)
|
|
32
|
+
.then(deliverOAuthCallback)
|
|
33
|
+
.catch((error) => rejectLogin?.(error));
|
|
34
|
+
}
|
|
21
35
|
});
|
|
22
36
|
child.stdout.on("data", parse);
|
|
23
37
|
const request = (method, params) => {
|
|
@@ -43,7 +57,13 @@ export async function runOfficialLogin(environment = process.env, version = "0.0
|
|
|
43
57
|
if (isJsonRpcFailure(initialized)) {
|
|
44
58
|
throw new Error(initialized.error.message);
|
|
45
59
|
}
|
|
46
|
-
|
|
60
|
+
authenticationStarted = true;
|
|
61
|
+
const authenticated = await Promise.race([
|
|
62
|
+
request("authenticate", { methodId: "oauth-personal" }),
|
|
63
|
+
new Promise((_, reject) => {
|
|
64
|
+
rejectLogin = reject;
|
|
65
|
+
})
|
|
66
|
+
]);
|
|
47
67
|
if (isJsonRpcFailure(authenticated)) {
|
|
48
68
|
throw new Error(authenticated.error.message);
|
|
49
69
|
}
|
|
@@ -64,6 +84,56 @@ export async function runOfficialLogin(environment = process.env, version = "0.0
|
|
|
64
84
|
}
|
|
65
85
|
}
|
|
66
86
|
}
|
|
87
|
+
function extractUrl(line) {
|
|
88
|
+
return line.match(/https?:\/\/\S+/)?.[0];
|
|
89
|
+
}
|
|
90
|
+
function formatLoginOutput(line) {
|
|
91
|
+
const url = extractUrl(line);
|
|
92
|
+
if (!url || !line.startsWith("Open the following link to authenticate the ACP server:")) {
|
|
93
|
+
return line;
|
|
94
|
+
}
|
|
95
|
+
return `${line.slice(0, line.indexOf(url)).trimEnd()}\n\n${url}\n`;
|
|
96
|
+
}
|
|
97
|
+
async function promptForCallbackUrl(input) {
|
|
98
|
+
const readline = createInterface({ input, output: process.stderr });
|
|
99
|
+
try {
|
|
100
|
+
const callbackUrl = (await readline.question("\nPaste the OAuth callback URL to finish login: ")).trim();
|
|
101
|
+
if (callbackUrl.length === 0)
|
|
102
|
+
throw new Error("OAuth callback URL is required");
|
|
103
|
+
return callbackUrl;
|
|
104
|
+
}
|
|
105
|
+
finally {
|
|
106
|
+
readline.close();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
function deliverOAuthCallback(callbackUrl) {
|
|
110
|
+
let url;
|
|
111
|
+
try {
|
|
112
|
+
url = new URL(callbackUrl);
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
return Promise.reject(new Error("OAuth callback URL is invalid"));
|
|
116
|
+
}
|
|
117
|
+
if (url.protocol !== "http:" || !isLoopbackHost(url.hostname)) {
|
|
118
|
+
return Promise.reject(new Error("OAuth callback URL must use a local HTTP address"));
|
|
119
|
+
}
|
|
120
|
+
return new Promise((resolve, reject) => {
|
|
121
|
+
const request = get(url, (response) => {
|
|
122
|
+
response.resume();
|
|
123
|
+
if ((response.statusCode ?? 500) >= 400) {
|
|
124
|
+
reject(new Error(`OAuth callback returned HTTP ${response.statusCode}`));
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
resolve();
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
request.setTimeout(10_000, () => request.destroy(new Error("OAuth callback timed out")));
|
|
131
|
+
request.once("error", reject);
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
function isLoopbackHost(hostname) {
|
|
135
|
+
return hostname === "127.0.0.1" || hostname === "localhost" || hostname === "[::1]";
|
|
136
|
+
}
|
|
67
137
|
function summarizeAuthUpdate(method, params) {
|
|
68
138
|
if (typeof params === "object" && params !== null) {
|
|
69
139
|
return `official kernel: ${method} ${JSON.stringify(params).slice(0, 400)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/login.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,uBAAuB,GAAG,EAAE,GAAG,MAAM,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAW,GAAsB,OAAO,CAAC,GAAG,EAC5C,OAAO,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAGjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,uBAAuB,GAAG,EAAE,GAAG,MAAM,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAW,GAAsB,OAAO,CAAC,GAAG,EAC5C,OAAO,GAAG,OAAO,EACjB,KAAK,GAAa,OAAO,CAAC,KAAK;IAE/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,mFAAmF,CACpF,CAAC;IACF,wEAAwE;IACxE,2EAA2E;IAC3E,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAE,GAAG,WAAW,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7E,MAAM,OAAO,GAAG,IAAI,GAAG,EAAgD,CAAC;IACxE,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,qBAAqB,GAAG,KAAK,CAAC;IAClC,IAAI,cAAyC,CAAC;IAC9C,IAAI,WAAqD,CAAC;IAE1D,MAAM,KAAK,GAAG,kBAAkB,CAC9B,CAAC,OAAO,EAAE,EAAE;QACV,IAAI,QAAQ,IAAI,OAAO,IAAI,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACzE,OAAO;QACT,CAAC;QACD,IAAI,IAAI,IAAI,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC3B,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;QACP,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,qBAAqB,IAAI,CAAC,cAAc,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACjE,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC;iBACzC,IAAI,CAAC,oBAAoB,CAAC;iBAC1B,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC,CACF,CAAC;IACF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAE/B,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,MAAe,EAA2B,EAAE;QAC3E,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;QACpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACnB,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,MAAM,EAAE,CAAC,CAAC,CAAC;YACrD,CAAC,EAAE,uBAAuB,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC1B,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE;YAC9C,eAAe,EAAE,CAAC;YAClB,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE;YACxC,YAAY,EAAE,EAAE;SACjB,CAAC,CAAC;QACH,IAAI,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,qBAAqB,GAAG,IAAI,CAAC;QAC7B,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YACvC,OAAO,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;YACvD,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBAC/B,WAAW,GAAG,MAAM,CAAC;YACvB,CAAC,CAAC;SACH,CAAC,CAAC;QACH,IAAI,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;YACzE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAC1D,OAAO,CAAC,CAAC;IACX,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACrC,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,yDAAyD,CAAC,EAAE,CAAC;QACxF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;AACrE,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,KAAe;IACjD,MAAM,QAAQ,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,kDAAkD,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACzG,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAChF,OAAO,WAAW,CAAC;IACrB,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAmB;IAC/C,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9D,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC,CAAC;IACvF,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE;YACpC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;gBACxC,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,QAAgB;IACtC,OAAO,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,OAAO,CAAC;AACtF,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAc,EAAE,MAAe;IAC1D,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,oBAAoB,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IAC9E,CAAC;IACD,OAAO,oBAAoB,MAAM,EAAE,CAAC;AACtC,CAAC"}
|
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import { TurnClaim } from "../acp/session/turn-scheduler.js";
|
|
2
2
|
import { createOfficialAdmission, issueAdmittedOfficialPromptWrite } from "./admission-fence.js";
|
|
3
|
-
import { extractPromptText, extractSessionId, injectPaseoContext } from "./context.js";
|
|
3
|
+
import { extractCwd, extractPromptText, extractSessionId, injectPaseoContext } from "./context.js";
|
|
4
4
|
import { blankTurnError, sessionUpdateShowsVisibleOutput, shouldRejectBlankTurn } from "./errors.js";
|
|
5
5
|
import { overlayProductIdentity } from "./identity.js";
|
|
6
6
|
import { isJsonRpcFailure, isJsonRpcNotification, isJsonRpcRequest, isJsonRpcSuccess, jsonRpcError } from "./json-rpc.js";
|
|
7
7
|
import { rewriteMcpServers } from "./mcp-rewrite.js";
|
|
8
8
|
import { rewriteModeFields } from "./mode-map.js";
|
|
9
9
|
import { createNdjsonParser, encodeNdjson } from "./ndjson.js";
|
|
10
|
+
import { augmentAvailableCommands } from "./skill-commands.js";
|
|
10
11
|
const INITIALIZE_METHOD = "initialize";
|
|
11
12
|
const SESSION_NEW_METHOD = "session/new";
|
|
13
|
+
const SESSION_LOAD_METHOD = "session/load";
|
|
14
|
+
const SESSION_RESUME_METHOD = "session/resume";
|
|
12
15
|
const SESSION_PROMPT_METHOD = "session/prompt";
|
|
13
16
|
const SESSION_SET_MODE_METHOD = "session/set_mode";
|
|
14
17
|
const SESSION_SET_CONFIG_METHOD = "session/set_config_option";
|
|
@@ -21,8 +24,10 @@ export class OfficialKernelProxy {
|
|
|
21
24
|
#version;
|
|
22
25
|
#pending = new Map();
|
|
23
26
|
#claims = new Map();
|
|
27
|
+
#sessionCwds = new Map();
|
|
24
28
|
#env;
|
|
25
29
|
#admission;
|
|
30
|
+
#sessionNewTail = Promise.resolve();
|
|
26
31
|
#closed = false;
|
|
27
32
|
constructor(options) {
|
|
28
33
|
this.#child = options.child;
|
|
@@ -91,6 +96,16 @@ export class OfficialKernelProxy {
|
|
|
91
96
|
let params = request.params;
|
|
92
97
|
if (request.method === SESSION_NEW_METHOD) {
|
|
93
98
|
params = rewriteMcpServers(rewriteModeFields(params));
|
|
99
|
+
await this.#forwardSessionNew(request, params);
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
else if (request.method === SESSION_LOAD_METHOD ||
|
|
103
|
+
request.method === SESSION_RESUME_METHOD) {
|
|
104
|
+
const sessionId = extractSessionId(params);
|
|
105
|
+
const cwd = extractCwd(params);
|
|
106
|
+
if (sessionId && cwd) {
|
|
107
|
+
this.#sessionCwds.set(sessionId, cwd);
|
|
108
|
+
}
|
|
94
109
|
}
|
|
95
110
|
else if (request.method === SESSION_SET_MODE_METHOD || request.method === SESSION_SET_CONFIG_METHOD) {
|
|
96
111
|
params = rewriteModeFields(params);
|
|
@@ -103,6 +118,23 @@ export class OfficialKernelProxy {
|
|
|
103
118
|
this.#track(request.id, request.method, params);
|
|
104
119
|
this.#writeChild({ ...request, jsonrpc: "2.0", params });
|
|
105
120
|
}
|
|
121
|
+
// Early session updates have no request id, so keep only one unbound cwd in flight.
|
|
122
|
+
async #forwardSessionNew(request, params) {
|
|
123
|
+
const previous = this.#sessionNewTail;
|
|
124
|
+
let release;
|
|
125
|
+
this.#sessionNewTail = new Promise((resolve) => {
|
|
126
|
+
release = resolve;
|
|
127
|
+
});
|
|
128
|
+
await previous;
|
|
129
|
+
try {
|
|
130
|
+
const response = this.#track(request.id, request.method, params);
|
|
131
|
+
this.#writeChild({ ...request, jsonrpc: "2.0", params });
|
|
132
|
+
await response;
|
|
133
|
+
}
|
|
134
|
+
finally {
|
|
135
|
+
release();
|
|
136
|
+
}
|
|
137
|
+
}
|
|
106
138
|
async #handlePrompt(request, params) {
|
|
107
139
|
const sessionId = extractSessionId(params);
|
|
108
140
|
const promptText = extractPromptText(params) || "prompt";
|
|
@@ -152,6 +184,7 @@ export class OfficialKernelProxy {
|
|
|
152
184
|
this.#pending.set(id, {
|
|
153
185
|
method,
|
|
154
186
|
sessionId: extractSessionId(params),
|
|
187
|
+
cwd: extractCwd(params),
|
|
155
188
|
sawVisibleOutput: false,
|
|
156
189
|
resolve
|
|
157
190
|
});
|
|
@@ -168,6 +201,30 @@ export class OfficialKernelProxy {
|
|
|
168
201
|
}
|
|
169
202
|
}
|
|
170
203
|
}
|
|
204
|
+
const params = message.params;
|
|
205
|
+
if (params?.update?.sessionUpdate === "available_commands_update") {
|
|
206
|
+
let cwd = sessionId ? this.#sessionCwds.get(sessionId) : undefined;
|
|
207
|
+
if (!cwd) {
|
|
208
|
+
const pendingSessionNews = Array.from(this.#pending.values()).filter((pending) => pending.method === SESSION_NEW_METHOD && pending.cwd !== undefined);
|
|
209
|
+
if (pendingSessionNews.length === 1) {
|
|
210
|
+
cwd = pendingSessionNews[0].cwd;
|
|
211
|
+
if (sessionId) {
|
|
212
|
+
this.#sessionCwds.set(sessionId, cwd);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
const augmented = augmentAvailableCommands(params.update.availableCommands, cwd);
|
|
217
|
+
message = {
|
|
218
|
+
...message,
|
|
219
|
+
params: {
|
|
220
|
+
...params,
|
|
221
|
+
update: {
|
|
222
|
+
...params.update,
|
|
223
|
+
availableCommands: augmented
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
};
|
|
227
|
+
}
|
|
171
228
|
this.#writeClient(message);
|
|
172
229
|
return;
|
|
173
230
|
}
|
|
@@ -182,6 +239,15 @@ export class OfficialKernelProxy {
|
|
|
182
239
|
if (pending.method === INITIALIZE_METHOD && isJsonRpcSuccess(message)) {
|
|
183
240
|
outbound = { ...message, result: overlayProductIdentity(message.result, this.#version) };
|
|
184
241
|
}
|
|
242
|
+
else if ((pending.method === SESSION_NEW_METHOD ||
|
|
243
|
+
pending.method === SESSION_LOAD_METHOD ||
|
|
244
|
+
pending.method === SESSION_RESUME_METHOD) &&
|
|
245
|
+
isJsonRpcSuccess(message)) {
|
|
246
|
+
const sessionId = extractSessionId(message.result) ?? pending.sessionId;
|
|
247
|
+
if (sessionId && pending.cwd) {
|
|
248
|
+
this.#sessionCwds.set(sessionId, pending.cwd);
|
|
249
|
+
}
|
|
250
|
+
}
|
|
185
251
|
else if (pending.method === SESSION_PROMPT_METHOD &&
|
|
186
252
|
isJsonRpcSuccess(message) &&
|
|
187
253
|
shouldRejectBlankTurn(message.result, pending.sawVisibleOutput)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export interface AvailableCommand {
|
|
2
|
+
name: string;
|
|
3
|
+
description: string;
|
|
4
|
+
}
|
|
5
|
+
export declare function parseFrontmatter(content: string): {
|
|
6
|
+
name?: string;
|
|
7
|
+
description?: string;
|
|
8
|
+
userInvocable?: boolean;
|
|
9
|
+
};
|
|
10
|
+
export declare function resolveSkillRoots(cwd?: string): string[];
|
|
11
|
+
export declare function discoverSkillCommands(cwd?: string): AvailableCommand[];
|
|
12
|
+
export declare function augmentAvailableCommands(existingCommands: AvailableCommand[] | undefined, cwd?: string): AvailableCommand[];
|
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import { existsSync, readdirSync, readFileSync } from "node:fs";
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
function parseYamlScalar(raw) {
|
|
5
|
+
const trimmed = raw.trim();
|
|
6
|
+
if (trimmed.length === 0)
|
|
7
|
+
return "";
|
|
8
|
+
if (trimmed.startsWith('"') && trimmed.endsWith('"') && trimmed.length >= 2) {
|
|
9
|
+
try {
|
|
10
|
+
return JSON.parse(trimmed);
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
return trimmed
|
|
14
|
+
.slice(1, -1)
|
|
15
|
+
.replace(/\\"/g, '"')
|
|
16
|
+
.replace(/\\\\/g, "\\")
|
|
17
|
+
.replace(/\\n/g, "\n")
|
|
18
|
+
.replace(/\\r/g, "\r")
|
|
19
|
+
.replace(/\\t/g, "\t");
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
if (trimmed.startsWith("'") && trimmed.endsWith("'") && trimmed.length >= 2) {
|
|
23
|
+
return trimmed.slice(1, -1).replace(/''/g, "'");
|
|
24
|
+
}
|
|
25
|
+
const commentIdx = trimmed.search(/\s+#/);
|
|
26
|
+
const withoutComment = commentIdx !== -1 ? trimmed.slice(0, commentIdx).trim() : trimmed;
|
|
27
|
+
return withoutComment;
|
|
28
|
+
}
|
|
29
|
+
function parseYamlBoolean(raw, defaultValue = true) {
|
|
30
|
+
if (raw === undefined)
|
|
31
|
+
return defaultValue;
|
|
32
|
+
const scalar = parseYamlScalar(raw).toLowerCase();
|
|
33
|
+
if (scalar === "false" || scalar === "no" || scalar === "off" || scalar === "0") {
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
if (scalar === "true" || scalar === "yes" || scalar === "on" || scalar === "1") {
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
return defaultValue;
|
|
40
|
+
}
|
|
41
|
+
export function parseFrontmatter(content) {
|
|
42
|
+
if (!content.startsWith("---"))
|
|
43
|
+
return {};
|
|
44
|
+
const match = content.match(/^---\r?\n([\s\S]*?)\r?\n(?:---|\.\.\.)(?:\r?\n|$)/);
|
|
45
|
+
if (!match)
|
|
46
|
+
return {};
|
|
47
|
+
const frontmatter = match[1];
|
|
48
|
+
const lines = frontmatter.split(/\r?\n/);
|
|
49
|
+
let name;
|
|
50
|
+
let description;
|
|
51
|
+
let userInvocable;
|
|
52
|
+
for (let i = 0; i < lines.length; i++) {
|
|
53
|
+
const line = lines[i];
|
|
54
|
+
const nameMatch = line.match(/^name:\s*(.*)$/);
|
|
55
|
+
if (nameMatch) {
|
|
56
|
+
name = parseYamlScalar(nameMatch[1]);
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
const invocableMatch = line.match(/^(?:user-invocable|user_invocable):\s*(.*)$/);
|
|
60
|
+
if (invocableMatch) {
|
|
61
|
+
userInvocable = parseYamlBoolean(invocableMatch[1], true);
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
const descMatch = line.match(/^description:\s*(.*)$/);
|
|
65
|
+
if (descMatch) {
|
|
66
|
+
const rest = descMatch[1].trim();
|
|
67
|
+
if (rest === ">" || rest === ">-" || rest === "|" || rest === "|-") {
|
|
68
|
+
const isFolded = rest.startsWith(">");
|
|
69
|
+
const blockLines = [];
|
|
70
|
+
for (let j = i + 1; j < lines.length; j++) {
|
|
71
|
+
if (/^\s+/.test(lines[j]) || lines[j].trim().length === 0) {
|
|
72
|
+
blockLines.push(lines[j].trim());
|
|
73
|
+
i = j;
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
if (isFolded) {
|
|
80
|
+
description = blockLines.filter((l) => l.length > 0).join(" ");
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
description = blockLines.join("\n").trim();
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
description = parseYamlScalar(rest);
|
|
88
|
+
}
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return { name, description, userInvocable };
|
|
93
|
+
}
|
|
94
|
+
export function resolveSkillRoots(cwd) {
|
|
95
|
+
const roots = new Set();
|
|
96
|
+
const home = homedir();
|
|
97
|
+
const readSkillsJson = (filePath, baseDir) => {
|
|
98
|
+
if (!existsSync(filePath))
|
|
99
|
+
return;
|
|
100
|
+
try {
|
|
101
|
+
const parsed = JSON.parse(readFileSync(filePath, "utf-8"));
|
|
102
|
+
if (Array.isArray(parsed.entries)) {
|
|
103
|
+
for (const entry of parsed.entries) {
|
|
104
|
+
if (entry && typeof entry.path === "string" && entry.path.trim().length > 0) {
|
|
105
|
+
const trimmed = entry.path.trim();
|
|
106
|
+
let resolved;
|
|
107
|
+
if (trimmed.startsWith("/")) {
|
|
108
|
+
resolved = trimmed;
|
|
109
|
+
}
|
|
110
|
+
else if (trimmed.startsWith("~/")) {
|
|
111
|
+
resolved = path.join(home, trimmed.slice(2));
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
resolved = path.resolve(baseDir, trimmed);
|
|
115
|
+
}
|
|
116
|
+
if (existsSync(resolved)) {
|
|
117
|
+
roots.add(resolved);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
catch {
|
|
124
|
+
// Ignore JSON parse errors
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
// 1. Workspace declared configs in skills.json
|
|
128
|
+
if (cwd && existsSync(cwd)) {
|
|
129
|
+
readSkillsJson(path.join(cwd, ".agents/skills.json"), cwd);
|
|
130
|
+
readSkillsJson(path.join(cwd, "skills.json"), cwd);
|
|
131
|
+
readSkillsJson(path.join(cwd, ".codex/skills.json"), cwd);
|
|
132
|
+
readSkillsJson(path.join(cwd, ".gemini/config/skills.json"), cwd);
|
|
133
|
+
}
|
|
134
|
+
// 2. Workspace default skill directories
|
|
135
|
+
if (cwd && existsSync(cwd)) {
|
|
136
|
+
const wsDefaults = [
|
|
137
|
+
path.join(cwd, ".agents/skills"),
|
|
138
|
+
path.join(cwd, ".codex/skills"),
|
|
139
|
+
path.join(cwd, "skills")
|
|
140
|
+
];
|
|
141
|
+
for (const dir of wsDefaults) {
|
|
142
|
+
if (existsSync(dir))
|
|
143
|
+
roots.add(dir);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
// 3. Global declared configs in skills.json
|
|
147
|
+
readSkillsJson(path.join(home, ".gemini/config/skills.json"), home);
|
|
148
|
+
readSkillsJson(path.join(home, ".agents/skills.json"), home);
|
|
149
|
+
readSkillsJson(path.join(home, ".codex/skills.json"), home);
|
|
150
|
+
// 4. Global default skill directories
|
|
151
|
+
const globalDefaults = [
|
|
152
|
+
path.join(home, ".gemini/config/skills"),
|
|
153
|
+
path.join(home, ".agents/skills"),
|
|
154
|
+
path.join(home, ".codex/skills")
|
|
155
|
+
];
|
|
156
|
+
for (const dir of globalDefaults) {
|
|
157
|
+
if (existsSync(dir))
|
|
158
|
+
roots.add(dir);
|
|
159
|
+
}
|
|
160
|
+
return Array.from(roots);
|
|
161
|
+
}
|
|
162
|
+
export function discoverSkillCommands(cwd) {
|
|
163
|
+
const roots = resolveSkillRoots(cwd);
|
|
164
|
+
const commands = new Map();
|
|
165
|
+
for (const root of roots) {
|
|
166
|
+
try {
|
|
167
|
+
const entries = readdirSync(root, { withFileTypes: true });
|
|
168
|
+
for (const entry of entries) {
|
|
169
|
+
if (entry.isDirectory() || entry.isSymbolicLink()) {
|
|
170
|
+
const skillDir = path.join(root, entry.name);
|
|
171
|
+
const skillFile = path.join(skillDir, "SKILL.md");
|
|
172
|
+
if (existsSync(skillFile)) {
|
|
173
|
+
try {
|
|
174
|
+
const content = readFileSync(skillFile, "utf-8");
|
|
175
|
+
const { name, description, userInvocable } = parseFrontmatter(content);
|
|
176
|
+
if (userInvocable === false) {
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
const commandName = name && name.length > 0 ? name : entry.name;
|
|
180
|
+
if (!commands.has(commandName)) {
|
|
181
|
+
commands.set(commandName, {
|
|
182
|
+
name: commandName,
|
|
183
|
+
description: description && description.length > 0
|
|
184
|
+
? description
|
|
185
|
+
: `Skill: ${commandName}`
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
catch {
|
|
190
|
+
// Ignore file read errors
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
catch {
|
|
197
|
+
// Ignore readdir errors
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
return Array.from(commands.values());
|
|
201
|
+
}
|
|
202
|
+
export function augmentAvailableCommands(existingCommands, cwd) {
|
|
203
|
+
const result = new Map();
|
|
204
|
+
if (Array.isArray(existingCommands)) {
|
|
205
|
+
for (const cmd of existingCommands) {
|
|
206
|
+
if (cmd && typeof cmd.name === "string") {
|
|
207
|
+
result.set(cmd.name, cmd);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
const skills = discoverSkillCommands(cwd);
|
|
212
|
+
for (const skill of skills) {
|
|
213
|
+
if (!result.has(skill.name)) {
|
|
214
|
+
result.set(skill.name, skill);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
return Array.from(result.values());
|
|
218
|
+
}
|
|
219
|
+
//# sourceMappingURL=skill-commands.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skill-commands.js","sourceRoot":"","sources":["../../../ACP Connector/official-kernel/skill-commands.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED