@cyberismo/backend 1.2.0 → 1.3.0

package/src/domain/projects/index.ts

@@ -1,19 +1,10 @@
-/**
-  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 { zValidator } from '../../middleware/zvalidator.js';
-import type { ProjectRegistry } from '../../project-registry.js';
+import type { ProjectDirectory } from '@cyberismo/data-handler';
+import { errorBody, errorResponse } from '../../common/errors.js';
 import { requireRole, getCurrentUser } from '../../middleware/auth.js';
 import { isProjectReadOnly } from '../../overlay.js';
 import { UserRole } from '../../types.js';
@@ -21,7 +12,7 @@ import { createProjectSchema, cloneProjectSchema } from './schema.js';
 import * as projectsService from './service.js';
 
 export function createProjectsRouter(
-  registry: ProjectRegistry,
+  directory: ProjectDirectory,
   multiProjectRoot?: string,
 ) {
   const router = new Hono();
@@ -38,9 +29,9 @@ export function createProjectsRouter(
    *       401:
    *         description: Unauthorized
    */
-  router.get('/', requireRole(UserRole.Reader), (c) => {
+  router.get('/', requireRole(UserRole.Reader), async (c) => {
     return c.json({
-      projects: registry.list().map((project) => ({
+      projects: (await directory.list()).map((project) => ({
         ...project,
         readOnly: isProjectReadOnly(project.prefix),
       })),
@@ -62,38 +53,31 @@ export function createProjectsRouter(
     async (c) => {
       if (!multiProjectRoot) {
         return c.json(
-          { error: 'Project creation is not available in single-project mode' },
+          errorBody(
+            'permission-denied',
+            'Project creation is not available in single-project mode',
+          ),
           403,
         );
       }
 
       const params = c.req.valid('json');
 
-      if (registry.has(params.prefix)) {
-        return c.json(
-          { error: `Project with prefix '${params.prefix}' already exists` },
-          409,
-        );
-      }
-
       try {
         const result = await projectsService.createProject(
-          registry,
-          multiProjectRoot,
+          directory,
           params,
           getCurrentUser(c),
         );
         return c.json(result, 201);
       } catch (error) {
-        return c.json(
-          {
-            error:
-              error instanceof Error
-                ? error.message
-                : 'Failed to create project',
-          },
-          500,
+        // A taken prefix is the directory's ProjectExistsError: a 409.
+        const { status, body } = errorResponse(
+          error instanceof Error
+            ? error
+            : new Error('Failed to create project'),
         );
+        return c.json(body, status);
       }
     },
   );
@@ -112,7 +96,10 @@ export function createProjectsRouter(
     async (c) => {
       if (!multiProjectRoot) {
         return c.json(
-          { error: 'Project cloning is not available in single-project mode' },
+          errorBody(
+            'permission-denied',
+            'Project cloning is not available in single-project mode',
+          ),
           403,
         );
       }
@@ -120,18 +107,15 @@ export function createProjectsRouter(
       const { url } = c.req.valid('json');
 
       try {
-        const result = await projectsService.cloneProject(
-          registry,
-          multiProjectRoot,
-          url,
-        );
+        const result = await directory.clone(url);
 
         if (result.projects.length === 0) {
           return c.json(
-            {
-              error: 'All projects in the cloned repository already exist',
-              skippedDuplicates: result.skippedDuplicates,
-            },
+            errorBody(
+              'conflict',
+              'All projects in the cloned repository already exist',
+              { skippedDuplicates: result.skippedDuplicates },
+            ),
             409,
           );
         }
@@ -139,12 +123,12 @@ export function createProjectsRouter(
         return c.json(result, 201);
       } catch (error) {
         return c.json(
-          {
-            error:
-              error instanceof Error
-                ? error.message
-                : 'Failed to clone repository',
-          },
+          errorBody(
+            'internal',
+            error instanceof Error
+              ? error.message
+              : 'Failed to clone repository',
+          ),
           500,
         );
       }

package/src/domain/projects/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 { Validate } from '@cyberismo/data-handler';
@@ -30,6 +20,7 @@ export const createProjectSchema = z.object({
     }),
   category: z.string().optional().default(''),
   description: z.string().optional().default(''),
+  skipDefaultHub: z.boolean().optional(),
 });
 
 export const cloneProjectSchema = z.object({

package/src/domain/projects/service.ts

@@ -1,98 +1,28 @@
-/**
-  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 { join } from 'node:path';
-import {
-  CommandManager,
-  Create,
-  scanForProjects,
-} from '@cyberismo/data-handler';
-import type { ProjectRegistry } from '../../project-registry.js';
-
-export interface CreateProjectParams {
-  name: string;
-  prefix: string;
-  category?: string;
-  description?: string;
-}
-
-export interface CreateProjectResult {
-  prefix: string;
-  name: string;
-  category?: string;
-  description?: string;
-}
+import { SYSTEM_ACTOR, type ProjectDirectory } from '@cyberismo/data-handler';
+import type { CreateProjectParams } from '@cyberismo/model';
+import { actorOf } from '../../middleware/commandManager.js';
+import type { UserInfo } from '../../types.js';
 
 export async function createProject(
-  registry: ProjectRegistry,
-  rootPath: string,
+  directory: ProjectDirectory,
   params: CreateProjectParams,
-  user?: { name: string; email: string } | null,
-): Promise<CreateProjectResult> {
-  const { name, prefix, category, description } = params;
-  const projectPath = join(rootPath, prefix);
-
-  const commands = await CommandManager.createProjectWithDefaults(
-    projectPath,
+  user?: UserInfo | null,
+) {
+  const { prefix, failures, warnings } = await directory.create(
     params,
-    {
-      ...registry.options,
-      gitUser: user ?? undefined,
-    },
+    user ? actorOf(user) : SYSTEM_ACTOR,
+    user ? { name: user.name, email: user.email } : undefined,
   );
-
-  registry.add(prefix, commands);
-
+  // The project's path stays on the server.
   return {
     prefix,
-    name,
-    category: category || undefined,
-    description: description || undefined,
-  };
-}
-
-export interface CloneProjectResult {
-  projects: { prefix: string; name: string }[];
-  skippedDuplicates?: string[];
-}
-
-export async function cloneProject(
-  registry: ProjectRegistry,
-  rootPath: string,
-  url: string,
-): Promise<CloneProjectResult> {
-  const clonedPath = await Create.cloneProject(url, rootPath);
-  const scanned = await scanForProjects(clonedPath);
-
-  const registered: { prefix: string; name: string }[] = [];
-  const skippedDuplicates: string[] = [];
-
-  for (const project of scanned) {
-    if (registry.has(project.prefix)) {
-      skippedDuplicates.push(project.prefix);
-      continue;
-    }
-    const commands = new CommandManager(project.path, registry.options);
-    await commands.initialize();
-    registry.add(project.prefix, commands);
-    registered.push({
-      prefix: project.prefix,
-      name: project.name,
-    });
-  }
-
-  return {
-    projects: registered,
-    ...(skippedDuplicates.length > 0 && { skippedDuplicates }),
+    name: params.name,
+    category: params.category || undefined,
+    description: params.description || undefined,
+    failures,
+    warnings,
   };
 }

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

package/src/domain/reports/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/reports/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 createReport(
-  commands: CommandManager,
-  reportName: string,
-) {
-  await commands.createCmd.createReport(reportName);
+export async function createReport(ws: Workspace, reportName: string) {
+  await ws.resources.create(reportName, 'reports', {});
 }

package/src/domain/resources/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 { ssgParams } from 'hono/ssg';
@@ -42,10 +32,10 @@ const router = new Hono();
  *         description: project_path not set or other internal error
  */
 router.get('/tree', requireRole(UserRole.Reader), async (c) => {
-  const commands = c.get('commands');
+  const ws = c.get('ws');
 
   try {
-    const tree = await resourceService.buildResourceTree(commands);
+    const tree = await resourceService.buildResourceTree(ws);
     return c.json(tree);
   } catch (error) {
     return c.json(
@@ -106,12 +96,12 @@ router.get(
   requireRole(UserRole.Reader),
   zValidator('param', validateResourceParamsSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const resourceParams = c.req.valid('param');
 
     try {
       const response: ResourceValidationResponse =
-        await resourceService.validateResource(commands, resourceParams);
+        await resourceService.validateResource(ws, resourceParams);
       return c.json(response);
     } catch (error) {
       if (error instanceof Error && error.message.includes('not found')) {
@@ -127,9 +117,9 @@ router.delete(
   requireRole(UserRole.Admin),
   zValidator('param', resourceParamsSchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const resourceParams = c.req.valid('param');
-    await resourceService.deleteResource(commands, resourceParams);
+    await resourceService.deleteResource(ws, resourceParams);
     return c.json({
       message: 'Resource deleted',
     });
@@ -186,19 +176,19 @@ router.get(
   '/:prefix/workflows/:identifier/graph',
   requireRole(UserRole.Reader),
   ssgParams(async (c: AppContext) => {
-    const commands = c.get('commands');
-    return resourceService.listWorkflowGraphParams(commands);
+    const ws = c.get('ws');
+    return resourceService.listWorkflowGraphParams(ws);
   }),
   zValidator('param', prefixIdentifierParamsSchema),
   zValidator('query', workflowGraphQuerySchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { prefix, identifier } = c.req.valid('param');
     const { card } = c.req.valid('query');
     const workflowName = `${prefix}/workflows/${identifier}`;
     try {
       const svg = await resourceService.getWorkflowGraph(
-        commands,
+        ws,
         workflowName,
         card,
       );
@@ -273,13 +263,13 @@ router.post(
   zValidator('param', prefixIdentifierParamsSchema),
   zValidator('json', skillPreviewBodySchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const { prefix, identifier } = c.req.valid('param');
     const body = c.req.valid('json');
     const skillName = `${prefix}/skills/${identifier}`;
     try {
       const instructions = await resourceService.previewSkill(
-        commands,
+        ws,
         skillName,
         body,
       );
@@ -300,15 +290,14 @@ router.post(
   zValidator('param', resourceParamsSchema),
   zValidator('json', updateOperationBodySchema),
   async (c) => {
-    const commands = c.get('commands');
+    const ws = c.get('ws');
     const resourceParams = c.req.valid('param');
     const { updateKey, operation } = c.req.valid('json');
 
-    await resourceService.updateResourceWithOperation(
-      commands,
-      resourceParams,
-      { updateKey, operation },
-    );
+    await resourceService.updateResourceWithOperation(ws, resourceParams, {
+      updateKey,
+      operation,
+    });
     return c.json({ message: 'Updated' });
   },
 );

package/src/domain/resources/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,