@cyberismo/backend 1.2.0 → 1.3.0

package/src/domain/events/project-events.ts

@@ -1,18 +1,9 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2026
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { randomUUID } from 'node:crypto';
 import type { SSEMessage } from 'hono/streaming';
+import type { ActorRef, ChangeEvent } from '@cyberismo/model';
 
 const LEASE_MS = 90_000;
 const EXPIRY_INTERVAL_MS = 30_000;
@@ -52,14 +43,23 @@ interface Connection {
   lastSent: string | null;
 }
 
+/** Where a project's change events come from. */
+export interface ChangeSource {
+  subscribe(listener: (event: ChangeEvent) => void): () => void;
+}
+
 /** The open subscriptions of one project and the presence leases they hold. */
 export class ProjectEvents {
   private connections = new Map<string, Connection>();
   private expiryTimer: ReturnType<typeof setInterval>;
+  private unsubscribe: () => void;
 
-  constructor() {
+  /** Announces the cards each of `changes`' events names, whoever wrote them. */
+  constructor(changes?: ChangeSource) {
     this.expiryTimer = setInterval(() => this.expire(), EXPIRY_INTERVAL_MS);
     this.expiryTimer.unref();
+    this.unsubscribe =
+      changes?.subscribe((event) => this.changed(event)) ?? (() => {});
   }
 
   connect(
@@ -155,15 +155,26 @@ export class ProjectEvents {
     );
   }
 
-  cardsUpdated(cardKeys: string[], user: Connection['user']): void {
+  // Only card changes go on the wire; a removed card is announced as updated.
+  private changed(event: ChangeEvent): void {
+    const cardKeys = event.changes.flatMap((change) =>
+      change.kind === 'card.updated' || change.kind === 'card.removed'
+        ? [change.key]
+        : [],
+    );
+    if (cardKeys.length > 0) this.cardsUpdated(cardKeys, event.actor);
+  }
+
+  cardsUpdated(cardKeys: string[], actor: ActorRef): void {
     for (const cardKey of new Set(cardKeys)) {
       const withIdentity = this.encode('card.updated', {
         cardKey,
-        userId: user.id,
-        userName: user.name,
+        userId: actor.id,
+        userName: actor.name,
       });
       const withoutIdentity = this.encode('card.updated', { cardKey });
-      for (const [connectionId, connection] of this.onCard(cardKey)) {
+      // Project-wide, since a page can show fields of cards it is not on.
+      for (const [connectionId, connection] of [...this.connections]) {
         this.deliver(
           connectionId,
           connection.capabilities.canSeeIdentity
@@ -175,6 +186,7 @@ export class ProjectEvents {
   }
 
   dispose(): void {
+    this.unsubscribe();
     clearInterval(this.expiryTimer);
     const connections = [...this.connections.values()];
     this.connections.clear();
@@ -211,7 +223,7 @@ export class ProjectEvents {
     }
   }
 
-  // Subscription governs delivery.
+  // Presence is delivered per card.
   private onCard(cardKey: string): [string, Connection][] {
     return [...this.connections].filter(([, c]) => c.cardKey === cardKey);
   }

package/src/domain/events/schema.ts

@@ -1,15 +1,5 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2026
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { z } from 'zod';
 

package/src/domain/fieldTypes/index.ts

@@ -1,15 +1,5 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { Hono } from 'hono';
 import * as fieldTypeService from './service.js';
@@ -35,10 +25,10 @@ const router = new Hono();
  *         description: project_path not set or other internal error
  */
 router.get('/', requireRole(UserRole.Reader), async (c) => {
-  const commands = c.get('commands');
+  const ws = c.get('ws');
 
   try {
-    const fieldTypes = await fieldTypeService.getFieldTypes(commands);
+    const fieldTypes = await fieldTypeService.getFieldTypes(ws);
     return c.json(fieldTypes);
   } catch (error) {
     return c.json(
@@ -84,11 +74,11 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', createFieldTypeSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { identifier, dataType } = c.req.valid('json');
 
     try {
-      await fieldTypeService.createFieldType(commands, identifier, dataType);
+      await fieldTypeService.createFieldType(ws, identifier, dataType);
       return c.json({ message: 'Field type created successfully' });
     } catch (error) {
       return c.json(

package/src/domain/fieldTypes/schema.ts

@@ -1,15 +1,6 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
+
 import { z } from 'zod';
 import { identifierSchema } from '../../common/validationSchemas.js';
 

package/src/domain/fieldTypes/service.ts

@@ -1,38 +1,26 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
-import type { CommandManager } from '@cyberismo/data-handler';
-import type { DataType } from '@cyberismo/data-handler/interfaces/resource-interfaces';
+import type { Workspace } from '@cyberismo/data-handler';
+import type { DataType } from '@cyberismo/model';
 
-export async function getFieldTypes(commands: CommandManager) {
-  const response = await commands.showCmd.showResources('fieldTypes');
+export async function getFieldTypes(ws: Workspace) {
+  const response = await ws.resources.list('fieldTypes');
   if (!response) {
     throw new Error('No field types found');
   }
 
   const fieldTypes = await Promise.all(
-    response.map((fieldType: string) =>
-      commands.showCmd.showResource(fieldType),
-    ),
+    response.map((fieldType: string) => ws.resources.show(fieldType)),
   );
 
   return fieldTypes;
 }
 
 export async function createFieldType(
-  commands: CommandManager,
+  ws: Workspace,
   identifier: string,
   dataType: DataType,
 ) {
-  await commands.createCmd.createFieldType(identifier, dataType);
+  await ws.resources.create(identifier, 'fieldTypes', { dataType });
 }

package/src/domain/graphModels/index.ts

@@ -1,15 +1,5 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { Hono } from 'hono';
 import * as graphModelService from './service.js';
@@ -50,10 +40,10 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', createGraphModelSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { identifier } = c.req.valid('json');
 
-    await graphModelService.createGraphModel(commands, identifier);
+    await graphModelService.createGraphModel(ws, identifier);
     return c.json({ message: 'Graph model created successfully' });
   },
 );

package/src/domain/graphModels/schema.ts

@@ -1,15 +1,6 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
+
 import { z } from 'zod';
 import { identifierSchema } from '../../common/validationSchemas.js';
 

package/src/domain/graphModels/service.ts

@@ -1,21 +1,8 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
-import type { CommandManager } from '@cyberismo/data-handler';
+import type { Workspace } from '@cyberismo/data-handler';
 
-export async function createGraphModel(
-  commands: CommandManager,
-  graphModelName: string,
-) {
-  await commands.createCmd.createGraphModel(graphModelName);
+export async function createGraphModel(ws: Workspace, graphModelName: string) {
+  await ws.resources.create(graphModelName, 'graphModels', {});
 }

package/src/domain/graphViews/index.ts

@@ -1,15 +1,5 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { Hono } from 'hono';
 import * as graphViewService from './service.js';
@@ -50,9 +40,9 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', createGraphViewSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { identifier } = c.req.valid('json');
-    await graphViewService.createGraphView(commands, identifier);
+    await graphViewService.createGraphView(ws, identifier);
     return c.json({ message: 'Graph view created successfully' });
   },
 );

package/src/domain/graphViews/schema.ts

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
+
 import { z } from 'zod';
 import { identifierSchema } from '../../common/validationSchemas.js';
 

package/src/domain/graphViews/service.ts

@@ -1,20 +1,7 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
-import type { CommandManager } from '@cyberismo/data-handler';
-export async function createGraphView(
-  commands: CommandManager,
-  graphViewName: string,
-) {
-  await commands.createCmd.createGraphView(graphViewName);
+import type { Workspace } from '@cyberismo/data-handler';
+export async function createGraphView(ws: Workspace, graphViewName: string) {
+  await ws.resources.create(graphViewName, 'graphViews', {});
 }

package/src/domain/labels/index.ts

@@ -1,15 +1,5 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { Hono } from 'hono';
 import * as labelsService from './service.js';
@@ -31,8 +21,8 @@ const router = new Hono();
  */
 
 router.get('/', requireRole(UserRole.Reader), async (c) => {
-  const commands = c.get('commands');
-  const labels = await labelsService.getLabels(commands);
+  const ws = c.get('ws');
+  const labels = await labelsService.getLabels(ws);
   return c.json(labels);
 });
 

package/src/domain/labels/service.ts

@@ -1,23 +1,13 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
-import type { CommandManager } from '@cyberismo/data-handler';
+import type { Workspace } from '@cyberismo/data-handler';
 
 /**
  * Returns all unique labels available in the project.
- * @param commands command manager used for the query
+ * @param ws command manager used for the query
  * @returns a list of labels
  */
-export async function getLabels(commands: CommandManager): Promise<string[]> {
-  return (await commands.showCmd.showLabels()).sort();
+export async function getLabels(ws: Workspace): Promise<string[]> {
+  return (await ws.cards.labels()).sort();
 }

package/src/domain/linkTypes/index.ts

@@ -1,15 +1,5 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { Hono } from 'hono';
 import * as linkTypeService from './service.js';
@@ -35,10 +25,10 @@ const router = new Hono();
  *         description: project_path not set or other internal error
  */
 router.get('/', requireRole(UserRole.Reader), async (c) => {
-  const commands = c.get('commands');
+  const ws = c.get('ws');
 
   try {
-    const linkTypes = await linkTypeService.getLinkTypes(commands);
+    const linkTypes = await linkTypeService.getLinkTypes(ws);
     return c.json(linkTypes);
   } catch (error) {
     return c.json(
@@ -80,10 +70,10 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', createLinkTypeSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { identifier } = c.req.valid('json');
 
-    await linkTypeService.createLinkType(commands, identifier);
+    await linkTypeService.createLinkType(ws, identifier);
     return c.json({ message: 'Link type created successfully' });
   },
 );

package/src/domain/linkTypes/schema.ts

@@ -1,15 +1,5 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
 import { z } from 'zod';
 import { identifierSchema } from '../../common/validationSchemas.js';

package/src/domain/linkTypes/service.ts

@@ -1,34 +1,21 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
 
-import type { CommandManager } from '@cyberismo/data-handler';
+import type { Workspace } from '@cyberismo/data-handler';
 
-export async function getLinkTypes(commands: CommandManager) {
-  const response = await commands.showCmd.showResources('linkTypes');
+export async function getLinkTypes(ws: Workspace) {
+  const response = await ws.resources.list('linkTypes');
   if (!response) {
     throw new Error('No link types found');
   }
 
   const linkTypes = await Promise.all(
-    response.map((linkType: string) => commands.showCmd.showResource(linkType)),
+    response.map((linkType: string) => ws.resources.show(linkType)),
   );
 
   return linkTypes;
 }
 
-export async function createLinkType(
-  commands: CommandManager,
-  linkTypeName: string,
-) {
-  await commands.createCmd.createLinkType(linkTypeName);
+export async function createLinkType(ws: Workspace, linkTypeName: string) {
+  await ws.resources.create(linkTypeName, 'linkTypes', {});
 }

package/src/domain/logicPrograms/index.ts

@@ -1,15 +1,6 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
+
 import { Hono } from 'hono';
 
 import { zValidator } from '../../middleware/zvalidator.js';
@@ -25,12 +16,9 @@ router.get(
   requireRole(UserRole.Reader),
   zValidator('param', resourceParamsWithCard),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const params = c.req.valid('param');
-    const logicProgram = await logicProgramService.getLogicProgram(
-      commands,
-      params,
-    );
+    const logicProgram = await logicProgramService.getLogicProgram(ws, params);
     return c.json({ logicProgram });
   },
 );

package/src/domain/logicPrograms/service.ts

@@ -1,25 +1,16 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2025
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-  details. You should have received a copy of the GNU Affero General Public
-  License along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-import type { CommandManager } from '@cyberismo/data-handler';
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import type { Workspace } from '@cyberismo/data-handler';
 import type { ResourceParamsWithCard } from '../../common/validationSchemas.js';
 
 export async function getLogicProgram(
-  commands: CommandManager,
+  ws: Workspace,
   resource: ResourceParamsWithCard,
 ) {
   if (resource.type === 'cards') {
-    return commands.showCmd.showCardLogicProgram(resource.identifier);
+    return ws.cards.logicProgram(resource.identifier);
   } else {
-    return commands.showCmd.showLogicProgram(resource);
+    return ws.queries.logicProgram(resource);
   }
 }