@grackle-ai/core 0.75.8 → 0.75.10
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.
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
import { powerline } from "@grackle-ai/common";
|
|
2
2
|
import { type DatabaseInstance } from "@grackle-ai/database";
|
|
3
|
+
/**
|
|
4
|
+
* Resolve a GitHub token from the `gh` CLI's credential store.
|
|
5
|
+
* Returns `undefined` if the CLI is unavailable, not authenticated, or errors.
|
|
6
|
+
* @internal Exported for testing.
|
|
7
|
+
*/
|
|
8
|
+
export declare function resolveGitHubTokenFromCli(): Promise<string | undefined>;
|
|
3
9
|
/**
|
|
4
10
|
* Build a token bundle containing enabled provider credentials.
|
|
5
11
|
* When `runtime` is a known {@link RuntimeName}, only providers mapped to that runtime are included.
|
|
6
12
|
* When `runtime` is omitted, all enabled providers are included.
|
|
7
13
|
* When `runtime` is provided but not a recognized {@link RuntimeName}, no providers are included
|
|
8
14
|
* (fails safe rather than exposing all credentials for an unrecognized runtime).
|
|
9
|
-
* Reads values fresh from `process.env
|
|
15
|
+
* Reads values fresh from `process.env`, disk, or the `gh` CLI at call time.
|
|
10
16
|
*/
|
|
11
|
-
export declare function buildProviderTokenBundle(runtime?: string, database?: DatabaseInstance): powerline.TokenBundle
|
|
17
|
+
export declare function buildProviderTokenBundle(runtime?: string, database?: DatabaseInstance): Promise<powerline.TokenBundle>;
|
|
12
18
|
//# sourceMappingURL=credential-bundle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-bundle.d.ts","sourceRoot":"","sources":["../src/credential-bundle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credential-bundle.d.ts","sourceRoot":"","sources":["../src/credential-bundle.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAoB,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAsD,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAmBjH;;;;GAIG;AACH,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAO7E;AAED;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAgP5H"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Builds token bundles from enabled credential providers by reading
|
|
3
|
-
* `process.env
|
|
3
|
+
* `process.env`, credential files from disk, and (as a fallback) the
|
|
4
|
+
* `gh` CLI's credential store.
|
|
4
5
|
*
|
|
5
6
|
* Separated from {@link ./credential-providers.ts} (persistence layer) and
|
|
6
7
|
* {@link ./token-push.ts} (network orchestration) to keep each module
|
|
@@ -12,6 +13,7 @@ import { join } from "node:path";
|
|
|
12
13
|
import { create } from "@bufbuild/protobuf";
|
|
13
14
|
import { powerline } from "@grackle-ai/common";
|
|
14
15
|
import { credentialProviders } from "@grackle-ai/database";
|
|
16
|
+
import { exec } from "./utils/exec.js";
|
|
15
17
|
/** Maps each runtime to the credential providers it needs. */
|
|
16
18
|
const RUNTIME_PROVIDERS = {
|
|
17
19
|
"claude-code": ["claude", "github"],
|
|
@@ -24,15 +26,31 @@ const RUNTIME_PROVIDERS = {
|
|
|
24
26
|
"codex-acp": ["codex", "github"],
|
|
25
27
|
"copilot-acp": ["copilot", "github"],
|
|
26
28
|
};
|
|
29
|
+
/** Timeout for the `gh auth token` subprocess call. */
|
|
30
|
+
const GH_AUTH_TOKEN_TIMEOUT_MS = 5_000;
|
|
31
|
+
/**
|
|
32
|
+
* Resolve a GitHub token from the `gh` CLI's credential store.
|
|
33
|
+
* Returns `undefined` if the CLI is unavailable, not authenticated, or errors.
|
|
34
|
+
* @internal Exported for testing.
|
|
35
|
+
*/
|
|
36
|
+
export async function resolveGitHubTokenFromCli() {
|
|
37
|
+
try {
|
|
38
|
+
const { stdout } = await exec("gh", ["auth", "token"], { timeout: GH_AUTH_TOKEN_TIMEOUT_MS });
|
|
39
|
+
return stdout || undefined;
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
27
45
|
/**
|
|
28
46
|
* Build a token bundle containing enabled provider credentials.
|
|
29
47
|
* When `runtime` is a known {@link RuntimeName}, only providers mapped to that runtime are included.
|
|
30
48
|
* When `runtime` is omitted, all enabled providers are included.
|
|
31
49
|
* When `runtime` is provided but not a recognized {@link RuntimeName}, no providers are included
|
|
32
50
|
* (fails safe rather than exposing all credentials for an unrecognized runtime).
|
|
33
|
-
* Reads values fresh from `process.env
|
|
51
|
+
* Reads values fresh from `process.env`, disk, or the `gh` CLI at call time.
|
|
34
52
|
*/
|
|
35
|
-
export function buildProviderTokenBundle(runtime, database) {
|
|
53
|
+
export async function buildProviderTokenBundle(runtime, database) {
|
|
36
54
|
const config = credentialProviders.getCredentialProviders(database);
|
|
37
55
|
// When runtime is given, look it up in the map. Unknown runtimes get [] (empty, not all providers).
|
|
38
56
|
const runtimeProviders = runtime !== undefined
|
|
@@ -42,6 +60,16 @@ export function buildProviderTokenBundle(runtime, database) {
|
|
|
42
60
|
? new Set(runtimeProviders)
|
|
43
61
|
: undefined;
|
|
44
62
|
const items = [];
|
|
63
|
+
// Lazily resolved GitHub token from the `gh` CLI — shared across provider blocks
|
|
64
|
+
// to avoid spawning the subprocess more than once per call. Stores a Promise
|
|
65
|
+
// (not the resolved value) so concurrent reads share the same in-flight call.
|
|
66
|
+
let cliTokenPromise;
|
|
67
|
+
function getCliToken() {
|
|
68
|
+
if (!cliTokenPromise) {
|
|
69
|
+
cliTokenPromise = resolveGitHubTokenFromCli();
|
|
70
|
+
}
|
|
71
|
+
return cliTokenPromise;
|
|
72
|
+
}
|
|
45
73
|
// Claude provider
|
|
46
74
|
if ((!allowedProviders || allowedProviders.has("claude")) && config.claude === "subscription") {
|
|
47
75
|
const credentialsPath = join(homedir(), ".claude", ".credentials.json");
|
|
@@ -70,9 +98,11 @@ export function buildProviderTokenBundle(runtime, database) {
|
|
|
70
98
|
}
|
|
71
99
|
// GitHub provider
|
|
72
100
|
if ((!allowedProviders || allowedProviders.has("github")) && config.github === "on") {
|
|
101
|
+
let hasGitHubEnvVar = false;
|
|
73
102
|
for (const varName of ["GITHUB_TOKEN", "GH_TOKEN"]) {
|
|
74
103
|
const value = process.env[varName];
|
|
75
104
|
if (value) {
|
|
105
|
+
hasGitHubEnvVar = true;
|
|
76
106
|
items.push(create(powerline.TokenItemSchema, {
|
|
77
107
|
name: varName.toLowerCase().replace(/_/g, "-"),
|
|
78
108
|
type: "env_var",
|
|
@@ -81,9 +111,26 @@ export function buildProviderTokenBundle(runtime, database) {
|
|
|
81
111
|
}));
|
|
82
112
|
}
|
|
83
113
|
}
|
|
114
|
+
// Fallback: resolve from `gh auth token` when no env vars are set.
|
|
115
|
+
// This covers dev workstations where `gh auth login` stores tokens in the
|
|
116
|
+
// gh CLI config rather than in GITHUB_TOKEN / GH_TOKEN env vars.
|
|
117
|
+
if (!hasGitHubEnvVar) {
|
|
118
|
+
const cliToken = await getCliToken();
|
|
119
|
+
if (cliToken) {
|
|
120
|
+
items.push(create(powerline.TokenItemSchema, {
|
|
121
|
+
name: "github-token",
|
|
122
|
+
type: "env_var",
|
|
123
|
+
envVar: "GITHUB_TOKEN",
|
|
124
|
+
value: cliToken,
|
|
125
|
+
}));
|
|
126
|
+
}
|
|
127
|
+
}
|
|
84
128
|
}
|
|
85
|
-
// Copilot provider — push the config file
|
|
86
|
-
// Also
|
|
129
|
+
// Copilot provider — push the config file and forward env vars.
|
|
130
|
+
// Also ensures a GitHub token is available for Copilot auth, even when the
|
|
131
|
+
// GitHub credential provider is disabled. Without a token, the Copilot SDK
|
|
132
|
+
// falls back to `useLoggedInUser` which fails on Docker / SSH environments
|
|
133
|
+
// that lack platform-injected GITHUB_TOKEN. (See #534.)
|
|
87
134
|
if ((!allowedProviders || allowedProviders.has("copilot")) && config.copilot === "on") {
|
|
88
135
|
const copilotConfigPath = join(homedir(), ".copilot", "config.json");
|
|
89
136
|
if (existsSync(copilotConfigPath)) {
|
|
@@ -97,6 +144,7 @@ export function buildProviderTokenBundle(runtime, database) {
|
|
|
97
144
|
}));
|
|
98
145
|
}
|
|
99
146
|
}
|
|
147
|
+
let hasGitHubToken = false;
|
|
100
148
|
for (const varName of [
|
|
101
149
|
"COPILOT_GITHUB_TOKEN",
|
|
102
150
|
"COPILOT_CLI_URL",
|
|
@@ -105,6 +153,9 @@ export function buildProviderTokenBundle(runtime, database) {
|
|
|
105
153
|
]) {
|
|
106
154
|
const value = process.env[varName];
|
|
107
155
|
if (value) {
|
|
156
|
+
if (varName === "COPILOT_GITHUB_TOKEN") {
|
|
157
|
+
hasGitHubToken = true;
|
|
158
|
+
}
|
|
108
159
|
items.push(create(powerline.TokenItemSchema, {
|
|
109
160
|
name: varName.toLowerCase().replace(/_/g, "-"),
|
|
110
161
|
type: "env_var",
|
|
@@ -113,6 +164,37 @@ export function buildProviderTokenBundle(runtime, database) {
|
|
|
113
164
|
}));
|
|
114
165
|
}
|
|
115
166
|
}
|
|
167
|
+
// Ensure Copilot gets a GitHub token for SDK authentication even when the
|
|
168
|
+
// GitHub credential provider is disabled. Check env vars first, then fall
|
|
169
|
+
// back to `gh auth token`. The Copilot SDK's resolveGithubToken() checks
|
|
170
|
+
// COPILOT_GITHUB_TOKEN → GH_TOKEN → GITHUB_TOKEN, so pushing GITHUB_TOKEN
|
|
171
|
+
// covers the fallback path.
|
|
172
|
+
if (!hasGitHubToken) {
|
|
173
|
+
const envToken = process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
|
|
174
|
+
if (envToken) {
|
|
175
|
+
const envVarName = process.env.GH_TOKEN ? "GH_TOKEN" : "GITHUB_TOKEN";
|
|
176
|
+
// Only push if not already included by the GitHub provider block above
|
|
177
|
+
if (!items.some((item) => item.envVar === envVarName)) {
|
|
178
|
+
items.push(create(powerline.TokenItemSchema, {
|
|
179
|
+
name: envVarName.toLowerCase().replace(/_/g, "-"),
|
|
180
|
+
type: "env_var",
|
|
181
|
+
envVar: envVarName,
|
|
182
|
+
value: envToken,
|
|
183
|
+
}));
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
const cliToken = await getCliToken();
|
|
188
|
+
if (cliToken && !items.some((item) => item.envVar === "GITHUB_TOKEN")) {
|
|
189
|
+
items.push(create(powerline.TokenItemSchema, {
|
|
190
|
+
name: "github-token",
|
|
191
|
+
type: "env_var",
|
|
192
|
+
envVar: "GITHUB_TOKEN",
|
|
193
|
+
value: cliToken,
|
|
194
|
+
}));
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
116
198
|
}
|
|
117
199
|
// Codex provider — push the auth file so the SDK's ChatGPT auth path works.
|
|
118
200
|
// Also forward OPENAI_API_KEY env var for API-key scenarios.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-bundle.js","sourceRoot":"","sources":["../src/credential-bundle.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"credential-bundle.js","sourceRoot":"","sources":["../src/credential-bundle.ts"],"names":[],"mappings":"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"}
|
package/dist/token-push.js
CHANGED
|
@@ -49,7 +49,7 @@ export async function pushProviderCredentialsToEnv(environmentId, runtime, optio
|
|
|
49
49
|
if (!conn) {
|
|
50
50
|
return;
|
|
51
51
|
}
|
|
52
|
-
const bundle = buildProviderTokenBundle(runtime);
|
|
52
|
+
const bundle = await buildProviderTokenBundle(runtime);
|
|
53
53
|
if (options?.excludeFileTokens) {
|
|
54
54
|
bundle.tokens = bundle.tokens.filter((t) => t.type !== "file");
|
|
55
55
|
}
|
package/dist/token-push.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-push.js","sourceRoot":"","sources":["../src/token-push.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAQrC,uEAAuE;AACvE,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,aAAqB,EAAE,OAA0B;IAC/E,MAAM,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;IAEtC,IAAI,OAAO,EAAE,iBAAiB,EAAE,CAAC;QAC/B,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,MAAM,WAAW,GAAG,cAAc,CAAC,eAAe,EAAE,CAAC;IACrD,MAAM,QAAQ,GAAoB,EAAE,CAAC;IAErC,KAAK,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,WAAW,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,IAAI,GACR,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACzD,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,uBAAuB,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,aAAqB,EAAE,OAAgB,EAAE,OAA0B;IACpH,MAAM,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"token-push.js","sourceRoot":"","sources":["../src/token-push.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@grackle-ai/core",
|
|
3
|
-
"version": "0.75.
|
|
3
|
+
"version": "0.75.10",
|
|
4
4
|
"description": "Core gRPC business logic for Grackle — RPC handlers, event system, streaming, session lifecycle",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -32,12 +32,12 @@
|
|
|
32
32
|
"ulid": "^2.3.0",
|
|
33
33
|
"uuid": "^11.0.0",
|
|
34
34
|
"ws": "^8.0.0",
|
|
35
|
-
"@grackle-ai/adapter-sdk": "0.75.
|
|
36
|
-
"@grackle-ai/auth": "0.75.
|
|
37
|
-
"@grackle-ai/
|
|
38
|
-
"@grackle-ai/
|
|
39
|
-
"@grackle-ai/
|
|
40
|
-
"@grackle-ai/prompt": "0.75.
|
|
35
|
+
"@grackle-ai/adapter-sdk": "0.75.10",
|
|
36
|
+
"@grackle-ai/auth": "0.75.10",
|
|
37
|
+
"@grackle-ai/database": "0.75.10",
|
|
38
|
+
"@grackle-ai/knowledge": "0.75.10",
|
|
39
|
+
"@grackle-ai/common": "0.75.10",
|
|
40
|
+
"@grackle-ai/prompt": "0.75.10"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
43
|
"@rushstack/heft": "1.2.7",
|