@pixelbyte-software/pixcode 1.33.11 → 1.35.0

package/dist-server/server/modules/orchestration/workspace/types.js

@@ -0,0 +1,11 @@
+export class WorkspaceError extends Error {
+    code;
+    details;
+    constructor(code, message, details = {}) {
+        super(message);
+        this.code = code;
+        this.details = details;
+        this.name = 'WorkspaceError';
+    }
+}
+//# sourceMappingURL=types.js.map

package/dist-server/server/modules/orchestration/workspace/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../server/modules/orchestration/workspace/types.ts"],"names":[],"mappings":"AA0CA,MAAM,OAAO,cAAe,SAAQ,KAAK;IAErB;IAEA;IAHlB,YACkB,IAAY,EAC5B,OAAe,EACC,UAAmC,EAAE;QAErD,KAAK,CAAC,OAAO,CAAC,CAAC;QAJC,SAAI,GAAJ,IAAI,CAAQ;QAEZ,YAAO,GAAP,OAAO,CAA8B;QAGrD,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAC/B,CAAC;CACF"}

package/dist-server/server/modules/orchestration/workspace/workspace-manager.js

@@ -0,0 +1,80 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { DockerWorkspace } from '../../../modules/orchestration/workspace/docker-workspace.js';
+import { safeJoin } from '../../../modules/orchestration/workspace/path-safety.js';
+import { WorktreeWorkspace } from '../../../modules/orchestration/workspace/worktree-workspace.js';
+class HostWorkspace {
+    kind = 'host';
+    id;
+    path;
+    baseRef;
+    metadata;
+    constructor(request) {
+        this.id = `host_${request.taskId}`;
+        this.path = request.projectPath;
+        this.baseRef = request.baseRef ?? 'HEAD';
+        this.metadata = { ...request.metadata, keepAfterCompletion: true };
+    }
+    async exec(command, args = []) {
+        const { execFile } = await import('node:child_process');
+        const { promisify } = await import('node:util');
+        const execFileAsync = promisify(execFile);
+        try {
+            const { stdout, stderr } = await execFileAsync(command, args, {
+                cwd: this.path,
+                maxBuffer: 20 * 1024 * 1024,
+            });
+            return { stdout: String(stdout), stderr: String(stderr), exitCode: 0 };
+        }
+        catch (error) {
+            const err = error;
+            return {
+                stdout: String(err.stdout ?? ''),
+                stderr: String(err.stderr ?? err.message),
+                exitCode: typeof err.code === 'number' ? err.code : 1,
+            };
+        }
+    }
+    async readFile(relativePath) {
+        return fs.promises.readFile(safeJoin(this.path, relativePath), 'utf8');
+    }
+    async writeFile(relativePath, content) {
+        const target = safeJoin(this.path, relativePath);
+        await fs.promises.mkdir(path.dirname(target), { recursive: true });
+        await fs.promises.writeFile(target, content, 'utf8');
+    }
+    async diff() {
+        const result = await this.exec('git', ['diff', `${this.baseRef}...HEAD`]);
+        return result.exitCode === 0 ? result.stdout : result.stderr || result.stdout;
+    }
+    destroy() {
+        return Promise.resolve();
+    }
+}
+function readKind(value) {
+    return value === 'host' || value === 'docker' || value === 'worktree' ? value : 'worktree';
+}
+class WorkspaceManager {
+    async create(request) {
+        const kind = readKind(request.kind);
+        if (kind === 'host') {
+            return new HostWorkspace(request);
+        }
+        if (kind === 'docker') {
+            return new DockerWorkspace(request);
+        }
+        return WorktreeWorkspace.create(request);
+    }
+    recover(request) {
+        return new HostWorkspace({
+            ...request,
+            kind: 'host',
+            metadata: {
+                ...request.metadata,
+                recovered: true,
+            },
+        });
+    }
+}
+export const workspaceManager = new WorkspaceManager();
+//# sourceMappingURL=workspace-manager.js.map

package/dist-server/server/modules/orchestration/workspace/workspace-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-manager.js","sourceRoot":"","sources":["../../../../../server/modules/orchestration/workspace/workspace-manager.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/orchestration/workspace/worktree-workspace.js

@@ -0,0 +1,96 @@
+import { execFile } from 'node:child_process';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { promisify } from 'node:util';
+import { assertSafeId, safeJoin, safeWorkspacePath } from '../../../modules/orchestration/workspace/path-safety.js';
+import { WorkspaceError } from '../../../modules/orchestration/workspace/types.js';
+const execFileAsync = promisify(execFile);
+async function run(command, args, cwd) {
+    try {
+        const { stdout, stderr } = await execFileAsync(command, args, {
+            cwd,
+            maxBuffer: 20 * 1024 * 1024,
+        });
+        return {
+            stdout: String(stdout),
+            stderr: String(stderr),
+            exitCode: 0,
+        };
+    }
+    catch (error) {
+        const err = error;
+        return {
+            stdout: String(err.stdout ?? ''),
+            stderr: String(err.stderr ?? err.message),
+            exitCode: typeof err.code === 'number' ? err.code : 1,
+        };
+    }
+}
+export class WorktreeWorkspace {
+    kind = 'worktree';
+    id;
+    path;
+    baseRef;
+    branchName;
+    metadata;
+    projectPath;
+    constructor(request, workspaceId, branchName) {
+        this.id = workspaceId;
+        this.path = safeWorkspacePath(workspaceId);
+        this.baseRef = request.baseRef ?? 'HEAD';
+        this.branchName = branchName;
+        this.projectPath = request.projectPath;
+        this.metadata = {
+            ...request.metadata,
+            keepAfterCompletion: request.keepAfterCompletion === true,
+        };
+    }
+    static async create(request) {
+        assertSafeId(request.taskId, 'task id');
+        const workspaceId = `ws_${request.taskId}`;
+        const branchName = `pixcode/task_${request.taskId}`;
+        const workspace = new WorktreeWorkspace(request, workspaceId, branchName);
+        const existingBranch = await run('git', ['rev-parse', '--verify', branchName], request.projectPath);
+        if (existingBranch.exitCode === 0) {
+            throw new WorkspaceError('WORKSPACE_EXISTS', `Workspace branch already exists: ${branchName}`, {
+                branchName,
+            });
+        }
+        const result = await run('git', ['worktree', 'add', workspace.path, '-b', branchName, workspace.baseRef], request.projectPath);
+        if (result.exitCode !== 0) {
+            throw new WorkspaceError('WORKSPACE_CREATE_FAILED', result.stderr || result.stdout, {
+                stdout: result.stdout,
+                stderr: result.stderr,
+                baseRef: workspace.baseRef,
+            });
+        }
+        return workspace;
+    }
+    exec(command, args = []) {
+        return run(command, args, this.path);
+    }
+    async readFile(relativePath) {
+        return fs.readFile(safeJoin(this.path, relativePath), 'utf8');
+    }
+    async writeFile(relativePath, content) {
+        const target = safeJoin(this.path, relativePath);
+        await fs.mkdir(path.dirname(target), { recursive: true });
+        await fs.writeFile(target, content, 'utf8');
+    }
+    async diff() {
+        const result = await run('git', ['diff', `${this.baseRef}...HEAD`], this.path);
+        if (result.exitCode !== 0) {
+            return result.stderr || result.stdout;
+        }
+        return result.stdout;
+    }
+    async destroy() {
+        const result = await run('git', ['worktree', 'remove', '--force', this.path], this.projectPath);
+        if (result.exitCode !== 0) {
+            throw new WorkspaceError('WORKSPACE_DESTROY_FAILED', result.stderr || result.stdout, {
+                workspacePath: this.path,
+            });
+        }
+    }
+}
+//# sourceMappingURL=worktree-workspace.js.map

package/dist-server/server/modules/orchestration/workspace/worktree-workspace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-workspace.js","sourceRoot":"","sources":["../../../../../server/modules/orchestration/workspace/worktree-workspace.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/index.js

@@ -0,0 +1,3 @@
+export { providerRegistry } from './provider.registry.js';
+export { CodexSessionsProvider } from './list/codex/codex-sessions.provider.js';
+//# sourceMappingURL=index.js.map

package/dist-server/server/modules/providers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/modules/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC"}

package/dist-server/server/openai-codex.js

@@ -12,6 +12,8 @@
  * - isCodexSessionActive(sessionId) - Check if a session is running
  * - getActiveCodexSessions() - List all active sessions
  */
+import { accessSync, constants } from 'node:fs';
+import path from 'node:path';
 import { Codex } from '@openai/codex-sdk';
 import { notifyRunFailed, notifyRunStopped } from './services/notification-orchestrator.js';
 import { sessionsService } from './modules/providers/services/sessions.service.js';
@@ -19,6 +21,31 @@ import { providerAuthService } from './modules/providers/services/provider-auth.
 import { createNormalizedMessage } from './shared/utils.js';
 // Track active sessions
 const activeCodexSessions = new Map();
+function isExecutable(filePath) {
+    try {
+        accessSync(filePath, constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function resolveCodexPathOverride() {
+    const configuredPath = process.env.CODEX_CLI_PATH || process.env.CODEX_PATH;
+    if (configuredPath && isExecutable(configuredPath)) {
+        return configuredPath;
+    }
+    const pathCandidates = (process.env.PATH || '')
+        .split(path.delimiter)
+        .filter(Boolean)
+        .map((entry) => path.join(entry, 'codex'));
+    return [
+        ...pathCandidates,
+        '/root/.npm-global/bin/codex',
+        '/usr/local/bin/codex',
+        '/usr/bin/codex',
+    ].find(isExecutable);
+}
 /**
  * Transform Codex SDK event to WebSocket message format
  * @param {object} event - SDK event
@@ -183,15 +210,19 @@ export async function queryCodex(command, options = {}, ws) {
     const abortController = new AbortController();
     try {
         // Initialize Codex SDK
-        codex = new Codex();
-        // Thread options with sandbox and approval settings
+        const codexPathOverride = resolveCodexPathOverride();
+        codex = new Codex(codexPathOverride ? { codexPathOverride } : undefined);
+        // Thread options with sandbox and approval settings. Do not pass a blank
+        // model: the SDK may resolve it to a hard default instead of CLI settings.
         const threadOptions = {
             workingDirectory,
             skipGitRepoCheck: true,
             sandboxMode,
-            approvalPolicy,
-            model
+            approvalPolicy
         };
+        if (typeof model === 'string' && model.trim()) {
+            threadOptions.model = model.trim();
+        }
         // Start or resume thread
         if (sessionId) {
             thread = codex.resumeThread(sessionId, threadOptions);

package/dist-server/server/openai-codex.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai-codex.js","sourceRoot":"","sources":["../../server/openai-codex.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai-codex.js","sourceRoot":"","sources":["../../server/openai-codex.js"],"names":[],"mappings":"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"}

package/dist-server/server/routes/taskmaster.js

@@ -15,6 +15,7 @@ import { spawn } from 'child_process';
 import { extractProjectDirectory } from '../projects.js';
 import { detectTaskMasterMCPServer } from '../utils/mcp-detector.js';
 import { broadcastTaskMasterProjectUpdate, broadcastTaskMasterTasksUpdate } from '../utils/taskmaster-websocket.js';
+import { orchestrationTaskService } from '../modules/orchestration/tasks/orchestration-task.service.js';
 const router = express.Router();
 /**
  * Check if TaskMaster CLI is installed globally
@@ -82,6 +83,48 @@ async function checkTaskMasterInstallation() {
         });
     });
 }
+async function readTaskMasterTasks(projectName) {
+    const projectPath = await extractProjectDirectory(projectName);
+    const tasksFilePath = path.join(projectPath, '.taskmaster', 'tasks', 'tasks.json');
+    await fsPromises.access(tasksFilePath);
+    const tasksContent = await fsPromises.readFile(tasksFilePath, 'utf8');
+    const tasksData = JSON.parse(tasksContent);
+    let tasks = [];
+    let currentTag = 'master';
+    if (Array.isArray(tasksData)) {
+        tasks = tasksData;
+    }
+    else if (tasksData.tasks) {
+        tasks = tasksData.tasks;
+    }
+    else if (tasksData[currentTag] && tasksData[currentTag].tasks) {
+        tasks = tasksData[currentTag].tasks;
+    }
+    else if (tasksData.master && tasksData.master.tasks) {
+        tasks = tasksData.master.tasks;
+    }
+    else {
+        const firstTag = Object.keys(tasksData).find((key) => tasksData[key].tasks && Array.isArray(tasksData[key].tasks));
+        if (firstTag) {
+            tasks = tasksData[firstTag].tasks;
+            currentTag = firstTag;
+        }
+    }
+    const transformedTasks = tasks.map((task) => ({
+        id: task.id,
+        title: task.title || 'Untitled Task',
+        description: task.description || '',
+        status: task.status || 'pending',
+        priority: task.priority || 'medium',
+        dependencies: task.dependencies || [],
+        createdAt: task.createdAt || task.created || new Date().toISOString(),
+        updatedAt: task.updatedAt || task.updated || new Date().toISOString(),
+        details: task.details || '',
+        testStrategy: task.testStrategy || task.test_strategy || '',
+        subtasks: task.subtasks || []
+    }));
+    return { projectPath, transformedTasks, currentTag };
+}
 // API Routes
 /**
  * GET /api/taskmaster/installation-status
@@ -123,102 +166,38 @@ router.get('/installation-status', async (req, res) => {
 router.get('/tasks/:projectName', async (req, res) => {
     try {
         const { projectName } = req.params;
-        // Get project path
-        let projectPath;
-        try {
-            projectPath = await extractProjectDirectory(projectName);
-        }
-        catch (error) {
-            return res.status(404).json({
-                error: 'Project not found',
-                message: `Project "${projectName}" does not exist`
-            });
-        }
-        const taskMasterPath = path.join(projectPath, '.taskmaster');
-        const tasksFilePath = path.join(taskMasterPath, 'tasks', 'tasks.json');
-        // Check if tasks file exists
-        try {
-            await fsPromises.access(tasksFilePath);
-        }
-        catch (error) {
+        const { projectPath, transformedTasks, currentTag } = await readTaskMasterTasks(projectName);
+        res.json({
+            projectName,
+            projectPath,
+            tasks: transformedTasks,
+            currentTag,
+            totalTasks: transformedTasks.length,
+            tasksByStatus: {
+                pending: transformedTasks.filter(t => t.status === 'pending').length,
+                'in-progress': transformedTasks.filter(t => t.status === 'in-progress').length,
+                done: transformedTasks.filter(t => t.status === 'done').length,
+                review: transformedTasks.filter(t => t.status === 'review').length,
+                deferred: transformedTasks.filter(t => t.status === 'deferred').length,
+                cancelled: transformedTasks.filter(t => t.status === 'cancelled').length
+            },
+            timestamp: new Date().toISOString()
+        });
+    }
+    catch (error) {
+        if (error?.code === 'ENOENT') {
             return res.json({
-                projectName,
+                projectName: req.params.projectName,
                 tasks: [],
                 message: 'No tasks.json file found'
             });
         }
-        // Read and parse tasks file
-        try {
-            const tasksContent = await fsPromises.readFile(tasksFilePath, 'utf8');
-            const tasksData = JSON.parse(tasksContent);
-            let tasks = [];
-            let currentTag = 'master';
-            // Handle both tagged and legacy formats
-            if (Array.isArray(tasksData)) {
-                // Legacy format
-                tasks = tasksData;
-            }
-            else if (tasksData.tasks) {
-                // Simple format with tasks array
-                tasks = tasksData.tasks;
-            }
-            else {
-                // Tagged format - get tasks from current tag or master
-                if (tasksData[currentTag] && tasksData[currentTag].tasks) {
-                    tasks = tasksData[currentTag].tasks;
-                }
-                else if (tasksData.master && tasksData.master.tasks) {
-                    tasks = tasksData.master.tasks;
-                }
-                else {
-                    // Get tasks from first available tag
-                    const firstTag = Object.keys(tasksData).find(key => tasksData[key].tasks && Array.isArray(tasksData[key].tasks));
-                    if (firstTag) {
-                        tasks = tasksData[firstTag].tasks;
-                        currentTag = firstTag;
-                    }
-                }
-            }
-            // Transform tasks to ensure all have required fields
-            const transformedTasks = tasks.map(task => ({
-                id: task.id,
-                title: task.title || 'Untitled Task',
-                description: task.description || '',
-                status: task.status || 'pending',
-                priority: task.priority || 'medium',
-                dependencies: task.dependencies || [],
-                createdAt: task.createdAt || task.created || new Date().toISOString(),
-                updatedAt: task.updatedAt || task.updated || new Date().toISOString(),
-                details: task.details || '',
-                testStrategy: task.testStrategy || task.test_strategy || '',
-                subtasks: task.subtasks || []
-            }));
-            res.json({
-                projectName,
-                projectPath,
-                tasks: transformedTasks,
-                currentTag,
-                totalTasks: transformedTasks.length,
-                tasksByStatus: {
-                    pending: transformedTasks.filter(t => t.status === 'pending').length,
-                    'in-progress': transformedTasks.filter(t => t.status === 'in-progress').length,
-                    done: transformedTasks.filter(t => t.status === 'done').length,
-                    review: transformedTasks.filter(t => t.status === 'review').length,
-                    deferred: transformedTasks.filter(t => t.status === 'deferred').length,
-                    cancelled: transformedTasks.filter(t => t.status === 'cancelled').length
-                },
-                timestamp: new Date().toISOString()
-            });
-        }
-        catch (parseError) {
-            console.error('Failed to parse tasks.json:', parseError);
-            return res.status(500).json({
-                error: 'Failed to parse tasks file',
-                message: parseError.message
+        if (String(error?.message || '').includes('does not exist')) {
+            return res.status(404).json({
+                error: 'Project not found',
+                message: `Project "${req.params.projectName}" does not exist`
             });
         }
-    }
-    catch (error) {
         console.error('TaskMaster tasks loading error:', error);
         res.status(500).json({
             error: 'Failed to load TaskMaster tasks',
@@ -226,6 +205,44 @@ router.get('/tasks/:projectName', async (req, res) => {
         });
     }
 });
+/**
+ * POST /api/taskmaster/sync-orchestration/:projectName
+ * One-way sync: TaskMaster -> Orchestration tasks
+ */
+router.post('/sync-orchestration/:projectName', async (req, res) => {
+    try {
+        const { projectName } = req.params;
+        const { transformedTasks } = await readTaskMasterTasks(projectName);
+        const projectId = typeof req.body?.projectId === 'string' && req.body.projectId.trim()
+            ? req.body.projectId.trim()
+            : projectName;
+        const syncedTasks = transformedTasks.map((task) => orchestrationTaskService.upsertFromTaskMaster({
+            projectId,
+            taskmasterId: String(task.id),
+            title: task.title,
+            description: task.description,
+        }));
+        res.json({
+            success: true,
+            projectName,
+            projectId,
+            synced: syncedTasks.length,
+            tasks: syncedTasks,
+            timestamp: new Date().toISOString(),
+        });
+    }
+    catch (error) {
+        if (error?.code === 'ENOENT') {
+            return res.json({ success: true, projectName: req.params.projectName, synced: 0, tasks: [] });
+        }
+        console.error('TaskMaster orchestration sync error:', error);
+        res.status(500).json({
+            success: false,
+            error: 'Failed to sync TaskMaster tasks to orchestration',
+            message: error.message,
+        });
+    }
+});
 /**
  * GET /api/taskmaster/prd/:projectName
  * List all PRD files in the project's .taskmaster/docs directory