@principles/install-layout 0.1.0 → 0.2.0

package/dist/index.d.ts

@@ -1,12 +1,20 @@
 export declare const INSTALL_LAYOUT_VERSION: 1;
-export declare const INSTALL_LAYOUT_MODES: readonly ["canonical", "legacy"];
+export declare const INSTALL_LAYOUT_MODES: readonly ['canonical', 'legacy'];
 export type InstallLayoutMode = (typeof INSTALL_LAYOUT_MODES)[number];
-export declare const INSTALL_HOSTS: readonly ["codex", "openclaw"];
+export declare const INSTALL_HOSTS: readonly ['codex', 'openclaw'];
 export type InstallHost = (typeof INSTALL_HOSTS)[number];
 export interface InstallManifest {
     layoutVersion: typeof INSTALL_LAYOUT_VERSION;
     mode: InstallLayoutMode;
     hosts: InstallHost[];
+    /**
+     * Canonical absolute paths of Workspaces the install serves (PRI-624 Slice C).
+     * Optional so pre-PRI-624 manifests stay valid; always normalized to
+     * resolved absolute paths and deduped. The installer merges the install
+     * Workspace in; the Companion worker discovers its per-Workspace workers
+     * from this list (SPEC §13 "canonical install manifest").
+     */
+    workspaces?: readonly string[];
 }
 export interface InstallLayoutPaths {
     homeDir: string;
@@ -37,6 +45,8 @@ export interface ResolveInstallLayoutOptions {
     canonicalRuntimeExists: boolean;
     legacyExtensionExists: boolean;
 }
+/** Merge one Workspace into a manifest's workspace list (installer write path). Idempotent by canonical path. */
+export declare function mergeInstallManifestWorkspaces(current: InstallManifest | undefined, workspaceDir: string): string[];
 export declare function parseInstallManifest(value: unknown): {
     manifest?: InstallManifest;
     error?: string;

package/dist/index.js

@@ -8,6 +8,36 @@ function isRecord(value) {
 function isHost(value) {
     return typeof value === 'string' && INSTALL_HOSTS.includes(value);
 }
+/** Workspace entries must be non-empty absolute paths — the Companion spawns per-Workspace workers keyed by canonical path. */
+function parseWorkspaceList(value) {
+    if (value === undefined)
+        return { workspaces: [] };
+    if (!Array.isArray(value))
+        return { error: 'install_manifest_malformed: workspaces must be non-empty absolute paths' };
+    const resolved = [];
+    for (const entry of value) {
+        if (typeof entry !== 'string' || entry.length === 0 || !path.isAbsolute(entry)) {
+            return { error: 'install_manifest_malformed: workspaces must be non-empty absolute paths' };
+        }
+        const canonical = path.resolve(entry);
+        if (!resolved.includes(canonical))
+            resolved.push(canonical);
+    }
+    return { workspaces: resolved };
+}
+/** Merge one Workspace into a manifest's workspace list (installer write path). Idempotent by canonical path. */
+export function mergeInstallManifestWorkspaces(current, workspaceDir) {
+    const canonical = path.resolve(workspaceDir);
+    const resolved = [];
+    for (const entry of current?.workspaces ?? []) {
+        const normalized = path.resolve(entry);
+        if (!resolved.includes(normalized))
+            resolved.push(normalized);
+    }
+    if (!resolved.includes(canonical))
+        resolved.push(canonical);
+    return resolved;
+}
 export function parseInstallManifest(value) {
     if (!isRecord(value))
         return { error: 'install_manifest_malformed: expected an object' };
@@ -21,7 +51,10 @@ export function parseInstallManifest(value) {
         return { error: 'install_manifest_malformed: hosts must contain codex and/or openclaw' };
     }
     const hosts = [...new Set(value.hosts)];
-    return { manifest: { layoutVersion: INSTALL_LAYOUT_VERSION, mode: value.mode, hosts } };
+    const workspaces = parseWorkspaceList(value.workspaces);
+    if (workspaces.error)
+        return { error: workspaces.error };
+    return { manifest: { layoutVersion: INSTALL_LAYOUT_VERSION, mode: value.mode, hosts, workspaces: workspaces.workspaces } };
 }
 export function getInstallLayoutPaths(homeDir) {
     const home = path.resolve(homeDir);

package/dist/index.test.js

@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { getInstallLayoutPaths, getConsoleServerEntry, parseInstallManifest, resolveInstallLayout } from './index.js';
+import * as path from 'node:path';
+import { getInstallLayoutPaths, getConsoleServerEntry, parseInstallManifest, resolveInstallLayout, mergeInstallManifestWorkspaces, } from './index.js';
 describe('install layout', () => {
     it('resolves a canonical Codex-only install without OpenClaw', () => {
         const paths = getInstallLayoutPaths('C:/Users/alice');
@@ -31,4 +32,38 @@ describe('install layout', () => {
             error: 'install_manifest_malformed: hosts must contain codex and/or openclaw',
         });
     });
+    it('accepts a manifest without workspaces (pre-PRI-624 manifests stay valid)', () => {
+        const { manifest, error } = parseInstallManifest({ layoutVersion: 1, mode: 'canonical', hosts: ['codex'] });
+        expect(error).toBeUndefined();
+        expect(manifest?.workspaces).toEqual([]);
+    });
+    it('parses workspaces as canonical absolute paths, deduped in insertion order', () => {
+        const { manifest, error } = parseInstallManifest({
+            layoutVersion: 1,
+            mode: 'canonical',
+            hosts: ['codex'],
+            workspaces: ['D:/Code/ws-a', 'D:\\Code\\ws-a', 'C:/work/ws b'],
+        });
+        expect(error).toBeUndefined();
+        expect(manifest?.workspaces?.length).toBe(2);
+        expect(manifest?.workspaces?.[0]).toBe(path.resolve('D:/Code/ws-a'));
+        expect(manifest?.workspaces).toContain(path.resolve('C:/work/ws b'));
+    });
+    it('rejects malformed workspace entries loudly', () => {
+        expect(parseInstallManifest({ layoutVersion: 1, mode: 'canonical', hosts: ['codex'], workspaces: [''] })).toEqual({
+            error: 'install_manifest_malformed: workspaces must be non-empty absolute paths',
+        });
+        expect(parseInstallManifest({ layoutVersion: 1, mode: 'canonical', hosts: ['codex'], workspaces: ['ws-a'] })).toEqual({
+            error: 'install_manifest_malformed: workspaces must be non-empty absolute paths',
+        });
+    });
+    it('merges a workspace into an existing manifest without duplicates', () => {
+        const merged = mergeInstallManifestWorkspaces({ layoutVersion: 1, mode: 'canonical', hosts: ['codex'], workspaces: ['D:/Code/ws-a'] }, 'D:\\Code\\ws-a');
+        expect(merged.length).toBe(1);
+        expect(merged[0]).toBe(path.resolve('D:/Code/ws-a'));
+    });
+    it('merge accepts unknown current manifests and starts a fresh list', () => {
+        const merged = mergeInstallManifestWorkspaces(undefined, 'D:/Code/ws-b');
+        expect(merged).toEqual([path.resolve('D:/Code/ws-b')]);
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@principles/install-layout",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -10,9 +10,17 @@
       "default": "./dist/index.js"
     }
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "license": "MIT",
-  "publishConfig": { "access": "public" },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/csuzngjh/principles.git"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "tsc",
     "test": "npm run build && vitest run"