@pixelbyte-software/pixcode 1.49.1 → 1.49.3

package/dist-server/server/index.js

@@ -356,16 +356,32 @@ function buildHermesShellCommand(kind, env) {
             `$env:PIXCODE_APP_ROOT=${quote(env.PIXCODE_APP_ROOT)}`,
         ].join('; ');
         const resolveHermesCommand = [
+            'function Test-HermesCommand($candidate) {',
+            'if (-not $candidate) { return $false; }',
+            'try {',
+            '& $candidate --version *> $null;',
+            'return $LASTEXITCODE -eq 0;',
+            '} catch { return $false; }',
+            '}',
             'function Resolve-HermesCommand {',
-            '$cmd = Get-Command hermes -ErrorAction SilentlyContinue;',
-            'if ($cmd) { return $cmd.Source; }',
             '$candidates = @(',
             '$env:HERMES_CLI_PATH,',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\bin\\hermes.cmd"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\bin\\hermes.bat"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\bin\\hermes.exe"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\venv\\Scripts\\hermes.cmd"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\venv\\Scripts\\hermes.bat"),',
             '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\venv\\Scripts\\hermes.exe"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\.venv\\Scripts\\hermes.cmd"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\.venv\\Scripts\\hermes.bat"),',
             '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\.venv\\Scripts\\hermes.exe"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\hermes.cmd"),',
+            '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\hermes.bat"),',
             '(Join-Path $env:LOCALAPPDATA "hermes\\hermes-agent\\hermes.exe")',
             ');',
-            'foreach ($candidate in $candidates) { if ($candidate -and (Test-Path $candidate)) { return $candidate; } }',
+            'foreach ($candidate in $candidates) { if ($candidate -and (Test-Path $candidate) -and (Test-HermesCommand $candidate)) { return $candidate; } }',
+            '$cmd = Get-Command hermes -ErrorAction SilentlyContinue;',
+            'if ($cmd -and (Test-HermesCommand $cmd.Source)) { return $cmd.Source; }',
             'return $null;',
             '}',
         ].join(' ');
@@ -393,23 +409,24 @@ function buildHermesShellCommand(kind, env) {
         `PIXCODE_APP_ROOT=${quote(env.PIXCODE_APP_ROOT)}`,
     ].join(' ');
     const resolveHermesCommand = [
+        'testHermesCommand() {',
+        '[ -n "$1" ] && [ -x "$1" ] && "$1" --version >/dev/null 2>&1;',
+        '}',
         'resolveHermesCommand() {',
-        'if command -v hermes >/dev/null 2>&1; then command -v hermes; return 0; fi;',
-        'if [ -n "${HERMES_CLI_PATH:-}" ] && [ -x "$HERMES_CLI_PATH" ]; then printf "%s\\n" "$HERMES_CLI_PATH"; return 0; fi;',
-        'if [ -x "$HOME/.local/bin/hermes" ]; then printf "%s\\n" "$HOME/.local/bin/hermes"; return 0; fi;',
-        'if [ -x "$HOME/.hermes/hermes-agent/venv/bin/hermes" ]; then printf "%s\\n" "$HOME/.hermes/hermes-agent/venv/bin/hermes"; return 0; fi;',
-        'if [ -x "/usr/local/bin/hermes" ]; then printf "%s\\n" "/usr/local/bin/hermes"; return 0; fi;',
+        'for candidate in "${HERMES_CLI_PATH:-}" "$HOME/.local/bin/hermes" "$HOME/.hermes/hermes-agent/venv/bin/hermes" "$HOME/.hermes/hermes-agent/.venv/bin/hermes" "/usr/local/bin/hermes" "/usr/local/lib/hermes-agent/venv/bin/hermes"; do',
+        'if testHermesCommand "$candidate"; then printf "%s\\n" "$candidate"; return 0; fi;',
+        'done;',
+        'candidate="$(command -v hermes 2>/dev/null || true)";',
+        'if testHermesCommand "$candidate"; then printf "%s\\n" "$candidate"; return 0; fi;',
         'return 1;',
         '}',
     ].join(' ');
-    const install = 'curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash';
     const installHermesIfMissing = [
         'installHermesIfMissing() {',
         'HERMES_CMD="$(resolveHermesCommand 2>/dev/null || true)";',
         'if [ -n "$HERMES_CMD" ]; then echo "Hermes already installed:"; "$HERMES_CMD" --version 2>/dev/null || true; return 0; fi;',
-        `${install};`,
-        'HERMES_CMD="$(resolveHermesCommand 2>/dev/null || true)";',
-        'if [ -z "$HERMES_CMD" ]; then echo "Hermes installed, but the hermes command could not be found. Reload PATH and retry." >&2; exit 127; fi;',
+        'echo "Hermes is not installed. Use Pixcode Settings > Hermes Agent > Install or repair, then start again." >&2;',
+        'exit 127;',
         '}',
     ].join(' ');
     if (kind === 'pixcode:hermes:install') {
@@ -540,7 +557,11 @@ adapterRegistry.register(new OpenCodeA2AAdapter());
 app.use('/hermes', createHermesTaskRouter());
 app.use('/preview', authenticateToken, createPreviewProxyRouter());
 app.use('/api/orchestration', authenticateToken, createOrchestrationTaskRouter());
-app.use('/api/orchestration/hermes', authenticateToken, createHermesRouter());
+app.use('/api/orchestration/hermes', authenticateToken, createHermesRouter({
+    appRoot: APP_ROOT,
+    createHermesApiKey: getOrCreateHermesApiKey,
+    resolvePublicBaseUrl,
+}));
 app.use('/api/orchestration', authenticateToken, createWorkflowRouter());
 app.use('/live', createLiveViewPublicRouter());
 // Network discovery / QR endpoints (protected)