@cyberismo/backend 1.2.0 → 1.3.0

package/src/domain/resources/service.ts

@@ -1,29 +1,20 @@
-/**
-  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 { AnyResourceContent } from '@cyberismo/data-handler/interfaces/resource-interfaces';
+// SPDX-FileCopyrightText: Cyberismo Ltd and contributors
+// SPDX-License-Identifier: AGPL-3.0-only
+
 import type {
+  AnyResourceContent,
   Card,
   CardWithChildrenCards,
   ResourceFolderType,
-  RemovableResourceTypes,
-} from '@cyberismo/data-handler/interfaces/project-interfaces';
+} from '@cyberismo/model';
 import {
-  type CommandManager,
+  type Workspace,
+  CardNotFoundError,
   isResourceFolderType,
   moduleNameFromCardKey,
   resourceName,
   resourceNameToString,
+  ResourceNotFoundError,
 } from '@cyberismo/data-handler';
 import type { ResourceParams } from '../../common/validationSchemas.js';
 import type {
@@ -45,13 +36,13 @@ const resourceTypes: ResourceFolderType[] = [
   'workflows',
 ];
 
-async function getModules(commands: CommandManager) {
+async function getModules(ws: Workspace) {
   try {
-    const modules = await commands.modulesCmd.list();
+    const modules = await ws.modules.list();
     return Promise.all(
       modules.map(async (mod) => {
         try {
-          const module = await commands.modulesCmd.show(mod.name);
+          const module = await ws.modules.show(mod.name);
           return { name: module.name, cardKeyPrefix: module.cardKeyPrefix };
         } catch {
           return { name: mod.name, cardKeyPrefix: mod.name };
@@ -81,9 +72,9 @@ function sortTemplateCardsByRank(
     }));
 }
 
-export async function buildResourceTree(commands: CommandManager) {
-  return commands.consistent(async () => {
-    const project = await commands.showCmd.showProject();
+export async function buildResourceTree(ws: Workspace) {
+  return ws.consistent(async () => {
+    const project = await ws.settings.info();
     const tree: unknown[] = [];
 
     const sortByDisplayName = (
@@ -95,7 +86,7 @@ export async function buildResourceTree(commands: CommandManager) {
         ),
       );
 
-    const modules = await getModules(commands);
+    const modules = await getModules(ws);
 
     // General section first (single node with project + modules metadata)
     tree.push({
@@ -117,12 +108,12 @@ export async function buildResourceTree(commands: CommandManager) {
 
       if (resourceType === 'templates') {
         ({ rootResources, moduleResources } = await processTemplates(
-          commands,
+          ws,
           project.prefix,
         ));
       } else {
         ({ rootResources, moduleResources } = await groupResourcesByPrefix(
-          commands,
+          ws,
           resourceType,
           project.prefix,
         ));
@@ -200,7 +191,7 @@ function parseResourcePrefix(resource: string): {
 // Helper function to create resource node with all data from showResource
 // TODO: The types should be shared between backend and frontend
 async function createResourceNode(
-  commands: CommandManager,
+  ws: Workspace,
   resourceType: ResourceFolderType,
   name: string,
   projectPrefix: string,
@@ -213,7 +204,7 @@ async function createResourceNode(
   children?: unknown[];
   readOnly?: boolean;
 }> {
-  const resourceData = await commands.showCmd.showResource(name);
+  const resourceData = await ws.resources.show(name);
   const node: {
     id: string;
     type: ResourceFolderType;
@@ -302,12 +293,9 @@ function createCardNode(
 }
 
 // Helper function to process templates using templateTree query
-async function processTemplates(
-  commands: CommandManager,
-  projectPrefix: string,
-) {
-  const templates = await commands.showCmd.showResources('templates');
-  const templateTree = await commands.showCmd.showAllTemplateCards();
+async function processTemplates(ws: Workspace, projectPrefix: string) {
+  const templates = await ws.resources.list('templates');
+  const templateTree = await ws.cards.templateCards();
 
   const rootTemplates: { [templateName: string]: unknown[] } = {};
   const moduleTemplates: {
@@ -341,13 +329,7 @@ async function processTemplates(
 
   const rootResources = await Promise.all(
     Object.entries(rootTemplates).map(([templateName, cards]) =>
-      createResourceNode(
-        commands,
-        'templates',
-        templateName,
-        projectPrefix,
-        cards,
-      ),
+      createResourceNode(ws, 'templates', templateName, projectPrefix, cards),
     ),
   );
 
@@ -355,13 +337,7 @@ async function processTemplates(
   for (const [prefix, templates] of Object.entries(moduleTemplates)) {
     moduleResources[prefix] = await Promise.all(
       Object.entries(templates).map(([templateName, cards]) =>
-        createResourceNode(
-          commands,
-          'templates',
-          templateName,
-          projectPrefix,
-          cards,
-        ),
+        createResourceNode(ws, 'templates', templateName, projectPrefix, cards),
       ),
     );
   }
@@ -373,7 +349,7 @@ async function processTemplates(
       if (!rootResources.find((resource) => resource.name === template)) {
         rootResources.push(
           await createResourceNode(
-            commands,
+            ws,
             'templates',
             template,
             projectPrefix,
@@ -392,7 +368,7 @@ async function processTemplates(
       ) {
         moduleResources[prefix].push(
           await createResourceNode(
-            commands,
+            ws,
             'templates',
             template,
             projectPrefix,
@@ -408,14 +384,14 @@ async function processTemplates(
 
 // Helper function to group regular resources by prefix
 async function groupResourcesByPrefix(
-  commands: CommandManager,
+  ws: Workspace,
   resourceType: ResourceFolderType,
   projectPrefix: string,
 ) {
-  const resourceNames = await commands.showCmd.showResources(resourceType);
+  const resourceNames = await ws.resources.list(resourceType);
   const resources = await Promise.all(
     resourceNames.map((name: string) =>
-      createResourceNode(commands, resourceType, name, projectPrefix),
+      createResourceNode(ws, resourceType, name, projectPrefix),
     ),
   );
 
@@ -439,35 +415,27 @@ async function groupResourcesByPrefix(
 
 /**
  * Delete a resource.
- * @param commands Command manager.
+ * @param ws Command manager.
  * @param resource Resource to delete.
  */
-export async function deleteResource(
-  commands: CommandManager,
-  resource: ResourceParams,
-) {
-  return commands.removeCmd.remove(
-    resource.type.substring(
-      0,
-      resource.type.length - 1,
-    ) as RemovableResourceTypes,
+export async function deleteResource(ws: Workspace, resource: ResourceParams) {
+  return ws.resources.remove(
     resourceNameToString(resource),
+    resource.type.substring(0, resource.type.length - 1),
   );
 }
 
 /**
  * Validate a single resource.
- * @param commands Command manager.
+ * @param ws Command manager.
  * @param resource Resource to validate.
  * @returns Validation result with errors and validity status.
  */
 export async function validateResource(
-  commands: CommandManager,
+  ws: Workspace,
   resource: ValidateResourceParams,
 ) {
-  const errors = await commands.consistent(() =>
-    commands.validateCmd.validateResource(resource, commands.project),
-  );
+  const errors = await ws.resources.validate(resource);
 
   return {
     errors: errors.split('\n\n').filter((error) => error !== ''),
@@ -476,13 +444,13 @@ export async function validateResource(
 
 /**
  * Lists the path params for every workflow resource in the project.
- * @param commands Command manager.
+ * @param ws Command manager.
  * @returns One `{ prefix, identifier }` entry per workflow resource.
  */
 export async function listWorkflowGraphParams(
-  commands: CommandManager,
+  ws: Workspace,
 ): Promise<{ prefix: string; identifier: string }[]> {
-  const workflows = await commands.showCmd.showResources('workflows');
+  const workflows = await ws.resources.list('workflows');
   return workflows.map((name) => {
     const { prefix, identifier } = resourceName(name);
     return { prefix, identifier };
@@ -501,15 +469,15 @@ export async function listWorkflowGraphParams(
  *   card cannot be resolved.
  */
 export async function getWorkflowGraph(
-  commands: CommandManager,
+  ws: Workspace,
   workflowName: string,
   cardKey?: string,
 ): Promise<string> {
-  return commands.consistent(async () => {
+  return ws.consistent(async () => {
     try {
-      await commands.showCmd.showResource(workflowName, 'workflows');
+      await ws.resources.show(workflowName, 'workflows');
     } catch (error) {
-      if (error instanceof Error && error.message.includes('does not exist')) {
+      if (error instanceof ResourceNotFoundError) {
         throw new Error(`Workflow '${workflowName}' not found`, {
           cause: error,
         });
@@ -520,7 +488,7 @@ export async function getWorkflowGraph(
     if (cardKey) {
       let card;
       try {
-        card = await commands.showCmd.showCardDetails(cardKey);
+        card = await ws.cards.details(cardKey);
       } catch (error) {
         throw new Error(`Card '${cardKey}' not found`, { cause: error });
       }
@@ -529,7 +497,7 @@ export async function getWorkflowGraph(
       }
       currentState = card.metadata.workflowState;
     }
-    return commands.calculateCmd.runWorkflowGraph(workflowName, {
+    return ws.queries.runWorkflowGraph(workflowName, {
       currentState,
     });
   });
@@ -547,34 +515,31 @@ export async function getWorkflowGraph(
  *   be resolved; any other error means the template or query failed to render.
  */
 export async function previewSkill(
-  commands: CommandManager,
+  ws: Workspace,
   skillName: string,
   body: SkillPreviewBody,
 ): Promise<string> {
   const { cardKey, skillContent, skillQuery } = body;
-  return commands.consistent(async () => {
+  return ws.consistent(async () => {
     try {
-      await commands.showCmd.showResource(skillName, 'skills');
+      await ws.resources.show(skillName, 'skills');
     } catch (error) {
-      if (error instanceof Error && error.message.includes('does not exist')) {
+      if (error instanceof ResourceNotFoundError) {
         throw new Error(`Skill '${skillName}' not found`, { cause: error });
       }
       throw error;
     }
     if (cardKey) {
       try {
-        await commands.showCmd.showCardDetails(cardKey);
+        await ws.cards.details(cardKey);
       } catch (error) {
-        if (
-          error instanceof Error &&
-          error.message.includes('does not exist')
-        ) {
+        if (error instanceof CardNotFoundError) {
           throw new Error(`Card '${cardKey}' not found`, { cause: error });
         }
         throw error;
       }
     }
-    return commands.showCmd.renderSkill(skillName, {
+    return ws.resources.skillPreview(skillName, {
       cardKey,
       skillContent,
       skillQuery,
@@ -587,14 +552,14 @@ export async function previewSkill(
  * This delegates to the data-handler mutation engine.
  */
 export async function updateResourceWithOperation(
-  commands: CommandManager,
+  ws: Workspace,
   resource: ResourceParams,
   body: UpdateOperationBody,
 ) {
   const { updateKey, operation } = body;
-  await commands.atomic(
+  await ws.atomic(
     () =>
-      commands.updateCmd.apply({
+      ws.changes.apply({
         kind: 'edit',
         target: resource,
         updateKey,

package/src/domain/skills/index.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 { Hono } from 'hono';
 import * as skillService from './service.js';
@@ -50,10 +40,10 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', createSkillSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { identifier } = c.req.valid('json');
 
-    await skillService.createSkill(commands, identifier);
+    await skillService.createSkill(ws, identifier);
     return c.json({ message: 'Skill created successfully' });
   },
 );

package/src/domain/skills/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';
 import { identifierSchema } from '../../common/validationSchemas.js';

package/src/domain/skills/service.ts

@@ -1,18 +1,8 @@
-/**
-  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 type { CommandManager } from '@cyberismo/data-handler';
+import type { Workspace } from '@cyberismo/data-handler';
 
-export async function createSkill(commands: CommandManager, skillName: string) {
-  await commands.createCmd.createSkill(skillName);
+export async function createSkill(ws: Workspace, skillName: string) {
+  await ws.resources.create(skillName, 'skills', {});
 }

package/src/domain/templates/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 templateService from './service.js';
@@ -40,10 +30,10 @@ router.get('/', requireRole(UserRole.Reader), async (c) => {
   if (isSSGContext(c)) {
     return c.json([]);
   }
-  const commands = c.get('commands');
+  const ws = c.get('ws');
 
   try {
-    const response = await templateService.getTemplatesWithDetails(commands);
+    const response = await templateService.getTemplatesWithDetails(ws);
     return c.json(response);
   } catch (error) {
     return c.json(
@@ -85,10 +75,10 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', createTemplateSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { identifier } = c.req.valid('json');
 
-    await templateService.createTemplate(commands, identifier);
+    await templateService.createTemplate(ws, identifier);
     return c.json({ message: 'Template created successfully' });
   },
 );
@@ -131,11 +121,11 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', addTemplateCardSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { template, cardType, parentKey, count } = c.req.valid('json');
 
     const added = await templateService.addTemplateCard(
-      commands,
+      ws,
       template,
       cardType,
       parentKey,

package/src/domain/templates/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/templates/service.ts

@@ -1,36 +1,23 @@
-/**
-  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';
 import { resourceName } from '@cyberismo/data-handler';
 
-export async function getTemplatesWithDetails(commands: CommandManager) {
-  const response = await commands.showCmd.showTemplatesWithDetails();
+export async function getTemplatesWithDetails(ws: Workspace) {
+  const response = await ws.resources.contents('templates');
   if (!response) {
     throw new Error('No templates found');
   }
   return response;
 }
 
-export async function createTemplate(
-  commands: CommandManager,
-  templateName: string,
-) {
-  await commands.createCmd.createTemplate(templateName, '');
+export async function createTemplate(ws: Workspace, templateName: string) {
+  await ws.resources.create(templateName, 'templates', {});
 }
 
 export async function addTemplateCard(
-  commands: CommandManager,
+  ws: Workspace,
   template: string,
   cardType: string,
   parentKey?: string,
@@ -40,7 +27,7 @@ export async function addTemplateCard(
   if (type !== 'templates') {
     throw new Error('Invalid template resource');
   }
-  const added = await commands.createCmd.addCards(
+  const added = await ws.cards.addToTemplate(
     cardType,
     identifier,
     parentKey,

package/src/domain/tree/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 treeService from './service.js';
@@ -35,12 +25,12 @@ const router = new Hono();
  *         description: project_path not set or other internal error
  */
 router.get('/', requireRole(UserRole.Reader), async (c: AppContext) => {
-  const commands = c.get('commands');
+  const ws = c.get('ws');
   const tree = c.get('tree');
 
   try {
     const response = await treeService.getCardTree(
-      commands,
+      ws,
       isSSGContext(c),
       tree?.cardKey,
       tree?.recursive,

package/src/domain/tree/service.ts

@@ -1,35 +1,24 @@
-/**
-  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 the card tree of the project
- * @param commands command manager used for the query
+ * @param ws command manager used for the query
  * @param isSsg whether the context is static site generation
  * @param cardKey optional card key to start the tree from
  * @param recursive if false, includes only the given card. Otherwise, includes all child cards recursively.
  * @returns
  */
 export async function getCardTree(
-  commands: CommandManager,
+  ws: Workspace,
   isSsg: boolean,
   cardKey?: string,
   recursive?: boolean,
-): ReturnType<typeof commands.calculateCmd.runQuery> {
-  return commands.calculateCmd.runQuery(
-    'tree',
-    isSsg ? 'exportedSite' : 'localApp',
-    { cardKey, recursive },
-  );
+): ReturnType<typeof ws.queries.runQuery> {
+  return ws.queries.runQuery('tree', isSsg ? 'exportedSite' : 'localApp', {
+    cardKey,
+    recursive,
+  });
 }

package/src/domain/workflows/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 workflowService from './service.js';
@@ -50,10 +40,10 @@ router.post(
   requireRole(UserRole.Admin),
   zValidator('json', createWorkflowSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { identifier } = c.req.valid('json');
 
-    await workflowService.createWorkflow(commands, identifier);
+    await workflowService.createWorkflow(ws, identifier);
     return c.json({ message: 'Workflow created successfully' });
   },
 );