@pixelbyte-software/pixcode 1.40.5 → 1.40.8

package/server/services/managed-runtimes.js

@@ -83,12 +83,21 @@ function selectFrankenPhpAsset(release) {
   return candidates[0]?.asset || null;
 }
 
-async function fetchJson(url, env = process.env) {
+function isGitHubUrl(url) {
+  try {
+    const hostname = new URL(url).hostname.toLowerCase();
+    return hostname === 'github.com' || hostname === 'api.github.com' || hostname.endsWith('.github.com');
+  } catch {
+    return String(url).includes('github.com');
+  }
+}
+
+async function fetchJson(url, env = process.env, options = {}) {
   const headers = {
-    Accept: 'application/vnd.github+json',
+    Accept: options.accept || 'application/json',
     'User-Agent': 'Pixcode Live View',
   };
-  if (env.GITHUB_TOKEN) headers.Authorization = `Bearer ${env.GITHUB_TOKEN}`;
+  if (env.GITHUB_TOKEN && isGitHubUrl(url)) headers.Authorization = `Bearer ${env.GITHUB_TOKEN}`;
 
   const response = await fetch(url, { headers });
   if (!response.ok) {
@@ -99,7 +108,7 @@ async function fetchJson(url, env = process.env) {
 
 async function downloadFile(url, targetFile, env = process.env) {
   const headers = { 'User-Agent': 'Pixcode Live View' };
-  if (env.GITHUB_TOKEN && url.includes('github.com')) headers.Authorization = `Bearer ${env.GITHUB_TOKEN}`;
+  if (env.GITHUB_TOKEN && isGitHubUrl(url)) headers.Authorization = `Bearer ${env.GITHUB_TOKEN}`;
 
   const response = await fetch(url, { headers });
   if (!response.ok) {
@@ -112,50 +121,65 @@ async function downloadFile(url, targetFile, env = process.env) {
 function runProcess(command, args, options = {}) {
   return new Promise((resolve, reject) => {
     let stderr = '';
+    let settled = false;
+    const { timeoutMs, ...spawnOptions } = options;
     const child = spawn(command, args, {
-      ...options,
+      ...spawnOptions,
       stdio: ['ignore', 'ignore', 'pipe'],
       windowsHide: true,
     });
+    const finish = (callback, value) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      callback(value);
+    };
+    const timer = timeoutMs
+      ? setTimeout(() => {
+        try {
+          child.kill();
+        } catch {
+          // Process may have exited between timeout scheduling and kill.
+        }
+        finish(reject, new Error(`${command} timed out after ${timeoutMs}ms`));
+      }, timeoutMs)
+      : null;
     child.stderr.on('data', (chunk) => {
       stderr += chunk.toString();
     });
-    child.on('error', reject);
+    child.on('error', (error) => finish(reject, error));
     child.on('close', (code) => {
       if (code === 0) {
-        resolve();
+        finish(resolve);
         return;
       }
-      reject(new Error(`${command} exited with code ${code}${stderr ? `: ${stderr.trim()}` : ''}`));
+      finish(reject, new Error(`${command} exited with code ${code}${stderr ? `: ${stderr.trim()}` : ''}`));
     });
   });
 }
 
+function buildPowerShellExpandArchiveArgs(archivePath, targetDir) {
+  return [
+    '-NoProfile',
+    '-ExecutionPolicy',
+    'Bypass',
+    '-Command',
+    '& { param([string]$archive, [string]$destination) Expand-Archive -Force -LiteralPath $archive -DestinationPath $destination }',
+    archivePath,
+    targetDir,
+  ];
+}
+
 async function extractZip(archivePath, targetDir, env = process.env) {
   if (process.platform === 'win32') {
     const shell = env.ComSpec || process.env.ComSpec || 'powershell.exe';
     const isCmd = shell.toLowerCase().endsWith('cmd.exe');
+    const expandArgs = buildPowerShellExpandArchiveArgs(archivePath, targetDir);
     if (isCmd) {
-      await runProcess('powershell.exe', [
-        '-NoProfile',
-        '-ExecutionPolicy',
-        'Bypass',
-        '-Command',
-        'Expand-Archive -Force -LiteralPath $args[0] -DestinationPath $args[1]',
-        archivePath,
-        targetDir,
-      ], { env });
+      await runProcess('powershell.exe', expandArgs, { env });
       return;
     }
-    await runProcess(shell, [
-      '-NoProfile',
-      '-ExecutionPolicy',
-      'Bypass',
-      '-Command',
-      'Expand-Archive -Force -LiteralPath $args[0] -DestinationPath $args[1]',
-      archivePath,
-      targetDir,
-    ], { env });
+    await runProcess(shell, expandArgs, { env });
     return;
   }
 
@@ -194,10 +218,33 @@ async function findRuntimeExecutable(searchRoot, binaryName) {
   return null;
 }
 
+async function copyRuntimeWithSidecars(executablePath, currentDir) {
+  const executableDir = path.dirname(executablePath);
+  await fs.rm(currentDir, { recursive: true, force: true });
+  await fs.mkdir(currentDir, { recursive: true });
+  await fs.cp(executableDir, currentDir, { recursive: true, force: true });
+  return path.join(currentDir, path.basename(executablePath));
+}
+
+async function validateManagedRuntimeExecutable(id, executablePath, env = process.env) {
+  if (id !== 'frankenphp') return true;
+  try {
+    await runProcess(executablePath, ['version'], {
+      env,
+      timeoutMs: 5000,
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function installFrankenPhp(env = process.env) {
   const releaseApiUrl = env.PIXCODE_FRANKENPHP_RELEASE_API
     || 'https://api.github.com/repos/php/frankenphp/releases/latest';
-  const release = env.PIXCODE_FRANKENPHP_URL ? null : await fetchJson(releaseApiUrl, env);
+  const release = env.PIXCODE_FRANKENPHP_URL
+    ? null
+    : await fetchJson(releaseApiUrl, env, { accept: 'application/vnd.github+json' });
   const asset = env.PIXCODE_FRANKENPHP_URL
     ? {
       name: path.basename(new URL(env.PIXCODE_FRANKENPHP_URL).pathname),
@@ -237,12 +284,7 @@ async function installFrankenPhp(env = process.env) {
     await fs.chmod(executablePath, 0o755).catch(() => undefined);
   }
 
-  await fs.rm(currentDir, { recursive: true, force: true });
-  await fs.mkdir(currentDir, { recursive: true });
-
-  const finalName = process.platform === 'win32' ? 'frankenphp.exe' : 'frankenphp';
-  const finalExecutable = path.join(currentDir, finalName);
-  await fs.copyFile(executablePath, finalExecutable);
+  const finalExecutable = await copyRuntimeWithSidecars(executablePath, currentDir);
   if (process.platform !== 'win32') {
     await fs.chmod(finalExecutable, 0o755).catch(() => undefined);
   }
@@ -264,7 +306,7 @@ async function installFrankenPhp(env = process.env) {
 async function installNpmRuntime(env = process.env) {
   const registryUrl = env.PIXCODE_NPM_RUNTIME_REGISTRY
     || 'https://registry.npmjs.org/npm/latest';
-  const metadata = await fetchJson(registryUrl, env);
+  const metadata = await fetchJson(registryUrl, env, { accept: 'application/json' });
   const tarballUrl = metadata?.dist?.tarball;
   if (!tarballUrl) {
     throw new Error('No npm runtime tarball is available from the npm registry.');
@@ -371,6 +413,18 @@ export async function getManagedRuntimeStatus(id, options = {}) {
 
   const manifest = await readManifest(id, env);
   if (manifest) {
+    const valid = await validateManagedRuntimeExecutable(id, manifest.executablePath, env);
+    if (!valid) {
+      return {
+        id,
+        label: 'Pixcode PHP runtime',
+        provider: 'FrankenPHP',
+        status: 'missing',
+        installable: true,
+        reason: 'The existing Pixcode PHP runtime is incomplete or cannot start. Pixcode will reinstall it automatically.',
+      };
+    }
+
     return {
       id,
       label: manifest.label || 'Pixcode PHP runtime',

package/server/services/provider-models.js

@@ -86,6 +86,20 @@ function mergeCatalogs(primary, secondary) {
     return Array.from(seen.values());
 }
 
+function mergeProviderCatalogs(provider, primary, staticCatalog) {
+    const normalizedPrimary = normalizeList(primary);
+
+    // OpenCode Zen free models rotate often. When models.dev succeeds, treat
+    // that live catalog as authoritative; otherwise stale static freebies can
+    // leak back into the UI and fail later with ProviderModelNotFoundError.
+    if (provider === 'opencode') {
+        const liveModels = normalizedPrimary.filter((item) => item.source === 'api');
+        if (liveModels.length > 0) return liveModels;
+    }
+
+    return mergeCatalogs(normalizedPrimary, staticCatalog);
+}
+
 // ---------------- Per-provider live discovery ----------------
 
 async function discoverAnthropic(apiKey, baseUrl) {
@@ -287,8 +301,9 @@ export async function getProviderModels(provider, opts = {}) {
         : false;
 
     if (!forceRefresh && cacheFresh && Array.isArray(cached?.models)) {
+        const merged = mergeProviderCatalogs(provider, cached.models, staticCatalog);
         return {
-            models: mergeCatalogs(normalizeList(cached.models), staticCatalog),
+            models: merged,
             fetchedAt: cached.fetchedAt,
             error: cached.error,
             fromCache: true,
@@ -305,7 +320,7 @@ export async function getProviderModels(provider, opts = {}) {
         } catch (err) {
             error = err?.message || String(err);
         }
-        const merged = mergeCatalogs(normalizeList(liveModels), staticCatalog);
+        const merged = mergeProviderCatalogs(provider, liveModels, staticCatalog);
         const entry = { models: merged, error };
         await saveCacheEntry(provider, entry).catch(() => { /* non-fatal */ });
         return { models: merged, fetchedAt: new Date().toISOString(), error, fromCache: false };
@@ -367,7 +382,7 @@ export async function getProviderModels(provider, opts = {}) {
         }
     }
 
-    const merged = mergeCatalogs(normalizeList(liveModels), staticCatalog);
+    const merged = mergeProviderCatalogs(provider, liveModels, staticCatalog);
     const entry = { models: merged, error };
     await saveCacheEntry(provider, entry).catch(() => { /* non-fatal */ });
     return { models: merged, fetchedAt: new Date().toISOString(), error, fromCache: false };

package/shared/modelConstants.js

@@ -110,11 +110,10 @@ export const QWEN_MODELS = {
 export const OPENCODE_MODELS = {
   OPTIONS: [
     // OpenCode Zen — free tier (no charge, may rate-limit). The "limited
-    // time" Zen freebies rotate, so this is the safest small set.
+    // time" Zen freebies rotate, so keep this fallback conservative and let
+    // the live models.dev catalog populate the full current list.
     { value: "opencode/big-pickle", label: "OpenCode Zen · Big Pickle (Free)", free: true },
     { value: "opencode/minimax-m2.5-free", label: "OpenCode Zen · MiniMax M2.5 (Free)", free: true },
-    { value: "opencode/hy3-preview-free", label: "OpenCode Zen · Hy3 Preview (Free)", free: true },
-    { value: "opencode/ling-2.6-flash-free", label: "OpenCode Zen · Ling 2.6 Flash (Free)", free: true },
     { value: "opencode/nemotron-3-super-free", label: "OpenCode Zen · Nemotron 3 Super (Free)", free: true },
     { value: "opencode/gpt-5-nano", label: "OpenCode Zen · GPT-5 Nano (Free)", free: true },