@pixelbyte-software/pixcode 1.47.4 → 1.48.0

package/scripts/smoke/vscode-workbench-polish.mjs

@@ -41,6 +41,18 @@ assert.match(
   'Projects activity should use a dedicated project-directory panel.',
 );
 
+assert.match(
+  workbench,
+  /function WorkbenchProjectLanding/,
+  'Workbench center should show a project landing page instead of a blank editor when no project is selected.',
+);
+
+assert.match(
+  workbench,
+  /function WorkbenchCliPanel/,
+  'Right workbench pane should use a terminal-only CLI panel.',
+);
+
 assert.doesNotMatch(
   workbench,
   /return <Sidebar \{\.\.\.sidebarProps\} isMobile=\{false\} \/>/,
@@ -59,6 +71,12 @@ assert.match(
   'Projects panel should show file counts.',
 );
 
+assert.match(
+  workbench,
+  /Work in this folder/,
+  'Project cards should make the folder binding explicit.',
+);
+
 assert.match(projectType, /fileCount\?: number/, 'Project type should expose optional fileCount metadata.');
 assert.match(projectsServer, /async function countProjectFiles/, 'Backend should count project files for the workbench project list.');
 
@@ -74,11 +92,7 @@ assert.doesNotMatch(
   'Workbench center panel should be allowed to shrink with narrow three-pane layouts.',
 );
 
-assert.match(
-  workbench,
-  /compactComposer/,
-  'Workbench should request compact composer behavior in the right CLI pane.',
-);
+assert.doesNotMatch(workbench, /<ChatInterface/, 'Workbench should not embed the chat composer in the right CLI pane.');
 
 assert.match(
   workbench,

package/server/index.js

@@ -58,7 +58,6 @@ import sessionManager from './sessionManager.js';
 import gitRoutes from './routes/git.js';
 import authRoutes from './routes/auth.js';
 import cursorRoutes from './routes/cursor.js';
-import taskmasterRoutes from './routes/taskmaster.js';
 import mcpUtilsRoutes from './routes/mcp-utils.js';
 import commandsRoutes from './routes/commands.js';
 import settingsRoutes from './routes/settings.js';
@@ -84,7 +83,7 @@ import platformizationRoutes from './routes/platformization.js';
 import liveViewRoutes, { createLiveViewPublicRouter } from './routes/live-view.js';
 import providerRoutes from './modules/providers/provider.routes.js';
 import {
-  createA2ARouter,
+  createHermesTaskRouter,
   adapterRegistry,
   ClaudeCodeA2AAdapter,
   CodexA2AAdapter,
@@ -94,6 +93,7 @@ import {
   QwenA2AAdapter,
   createPreviewProxyRouter,
   createOrchestrationTaskRouter,
+  createHermesRouter,
   createWorkflowRouter,
 } from './modules/orchestration/index.js';
 import networkRoutes from './routes/network.js';
@@ -370,9 +370,6 @@ app.use('/api/git', authenticateToken, gitRoutes);
 // Cursor API Routes (protected)
 app.use('/api/cursor', authenticateToken, cursorRoutes);
 
-// TaskMaster API Routes (protected)
-app.use('/api/taskmaster', authenticateToken, taskmasterRoutes);
-
 // MCP utilities
 app.use('/api/mcp-utils', authenticateToken, mcpUtilsRoutes);
 
@@ -424,16 +421,17 @@ app.use('/api/live-view', authenticateToken, liveViewRoutes);
 // Unified provider MCP routes (protected)
 app.use('/api/providers', authenticateToken, providerRoutes);
 
-// A2A protocol router — has its own auth middleware, do NOT wrap with authenticateToken
+// Hermes internal task router has its own localhost/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('/hermes', createHermesTaskRouter());
 app.use('/preview', authenticateToken, createPreviewProxyRouter());
 app.use('/api/orchestration', authenticateToken, createOrchestrationTaskRouter());
+app.use('/api/orchestration/hermes', authenticateToken, createHermesRouter());
 app.use('/api/orchestration', authenticateToken, createWorkflowRouter());
 app.use('/live', createLiveViewPublicRouter());
 

package/server/modules/orchestration/a2a/adapters/claude-code.adapter.ts

@@ -49,7 +49,7 @@ export class ClaudeCodeA2AAdapter extends AbstractA2AAdapter {
   readonly agentCard: AgentCard = {
     name: 'pixcode-claude-code',
     description: 'Anthropic Claude Code, accessed via Pixcode',
-    url: '/a2a/agents/claude-code',
+    url: '/hermes/agents/claude-code',
     version: '1.0.0',
     capabilities: ['streaming', 'fileEdit', 'commandExec', 'mcp'],
     skills: [

package/server/modules/orchestration/a2a/adapters/codex.adapter.ts

@@ -40,7 +40,7 @@ export class CodexA2AAdapter extends AbstractA2AAdapter {
   readonly agentCard: AgentCard = {
     name: 'pixcode-codex',
     description: 'OpenAI Codex, accessed via Pixcode',
-    url: '/a2a/agents/codex',
+    url: '/hermes/agents/codex',
     version: '1.0.0',
     capabilities: ['streaming', 'fileEdit', 'commandExec', 'webSearch', 'mcp'],
     skills: [

package/server/modules/orchestration/a2a/adapters/cursor.adapter.ts

@@ -40,7 +40,7 @@ export class CursorA2AAdapter extends AbstractA2AAdapter {
   readonly agentCard: AgentCard = {
     name: 'pixcode-cursor',
     description: 'Cursor CLI, accessed via Pixcode',
-    url: '/a2a/agents/cursor',
+    url: '/hermes/agents/cursor',
     version: '1.0.0',
     capabilities: ['streaming', 'fileEdit', 'commandExec'],
     skills: [

package/server/modules/orchestration/a2a/adapters/gemini.adapter.ts

@@ -40,7 +40,7 @@ export class GeminiA2AAdapter extends AbstractA2AAdapter {
   readonly agentCard: AgentCard = {
     name: 'pixcode-gemini',
     description: 'Google Gemini CLI, accessed via Pixcode',
-    url: '/a2a/agents/gemini',
+    url: '/hermes/agents/gemini',
     version: '1.0.0',
     capabilities: ['streaming', 'fileEdit', 'commandExec', 'mcp'],
     skills: [

package/server/modules/orchestration/a2a/adapters/opencode.adapter.ts

@@ -40,7 +40,7 @@ export class OpenCodeA2AAdapter extends AbstractA2AAdapter {
   readonly agentCard: AgentCard = {
     name: 'pixcode-opencode',
     description: 'OpenCode CLI, accessed via Pixcode',
-    url: '/a2a/agents/opencode',
+    url: '/hermes/agents/opencode',
     version: '1.0.0',
     capabilities: ['streaming', 'fileEdit', 'commandExec', 'multiProvider'],
     skills: [

package/server/modules/orchestration/a2a/adapters/qwen.adapter.ts

@@ -40,7 +40,7 @@ export class QwenA2AAdapter extends AbstractA2AAdapter {
   readonly agentCard: AgentCard = {
     name: 'pixcode-qwen',
     description: 'Qwen Code CLI, accessed via Pixcode',
-    url: '/a2a/agents/qwen',
+    url: '/hermes/agents/qwen',
     version: '1.0.0',
     capabilities: ['streaming', 'fileEdit', 'commandExec', 'mcp'],
     skills: [

package/server/modules/orchestration/a2a/agent-card.ts

@@ -1,6 +1,6 @@
 // server/modules/orchestration/a2a/agent-card.ts
-// Pixcode advertises itself as one A2A agent at /a2a/.well-known/agent-card.json.
-// Per-CLI adapters publish their own cards under /a2a/agents/:id/agent-card.
+// Pixcode advertises Hermes as one local control agent at /hermes/.well-known/agent-card.json.
+// Per-CLI adapters publish their own cards under /hermes/agents/:id/agent-card.
 
 import { readFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
@@ -44,9 +44,9 @@ export function buildPixcodeAgentCard(baseUrl: string): AgentCard {
   return {
     name: 'pixcode',
     description:
-      'Pixcode multi-CLI orchestration platform. Routes A2A tasks to ' +
+      'Pixcode Hermes multi-CLI orchestration platform. Routes Hermes tasks to ' +
       'Claude Code, Codex, Cursor, Gemini, Qwen, or OpenCode adapters.',
-    url: `${baseUrl.replace(/\/$/, '')}/a2a`,
+    url: `${baseUrl.replace(/\/$/, '')}/hermes`,
     version: VERSION,
     capabilities: ['streaming', 'taskRouting'],
     skills,

package/server/modules/orchestration/a2a/routes.ts

@@ -1,5 +1,6 @@
 // server/modules/orchestration/a2a/routes.ts
-// HTTP surface for A2A v0.2. Mounted at /a2a in server/index.js.
+// Internal Hermes task router. The adapter primitives still live in this legacy
+// folder, but the public mount is /hermes.
 
 import crypto from 'node:crypto';
 
@@ -257,7 +258,7 @@ for (const task of taskStore.values()) {
   }
 }
 
-export function createA2ARouter(): Router {
+function createA2ARouter(): Router {
   const router: Router = express.Router();
 
   router.use(express.json({ limit: '5mb' }));
@@ -583,3 +584,7 @@ export function createA2ARouter(): Router {
 
   return router;
 }
+
+export function createHermesTaskRouter(): Router {
+  return createA2ARouter();
+}

package/server/modules/orchestration/hermes/hermes.routes.ts

@@ -0,0 +1,69 @@
+import os from 'node:os';
+
+import express, { type Router } from 'express';
+
+import { adapterRegistry } from '@/modules/orchestration/a2a/adapter-registry.js';
+import { a2aTaskStore as hermesTaskStore } from '@/modules/orchestration/a2a/task-store.js';
+
+export function createHermesRouter(): Router {
+  const router = express.Router();
+
+  router.get('/status', (_req, res) => {
+    res.json({
+      id: 'hermes',
+      name: 'Hermes Agent',
+      product: 'Pixcode',
+      runtime: {
+        mode: process.env.PIXCODE_MANAGED_PLATFORM === '1' ? 'managed' : 'local',
+        host: os.hostname(),
+        node: process.version,
+        pid: process.pid,
+      },
+      capabilities: [
+        'project-aware CLI orchestration',
+        'background checks and tests',
+        'workspace-scoped terminal operations',
+        'run history and artifact review',
+      ],
+    });
+  });
+
+  router.get('/context', (req, res) => {
+    const project = typeof req.query.project === 'string' ? req.query.project : null;
+    const cwd = typeof req.query.cwd === 'string' ? req.query.cwd : process.cwd();
+    res.json({
+      agent: 'Hermes Agent',
+      product: 'Pixcode',
+      project,
+      cwd,
+      local: true,
+      message: project
+        ? `Hermes is operating inside Pixcode for ${project}.`
+        : 'Hermes is operating inside Pixcode.',
+    });
+  });
+
+  router.get('/agents', (_req, res) => {
+    res.json({
+      agent: 'hermes',
+      agents: adapterRegistry.agentCards().map((agent) => ({
+        ...agent,
+        coordinator: 'hermes',
+      })),
+    });
+  });
+
+  router.get('/tasks/:id', (req, res) => {
+    const task = hermesTaskStore.get(req.params.id);
+    if (!task) {
+      res.status(404).json({ error: { code: 'HERMES_TASK_NOT_FOUND', message: req.params.id } });
+      return;
+    }
+    res.json({
+      ...task,
+      hermesTaskId: task.id,
+    });
+  });
+
+  return router;
+}

package/server/modules/orchestration/index.ts

@@ -3,7 +3,7 @@
 // All cross-module consumers must import from here per
 // eslint.config.js boundaries rules.
 
-export { createA2ARouter } from './a2a/routes.js';
+export { createHermesTaskRouter } from './a2a/routes.js';
 export { adapterRegistry } from './a2a/adapter-registry.js';
 export { ClaudeCodeA2AAdapter } from './a2a/adapters/claude-code.adapter.js';
 export { CodexA2AAdapter } from './a2a/adapters/codex.adapter.js';
@@ -30,6 +30,7 @@ export {
 } from './security/permission-policy.js';
 export { createOrchestrationTaskRouter } from './tasks/orchestration-task.routes.js';
 export { orchestrationTaskService } from './tasks/orchestration-task.service.js';
+export { createHermesRouter } from './hermes/hermes.routes.js';
 export { createWorkflowRouter } from './workflows/workflow.routes.js';
 export {
   listPendingApprovals,

package/server/modules/orchestration/tasks/orchestration-task-store.ts

@@ -20,12 +20,8 @@ export class OrchestrationTaskStore {
     return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.id === id) ?? undefined;
   }
 
-  getByA2ATaskId(a2aTaskId: string): OrchestrationTask | undefined {
-    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.a2aTaskId === a2aTaskId) ?? undefined;
-  }
-
-  getByTaskMasterId(taskmasterId: string): OrchestrationTask | undefined {
-    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.taskmasterId === taskmasterId) ?? undefined;
+  getByHermesTaskId(hermesTaskId: string): OrchestrationTask | undefined {
+    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.hermesTaskId === hermesTaskId) ?? undefined;
   }
 
   list(projectId?: string): OrchestrationTask[] {

package/server/modules/orchestration/tasks/orchestration-task.routes.ts

@@ -15,35 +15,16 @@ export function createOrchestrationTaskRouter(): Router {
     const projectId = typeof req.body?.projectId === 'string' ? req.body.projectId : 'default';
     const title = typeof req.body?.title === 'string' ? req.body.title.trim() : '';
     const description = typeof req.body?.description === 'string' ? req.body.description : undefined;
-    const taskmasterId = typeof req.body?.taskmasterId === 'string' ? req.body.taskmasterId : undefined;
 
     if (!title) {
       res.status(400).json({ error: { code: 'TITLE_REQUIRED', message: 'title is required' } });
       return;
     }
 
-    const task = orchestrationTaskService.create({ projectId, title, description, taskmasterId });
+    const task = orchestrationTaskService.create({ projectId, title, description });
     res.status(201).json(task);
   });
 
-  router.post('/tasks/import-taskmaster', (req, res) => {
-    const projectId = typeof req.body?.projectId === 'string' ? req.body.projectId : 'default';
-    const entries = Array.isArray(req.body?.tasks) ? req.body.tasks : [];
-    const imported = entries
-      .map((entry: unknown) => {
-        if (!entry || typeof entry !== 'object') return null;
-        const record = entry as Record<string, unknown>;
-        const taskmasterId = typeof record.id === 'string' ? record.id : undefined;
-        const title = typeof record.title === 'string' ? record.title : undefined;
-        const description = typeof record.description === 'string' ? record.description : undefined;
-        if (!taskmasterId || !title) return null;
-        return orchestrationTaskService.upsertFromTaskMaster({ projectId, title, description, taskmasterId });
-      })
-      .filter(Boolean);
-
-    res.json({ tasks: imported, count: imported.length });
-  });
-
   router.post('/tasks/:id/dispatch', async (req, res) => {
     try {
       const adapterId = typeof req.body?.adapterId === 'string' ? req.body.adapterId : '';

package/server/modules/orchestration/tasks/orchestration-task.service.ts

@@ -79,7 +79,6 @@ class OrchestrationTaskService {
       projectId: input.projectId,
       title: input.title,
       description: input.description,
-      taskmasterId: input.taskmasterId,
       acceptanceCriteria: input.acceptanceCriteria,
       changedFiles: input.changedFiles,
       state: 'todo',
@@ -90,27 +89,11 @@ class OrchestrationTaskService {
     return task;
   }
 
-  upsertFromTaskMaster(input: CreateOrchestrationTaskInput): OrchestrationTask {
-    const existing = this.store.list(input.projectId).find((task) =>
-      task.taskmasterId === input.taskmasterId,
-    );
-    if (existing) {
-      existing.title = input.title;
-      existing.description = input.description;
-      existing.acceptanceCriteria = input.acceptanceCriteria ?? existing.acceptanceCriteria;
-      existing.changedFiles = uniqueStrings([...(existing.changedFiles ?? []), ...(input.changedFiles ?? [])]);
-      existing.updatedAt = Date.now();
-      this.store.set(existing);
-      return existing;
-    }
-    return this.create(input);
-  }
-
   async dispatch(taskId: string, input: DispatchOrchestrationTaskInput): Promise<OrchestrationTask> {
     const task = this.store.get(taskId);
     if (!task) throw new Error('TASK_NOT_FOUND');
 
-    const a2aResponse = await fetch(`http://127.0.0.1:${process.env.SERVER_PORT ?? '3001'}/a2a/tasks`, {
+    const a2aResponse = await fetch(`http://127.0.0.1:${process.env.SERVER_PORT ?? '3001'}/hermes/tasks`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
@@ -129,7 +112,6 @@ class OrchestrationTaskService {
             projectPath: input.projectPath,
           },
           orchestrationTaskId: task.id,
-          taskmasterId: task.taskmasterId,
         },
       }),
     });
@@ -139,7 +121,7 @@ class OrchestrationTaskService {
       throw new Error(body?.error?.message ?? 'DISPATCH_FAILED');
     }
 
-    task.a2aTaskId = body.id;
+    task.hermesTaskId = body.id;
     task.adapterId = input.adapterId;
     task.adapterSelector = input.adapterId;
     task.workspaceKind = input.isolation ?? 'worktree';
@@ -163,12 +145,7 @@ class OrchestrationTaskService {
   updateFromWorkflowRun(run: WorkflowRun): OrchestrationTask | undefined {
     const metadata = run.metadata ?? {};
     const taskId = readString(metadata.orchestrationTaskId);
-    const taskmasterId = readString(metadata.taskmasterId);
-    const task = taskId
-      ? this.store.get(taskId)
-      : taskmasterId
-        ? this.store.list(readString(metadata.projectId)).find((candidate) => candidate.taskmasterId === taskmasterId)
-        : undefined;
+    const task = taskId ? this.store.get(taskId) : undefined;
     if (!task) return undefined;
 
     const changedFiles = changedFilesFromWorkflowRun(run);
@@ -187,9 +164,6 @@ class OrchestrationTaskService {
     task.updatedAt = Date.now();
     this.store.set(task);
 
-    if (task.taskmasterId && task.state === 'done') {
-      this.syncTaskMasterStatus(task.taskmasterId, 'done');
-    }
     return task;
   }
 
@@ -207,7 +181,7 @@ class OrchestrationTaskService {
       if (event.kind !== 'task-state') return;
       if (!TERMINAL_A2A_STATES.includes(event.state)) return;
 
-      const orchTask = this.store.getByA2ATaskId(event.taskId);
+      const orchTask = this.store.getByHermesTaskId(event.taskId);
       if (!orchTask) return;
       if (orchTask.state === 'done' || orchTask.state === 'failed' || orchTask.state === 'canceled') return;
 
@@ -219,20 +193,9 @@ class OrchestrationTaskService {
       orchTask.updatedAt = Date.now();
       this.store.set(orchTask);
 
-      if (orchTask.taskmasterId && mapped === 'done') {
-        this.syncTaskMasterStatus(orchTask.taskmasterId, 'done');
-      }
     });
   }
 
-  private syncTaskMasterStatus(taskmasterId: string, status: string): void {
-    const { spawn } = require('node:child_process') as typeof import('node:child_process');
-    spawn('task-master', ['set-status', '--id', taskmasterId, '--status', status], {
-      stdio: 'ignore',
-      detached: true,
-    }).unref();
-  }
-
   cancel(taskId: string): OrchestrationTask {
     const task = this.store.get(taskId);
     if (!task) throw new Error('TASK_NOT_FOUND');

package/server/modules/orchestration/tasks/orchestration-task.types.ts

@@ -2,9 +2,8 @@ export type OrchestrationTaskState = 'todo' | 'in_progress' | 'in_review' | 'don
 
 export interface OrchestrationTask {
   id: string;
-  a2aTaskId?: string;
+  hermesTaskId?: string;
   workflowRunIds?: string[];
-  taskmasterId?: string;
   projectId: string;
   title: string;
   description?: string;
@@ -13,7 +12,7 @@ export interface OrchestrationTask {
     id: string;
     label: string;
     status: 'pending' | 'passed' | 'failed';
-    source: 'taskmaster' | 'workflow';
+    source: 'workflow' | 'hermes';
   }>;
   changedFiles?: string[];
   adapterId?: string;
@@ -28,7 +27,6 @@ export interface CreateOrchestrationTaskInput {
   projectId: string;
   title: string;
   description?: string;
-  taskmasterId?: string;
   acceptanceCriteria?: OrchestrationTask['acceptanceCriteria'];
   changedFiles?: string[];
 }

package/server/modules/orchestration/tasks/task-run-graph.ts

@@ -11,7 +11,7 @@ export interface TaskRunGraphCriterion {
   id: string;
   label: string;
   status: TaskRunGraphCriterionStatus;
-  source: 'taskmaster' | 'workflow';
+  source: 'workflow' | 'hermes';
 }
 
 export interface TaskRunGraphRunSummary {
@@ -20,7 +20,6 @@ export interface TaskRunGraphRunSummary {
   status: WorkflowRun['status'];
   startedAt: number;
   finishedAt?: number;
-  taskmasterId?: string;
   orchestrationTaskId?: string;
   changedFiles: string[];
 }
@@ -28,7 +27,6 @@ export interface TaskRunGraphRunSummary {
 export interface TaskRunGraph {
   protocol: typeof PIXCODE_TASK_RUN_GRAPH_PROTOCOL;
   projectId: string;
-  taskmasterId?: string;
   orchestrationTaskId?: string;
   workflowRuns: TaskRunGraphRunSummary[];
   changedFiles: string[];
@@ -55,59 +53,6 @@ function uniqueStrings(values: Array<string | undefined>): string[] {
     .sort((a, b) => a.localeCompare(b));
 }
 
-function taskStatusPassed(status: unknown): boolean {
-  const normalized = String(status ?? '').toLocaleLowerCase('en');
-  return normalized === 'done' || normalized === 'completed';
-}
-
-function taskStatusFailed(status: unknown): boolean {
-  const normalized = String(status ?? '').toLocaleLowerCase('en');
-  return normalized === 'failed' || normalized === 'blocked' || normalized === 'cancelled' || normalized === 'canceled';
-}
-
-function criterionStatus(status: unknown): TaskRunGraphCriterionStatus {
-  if (taskStatusPassed(status)) return 'passed';
-  if (taskStatusFailed(status)) return 'failed';
-  return 'pending';
-}
-
-function taskmasterAcceptanceCriteria(taskmasterTask: Record<string, unknown> | undefined): TaskRunGraphCriterion[] {
-  if (!taskmasterTask) return [];
-
-  const criteria: TaskRunGraphCriterion[] = [];
-  const testStrategy = readString(taskmasterTask.testStrategy) ?? readString(taskmasterTask.test_strategy);
-  if (testStrategy) {
-    criteria.push({
-      id: 'test-strategy',
-      label: testStrategy,
-      status: criterionStatus(taskmasterTask.status),
-      source: 'taskmaster',
-    });
-  }
-
-  const subtasks = Array.isArray(taskmasterTask.subtasks) ? taskmasterTask.subtasks : [];
-  subtasks.forEach((subtask, index) => {
-    const record = readRecord(subtask);
-    if (!record) return;
-    const title = readString(record.title);
-    if (!title) return;
-    criteria.push({
-      id: `subtask-${readString(record.id) ?? index + 1}`,
-      label: title,
-      status: criterionStatus(record.status),
-      source: 'taskmaster',
-    });
-  });
-
-  return criteria;
-}
-
-function metadataTaskmasterId(run: WorkflowRun): string | undefined {
-  return readString(run.metadata?.taskmasterId)
-    ?? readString(readRecord(run.metadata?.taskGraph)?.taskmasterId)
-    ?? readString(readRecord(run.metadata?.replay)?.taskmasterId);
-}
-
 function metadataOrchestrationTaskId(run: WorkflowRun): string | undefined {
   return readString(run.metadata?.orchestrationTaskId)
     ?? readString(readRecord(run.metadata?.taskGraph)?.orchestrationTaskId);
@@ -146,10 +91,8 @@ export function changedFilesFromWorkflowRun(run: WorkflowRun): string[] {
   return uniqueStrings(run.nodeRuns.flatMap((node) => artifactChangedFiles(node)));
 }
 
-function workflowRunMatchesTask(run: WorkflowRun, task: OrchestrationTask | undefined, taskmasterId: string | undefined): boolean {
-  const runTaskmasterId = metadataTaskmasterId(run);
+function workflowRunMatchesTask(run: WorkflowRun, task: OrchestrationTask | undefined): boolean {
   const runOrchestrationTaskId = metadataOrchestrationTaskId(run);
-  if (taskmasterId && runTaskmasterId === taskmasterId) return true;
   if (task?.id && runOrchestrationTaskId === task.id) return true;
   if (task?.workflowRunIds?.includes(run.id)) return true;
   return false;
@@ -162,7 +105,6 @@ function runSummary(run: WorkflowRun): TaskRunGraphRunSummary {
     status: run.status,
     startedAt: run.startedAt,
     finishedAt: run.finishedAt,
-    taskmasterId: metadataTaskmasterId(run),
     orchestrationTaskId: metadataOrchestrationTaskId(run),
     changedFiles: changedFilesFromWorkflowRun(run),
   };
@@ -170,19 +112,15 @@ function runSummary(run: WorkflowRun): TaskRunGraphRunSummary {
 
 export function buildTaskRunGraph({
   projectId,
-  taskmasterId,
-  taskmasterTask,
+  orchestrationTaskId,
 }: {
   projectId: string;
-  taskmasterId?: string;
-  taskmasterTask?: Record<string, unknown>;
+  orchestrationTaskId?: string;
 }): TaskRunGraph {
-  const orchestrationTask = taskmasterId
-    ? orchestrationTaskService.list(projectId).find((task) => task.taskmasterId === taskmasterId)
-    : undefined;
+  const orchestrationTask = orchestrationTaskId ? orchestrationTaskService.get(orchestrationTaskId) : undefined;
   const workflowRuns = workflowStore
     .listRuns()
-    .filter((run) => workflowRunMatchesTask(run, orchestrationTask, taskmasterId))
+    .filter((run) => workflowRunMatchesTask(run, orchestrationTask))
     .map(runSummary);
   const workflowCriteria: TaskRunGraphCriterion[] = workflowRuns.map((run) => ({
     id: `run-${run.id}`,
@@ -191,7 +129,6 @@ export function buildTaskRunGraph({
     source: 'workflow',
   }));
   const acceptanceCriteria = [
-    ...taskmasterAcceptanceCriteria(taskmasterTask),
     ...(orchestrationTask?.acceptanceCriteria ?? []),
     ...workflowCriteria,
   ];
@@ -203,7 +140,6 @@ export function buildTaskRunGraph({
   return {
     protocol: PIXCODE_TASK_RUN_GRAPH_PROTOCOL,
     projectId,
-    taskmasterId,
     orchestrationTaskId: orchestrationTask?.id,
     workflowRuns,
     changedFiles,