dsh-cliworker-now 0.7.6 → 0.7.8

package/lib/types/host/windows-account-launch.mjs

@@ -0,0 +1,47 @@
+// Windows account PTY bootstrap. No native CLI runs until its process has been
+// assigned to the separate lifecycle Job owner; no task sandbox is applied.
+import { accountInput } from './windows-account-stdio.mjs'
+import { fileURLToPath } from 'node:url'
+import { spawnNativeProcess } from './native-spawn.mjs'
+import { writeFileSync, existsSync } from 'node:fs'
+import { join } from 'node:path'
+import { setTimeout as delay } from 'node:timers/promises'
+import { nativeLaunchArgv } from './native-launch.mjs'
+process.umask(0o077)
+const [directory, encoded] = process.argv.slice(2)
+let requested
+try { requested = JSON.parse(Buffer.from(encoded, 'base64').toString('utf8')) } catch { process.exit(1) }
+if (!directory || !Array.isArray(requested) || !requested.length || requested.some(value => typeof value !== 'string')) process.exit(1)
+// This exact plugin wrapper only sets umask and delegates an argv array. This
+// helper already does both; avoid another GUI runtime losing console stdin.
+if (requested[0] === process.execPath && requested[1] === fileURLToPath(new URL('./private-launch.mjs', import.meta.url)))
+  requested = requested.slice(2)
+const until = Date.now() + 15_000
+while (!existsSync(join(directory, 'ready'))) {
+  if (Date.now() >= until) process.exit(1)
+  await delay(20)
+}
+// Keep ConPTY alive after the native command exits so Host can dispose its
+// native worker before closing the entire Job. Only the exit code is exposed.
+setInterval(() => {}, 1000)
+const recordExit = (code, signal) => {
+  const exitCode = Number.isInteger(code) ? code : 1
+  writeFileSync(join(directory, 'exit'), JSON.stringify({ exitCode, signal: signal ?? null }), { mode: 0o600 })
+}
+if (!existsSync(join(directory, 'cancel')) && !existsSync(join(directory, 'stop'))) {
+  try {
+    const [executable, ...argv] = nativeLaunchArgv(requested)
+    // Node-based CLI account UIs also need their own Electron stdin restored.
+    // This fixed preload is scoped to that child, never NODE_OPTIONS or Host.
+    if (executable === process.execPath && process.versions.electron)
+      argv.unshift('--import', new URL('./windows-account-stdio.mjs', import.meta.url).href)
+    // Keep the existing ConPTY handles; a GUI-subsystem parent must not cause
+    // the native CLI to present an additional Windows console window.
+    const child = spawnNativeProcess(executable, argv, { env: process.env, stdio: [accountInput, 1, 2] })
+    child.once('error', () => { process.stderr.write('CLI launch failed\r\n') })
+    child.once('close', recordExit)
+  } catch {
+    process.stderr.write('CLI launch failed\r\n')
+    recordExit(1)
+  }
+}

package/lib/types/host/windows-account-owner.ps1

@@ -0,0 +1,137 @@
+param([Parameter(Mandatory=$true)][string]$Directory, [Parameter(Mandatory=$true)][int]$HostProcessId)
+$ErrorActionPreference = 'Stop'
+# Fixed process ownership only: no resource, privilege, network, or filesystem limits.
+Add-Type -TypeDefinition @'
+using System;
+using System.Diagnostics;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+public sealed class CwnAccountJob : IDisposable {
+ [StructLayout(LayoutKind.Sequential)] struct BasicLimits { public long ProcessTime, JobTime; public uint Flags; public UIntPtr MinWorking, MaxWorking; public uint ActiveLimit; public UIntPtr Affinity; public uint Priority, Scheduling; }
+ [StructLayout(LayoutKind.Sequential)] struct Io { public ulong ReadOps, WriteOps, OtherOps, ReadBytes, WriteBytes, OtherBytes; }
+ [StructLayout(LayoutKind.Sequential)] struct ExtendedLimits { public BasicLimits Basic; public Io Io; public UIntPtr ProcessMemory, JobMemory, PeakProcessMemory, PeakJobMemory; }
+ [StructLayout(LayoutKind.Sequential)] struct Accounting { public long User, Kernel, PeriodUser, PeriodKernel; public uint PageFaults, TotalProcesses, ActiveProcesses, TerminatedProcesses; }
+ [DllImport("kernel32.dll", CharSet=CharSet.Unicode, SetLastError=true)] static extern IntPtr CreateJobObject(IntPtr attr, string name);
+ [DllImport("kernel32.dll", SetLastError=true)] static extern bool SetInformationJobObject(IntPtr job, int kind, ref ExtendedLimits limits, uint size);
+ [DllImport("kernel32.dll", SetLastError=true)] static extern bool QueryInformationJobObject(IntPtr job, int kind, out Accounting info, uint size, IntPtr length);
+ [DllImport("kernel32.dll", SetLastError=true)] static extern bool AssignProcessToJobObject(IntPtr job, IntPtr process);
+ [DllImport("kernel32.dll", SetLastError=true)] static extern bool TerminateJobObject(IntPtr job, uint code);
+ [DllImport("kernel32.dll")] static extern bool CloseHandle(IntPtr handle);
+ [DllImport("kernel32.dll")] static extern bool FreeConsole();
+ [DllImport("kernel32.dll", SetLastError=true)] static extern bool AttachConsole(uint pid);
+ [DllImport("kernel32.dll")] static extern IntPtr GetConsoleWindow();
+ [DllImport("user32.dll", SetLastError=true)] static extern uint GetWindowThreadProcessId(IntPtr window, out uint pid);
+ [DllImport("kernel32.dll", CharSet=CharSet.Unicode, SetLastError=true)] static extern IntPtr GetModuleHandle(string name);
+ [DllImport("kernel32.dll", SetLastError=true)] static extern IntPtr GetProcAddress(IntPtr module, IntPtr ordinal);
+ [UnmanagedFunctionPointer(CallingConvention.Winapi)] delegate uint RealWindowOwner(IntPtr window);
+ IntPtr job; Process root;
+ public CwnAccountJob() { job=CreateJobObject(IntPtr.Zero,null); if(job==IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error()); var l=new ExtendedLimits(); l.Basic.Flags=0x2000; if(!SetInformationJobObject(job,9,ref l,(uint)Marshal.SizeOf(l))) { var error=Marshal.GetLastWin32Error(); Dispose(); throw new Win32Exception(error); } }
+ public void Attach(int pid, DateTime receiptTime, DateTime earliest) { root=Process.GetProcessById(pid); var handle=root.Handle; var started=root.StartTime.ToUniversalTime(); if(started>receiptTime || started<earliest) throw new Exception("process identity changed"); if(!AssignProcessToJobObject(job,handle)) throw new Win32Exception(Marshal.GetLastWin32Error()); }
+ public static int ConsoleOwner(int pid) {
+  FreeConsole(); if(!AttachConsole((uint)pid)) throw new Win32Exception(Marshal.GetLastWin32Error());
+  try {
+   var window=GetConsoleWindow(); uint owner;
+   if(window==IntPtr.Zero || GetWindowThreadProcessId(window,out owner)==0 || owner==0) throw new Exception("console owner unavailable");
+   // Modern ConPTY gives its message-only window to the root client, not
+   // conhost: microsoft/terminal#14196. Resolve this same HWND's real owner
+   // using the maintainer's dynamic API from discussion #16447. The ordinal
+   // is not a stable public API; absence or an invalid result fails closed.
+   if(owner==(uint)pid) {
+    var module=GetModuleHandle("user32.dll");
+    var address=module==IntPtr.Zero?IntPtr.Zero:GetProcAddress(module,new IntPtr(2712));
+    if(address==IntPtr.Zero) throw new Exception("real console owner unavailable");
+    var getOwner=(RealWindowOwner)Marshal.GetDelegateForFunctionPointer(address,typeof(RealWindowOwner));
+    owner=getOwner(window);
+   }
+   if(owner==0 || owner>(uint)Int32.MaxValue || owner==(uint)pid) throw new Exception("console owner unavailable");
+   return (int)owner;
+  } finally { FreeConsole(); }
+ }
+ public string ConsoleIdentityReason { get; private set; }
+ public string ConsoleImageKind { get; private set; }
+ public bool ConsoleImageDevicePrefix { get; private set; }
+ public void AttachConsoleHost(int pid, DateTime latest, DateTime earliest) {
+  using(var p=Process.GetProcessById(pid)) {
+   var handle=p.Handle; var started=p.StartTime.ToUniversalTime();
+   var expected=System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System),"conhost.exe");
+   if(started>latest) { ConsoleIdentityReason="after-receipt"; throw new Exception("console identity changed"); }
+   if(started<earliest) { ConsoleIdentityReason="before-directory"; throw new Exception("console identity changed"); }
+   var image=p.MainModule.FileName; var leaf=System.IO.Path.GetFileName(image);
+   ConsoleImageKind=String.Equals(leaf,"conhost.exe",StringComparison.OrdinalIgnoreCase)?"conhost.exe":String.Equals(leaf,"openconsole.exe",StringComparison.OrdinalIgnoreCase)?"openconsole.exe":"other";
+   ConsoleImageDevicePrefix=image!=null && (image.StartsWith(@"\\?\") || image.StartsWith(@"\??\"));
+   if(!String.Equals(image,expected,StringComparison.OrdinalIgnoreCase)) { ConsoleIdentityReason="wrong-image"; throw new Exception("console identity changed"); }
+   if(!AssignProcessToJobObject(job,handle)) throw new Win32Exception(Marshal.GetLastWin32Error());
+  }
+ }
+ public bool RootExited { get { return root.HasExited; } }
+ public void Stop() { if(!TerminateJobObject(job,143)) throw new Win32Exception(Marshal.GetLastWin32Error()); }
+ public bool Empty { get { Accounting a; if(!QueryInformationJobObject(job,1,out a,(uint)Marshal.SizeOf(typeof(Accounting)),IntPtr.Zero)) throw new Win32Exception(Marshal.GetLastWin32Error()); return a.ActiveProcesses==0; } }
+ public void Dispose() { if(job!=IntPtr.Zero) { CloseHandle(job); job=IntPtr.Zero; } if(root!=null) root.Dispose(); }
+}
+'@
+$job=$null
+$stage='await-bootstrap'
+$consolePid=$null
+$consoleParentPid=$null
+try {
+  $earliest=[System.IO.Directory]::GetCreationTimeUtc($Directory).AddSeconds(-1)
+  $pidFile=Join-Path $Directory 'pid'
+  $stopFile=Join-Path $Directory 'stop'
+  [System.IO.File]::WriteAllText((Join-Path $Directory 'owner-ready'),'owner-ready')
+  $until=[DateTime]::UtcNow.AddSeconds(15)
+  while (!(Test-Path -LiteralPath $pidFile)) {
+    if ([DateTime]::UtcNow -ge $until) { throw 'bootstrap timeout' }
+    Start-Sleep -Milliseconds 20
+  }
+  $childPid=0
+  if (![int]::TryParse([System.IO.File]::ReadAllText($pidFile),[ref]$childPid) -or $childPid -le 0) { throw 'invalid bootstrap receipt' }
+  $stage='create-job'
+  $job=New-Object CwnAccountJob
+  $stage='attach-root'
+  $job.Attach($childPid,[System.IO.File]::GetLastWriteTimeUtc($pidFile),$earliest)
+  # The ConPTY console is a sibling of the bootstrap, created by the Host.
+  # Resolve it through this exact console, then validate parent and creation
+  # identity before adding it; never enumerate/kill processes by image name.
+  $stage='resolve-console'
+  $consolePid=[CwnAccountJob]::ConsoleOwner($childPid)
+  $stage='validate-console-parent'
+  $console=Get-CimInstance Win32_Process -Filter "ProcessId=$consolePid"
+  if ($null -ne $console) { $consoleParentPid=$console.ParentProcessId }
+  if ($null -eq $console -or $console.ParentProcessId -ne $HostProcessId) { throw 'console owner mismatch' }
+  $stage='attach-console'
+  $job.AttachConsoleHost($consolePid,[System.IO.File]::GetLastWriteTimeUtc($pidFile),$earliest)
+  $stage='await-stop'
+  [System.IO.File]::WriteAllText((Join-Path $Directory 'ready'),'ready')
+  while (!$job.RootExited -and !(Test-Path -LiteralPath $stopFile)) { Start-Sleep -Milliseconds 50 }
+  $stage='stop-job'
+  $job.Stop()
+  $stage='confirm-empty'
+  $until=[DateTime]::UtcNow.AddSeconds(8)
+  while (!$job.Empty) {
+    if ([DateTime]::UtcNow -ge $until) { throw 'empty receipt timeout' }
+    Start-Sleep -Milliseconds 20
+  }
+  [System.IO.File]::WriteAllText((Join-Path $Directory 'closed'),'closed')
+  exit 0
+} catch {
+  # Fixed stage and numeric metadata only; no exception text/argv/environment.
+  $failure=@{ stage=$stage; hostPid=$HostProcessId; ownerPid=$PID }
+  if ($null -ne $consolePid) { $failure.consolePid=$consolePid }
+  if ($null -ne $consoleParentPid) { $failure.consoleParentPid=$consoleParentPid }
+  if ($null -ne $job -and $job.ConsoleIdentityReason -in @('before-directory','after-receipt','wrong-image')) {
+    $failure.identityReason=$job.ConsoleIdentityReason
+    if ($job.ConsoleImageKind -in @('conhost.exe','openconsole.exe','other')) {
+      $failure.imageKind=$job.ConsoleImageKind
+      $failure.imageDevicePrefix=$job.ConsoleImageDevicePrefix
+    }
+  }
+  $errorObject=$_.Exception
+  while ($null -ne $errorObject) {
+    if ($errorObject -is [System.ComponentModel.Win32Exception]) { $failure.win32Code=$errorObject.NativeErrorCode; break }
+    $errorObject=$errorObject.InnerException
+  }
+  try { [System.IO.File]::WriteAllText((Join-Path $Directory 'failure'),($failure | ConvertTo-Json -Compress)) } catch {}
+  # Fixed classification only: never emit native exception/context/environment.
+  [Console]::Error.WriteLine('Windows account process ownership failed')
+  exit 2
+} finally { if ($null -ne $job) { $job.Dispose() } }

package/lib/types/host/windows-account-stdio.mjs

@@ -0,0 +1,19 @@
+// Imported only by the Windows account-terminal runtime and its Electron CLI
+// child. Electron attaches stdout/stderr to the parent console, but its GUI
+// executable can leave fd 0 mapped to NUL. Reopen this already-owned console;
+// do not redirect stdin for task processes or change the shared Host.
+import { openSync, closeSync } from 'node:fs'
+import { isatty, ReadStream } from 'node:tty'
+export let accountInput = 0
+if (process.platform === 'win32' && !isatty(0)) {
+  try {
+    accountInput = openSync('\\\\.\\CONIN$', 'r+')
+    if (!isatty(accountInput)) throw new Error('not a console')
+    const input = new ReadStream(accountInput)
+    Object.defineProperty(process, 'stdin', { value: input, configurable: true })
+    process.once('exit', () => { try { closeSync(accountInput) } catch {} })
+  } catch {
+    if (accountInput) { try { closeSync(accountInput) } catch {} }
+    throw new Error('Windows account console input unavailable')
+  }
+}

package/lib/types/host/windows-account-terminal.d.ts

@@ -0,0 +1,17 @@
+import type { SubprocessTerminalHandle, SubprocessTerminalSpawnSpec } from '@deepseek-ai/dsh-subprocess';
+import { type ProcessBackend } from './process.ts';
+/** A fixed diagnostic; never derived from PowerShell or native output. */
+export declare class WindowsAccountTerminalError extends Error {
+    constructor();
+}
+/** ConPTY publishes pid=0 during async allocation in the pinned Windows SDK.
+ * Attach a waiting bootstrap to a lifecycle-only Job before allowing the CLI to
+ * spawn. The separate owner is itself held by the Host's ordinary subprocess
+ * Job, so closing/crashing the Host also closes the account process range.
+ */
+export declare function spawnAccountTerminal(backend: ProcessBackend, spec: SubprocessTerminalSpawnSpec, options?: {
+    platform?: NodeJS.Platform;
+    handshakeMs?: number;
+    cleanupMs?: number;
+    terminalExitMs?: number;
+}): Promise<SubprocessTerminalHandle>;

package/lib/types/host/windows-account-terminal.js

@@ -0,0 +1,208 @@
+import { mkdtemp, readFile, writeFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { setTimeout as delay } from 'node:timers/promises';
+import { ProcessCleanupUnconfirmedError } from "./process.js";
+/** A fixed diagnostic; never derived from PowerShell or native output. */
+export class WindowsAccountTerminalError extends Error {
+    constructor() {
+        super('Windows 账号终端托管不可用，请检查 PowerShell 后重试');
+    }
+}
+/** ConPTY publishes pid=0 during async allocation in the pinned Windows SDK.
+ * Attach a waiting bootstrap to a lifecycle-only Job before allowing the CLI to
+ * spawn. The separate owner is itself held by the Host's ordinary subprocess
+ * Job, so closing/crashing the Host also closes the account process range.
+ */
+export async function spawnAccountTerminal(backend, spec, options = {}) {
+    if ((options.platform ?? process.platform) !== 'win32')
+        return backend.spawnTerminal(spec);
+    spec.signal?.throwIfAborted();
+    const directory = await mkdtemp(join(tmpdir(), 'cwn-account-job-'));
+    const windows = process.env.SystemRoot ?? 'C:\\Windows';
+    let terminal;
+    const owner = await (async () => {
+        try {
+            return backend.spawn({
+                argv: [
+                    join(windows, 'System32/WindowsPowerShell/v1.0/powershell.exe'),
+                    '-NoLogo',
+                    '-NoProfile',
+                    '-NonInteractive',
+                    '-File',
+                    fileURLToPath(new URL('./windows-account-owner.ps1', import.meta.url)),
+                    '-HostProcessId',
+                    String(process.pid),
+                    '-Directory',
+                    directory,
+                ],
+                cwd: spec.cwd,
+                stdio: { stdin: 'ignore', stdout: 'pipe', stderr: 'pipe' },
+                graceMs: 1000,
+            });
+        }
+        catch (error) {
+            await rm(directory, { recursive: true, force: true });
+            throw error;
+        }
+    })();
+    void owner.done.catch(() => undefined);
+    owner.stdout?.resume();
+    owner.stderr?.resume();
+    let cleanup;
+    const exists = async (name) => {
+        try {
+            return (await readFile(join(directory, name), 'utf8')).trim() === name;
+        }
+        catch {
+            return false;
+        }
+    };
+    const terminate = () => (cleanup ??= (async () => {
+        let stage = 'receipt';
+        try {
+            // Cancellation before the handshake must still let the owner adopt the
+            // bootstrap/console, while preventing it from launching the native CLI.
+            await writeFile(join(directory, 'cancel'), 'cancel', { mode: 0o600 });
+            const adoptedUntil = Date.now() + (options.cleanupMs ?? 9000);
+            while (!(await exists('ready'))) {
+                if (Date.now() >= adoptedUntil)
+                    throw new ProcessCleanupUnconfirmedError();
+                await delay(25);
+            }
+            // Dispose ConPTY while the bootstrap is still alive. With the pinned
+            // node-pty provider, killing the Job first bypasses its worker disposal.
+            // Native exit receipts keep the bootstrap alive for this same reason.
+            const disposal = terminal?.terminate().then(() => true, () => false);
+            if (disposal)
+                await Promise.race([disposal, delay(options.terminalExitMs ?? 2500)]);
+            await writeFile(join(directory, 'stop'), 'stop', { mode: 0o600 });
+            const deadline = Date.now() + (options.cleanupMs ?? 9000);
+            while (!(await exists('closed'))) {
+                if (Date.now() >= deadline)
+                    throw new ProcessCleanupUnconfirmedError();
+                await delay(25);
+            }
+            // The receipt follows ActiveProcesses == 0, not just the root's exit.
+            stage = 'terminal';
+            if (disposal && !(await Promise.race([disposal, delay(options.terminalExitMs ?? 2500, false)])))
+                throw new ProcessCleanupUnconfirmedError();
+            stage = 'owner';
+            if (!(await owner.waitForExit()))
+                throw new ProcessCleanupUnconfirmedError();
+            await owner.done;
+            stage = 'directory';
+            await rm(directory, { recursive: true, force: true });
+        }
+        catch {
+            cleanup = undefined;
+            throw Object.assign(new ProcessCleanupUnconfirmedError(), { stage });
+        }
+    })());
+    try {
+        // Compile/validate the fixed owner before allocating any ConPTY resources.
+        const ownerUntil = Date.now() + (options.handshakeMs ?? 15_000);
+        while (!(await exists('owner-ready'))) {
+            spec.signal?.throwIfAborted();
+            if (Date.now() >= ownerUntil)
+                throw new Error('Windows account owner handshake timed out');
+            await Promise.race([
+                delay(25),
+                owner.done.then(() => {
+                    throw new Error('Windows account owner ended');
+                }),
+            ]);
+        }
+        spec.signal?.throwIfAborted();
+        terminal = await backend.spawnTerminal({
+            ...spec,
+            signal: undefined,
+            argv: [
+                join(windows, 'System32/WindowsPowerShell/v1.0/powershell.exe'),
+                '-NoLogo',
+                '-NoProfile',
+                '-NonInteractive',
+                '-File',
+                fileURLToPath(new URL('./windows-account-bootstrap.ps1', import.meta.url)),
+                '-Directory',
+                directory,
+                '-RuntimePath',
+                process.execPath,
+                '-LaunchPath',
+                fileURLToPath(new URL('./windows-account-launch.mjs', import.meta.url)),
+                '-ArgumentsBase64',
+                Buffer.from(JSON.stringify(spec.argv), 'utf8').toString('base64'),
+            ],
+            env: { ...spec.env, ELECTRON_RUN_AS_NODE: '1' },
+        });
+        void terminal.done.catch(() => undefined);
+        const until = Date.now() + (options.handshakeMs ?? 15_000);
+        while (!(await exists('ready'))) {
+            spec.signal?.throwIfAborted();
+            if (Date.now() >= until)
+                throw new Error('Windows account terminal handshake timed out');
+            await Promise.race([
+                delay(25),
+                owner.done.then(() => {
+                    throw new Error('Windows account owner ended');
+                }),
+            ]);
+        }
+        const current = terminal;
+        const done = (async () => {
+            for (;;) {
+                try {
+                    const receipt = JSON.parse(await readFile(join(directory, 'exit'), 'utf8'));
+                    if (Number.isInteger(receipt.exitCode))
+                        return { exitCode: receipt.exitCode, signal: null };
+                }
+                catch {
+                    /* An interrupted bootstrap retains the SDK outcome. */
+                }
+                const outcome = await Promise.race([current.done, delay(50, undefined)]);
+                if (outcome)
+                    return outcome;
+            }
+        })();
+        void done.catch(() => undefined);
+        return {
+            pid: Number(await readFile(join(directory, 'pid'), 'utf8')),
+            output: current.output,
+            done,
+            write: (data) => current.write(data),
+            resize: (cols, rows) => current.resize(cols, rows),
+            inspectForeground: () => current.inspectForeground(),
+            inspectActivity: () => current.inspectActivity(),
+            signalForeground: (signal) => current.signalForeground(signal),
+            terminate,
+        };
+    }
+    catch (error) {
+        if (terminal) {
+            // A cancellation can precede ready: the bootstrap keeps waiting until
+            // the owner adopts its console/Job, then observes stop without running
+            // the CLI. Require the same empty-range receipt as a normal close.
+            try {
+                await terminate();
+            }
+            catch (failure) {
+                owner.terminate();
+                await terminal.terminate().catch(() => undefined);
+                throw failure;
+            }
+        }
+        else {
+            // No terminal was allocated; only the ordinary managed owner exists.
+            await writeFile(join(directory, 'stop'), 'stop', { mode: 0o600 });
+            owner.terminate();
+            if (!(await owner.waitForExit()))
+                throw new ProcessCleanupUnconfirmedError();
+            await rm(directory, { recursive: true, force: true });
+        }
+        if (spec.signal?.aborted)
+            throw error;
+        throw new WindowsAccountTerminalError();
+    }
+}
+//# sourceMappingURL=windows-account-terminal.js.map

package/lib/types/host/windows-account-terminal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"windows-account-terminal.js","sourceRoot":"","sources":["../../../src/host/windows-account-terminal.ts"],"names":[],"mappings":"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"}

package/lib/types/host/windows-agy-account.ps1

@@ -0,0 +1,81 @@
+# Read only Antigravity's own native Windows credential. Never emit its blob.
+$ErrorActionPreference = 'Stop'
+[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false)
+try {
+  Add-Type @'
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+public static class CwnAgyCredential {
+  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)] struct Credential {
+    public uint Flags, Type;
+    public string TargetName, Comment;
+    public System.Runtime.InteropServices.ComTypes.FILETIME LastWritten;
+    public uint CredentialBlobSize;
+    public IntPtr CredentialBlob;
+    public uint Persist, AttributeCount;
+    public IntPtr Attributes;
+    public string TargetAlias, UserName;
+  }
+  [DllImport("advapi32.dll", CharSet=CharSet.Unicode, SetLastError=true)]
+  static extern bool CredRead(string target, uint type, uint flags, out IntPtr value);
+  [DllImport("advapi32.dll")] static extern void CredFree(IntPtr value);
+  public static string Read() {
+    IntPtr value;
+    if (!CredRead("gemini:antigravity", 1, 0, out value)) {
+      if (Marshal.GetLastWin32Error() == 1168) return null;
+      throw new Exception("Credential store unavailable");
+    }
+    byte[] bytes = null;
+    try {
+      var credential = (Credential)Marshal.PtrToStructure(value, typeof(Credential));
+      if (credential.CredentialBlobSize > 65536) throw new Exception("Invalid credential");
+      bytes = new byte[credential.CredentialBlobSize];
+      Marshal.Copy(credential.CredentialBlob, bytes, 0, bytes.Length);
+      return bytes.Length > 1 && bytes[1] == 0
+        ? new UnicodeEncoding(false, false, true).GetString(bytes)
+        : new UTF8Encoding(false, true).GetString(bytes);
+    } finally {
+      if (bytes != null) Array.Clear(bytes, 0, bytes.Length);
+      CredFree(value);
+    }
+  }
+}
+'@
+  $raw = [CwnAgyCredential]::Read()
+  if ($null -eq $raw) { @{ state = 'unconfigured' } | ConvertTo-Json -Compress; exit 0 }
+  $account = $raw | ConvertFrom-Json
+  $raw = $null
+  if ($account.auth_method -ne 'consumer' -or -not $account.token) {
+    @{ state = 'unknown' } | ConvertTo-Json -Compress; exit 0
+  }
+  $active = $false
+  if ($account.token.access_token -is [string] -and $account.token.access_token.Trim()) {
+    try { $active = [DateTimeOffset]::Parse($account.token.expiry) -gt [DateTimeOffset]::UtcNow } catch {}
+  }
+  $refreshable = $account.token.refresh_token -is [string] -and $account.token.refresh_token.Trim().Length -gt 0
+  if (-not $active -and -not $refreshable) {
+    @{ state = 'unauthenticated' } | ConvertTo-Json -Compress; exit 0
+  }
+  $result = @{ state = 'authenticated' }
+  if ($account.id_token -is [string] -and $account.id_token.Length -le 32768 -and $account.id_token -match '^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$') {
+    $encoded = $account.id_token.Split('.')[1].Replace('-','+').Replace('_','/')
+    $encoded = $encoded.PadRight($encoded.Length + ((4 - $encoded.Length % 4) % 4), '=')
+    $bytes = [Convert]::FromBase64String($encoded)
+    try { $claims = [Text.Encoding]::UTF8.GetString($bytes) | ConvertFrom-Json }
+    finally { [Array]::Clear($bytes, 0, $bytes.Length) }
+    if ($claims.iss -in @('accounts.google.com', 'https://accounts.google.com') -and $claims.sub -is [string] -and $claims.sub -match '^[A-Za-z0-9_-]{6,128}$') {
+      $hash = [Security.Cryptography.SHA256]::Create()
+      $principal = [Text.Encoding]::UTF8.GetBytes('google:' + $claims.sub)
+      try { $result.principalHash = ([BitConverter]::ToString($hash.ComputeHash($principal))).Replace('-','').ToLowerInvariant() }
+      finally { [Array]::Clear($principal, 0, $principal.Length); $hash.Dispose() }
+      if ($claims.email -is [string] -and $claims.email.Length -le 254 -and $claims.email -match '^[^\s<>@]+@[^\s<>@]+\.[^\s<>@]+$') { $result.email = $claims.email }
+    }
+  }
+  $account = $null; $claims = $null
+  $result | ConvertTo-Json -Compress
+} catch {
+  # Neither exception strings nor credential fragments cross the process boundary.
+  @{ state = 'unavailable' } | ConvertTo-Json -Compress
+  exit 1
+}

package/lib/types/host/windows-cli-installation.d.ts

@@ -0,0 +1,35 @@
+export declare class WindowsCliInstallationError extends Error {
+    readonly installed: boolean;
+    readonly code = "CLI_INSTALLATION_UNAVAILABLE";
+    constructor(message: string, installed?: boolean);
+}
+/** A completed desktop/PATH search found no CLI; absence is not a broken installation. */
+export declare class WindowsCliNotFoundError extends WindowsCliInstallationError {
+    constructor(cli: 'zcode' | 'opencode');
+}
+type WindowsEnvironment = {
+    home?: string;
+    env?: NodeJS.ProcessEnv;
+};
+/** Fixed installer locations only; never scan arbitrary drives or select a venv by recency. */
+export declare function windowsCliCandidates(cli: 'codex' | 'hermes', options?: WindowsEnvironment): string[];
+/** A residue is not a runnable installation and is not evidence of an account. */
+export declare function hasWindowsHermesInstallDirectory(options?: WindowsEnvironment): boolean;
+/** Validate an automatically discovered npm shim against Codex's own package, not just its name. */
+export declare function validateWindowsCodexNpmEntry(path: string): string;
+export declare function presentWindowsCliCandidate(cli: 'codex' | 'hermes', options?: WindowsEnvironment): string | undefined;
+/** Query current-user registered packages, never guess the newest WindowsApps directory. */
+export declare const CODEX_APPX_QUERY = "$ErrorActionPreference='Stop'; [Console]::OutputEncoding=[Text.UTF8Encoding]::new($false); $p=@(Get-AppxPackage -Name 'OpenAI.Codex'); if($p.Count -eq 0){'null';exit 0}; if($p.Count -ne 1){throw 'Ambiguous Codex package'}; $v=$p[0]; [ordered]@{name=$v.Name;family=$v.PackageFamilyName;fullName=$v.PackageFullName;publisher=$v.Publisher;signature=[string]$v.SignatureKind;status=[string]$v.Status;location=$v.InstallLocation}|ConvertTo-Json -Compress";
+export interface CodexAppxRecord {
+    name: string;
+    family: string;
+    fullName: string;
+    publisher: string;
+    signature: string;
+    status: string;
+    location: string;
+}
+/** Exported separately for synthetic identity/relocation tests; no process or account access. */
+export declare function codexAppxExecutable(raw: string, validateFile?: (path: string) => string): string | undefined;
+export declare function findWindowsCodexAppx(capture: (argv: string[], cwd: string) => Promise<string>, signal: AbortSignal, env?: NodeJS.ProcessEnv): Promise<string | undefined>;
+export {};