@walkhi/code-relax 0.1.0-beta.30 → 0.1.0-beta.31

package/dist/src/platform/user-environment.mjs

@@ -1,3 +1,3 @@
-import { platformModule } from './select.mjs';
-const adapter = await import(platformModule('user-environment'));
-export const { configureManagedEnvironment, clearManagedEnvironment } = adapter;
+import { platformModule } from './select.mjs';
+const adapter = await import(platformModule('user-environment'));
+export const { configureManagedEnvironment, clearManagedEnvironment } = adapter;

package/dist/src/platform/windows/IsolatedProcess.cs

@@ -1,79 +1,79 @@
-using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Text;
-
-// Only the three explicitly opened standard handles cross the process boundary.
-// In particular, inherited app-server sockets must not reach background workers.
-public static class IsolatedProcess {
-    [StructLayout(LayoutKind.Sequential)] struct Security { public int length; public IntPtr descriptor; public int inherit; }
-    [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)] struct Startup {
-        public int cb; public string reserved, desktop, title;
-        public int x,y,xSize,ySize,xCount,yCount,fill,flags; public short show,reservedSize;
-        public IntPtr reservedBytes,input,output,error;
-    }
-    [StructLayout(LayoutKind.Sequential)] struct StartupEx { public Startup startup; public IntPtr attributes; }
-    [StructLayout(LayoutKind.Sequential)] struct ProcessInfo { public IntPtr process,thread; public int pid,tid; }
-    [DllImport("kernel32.dll", CharSet=CharSet.Unicode, SetLastError=true)] static extern IntPtr CreateFileW(string name,uint access,uint share,ref Security security,uint disposition,uint flags,IntPtr template);
-    [DllImport("kernel32.dll", SetLastError=true)] static extern bool InitializeProcThreadAttributeList(IntPtr list,int count,int flags,ref IntPtr size);
-    [DllImport("kernel32.dll", SetLastError=true)] static extern bool UpdateProcThreadAttribute(IntPtr list,uint flags,IntPtr attribute,IntPtr value,IntPtr size,IntPtr previous,IntPtr returned);
-    [DllImport("kernel32.dll")] static extern void DeleteProcThreadAttributeList(IntPtr list);
-    [DllImport("kernel32.dll", CharSet=CharSet.Unicode, SetLastError=true)] static extern bool CreateProcessW(string application,StringBuilder command,IntPtr processSecurity,IntPtr threadSecurity,bool inherit,uint flags,IntPtr environment,string cwd,ref StartupEx startup,out ProcessInfo info);
-    [DllImport("kernel32.dll")] static extern bool CloseHandle(IntPtr handle);
-    [DllImport("kernel32.dll",CharSet=CharSet.Unicode,SetLastError=true)] static extern uint GetFinalPathNameByHandleW(IntPtr handle,StringBuilder path,uint length,uint flags);
-    public static string ResolvePath(string path) {
-        var security=new Security {length=Marshal.SizeOf(typeof(Security))};
-        var handle=CreateFileW(path,0,7,ref security,3,0x02000000,IntPtr.Zero);
-        if(handle==new IntPtr(-1)) throw new Win32Exception(Marshal.GetLastWin32Error());
-        try {
-            var result=new StringBuilder(32768);
-            uint length=GetFinalPathNameByHandleW(handle,result,(uint)result.Capacity,0);
-            if(length==0 || length>=result.Capacity) throw new Win32Exception(Marshal.GetLastWin32Error());
-            var value=result.ToString();
-            return value.StartsWith(@"\\?\UNC\") ? @"\\"+value.Substring(8) : value.StartsWith(@"\\?\") ? value.Substring(4) : value;
-        } finally { CloseHandle(handle); }
-    }
-    static string Quote(string value) {
-        var result=new StringBuilder("\""); int slashes=0;
-        foreach(char c in value) {
-            if(c=='\\') { slashes++; continue; }
-            result.Append('\\', c=='"' ? slashes*2+1 : slashes); slashes=0; result.Append(c);
-        }
-        result.Append('\\',slashes*2); return result.Append('"').ToString();
-    }
-    static IntPtr File(string file,bool input) {
-        var sa=new Security { length=Marshal.SizeOf(typeof(Security)), inherit=1 };
-        // FILE_APPEND_DATA avoids truncating diagnostic history on recovery.
-        var handle=CreateFileW(file,input?0x80000000u:4u,7,ref sa,input?3u:4u,0x80,IntPtr.Zero);
-        if(handle==new IntPtr(-1)) throw new Win32Exception(Marshal.GetLastWin32Error());
-        return handle;
-    }
-    public static int Start(string executable,string[] arguments,string stdout,string stderr,string[] environment) {
-        IntPtr input=IntPtr.Zero,output=IntPtr.Zero,error=IntPtr.Zero,list=IntPtr.Zero,handles=IntPtr.Zero,environmentBlock=IntPtr.Zero;
-        bool initialized=false;
-        try {
-            input=File("NUL",true); output=File(String.IsNullOrEmpty(stdout)?"NUL":stdout,false); error=File(String.IsNullOrEmpty(stderr)?"NUL":stderr,false);
-            IntPtr size=IntPtr.Zero; InitializeProcThreadAttributeList(IntPtr.Zero,1,0,ref size);
-            list=Marshal.AllocHGlobal(size);
-            if(!InitializeProcThreadAttributeList(list,1,0,ref size)) throw new Win32Exception(Marshal.GetLastWin32Error());
-            initialized=true; handles=Marshal.AllocHGlobal(IntPtr.Size*3);
-            Marshal.Copy(new IntPtr[]{input,output,error},0,handles,3);
-            if(!UpdateProcThreadAttribute(list,0,new IntPtr(0x20002),handles,new IntPtr(IntPtr.Size*3),IntPtr.Zero,IntPtr.Zero)) throw new Win32Exception(Marshal.GetLastWin32Error());
-            var startup=new StartupEx(); startup.startup.cb=Marshal.SizeOf(typeof(StartupEx));
-            startup.startup.flags=0x101; startup.startup.show=0;
-            startup.startup.input=input; startup.startup.output=output; startup.startup.error=error; startup.attributes=list;
-            var command=new StringBuilder(Quote(executable)); foreach(var argument in arguments) command.Append(' ').Append(Quote(argument));
-            Array.Sort(environment,StringComparer.OrdinalIgnoreCase);
-            var environmentBytes=Encoding.Unicode.GetBytes(String.Join("\0",environment)+"\0\0");
-            environmentBlock=Marshal.AllocHGlobal(environmentBytes.Length); Marshal.Copy(environmentBytes,0,environmentBlock,environmentBytes.Length);
-            ProcessInfo info;
-            if(!CreateProcessW(executable,command,IntPtr.Zero,IntPtr.Zero,true,0x80410,environmentBlock,null,ref startup,out info)) throw new Win32Exception(Marshal.GetLastWin32Error());
-            CloseHandle(info.thread); CloseHandle(info.process); return info.pid;
-        } finally {
-            if(initialized) DeleteProcThreadAttributeList(list);
-            if(list!=IntPtr.Zero) Marshal.FreeHGlobal(list); if(handles!=IntPtr.Zero) Marshal.FreeHGlobal(handles);
-            if(environmentBlock!=IntPtr.Zero) Marshal.FreeHGlobal(environmentBlock);
-            if(input!=IntPtr.Zero) CloseHandle(input); if(output!=IntPtr.Zero) CloseHandle(output); if(error!=IntPtr.Zero) CloseHandle(error);
-        }
-    }
-}
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Text;
+
+// Only the three explicitly opened standard handles cross the process boundary.
+// In particular, inherited app-server sockets must not reach background workers.
+public static class IsolatedProcess {
+    [StructLayout(LayoutKind.Sequential)] struct Security { public int length; public IntPtr descriptor; public int inherit; }
+    [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)] struct Startup {
+        public int cb; public string reserved, desktop, title;
+        public int x,y,xSize,ySize,xCount,yCount,fill,flags; public short show,reservedSize;
+        public IntPtr reservedBytes,input,output,error;
+    }
+    [StructLayout(LayoutKind.Sequential)] struct StartupEx { public Startup startup; public IntPtr attributes; }
+    [StructLayout(LayoutKind.Sequential)] struct ProcessInfo { public IntPtr process,thread; public int pid,tid; }
+    [DllImport("kernel32.dll", CharSet=CharSet.Unicode, SetLastError=true)] static extern IntPtr CreateFileW(string name,uint access,uint share,ref Security security,uint disposition,uint flags,IntPtr template);
+    [DllImport("kernel32.dll", SetLastError=true)] static extern bool InitializeProcThreadAttributeList(IntPtr list,int count,int flags,ref IntPtr size);
+    [DllImport("kernel32.dll", SetLastError=true)] static extern bool UpdateProcThreadAttribute(IntPtr list,uint flags,IntPtr attribute,IntPtr value,IntPtr size,IntPtr previous,IntPtr returned);
+    [DllImport("kernel32.dll")] static extern void DeleteProcThreadAttributeList(IntPtr list);
+    [DllImport("kernel32.dll", CharSet=CharSet.Unicode, SetLastError=true)] static extern bool CreateProcessW(string application,StringBuilder command,IntPtr processSecurity,IntPtr threadSecurity,bool inherit,uint flags,IntPtr environment,string cwd,ref StartupEx startup,out ProcessInfo info);
+    [DllImport("kernel32.dll")] static extern bool CloseHandle(IntPtr handle);
+    [DllImport("kernel32.dll",CharSet=CharSet.Unicode,SetLastError=true)] static extern uint GetFinalPathNameByHandleW(IntPtr handle,StringBuilder path,uint length,uint flags);
+    public static string ResolvePath(string path) {
+        var security=new Security {length=Marshal.SizeOf(typeof(Security))};
+        var handle=CreateFileW(path,0,7,ref security,3,0x02000000,IntPtr.Zero);
+        if(handle==new IntPtr(-1)) throw new Win32Exception(Marshal.GetLastWin32Error());
+        try {
+            var result=new StringBuilder(32768);
+            uint length=GetFinalPathNameByHandleW(handle,result,(uint)result.Capacity,0);
+            if(length==0 || length>=result.Capacity) throw new Win32Exception(Marshal.GetLastWin32Error());
+            var value=result.ToString();
+            return value.StartsWith(@"\\?\UNC\") ? @"\\"+value.Substring(8) : value.StartsWith(@"\\?\") ? value.Substring(4) : value;
+        } finally { CloseHandle(handle); }
+    }
+    static string Quote(string value) {
+        var result=new StringBuilder("\""); int slashes=0;
+        foreach(char c in value) {
+            if(c=='\\') { slashes++; continue; }
+            result.Append('\\', c=='"' ? slashes*2+1 : slashes); slashes=0; result.Append(c);
+        }
+        result.Append('\\',slashes*2); return result.Append('"').ToString();
+    }
+    static IntPtr File(string file,bool input) {
+        var sa=new Security { length=Marshal.SizeOf(typeof(Security)), inherit=1 };
+        // FILE_APPEND_DATA avoids truncating diagnostic history on recovery.
+        var handle=CreateFileW(file,input?0x80000000u:4u,7,ref sa,input?3u:4u,0x80,IntPtr.Zero);
+        if(handle==new IntPtr(-1)) throw new Win32Exception(Marshal.GetLastWin32Error());
+        return handle;
+    }
+    public static int Start(string executable,string[] arguments,string stdout,string stderr,string[] environment) {
+        IntPtr input=IntPtr.Zero,output=IntPtr.Zero,error=IntPtr.Zero,list=IntPtr.Zero,handles=IntPtr.Zero,environmentBlock=IntPtr.Zero;
+        bool initialized=false;
+        try {
+            input=File("NUL",true); output=File(String.IsNullOrEmpty(stdout)?"NUL":stdout,false); error=File(String.IsNullOrEmpty(stderr)?"NUL":stderr,false);
+            IntPtr size=IntPtr.Zero; InitializeProcThreadAttributeList(IntPtr.Zero,1,0,ref size);
+            list=Marshal.AllocHGlobal(size);
+            if(!InitializeProcThreadAttributeList(list,1,0,ref size)) throw new Win32Exception(Marshal.GetLastWin32Error());
+            initialized=true; handles=Marshal.AllocHGlobal(IntPtr.Size*3);
+            Marshal.Copy(new IntPtr[]{input,output,error},0,handles,3);
+            if(!UpdateProcThreadAttribute(list,0,new IntPtr(0x20002),handles,new IntPtr(IntPtr.Size*3),IntPtr.Zero,IntPtr.Zero)) throw new Win32Exception(Marshal.GetLastWin32Error());
+            var startup=new StartupEx(); startup.startup.cb=Marshal.SizeOf(typeof(StartupEx));
+            startup.startup.flags=0x101; startup.startup.show=0;
+            startup.startup.input=input; startup.startup.output=output; startup.startup.error=error; startup.attributes=list;
+            var command=new StringBuilder(Quote(executable)); foreach(var argument in arguments) command.Append(' ').Append(Quote(argument));
+            Array.Sort(environment,StringComparer.OrdinalIgnoreCase);
+            var environmentBytes=Encoding.Unicode.GetBytes(String.Join("\0",environment)+"\0\0");
+            environmentBlock=Marshal.AllocHGlobal(environmentBytes.Length); Marshal.Copy(environmentBytes,0,environmentBlock,environmentBytes.Length);
+            ProcessInfo info;
+            if(!CreateProcessW(executable,command,IntPtr.Zero,IntPtr.Zero,true,0x80410,environmentBlock,null,ref startup,out info)) throw new Win32Exception(Marshal.GetLastWin32Error());
+            CloseHandle(info.thread); CloseHandle(info.process); return info.pid;
+        } finally {
+            if(initialized) DeleteProcThreadAttributeList(list);
+            if(list!=IntPtr.Zero) Marshal.FreeHGlobal(list); if(handles!=IntPtr.Zero) Marshal.FreeHGlobal(handles);
+            if(environmentBlock!=IntPtr.Zero) Marshal.FreeHGlobal(environmentBlock);
+            if(input!=IntPtr.Zero) CloseHandle(input); if(output!=IntPtr.Zero) CloseHandle(output); if(error!=IntPtr.Zero) CloseHandle(error);
+        }
+    }
+}

package/dist/src/platform/windows/activate-desktop.ps1

@@ -1,48 +1,48 @@
-param(
-    [Parameter(Mandatory=$true)][string]$Executable,
-    [Parameter(Mandatory=$true)][string]$AppServerUrl
-)
-$ErrorActionPreference = 'Stop'
-[Console]::OutputEncoding = New-Object System.Text.UTF8Encoding($false)
-$package = Get-AppxPackage OpenAI.Codex | Select-Object -First 1
-if (-not $package -or $Executable -ne (Join-Path $package.InstallLocation 'app/ChatGPT.exe')) {
-    throw 'Desktop executable identity changed; activation stopped.'
-}
-# Packaged activation uses the user's environment, not the worker's env block.
-# Installation already owns and broadcasts this setting. Do not silently launch
-# a separate app-server if it has been removed or changed since installation.
-if ([Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_WS_URL', 'User') -ne $AppServerUrl) {
-    throw 'Desktop app-server environment differs from the workstation; run relax setup to repair it.'
-}
-if ([Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_FORCE_CLI', 'User') -eq '1' -or
-    [Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_FORCE_CLI', 'Machine') -eq '1') {
-    throw 'CODEX_APP_SERVER_FORCE_CLI=1 prevents Desktop from connecting to the workstation.'
-}
-# Activate the registered application so Windows supplies its MSIX identity.
-# Never spawn ChatGPT.exe through the hidden-console broker: a bootstrap failure
-# can leave a windowless Electron singleton blocking subsequent taskbar launches.
-Add-Type -TypeDefinition @'
-using System;
-using System.Runtime.InteropServices;
-namespace CodeRelax {
-    [ComImport, Guid("2e941141-7f97-4756-ba1d-9decde894a3d"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    interface IApplicationActivationManager {
-        void ActivateApplication([MarshalAs(UnmanagedType.LPWStr)] string appId,
-            [MarshalAs(UnmanagedType.LPWStr)] string arguments, uint options, out uint processId);
-        void ActivateForFile([MarshalAs(UnmanagedType.LPWStr)] string appId, IntPtr items,
-            [MarshalAs(UnmanagedType.LPWStr)] string verb, out uint processId);
-        void ActivateForProtocol([MarshalAs(UnmanagedType.LPWStr)] string appId, IntPtr items, out uint processId);
-    }
-    public static class DesktopActivation {
-        public static uint Activate(string appId) {
-            object instance = Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C")));
-            try {
-                uint processId;
-                ((IApplicationActivationManager)instance).ActivateApplication(appId, "", 2, out processId);
-                return processId;
-            } finally { Marshal.ReleaseComObject(instance); }
-        }
-    }
-}
-'@
-[CodeRelax.DesktopActivation]::Activate($package.PackageFamilyName + '!App')
+param(
+    [Parameter(Mandatory=$true)][string]$Executable,
+    [Parameter(Mandatory=$true)][string]$AppServerUrl
+)
+$ErrorActionPreference = 'Stop'
+[Console]::OutputEncoding = New-Object System.Text.UTF8Encoding($false)
+$package = Get-AppxPackage OpenAI.Codex | Select-Object -First 1
+if (-not $package -or $Executable -ne (Join-Path $package.InstallLocation 'app/ChatGPT.exe')) {
+    throw 'Desktop executable identity changed; activation stopped.'
+}
+# Packaged activation uses the user's environment, not the worker's env block.
+# Installation already owns and broadcasts this setting. Do not silently launch
+# a separate app-server if it has been removed or changed since installation.
+if ([Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_WS_URL', 'User') -ne $AppServerUrl) {
+    throw 'Desktop app-server environment differs from the workstation; run relax setup to repair it.'
+}
+if ([Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_FORCE_CLI', 'User') -eq '1' -or
+    [Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_FORCE_CLI', 'Machine') -eq '1') {
+    throw 'CODEX_APP_SERVER_FORCE_CLI=1 prevents Desktop from connecting to the workstation.'
+}
+# Activate the registered application so Windows supplies its MSIX identity.
+# Never spawn ChatGPT.exe through the hidden-console broker: a bootstrap failure
+# can leave a windowless Electron singleton blocking subsequent taskbar launches.
+Add-Type -TypeDefinition @'
+using System;
+using System.Runtime.InteropServices;
+namespace CodeRelax {
+    [ComImport, Guid("2e941141-7f97-4756-ba1d-9decde894a3d"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    interface IApplicationActivationManager {
+        void ActivateApplication([MarshalAs(UnmanagedType.LPWStr)] string appId,
+            [MarshalAs(UnmanagedType.LPWStr)] string arguments, uint options, out uint processId);
+        void ActivateForFile([MarshalAs(UnmanagedType.LPWStr)] string appId, IntPtr items,
+            [MarshalAs(UnmanagedType.LPWStr)] string verb, out uint processId);
+        void ActivateForProtocol([MarshalAs(UnmanagedType.LPWStr)] string appId, IntPtr items, out uint processId);
+    }
+    public static class DesktopActivation {
+        public static uint Activate(string appId) {
+            object instance = Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C")));
+            try {
+                uint processId;
+                ((IApplicationActivationManager)instance).ActivateApplication(appId, "", 2, out processId);
+                return processId;
+            } finally { Marshal.ReleaseComObject(instance); }
+        }
+    }
+}
+'@
+[CodeRelax.DesktopActivation]::Activate($package.PackageFamilyName + '!App')

package/dist/src/platform/windows/background-process.mjs

@@ -1,30 +1,30 @@
-import { spawn } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
-
-export function startWindowsProcess(executable, args, environment, logs = []) {
-  return new Promise((resolve, reject) => {
-    const powershell = path.join(process.env.SystemRoot || 'C:\\Windows', 'System32/WindowsPowerShell/v1.0/powershell.exe');
-    const helperEnvironment = {};
-    for (const name of ['SystemRoot', 'windir', 'LOCALAPPDATA', 'USERPROFILE', 'TEMP', 'TMP', 'PSModulePath']) {
-      const key = Object.keys(process.env).find(item => item.toLowerCase() === name.toLowerCase());
-      if (key) helperEnvironment[key] = process.env[key];
-    }
-    const helper = spawn(powershell, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File',
-      fileURLToPath(new URL('./start-hidden-console.ps1', import.meta.url))], {
-      windowsHide: true, env: helperEnvironment, stdio: ['pipe', 'pipe', 'pipe'],
-    });
-    let output = '', error = '';
-    helper.stdout.setEncoding('utf8').on('data', chunk => { output += chunk; });
-    helper.stderr.setEncoding('utf8').on('data', chunk => { error += chunk; });
-    helper.once('error', reject); helper.stdin.on('error', reject);
-    helper.once('exit', code => {
-      helper.stdout.destroy(); helper.stderr.destroy(); helper.stdin.destroy();
-      if (code !== 0) return reject(new Error(error.trim() || `后台启动失败 (${code})`));
-      const pid = Number(output.trim());
-      if (!Number.isSafeInteger(pid) || pid <= 0) return reject(new Error('后台启动未返回有效 PID'));
-      resolve(pid);
-    });
-    helper.stdin.end(JSON.stringify({ brokerExecutable: process.execPath, executable, args, logs, environment }));
-  });
-}
+import { spawn } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+
+export function startWindowsProcess(executable, args, environment, logs = []) {
+  return new Promise((resolve, reject) => {
+    const powershell = path.join(process.env.SystemRoot || 'C:\\Windows', 'System32/WindowsPowerShell/v1.0/powershell.exe');
+    const helperEnvironment = {};
+    for (const name of ['SystemRoot', 'windir', 'LOCALAPPDATA', 'USERPROFILE', 'TEMP', 'TMP', 'PSModulePath']) {
+      const key = Object.keys(process.env).find(item => item.toLowerCase() === name.toLowerCase());
+      if (key) helperEnvironment[key] = process.env[key];
+    }
+    const helper = spawn(powershell, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File',
+      fileURLToPath(new URL('./start-hidden-console.ps1', import.meta.url))], {
+      windowsHide: true, env: helperEnvironment, stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    let output = '', error = '';
+    helper.stdout.setEncoding('utf8').on('data', chunk => { output += chunk; });
+    helper.stderr.setEncoding('utf8').on('data', chunk => { error += chunk; });
+    helper.once('error', reject); helper.stdin.on('error', reject);
+    helper.once('exit', code => {
+      helper.stdout.destroy(); helper.stderr.destroy(); helper.stdin.destroy();
+      if (code !== 0) return reject(new Error(error.trim() || `后台启动失败 (${code})`));
+      const pid = Number(output.trim());
+      if (!Number.isSafeInteger(pid) || pid <= 0) return reject(new Error('后台启动未返回有效 PID'));
+      resolve(pid);
+    });
+    helper.stdin.end(JSON.stringify({ brokerExecutable: process.execPath, executable, args, logs, environment }));
+  });
+}