@pixelbyte-software/pixcode 1.34.0 → 1.35.0

package/server/database/json-store.js

@@ -29,7 +29,7 @@ import path from 'node:path';
 const CURRENT_VERSION = 1;
 
 // Tables the store manages — empty arrays on a fresh file.
-const EMPTY_STORE = () => ({
+const EMPTY_STORE = (extraTables = {}) => ({
   _version: CURRENT_VERSION,
   _sequences: {
     users: 0,
@@ -37,6 +37,7 @@ const EMPTY_STORE = () => ({
     user_credentials: 0,
     vapid_keys: 0,
     push_subscriptions: 0,
+    ...Object.fromEntries(Object.keys(extraTables).map((k) => [k, 0])),
   },
   users: [],
   api_keys: [],
@@ -48,12 +49,14 @@ const EMPTY_STORE = () => ({
   app_config: [], // each row: { key, value, created_at }
   telegram_config: [], // 0 or 1 row: { id=1, bot_token, bot_username, updated_at }
   telegram_links: [], // each row: { user_id, chat_id, ... }
+  ...Object.fromEntries(Object.entries(extraTables).map(([k, v]) => [k, v ?? []])),
 });
 
 export class JsonStore {
-  constructor(filePath) {
+  constructor(filePath, extraTables = {}) {
     this.filePath = filePath;
     this.tmpPath = `${filePath}.tmp`;
+    this.extraTables = extraTables;
     this.data = null;
     this._ensureLoaded();
   }
@@ -69,7 +72,7 @@ export class JsonStore {
     }
 
     if (!fs.existsSync(this.filePath)) {
-      this.data = EMPTY_STORE();
+      this.data = EMPTY_STORE(this.extraTables);
       this._flush();
       return;
     }
@@ -79,7 +82,7 @@ export class JsonStore {
       const parsed = JSON.parse(raw);
       // Fill missing keys from EMPTY_STORE so adding a new "table" in a
       // later schema doesn't crash a fresh deploy reading an old file.
-      this.data = { ...EMPTY_STORE(), ...parsed };
+      this.data = { ...EMPTY_STORE(this.extraTables), ...parsed };
       // Ensure each well-known array key is actually an array — defends
       // against a hand-edited file that set one to null or an object.
       const empty = EMPTY_STORE();
@@ -96,7 +99,7 @@ export class JsonStore {
       const backup = `${this.filePath}.corrupt-${Date.now()}`;
       console.error(`[JsonStore] Failed to read ${this.filePath}: ${err.message}. Backing up to ${backup}.`);
       try { fs.renameSync(this.filePath, backup); } catch { /* noop */ }
-      this.data = EMPTY_STORE();
+      this.data = EMPTY_STORE(this.extraTables);
       this._flush();
     }
   }

package/server/index.js

@@ -75,6 +75,14 @@ import {
   createA2ARouter,
   adapterRegistry,
   ClaudeCodeA2AAdapter,
+  CodexA2AAdapter,
+  CursorA2AAdapter,
+  GeminiA2AAdapter,
+  OpenCodeA2AAdapter,
+  QwenA2AAdapter,
+  createPreviewProxyRouter,
+  createOrchestrationTaskRouter,
+  createWorkflowRouter,
 } from './modules/orchestration/index.js';
 import networkRoutes from './routes/network.js';
 import telegramRoutes from './routes/telegram.js';
@@ -383,7 +391,15 @@ app.use('/api/providers', authenticateToken, providerRoutes);
 
 // A2A protocol router — has its own auth middleware, do NOT wrap with authenticateToken
 adapterRegistry.register(new ClaudeCodeA2AAdapter());
+adapterRegistry.register(new CodexA2AAdapter());
+adapterRegistry.register(new CursorA2AAdapter());
+adapterRegistry.register(new GeminiA2AAdapter());
+adapterRegistry.register(new QwenA2AAdapter());
+adapterRegistry.register(new OpenCodeA2AAdapter());
 app.use('/a2a', createA2ARouter());
+app.use('/preview', authenticateToken, createPreviewProxyRouter());
+app.use('/api/orchestration', authenticateToken, createOrchestrationTaskRouter());
+app.use('/api/orchestration', authenticateToken, createWorkflowRouter());
 
 // Network discovery / QR endpoints (protected)
 app.use('/api/network', authenticateToken, networkRoutes);
@@ -2831,6 +2847,7 @@ const SERVER_PORT = process.env.SERVER_PORT || 3001;
 const HOST = process.env.HOST || '0.0.0.0';
 const DISPLAY_HOST = getConnectableHost(HOST);
 const VITE_PORT = process.env.VITE_PORT || 5173;
+const SEPARATE_FRONTEND = process.env.PIXCODE_SEPARATE_FRONTEND === '1';
 
 async function isPortOpen(port, timeoutMs = 800) {
     return await new Promise((resolve) => {
@@ -2882,7 +2899,17 @@ function printSystemDaemonActiveNotice(port) {
     console.log(`${c.info('[INFO]')} Logs: ${c.bright(logsCommand)}`);
 }
 
-function printUserDaemonActiveNotice(port, frontendPort) {
+function daemonFrontendArgs() {
+    return SEPARATE_FRONTEND
+        ? ['--frontend-port', String(VITE_PORT)]
+        : ['--single-port'];
+}
+
+function daemonInstallArgs(mode) {
+    return ['install', '--mode', mode, '--port', String(SERVER_PORT), ...daemonFrontendArgs()];
+}
+
+function printUserDaemonActiveNotice(port, frontendPort, frontendEnabled = SEPARATE_FRONTEND) {
     const effectivePort = Number(port) || 3001;
     const effectiveFrontendPort = Number(frontendPort) || 5173;
     const statusCommand = buildDaemonCliCommand(
@@ -2898,8 +2925,10 @@ function printUserDaemonActiveNotice(port, frontendPort) {
         DAEMON_COMMAND_CONTEXT
     );
     console.log(`${c.ok('[OK]')} User daemon is active for this account.`);
-    console.log(`${c.info('[INFO]')} Backend: ${c.bright(`http://localhost:${effectivePort}`)}`);
-    console.log(`${c.info('[INFO]')} Frontend: ${c.bright(`http://localhost:${effectiveFrontendPort}`)}`);
+    console.log(`${c.info('[INFO]')} App URL: ${c.bright(`http://localhost:${effectivePort}`)}`);
+    if (frontendEnabled) {
+        console.log(`${c.info('[INFO]')} Frontend: ${c.bright(`http://localhost:${effectiveFrontendPort}`)}`);
+    }
     console.log(`${c.info('[INFO]')} Status: ${c.bright(statusCommand)}`);
     console.log(`${c.info('[INFO]')} Stop: ${c.bright(stopCommand)}`);
     console.log(`${c.info('[INFO]')} Logs: ${c.bright(logsCommand)}`);
@@ -2919,8 +2948,8 @@ async function maybeAutoDaemonBootstrapFromIndex() {
 
     process.env.PIXCODE_DAEMON_ATTEMPTED = '1';
 
-    const systemArgs = ['install', '--mode=system', '--port', String(SERVER_PORT), '--frontend-port', String(VITE_PORT)];
-    const userArgs = ['install', '--mode=user', '--port', String(SERVER_PORT), '--frontend-port', String(VITE_PORT)];
+    const systemArgs = daemonInstallArgs('system');
+    const userArgs = daemonInstallArgs('user');
 
     try {
         console.log(`${c.info('[INFO]')} Linux detected. Enforcing system daemon mode for Pixcode...`);
@@ -2944,7 +2973,7 @@ async function maybeAutoDaemonBootstrapFromIndex() {
                 {
                     subcommand: 'install',
                     mode: 'system',
-                    extraArgs: ['--port', String(SERVER_PORT), '--frontend-port', String(VITE_PORT)],
+                    extraArgs: ['--port', String(SERVER_PORT), ...daemonFrontendArgs()],
                 },
                 DAEMON_COMMAND_CONTEXT
             );
@@ -2978,7 +3007,7 @@ async function maybeAutoDaemonBootstrapFromIndex() {
                 {
                     subcommand: 'install',
                     mode: 'system',
-                    extraArgs: ['--port', String(SERVER_PORT), '--frontend-port', String(VITE_PORT)],
+                    extraArgs: ['--port', String(SERVER_PORT), ...daemonFrontendArgs()],
                 },
                 DAEMON_COMMAND_CONTEXT
             );
@@ -2986,7 +3015,7 @@ async function maybeAutoDaemonBootstrapFromIndex() {
                 {
                     subcommand: 'install',
                     mode: 'user',
-                    extraArgs: ['--port', String(SERVER_PORT), '--frontend-port', String(VITE_PORT)],
+                    extraArgs: ['--port', String(SERVER_PORT), ...daemonFrontendArgs()],
                 },
                 DAEMON_COMMAND_CONTEXT
             );
@@ -3054,7 +3083,9 @@ async function startServer() {
             console.log(`${c.info('[INFO]')} To run in production mode, go to http://${DISPLAY_HOST}:${SERVER_PORT}`);            
         }
 
-        console.log(`${c.info('[INFO]')} To run in development mode with hot-module replacement, go to http://${DISPLAY_HOST}:${VITE_PORT}`);
+        if (SEPARATE_FRONTEND) {
+            console.log(`${c.info('[INFO]')} To run in development mode with hot-module replacement, go to http://${DISPLAY_HOST}:${VITE_PORT}`);
+        }
    
         server.listen(SERVER_PORT, HOST, async () => {
             const appInstallPath = APP_ROOT;

package/server/modules/orchestration/a2a/adapter-registry.ts

@@ -1,58 +1,108 @@
-// server/modules/orchestration/a2a/adapter-registry.ts
-// In-process registry mapping adapter ids to AbstractA2AAdapter
-// instances. Resolution supports three id forms:
-//   - "claude-code"        explicit
-//   - "skill:<skillId>"    first REGISTERED adapter advertising that skill
-//                          (Map iteration is insertion-ordered per ES spec).
-//   - "auto"               first registered adapter (placeholder until
-//                          AI-suggested routing arrives in a later plan)
-
-import type { AbstractA2AAdapter } from '@/modules/orchestration/a2a/adapters/abstract-a2a.adapter.js';
-import type { AgentCard } from '@/modules/orchestration/a2a/types.js';
-
-class AdapterRegistry {
-  // Map iteration order is insertion-ordered (ES spec); auto and skill: resolution depend on this.
-  private readonly byId = new Map<string, AbstractA2AAdapter>();
-
-  register(adapter: AbstractA2AAdapter): void {
-    if (this.byId.has(adapter.id)) {
-      throw new Error(`A2A adapter already registered: ${adapter.id}`);
-    }
-    this.byId.set(adapter.id, adapter);
-  }
-
-  get(idOrSelector: string): AbstractA2AAdapter | undefined {
-    if (idOrSelector === 'auto') {
-      if (this.byId.size > 1) {
-        throw new Error(
-          'A2A adapter selector "auto" is not yet implemented for multi-adapter registries. ' +
-          'Pass an explicit adapter id ("claude-code") or a "skill:<id>" selector. ' +
-          'AI-suggested routing will replace this stub in a later plan.',
-        );
-      }
-      const first = this.byId.values().next().value;
-      return first ?? undefined;
-    }
-    if (idOrSelector.startsWith('skill:')) {
-      const skill = idOrSelector.slice('skill:'.length);
-      for (const adapter of this.byId.values()) {
-        if (adapter.agentCard.skills.some((s) => s.id === skill)) {
-          return adapter;
-        }
-      }
-      return undefined;
-    }
-    return this.byId.get(idOrSelector);
-  }
-
-  list(): AbstractA2AAdapter[] {
-    return [...this.byId.values()];
-  }
-
-  agentCards(): AgentCard[] {
-    return this.list().map((a) => a.agentCard);
-  }
-}
-
-export const adapterRegistry = new AdapterRegistry();
-export type { AdapterRegistry };
+// server/modules/orchestration/a2a/adapter-registry.ts
+// In-process registry mapping adapter ids to AbstractA2AAdapter
+// instances. Resolution supports three id forms:
+//   - "claude-code"        explicit
+//   - "skill:<skillId>"    first REGISTERED adapter advertising that skill
+//                          (Map iteration is insertion-ordered per ES spec).
+//   - "auto"               first registered adapter (deterministic fallback
+//                          until smarter routing arrives in a later plan)
+
+import type { AbstractA2AAdapter } from '@/modules/orchestration/a2a/adapters/abstract-a2a.adapter.js';
+import type { AgentCard } from '@/modules/orchestration/a2a/types.js';
+
+interface ResolveAdapterOptions {
+  preferredAdapterId?: string;
+  preferredProvider?: string;
+  preferredSkillId?: string;
+}
+
+class AdapterRegistry {
+  // Map iteration order is insertion-ordered (ES spec); auto and skill: resolution depend on this.
+  private readonly byId = new Map<string, AbstractA2AAdapter>();
+
+  register(adapter: AbstractA2AAdapter): void {
+    if (this.byId.has(adapter.id)) {
+      throw new Error(`A2A adapter already registered: ${adapter.id}`);
+    }
+    this.byId.set(adapter.id, adapter);
+  }
+
+  get(id: string): AbstractA2AAdapter | undefined {
+    return this.byId.get(id);
+  }
+
+  resolve(idOrSelector: string, options: ResolveAdapterOptions = {}): AbstractA2AAdapter | undefined {
+    const normalizedSelector = idOrSelector.trim();
+    if (!normalizedSelector) {
+      return undefined;
+    }
+
+    if (normalizedSelector === 'auto') {
+      return this.pickPreferred(this.list(), options);
+    }
+
+    if (normalizedSelector.startsWith('skill:')) {
+      const skill = normalizedSelector.slice('skill:'.length);
+      const matches = this.list().filter((adapter) =>
+        adapter.agentCard.skills.some((s) => s.id === skill),
+      );
+      if (matches.length === 0) {
+        return undefined;
+      }
+      return this.pickPreferred(matches, {
+        ...options,
+        preferredSkillId: options.preferredSkillId ?? skill,
+      });
+    }
+
+    return this.byId.get(normalizedSelector);
+  }
+
+  list(): AbstractA2AAdapter[] {
+    return [...this.byId.values()];
+  }
+
+  agentCards(): AgentCard[] {
+    return this.list().map((a) => a.agentCard);
+  }
+
+  private pickPreferred(
+    adapters: AbstractA2AAdapter[],
+    options: ResolveAdapterOptions,
+  ): AbstractA2AAdapter | undefined {
+    const {
+      preferredAdapterId,
+      preferredProvider,
+      preferredSkillId,
+    } = options;
+
+    if (preferredAdapterId) {
+      const byAdapterId = adapters.find((adapter) => adapter.id === preferredAdapterId);
+      if (byAdapterId) {
+        return byAdapterId;
+      }
+    }
+
+    if (preferredProvider) {
+      const normalizedProvider = preferredProvider.trim().toLowerCase();
+      const byProvider = adapters.find((adapter) => adapter.id === normalizedProvider);
+      if (byProvider) {
+        return byProvider;
+      }
+    }
+
+    if (preferredSkillId) {
+      const bySkill = adapters.find((adapter) =>
+        adapter.agentCard.skills.some((skill) => skill.id === preferredSkillId),
+      );
+      if (bySkill) {
+        return bySkill;
+      }
+    }
+
+    return adapters[0];
+  }
+}
+
+export const adapterRegistry = new AdapterRegistry();
+export type { AdapterRegistry, ResolveAdapterOptions };

package/server/modules/orchestration/a2a/adapters/abstract-a2a.adapter.ts

@@ -1,49 +1,55 @@
-// server/modules/orchestration/a2a/adapters/abstract-a2a.adapter.ts
-// Base class every CLI adapter extends. Adapters wrap the
-// existing per-CLI runtime files (claude-sdk.js, openai-codex.js, ...)
-// and translate between A2A messages and the CLI's native I/O.
-
-import { a2aBus } from '@/modules/orchestration/a2a/bus.js';
-import type {
-  AgentCard,
-  Artifact,
-  Message,
-  Task,
-  TaskError,
-  TaskState,
-} from '@/modules/orchestration/a2a/types.js';
-
-export interface AdapterContext {
-  /** Where the adapter executes — for now this is the project cwd; a future
-   *  plan introduces WorkspaceHandle (worktree / docker). */
-  cwd: string;
-  /** pixcode permission mode passed through to the underlying CLI. */
-  permissionMode?: 'acceptEdits' | 'plan' | 'bypassPermissions' | 'default';
-  /** Optional parent task id when this adapter is invoked inside a workflow. */
-  parentTaskId?: string;
-}
-
-export interface TaskHandle {
-  cancel(): Promise<void>;
-  finished: Promise<void>;
-}
-
-export abstract class AbstractA2AAdapter {
-  abstract readonly id: string;
-  abstract readonly agentCard: AgentCard;
-
-  abstract submitTask(task: Task, ctx: AdapterContext): Promise<TaskHandle>;
-  abstract cancelTask(taskId: string): Promise<void>;
-
-  protected emitState(taskId: string, state: TaskState, error?: TaskError): void {
-    a2aBus.publish({ kind: 'task-state', taskId, state, error });
-  }
-
-  protected emitMessage(taskId: string, message: Message): void {
-    a2aBus.publish({ kind: 'message', taskId, message });
-  }
-
-  protected emitArtifact(taskId: string, artifact: Artifact): void {
-    a2aBus.publish({ kind: 'artifact', taskId, artifact });
-  }
-}
+// server/modules/orchestration/a2a/adapters/abstract-a2a.adapter.ts
+// Base class every CLI adapter extends. Adapters wrap the
+// existing per-CLI runtime files (claude-sdk.js, openai-codex.js, ...)
+// and translate between A2A messages and the CLI's native I/O.
+
+import { a2aBus } from '@/modules/orchestration/a2a/bus.js';
+import type {
+  AgentCard,
+  Artifact,
+  Message,
+  Task,
+  TaskError,
+  TaskState,
+} from '@/modules/orchestration/a2a/types.js';
+import type { WorkspaceHandle } from '@/modules/orchestration/workspace/types.js';
+
+export interface AdapterContext {
+  /** Isolated execution workspace for the task. */
+  workspace: WorkspaceHandle;
+  /** Compatibility alias while legacy adapters still accept cwd directly. */
+  cwd: string;
+  /** pixcode permission mode passed through to the underlying CLI. */
+  permissionMode?: string;
+  /** Provider model selected by the user in Pixcode. */
+  model?: string;
+  /** Provider-specific tool / permission settings from Pixcode Settings. */
+  toolsSettings?: Record<string, unknown>;
+  /** Optional parent task id when this adapter is invoked inside a workflow. */
+  parentTaskId?: string;
+}
+
+export interface TaskHandle {
+  cancel(): Promise<void>;
+  finished: Promise<void>;
+}
+
+export abstract class AbstractA2AAdapter {
+  abstract readonly id: string;
+  abstract readonly agentCard: AgentCard;
+
+  abstract submitTask(task: Task, ctx: AdapterContext): Promise<TaskHandle>;
+  abstract cancelTask(taskId: string): Promise<void>;
+
+  protected emitState(taskId: string, state: TaskState, error?: TaskError): void {
+    a2aBus.publish({ kind: 'task-state', taskId, state, error });
+  }
+
+  protected emitMessage(taskId: string, message: Message): void {
+    a2aBus.publish({ kind: 'message', taskId, message });
+  }
+
+  protected emitArtifact(taskId: string, artifact: Artifact): void {
+    a2aBus.publish({ kind: 'artifact', taskId, artifact });
+  }
+}