fix: address review findings round 2

- Add deploy non-TTY regression test (deploy-non-tty.test.ts) that
  pins exit 1 + clear message + no Ink raw-mode error for the no-flags
  and --diff TUI paths. Flag-bearing modes (--yes, --json, --dry-run,
  --target, --verbose) route to the non-interactive CLI path which
  does not require a TTY.
- Add import --source <bogus> negative test that pins the guard
  placement: a future regression that hoists requireTTY() to the top
  of the action will break this test (it would yield the
  interactive-terminal message instead of 'Source file not found').
- Move originalStdinIsTTY/originalStdoutIsTTY snapshots into beforeEach
  in tty.test.ts and re-define with configurable: true so prior test
  contamination cannot poison restoration.

Author: AgentCore Bot

src/cli/commands/deploy/__tests__/deploy-non-tty.test.ts

@@ -0,0 +1,59 @@
+import { runCLI } from '../../../../test-utils/index.js';
+import { randomUUID } from 'node:crypto';
+import { mkdir, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+
+/**
+ * Regression test for issue #982 (the command named in the bug title):
+ * `agentcore deploy` (and any TUI-mode invocation) in a non-TTY context
+ * must NOT crash with the Ink "Raw mode is not supported" error and must
+ * NOT exit 0. It must exit 1 with a clear interactive-terminal message so
+ * CI pipelines can detect the failure.
+ *
+ * The TUI path is reached when no flags are provided (and also for --diff).
+ * Flag-bearing modes (--yes, --json, --dry-run, --target, --verbose) route
+ * to the non-interactive CLI path which does not require a TTY and is not
+ * the subject of this regression.
+ */
+describe('deploy command non-TTY behavior (issue #982)', () => {
+  let testDir: string;
+  let projectDir: string;
+
+  beforeAll(async () => {
+    testDir = join(tmpdir(), `agentcore-deploy-tty-${randomUUID()}`);
+    projectDir = join(testDir, 'project');
+    const configDir = join(projectDir, 'agentcore');
+    await mkdir(configDir, { recursive: true });
+    // Minimal valid project marker so requireProject() passes — guard
+    // ordering means requireTTY() will fire first, but we keep a real
+    // project dir so an accidental ordering regression surfaces clearly.
+    await writeFile(join(configDir, 'agentcore.json'), JSON.stringify({ name: 'test', version: 1 }, null, 2), 'utf-8');
+  });
+
+  afterAll(async () => {
+    await rm(testDir, { recursive: true, force: true });
+  });
+
+  it('exits 1 with a clear message when run without flags in non-TTY (interactive path)', async () => {
+    // runCLI uses stdio: ['ignore', 'pipe', 'pipe'] — both stdin and stdout
+    // are non-TTY, exactly the scenario from the bug report.
+    const result = await runCLI(['deploy'], projectDir);
+
+    expect(result.exitCode).toBe(1);
+
+    const combined = `${result.stdout}\n${result.stderr}`;
+    expect(combined.toLowerCase()).toContain('requires an interactive terminal');
+    expect(combined).not.toContain('Raw mode is not supported');
+  });
+
+  it('exits 1 cleanly with --diff in non-TTY (TUI diff path)', async () => {
+    const result = await runCLI(['deploy', '--diff'], projectDir);
+
+    expect(result.exitCode).toBe(1);
+
+    const combined = `${result.stdout}\n${result.stderr}`;
+    expect(combined).not.toContain('Raw mode is not supported');
+  });
+});

src/cli/commands/import/__tests__/command.test.ts

@@ -40,4 +40,19 @@ describe('import command non-TTY behavior (issue #982)', () => {
     expect(combined.toLowerCase()).toContain('requires an interactive terminal');
     expect(combined).not.toContain('Raw mode is not supported');
   });
+
+  it('does not apply the TTY guard to --source path (pins guard placement)', async () => {
+    // The requireTTY() guard must remain inside the no-source branch only.
+    // If it gets accidentally hoisted to the top of the action, this test
+    // will start failing with the interactive-terminal message instead of
+    // the source-file-validation message.
+    const bogusSource = join(projectDir, 'definitely-does-not-exist.yaml');
+    const result = await runCLI(['import', '--source', bogusSource], projectDir);
+
+    expect(result.exitCode).toBe(1);
+
+    const combined = `${result.stdout}\n${result.stderr}`;
+    expect(combined).toContain('Source file not found');
+    expect(combined.toLowerCase()).not.toContain('requires an interactive terminal');
+  });
 });

src/cli/tui/guards/__tests__/tty.test.ts

@@ -2,12 +2,31 @@ import { requireTTY } from '../tty.js';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 describe('requireTTY', () => {
-  const originalStdinIsTTY = process.stdin.isTTY;
-  const originalStdoutIsTTY = process.stdout.isTTY;
+  let originalStdinIsTTY: boolean | undefined;
+  let originalStdoutIsTTY: boolean | undefined;
   let exitSpy: ReturnType<typeof vi.spyOn>;
   let errorSpy: ReturnType<typeof vi.spyOn>;
 
   beforeEach(() => {
+    // Snapshot the live values inside beforeEach so a previous test file in
+    // the same worker that mutated process.stdin/stdout.isTTY without
+    // restoring cannot poison our restoration. Also re-define with
+    // configurable: true to make subsequent restoration deterministic
+    // across Node versions where the original descriptor for piped streams
+    // may not be configurable.
+    originalStdinIsTTY = process.stdin.isTTY;
+    originalStdoutIsTTY = process.stdout.isTTY;
+    Object.defineProperty(process.stdin, 'isTTY', {
+      value: originalStdinIsTTY,
+      configurable: true,
+      writable: true,
+    });
+    Object.defineProperty(process.stdout, 'isTTY', {
+      value: originalStdoutIsTTY,
+      configurable: true,
+      writable: true,
+    });
+
     // Throw from process.exit so we can assert without actually exiting the test runner.
     exitSpy = vi.spyOn(process, 'exit').mockImplementation(((code?: number) => {
       throw new Error(`__exit__:${code}`);