Back out @lib indirection in tsconfig.json (#111)

codex-cli/tests/agent-cancel-early.test.ts

@@ -64,13 +64,13 @@ vi.mock("openai", () => {
   };
 });
 
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-cancel-prev-response.test.ts

@@ -71,13 +71,13 @@ vi.mock("openai", () => {
 });
 
 // Stub helpers not relevant for this test.
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-cancel-race.test.ts

@@ -67,11 +67,11 @@ vi.mock("openai", () => {
 });
 
 // Stubs for external helpers referenced indirectly.
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   isSafeCommand: () => null,
 }));
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-cancel.test.ts

@@ -47,7 +47,7 @@ vi.mock("openai", () => {
 });
 
 // Mock the approvals and formatCommand helpers referenced by handle‑exec‑command.
-vi.mock("@lib/approvals.js", () => {
+vi.mock("../src/approvals.js", () => {
   return {
     __esModule: true,
     alwaysApprovedCommands: new Set<string>(),
@@ -57,7 +57,7 @@ vi.mock("@lib/approvals.js", () => {
   };
 });
 
-vi.mock("@lib/format-command.js", () => {
+vi.mock("../src/format-command.js", () => {
   return {
     __esModule: true,
     formatCommandForDisplay: (cmd: Array<string>) => cmd.join(" "),

codex-cli/tests/agent-function-call-id.test.ts

@@ -88,14 +88,14 @@ vi.mock("openai", () => {
 });
 
 // Stub approvals & command formatting – not relevant for this test.
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-generic-network-error.test.ts

@@ -23,14 +23,14 @@ vi.mock("openai", () => {
 });
 
 // Stub approvals / formatting helpers – unrelated to network handling.
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-invalid-request-error.test.ts

@@ -22,14 +22,14 @@ vi.mock("openai", () => {
   };
 });
 
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-max-tokens-error.test.ts

@@ -22,14 +22,14 @@ vi.mock("openai", () => {
   };
 });
 
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-network-errors.test.ts

@@ -42,14 +42,14 @@ vi.mock("openai", () => {
 });
 
 // Stub approvals / formatting helpers – not relevant here.
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-project-doc.test.ts

@@ -51,7 +51,7 @@ vi.mock("openai", () => {
 // The AgentLoop pulls these helpers in order to decide whether a command can
 // be auto‑approved. None of that matters for this test, so we stub the module
 // with minimal no‑op implementations.
-vi.mock("@lib/approvals.js", () => {
+vi.mock("../src/approvals.js", () => {
   return {
     __esModule: true,
     alwaysApprovedCommands: new Set<string>(),
@@ -61,7 +61,7 @@ vi.mock("@lib/approvals.js", () => {
   };
 });
 
-vi.mock("@lib/format-command.js", () => {
+vi.mock("../src/format-command.js", () => {
   return {
     __esModule: true,
     formatCommandForDisplay: (cmd: Array<string>) => cmd.join(" "),

codex-cli/tests/agent-rate-limit-error.test.ts

@@ -34,14 +34,14 @@ vi.mock("openai", () => {
 
 // Stub helpers that the agent indirectly imports so it does not attempt any
 // file‑system access or real approvals logic during the test.
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-server-retry.test.ts

@@ -32,14 +32,14 @@ vi.mock("openai", () => {
   };
 });
 
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   alwaysApprovedCommands: new Set<string>(),
   canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false } as any),
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/agent-terminate.test.ts

@@ -49,7 +49,7 @@ vi.mock("openai", () => {
 
 // --- Helpers referenced by handle‑exec‑command -----------------------------
 
-vi.mock("@lib/approvals.js", () => {
+vi.mock("../src/approvals.js", () => {
   return {
     __esModule: true,
     alwaysApprovedCommands: new Set<string>(),
@@ -59,7 +59,7 @@ vi.mock("@lib/approvals.js", () => {
   };
 });
 
-vi.mock("@lib/format-command.js", () => {
+vi.mock("../src/format-command.js", () => {
   return {
     __esModule: true,
     formatCommandForDisplay: (cmd: Array<string>) => cmd.join(" "),

codex-cli/tests/agent-thinking-time.test.ts

@@ -74,12 +74,12 @@ vi.mock("openai", () => {
 });
 
 // Stub helpers referenced indirectly so we do not pull in real FS/network
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   __esModule: true,
   isSafeCommand: () => null,
 }));
 
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   __esModule: true,
   formatCommandForDisplay: (c: Array<string>) => c.join(" "),
 }));

codex-cli/tests/approvals.test.ts

@@ -1,6 +1,6 @@
-import type { SafetyAssessment } from "../src/lib/approvals";
+import type { SafetyAssessment } from "../src/approvals";
 
-import { canAutoApprove } from "../src/lib/approvals";
+import { canAutoApprove } from "../src/approvals";
 import { describe, test, expect } from "vitest";
 
 describe("canAutoApprove()", () => {

codex-cli/tests/external-editor.test.ts

@@ -1,4 +1,4 @@
-import TextBuffer from "../src/lib/text-buffer";
+import TextBuffer from "../src/text-buffer";
 import { describe, it, expect, vi } from "vitest";
 
 /* -------------------------------------------------------------------------

codex-cli/tests/format-command.test.ts

@@ -1,4 +1,4 @@
-import { formatCommandForDisplay } from "../src/lib/format-command";
+import { formatCommandForDisplay } from "../src/format-command";
 import { describe, test, expect } from "vitest";
 
 describe("formatCommandForDisplay()", () => {

codex-cli/tests/invalid-command-handling.test.ts

@@ -22,7 +22,7 @@ describe("rawExec – invalid command handling", () => {
 // ---------------------------------------------------------------------------
 
 // Mock approvals and logging helpers so the test focuses on execution flow.
-vi.mock("@lib/approvals.js", () => {
+vi.mock("../src/approvals.js", () => {
   return {
     __esModule: true,
     canAutoApprove: () =>
@@ -31,7 +31,7 @@ vi.mock("@lib/approvals.js", () => {
   };
 });
 
-vi.mock("@lib/format-command.js", () => {
+vi.mock("../src/format-command.js", () => {
   return {
     __esModule: true,
     formatCommandForDisplay: (cmd: Array<string>) => cmd.join(" "),

codex-cli/tests/multiline-external-editor-shortcut.test.tsx

@@ -1,6 +1,6 @@
 import { renderTui } from "./ui-test-helpers.js";
 import MultilineTextEditor from "../src/components/chat/multiline-editor.js";
-import TextBuffer from "../src/lib/text-buffer.js";
+import TextBuffer from "../src/text-buffer.js";
 import * as React from "react";
 import { describe, it, expect, vi } from "vitest";
 

codex-cli/tests/multiline-history-behavior.test.tsx

@@ -34,12 +34,12 @@ vi.mock("../src/utils/input-utils.js", () => ({
   })),
 }));
 
-// Mock the optional @lib/* dependencies so the dynamic import in parsers.ts
+// Mock the optional ../src/* dependencies so the dynamic import in parsers.ts
 // does not fail during the test environment where the alias isn't configured.
-vi.mock("@lib/format-command.js", () => ({
+vi.mock("../src/format-command.js", () => ({
   formatCommandForDisplay: (cmd: Array<string>) => cmd.join(" "),
 }));
-vi.mock("@lib/approvals.js", () => ({
+vi.mock("../src/approvals.js", () => ({
   isSafeCommand: (_cmd: Array<string>) => null,
 }));
 

codex-cli/tests/parse-apply-patch.test.ts

@@ -1,4 +1,4 @@
-import { parseApplyPatch } from "../src/lib/parse-apply-patch";
+import { parseApplyPatch } from "../src/parse-apply-patch";
 import { expect, test, describe } from "vitest";
 
 // Helper function to unwrap a non‑null result in tests that expect success.

codex-cli/tests/text-buffer-copy-paste.test.ts

@@ -1,4 +1,4 @@
-import TextBuffer from "../src/lib/text-buffer.js";
+import TextBuffer from "../src/text-buffer.js";
 import { describe, it, expect } from "vitest";
 
 // These tests ensure that the TextBuffer copy‑&‑paste logic keeps parity with

codex-cli/tests/text-buffer-crlf.test.ts

@@ -1,4 +1,4 @@
-import TextBuffer from "../src/lib/text-buffer.js";
+import TextBuffer from "../src/text-buffer.js";
 import { describe, it, expect } from "vitest";
 
 describe("TextBuffer – newline normalisation", () => {

codex-cli/tests/text-buffer-gaps.test.ts

@@ -1,4 +1,4 @@
-import TextBuffer from "../src/lib/text-buffer";
+import TextBuffer from "../src/text-buffer";
 import { describe, it, expect } from "vitest";
 
 // The purpose of this test‑suite is NOT to make the implementation green today

codex-cli/tests/text-buffer-word.test.ts

@@ -1,4 +1,4 @@
-import TextBuffer from "../src/lib/text-buffer.js";
+import TextBuffer from "../src/text-buffer.js";
 import { describe, test, expect } from "vitest";
 
 describe("TextBuffer – word‑wise navigation & deletion", () => {

codex-cli/tests/text-buffer.test.ts

@@ -1,4 +1,4 @@
-import TextBuffer from "../src/lib/text-buffer";
+import TextBuffer from "../src/text-buffer";
 import { describe, it, expect } from "vitest";
 
 describe("TextBuffer – basic editing parity with Rust suite", () => {