History

[codex] Enforce canonical Node namespace imports (#3238)

Julius Marminge committed 4 months ago

Commit 2fa37ec1 parent db2750271 files · +1205 −952Browse files

Showing the changes to apps/server/scripts (2 of 71 files). Show all

Unified · Split

2 files
  1. apps/server/scripts/acp-mock-agent.ts +3 −3
  2. apps/server/scripts/cursor-acp-model-mismatch-probe.ts +24 −24
apps/server/scripts/acp-mock-agent.ts+3−3
@@ -1,6 +1,6 @@
11 #!/usr/bin/env node
22 // @effect-diagnostics nodeBuiltinImport:off
3−import { appendFileSync } from "node:fs";
3+import * as NodeFS from "node:fs";
44
55 import * as Effect from "effect/Effect";
66
@@ -42,7 +42,7 @@ function logExit(reason: string): void { · 35 unmodified lines
4242 if (!exitLogPath) {
4343 return;
4444 }
45− appendFileSync(exitLogPath, `${reason}\n`, "utf8");
45+ NodeFS.appendFileSync(exitLogPath, `${reason}\n`, "utf8");
4646 }
4747
4848 process.once("SIGTERM", () => {
@@ -693,7 +693,7 @@ const program = Effect.gen(function* () { · 644 unmodified lines
693693 }
694694 const payload = event.payload;
695695 return Effect.sync(() => {
696− appendFileSync(
696+ NodeFS.appendFileSync(
697697 requestLogPath,
698698 payload.endsWith("\n") ? payload : `${payload}\n`,
699699 "utf8",
apps/server/scripts/cursor-acp-model-mismatch-probe.ts+24−24
@@ -1,7 +1,7 @@
11 // @effect-diagnostics nodeBuiltinImport:off
2−import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
3−import process from "node:process";
4−import readline from "node:readline";
2+import * as NodeChildProcess from "node:child_process";
3+import * as NodeProcess from "node:process";
4+import * as NodeReadline from "node:readline";
55 import * as NodeTimers from "node:timers";
66 import { resolveSpawnCommand } from "@t3tools/shared/shell";
77 import * as Effect from "effect/Effect";
@@ -56,19 +56,19 @@ type PendingRequest = { · 48 unmodified lines
5656 reject: (error: Error) => void;
5757 };
5858
59−const targetCwd = process.argv[2] ?? process.cwd();
60−const targetModel = process.argv[3] ?? "gpt-5.4";
61−const promptText = process.argv[4] ?? "helo";
62−const targetReasoning = process.env.CURSOR_REASONING ?? "";
63−const targetContext = process.env.CURSOR_CONTEXT ?? "";
64−const targetFast = process.env.CURSOR_FAST ?? "";
65−const agentBin = process.env.CURSOR_AGENT_BIN ?? "agent";
66−const promptWaitMs = Number(process.env.CURSOR_PROMPT_WAIT_MS ?? "4000");
67−const requestTimeoutMs = Number(process.env.CURSOR_REQUEST_TIMEOUT_MS ?? "20000");
59+const targetCwd = NodeProcess.argv[2] ?? NodeProcess.cwd();
60+const targetModel = NodeProcess.argv[3] ?? "gpt-5.4";
61+const promptText = NodeProcess.argv[4] ?? "helo";
62+const targetReasoning = NodeProcess.env.CURSOR_REASONING ?? "";
63+const targetContext = NodeProcess.env.CURSOR_CONTEXT ?? "";
64+const targetFast = NodeProcess.env.CURSOR_FAST ?? "";
65+const agentBin = NodeProcess.env.CURSOR_AGENT_BIN ?? "agent";
66+const promptWaitMs = Number(NodeProcess.env.CURSOR_PROMPT_WAIT_MS ?? "4000");
67+const requestTimeoutMs = Number(NodeProcess.env.CURSOR_REQUEST_TIMEOUT_MS ?? "20000");
6868
6969 function logSection(title: string, value: unknown) {
70− process.stdout.write(`\n=== ${title} ===\n`);
71− process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
70+ NodeProcess.stdout.write(`\n=== ${title} ===\n`);
71+ NodeProcess.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
7272 }
7373
7474 function fail(message: string): never {
@@ -124,18 +124,18 @@ function sleep(ms: number) { · 49 unmodified lines
124124 }
125125
126126 class JsonRpcChild {
127− readonly child: ChildProcessWithoutNullStreams;
127+ readonly child: NodeChildProcess.ChildProcessWithoutNullStreams;
128128 readonly pending = new Map<JsonRpcId, PendingRequest>();
129129 nextId = 1;
130130 closed = false;
131131
132132 constructor(bin: string, args: string[], cwd: string) {
133133 const spawnCommand = Effect.runSync(resolveSpawnCommand(bin, args));
134− this.child = spawn(spawnCommand.command, spawnCommand.args, {
134+ this.child = NodeChildProcess.spawn(spawnCommand.command, spawnCommand.args, {
135135 cwd,
136136 shell: spawnCommand.shell,
137137 stdio: ["pipe", "pipe", "pipe"],
138− env: process.env,
138+ env: NodeProcess.env,
139139 });
140140
141141 this.child.on("exit", (code, signal) => {
@@ -155,14 +155,14 @@ class JsonRpcChild { · 13 unmodified lines
155155 this.pending.clear();
156156 });
157157
158− const stdout = readline.createInterface({ input: this.child.stdout });
158+ const stdout = NodeReadline.createInterface({ input: this.child.stdout });
159159 stdout.on("line", (line) => {
160160 void this.handleStdoutLine(line);
161161 });
162162
163− const stderr = readline.createInterface({ input: this.child.stderr });
163+ const stderr = NodeReadline.createInterface({ input: this.child.stderr });
164164 stderr.on("line", (line) => {
165− process.stdout.write(`[stderr] ${line}\n`);
165+ NodeProcess.stdout.write(`[stderr] ${line}\n`);
166166 });
167167 }
168168
@@ -175,7 +175,7 @@ class JsonRpcChild { · 6 unmodified lines
175175 headers: [],
176176 ...message,
177177 });
178− process.stdout.write(`>>> ${payload}\n`);
178+ NodeProcess.stdout.write(`>>> ${payload}\n`);
179179 this.child.stdin.write(`${payload}\n`);
180180 }
181181
@@ -240,13 +240,13 @@ class JsonRpcChild { · 58 unmodified lines
240240 return;
241241 }
242242
243− process.stdout.write(`<<< ${line}\n`);
243+ NodeProcess.stdout.write(`<<< ${line}\n`);
244244
245245 let message: JsonRpcMessage;
246246 try {
247247 message = JSON.parse(line) as JsonRpcMessage;
248248 } catch (error) {
249− process.stdout.write(`[parse-error] ${(error as Error).message}\n`);
249+ NodeProcess.stdout.write(`[parse-error] ${(error as Error).message}\n`);
250250 return;
251251 }
252252
@@ -435,7 +435,7 @@ async function main() { · 182 unmodified lines
435435 }
436436
437437 void main().catch((error: unknown) => {
438− process.stderr.write(
438+ NodeProcess.stderr.write(
439439 `${error instanceof Error ? (error.stack ?? error.message) : String(error)}\n`,
440440 );
441441 process.exitCode = 1;