naiad-cli 0.2.1 → 0.2.3
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/dist/pi/launcher.js +33 -2
- package/dist/pi/launcher.js.map +1 -1
- package/package.json +2 -2
package/dist/pi/launcher.js
CHANGED
|
@@ -2,6 +2,37 @@ import { spawn } from "child_process";
|
|
|
2
2
|
import { join } from "path";
|
|
3
3
|
import { existsSync } from "fs";
|
|
4
4
|
import { findPackageRoot } from "../utils/package-root.js";
|
|
5
|
+
// All env vars that pi recognises as direct LLM provider credentials.
|
|
6
|
+
// These are stripped from the child environment so that pi is forced to use
|
|
7
|
+
// the Naiad inference proxy and cannot fall back to a user's personal keys.
|
|
8
|
+
const BLOCKED_LLM_ENV_VARS = [
|
|
9
|
+
"ANTHROPIC_API_KEY",
|
|
10
|
+
"ANTHROPIC_OAUTH_TOKEN",
|
|
11
|
+
"OPENAI_API_KEY",
|
|
12
|
+
"AZURE_OPENAI_API_KEY",
|
|
13
|
+
"AZURE_OPENAI_BASE_URL",
|
|
14
|
+
"AZURE_OPENAI_RESOURCE_NAME",
|
|
15
|
+
"AZURE_OPENAI_API_VERSION",
|
|
16
|
+
"AZURE_OPENAI_DEPLOYMENT_NAME_MAP",
|
|
17
|
+
"GEMINI_API_KEY",
|
|
18
|
+
"GROQ_API_KEY",
|
|
19
|
+
"CEREBRAS_API_KEY",
|
|
20
|
+
"XAI_API_KEY",
|
|
21
|
+
"OPENROUTER_API_KEY",
|
|
22
|
+
"AI_GATEWAY_API_KEY",
|
|
23
|
+
"ZAI_API_KEY",
|
|
24
|
+
"MISTRAL_API_KEY",
|
|
25
|
+
"MINIMAX_API_KEY",
|
|
26
|
+
"KIMI_API_KEY",
|
|
27
|
+
"AWS_BEARER_TOKEN_BEDROCK",
|
|
28
|
+
];
|
|
29
|
+
function buildPiEnv(overrides) {
|
|
30
|
+
const env = { ...process.env };
|
|
31
|
+
for (const key of BLOCKED_LLM_ENV_VARS) {
|
|
32
|
+
delete env[key];
|
|
33
|
+
}
|
|
34
|
+
return { ...env, ...overrides };
|
|
35
|
+
}
|
|
5
36
|
export function launchPi(options) {
|
|
6
37
|
const piPath = resolvePiBin();
|
|
7
38
|
const piProcess = spawn(piPath, [
|
|
@@ -11,7 +42,7 @@ export function launchPi(options) {
|
|
|
11
42
|
"--session-dir", options.sessionDir,
|
|
12
43
|
"-e", options.extensionPath,
|
|
13
44
|
], {
|
|
14
|
-
env:
|
|
45
|
+
env: buildPiEnv(options.env),
|
|
15
46
|
stdio: ["pipe", "pipe", "pipe"],
|
|
16
47
|
});
|
|
17
48
|
let eventHandler = null;
|
|
@@ -74,7 +105,7 @@ export function launchPiInteractive(options) {
|
|
|
74
105
|
args.push("--session", options.resumeSessionFile);
|
|
75
106
|
}
|
|
76
107
|
const piProcess = spawn(piPath, args, {
|
|
77
|
-
env:
|
|
108
|
+
env: buildPiEnv(options.env),
|
|
78
109
|
stdio: "inherit",
|
|
79
110
|
});
|
|
80
111
|
return {
|
package/dist/pi/launcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../src/pi/launcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../src/pi/launcher.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "naiad-cli",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"bin": {
|
|
6
6
|
"naiad": "./dist/index.js"
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"test": "tsx --test src/callback/server.test.ts"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@mariozechner/pi-coding-agent": "^0.55.
|
|
24
|
+
"@mariozechner/pi-coding-agent": "^0.55.4"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@types/node": "^22.0.0",
|