t44 0.4.0-rc.7 → 0.4.0-rc.8

package/caps/Home.ts

@@ -14,11 +14,17 @@ export async function capsule({
     return encapsulate({
         '#@stream44.studio/encapsulate/spine-contracts/CapsuleSpineContract.v0': {
             '#@stream44.studio/encapsulate/structs/Capsule': {},
+            '#t44/structs/HomeRegistryConfig': {
+                as: '$HomeRegistryConfig'
+            },
             '#': {
                 homeDir: {
                     type: CapsulePropertyTypes.GetterFunction,
                     value: async function (this: any): Promise<string> {
-                        return process.env.T44_HOME_DIR || homedir()
+                        if (process.env.T44_HOME_DIR) return process.env.T44_HOME_DIR
+                        const config = await this.$HomeRegistryConfig.config
+                        if (config?.homeDir) return config.homeDir
+                        return homedir()
                     }
                 },
                 sshDir: {

package/caps/HomeRegistry.ts

@@ -51,10 +51,11 @@ export async function capsule({
                     type: CapsulePropertyTypes.Function,
                     value: async function (this: any): Promise<string> {
                         const { stat, mkdir } = await import('fs/promises')
+                        const { join } = await import('path')
                         const chalk = (await import('chalk')).default
 
                         const config = await this.$HomeRegistryConfig.config
-                        const defaultDir = await this.Home.registryDir
+                        const defaultHomeDir = await this.Home.homeDir
 
                         let chosenDir: string
 
@@ -73,15 +74,15 @@ export async function capsule({
                             }
                             chosenDir = config.rootDir
                         } else {
-                            // rootDir not set — prompt user
-                            console.log(chalk.cyan(`\n🏠 Home Registry Setup\n`))
-                            console.log(chalk.gray('   The home registry is the place in your home directory that keeps'))
-                            console.log(chalk.gray('   details about your workspaces and projects.'))
+                            // rootDir not set — prompt user for home directory
+                            console.log(chalk.cyan(`\n🏠 Home Directory Setup\n`))
+                            console.log(chalk.gray('   The home directory is where your workspace keeps its registry,'))
+                            console.log(chalk.gray('   SSH keys, and other workspace-related files.'))
                             console.log('')
 
-                            chosenDir = await this.WorkspacePrompt.input({
-                                message: 'Enter the home registry directory:',
-                                defaultValue: defaultDir,
+                            const chosenHomeDir = await this.WorkspacePrompt.input({
+                                message: 'Enter the home directory:',
+                                defaultValue: defaultHomeDir,
                                 validate: (input: string) => {
                                     if (!input || input.trim().length === 0) {
                                         return 'Directory path cannot be empty'
@@ -90,18 +91,18 @@ export async function capsule({
                                 }
                             })
 
-                            // Check if directory exists
-                            let dirExists = false
+                            // Check if home directory exists
+                            let homeDirExists = false
                             try {
-                                const s = await stat(chosenDir)
-                                dirExists = s.isDirectory()
+                                const s = await stat(chosenHomeDir)
+                                homeDirExists = s.isDirectory()
                             } catch {
                                 // Does not exist
                             }
 
-                            if (dirExists) {
+                            if (homeDirExists) {
                                 const confirmed = await this.WorkspacePrompt.confirm({
-                                    message: `Directory '${chosenDir}' already exists. Use this existing registry as the home registry for your workspace?`,
+                                    message: `Directory '${chosenHomeDir}' already exists. Use it as the home directory for your workspace?`,
                                     defaultValue: true
                                 })
 
@@ -110,11 +111,16 @@ export async function capsule({
                                     process.exit(0)
                                 }
                             } else {
-                                // Create the directory
-                                await mkdir(chosenDir, { recursive: true })
-                                console.log(chalk.green(`\n   ✓ Created home registry directory: ${chosenDir}\n`))
+                                // Create the home directory
+                                await mkdir(chosenHomeDir, { recursive: true })
+                                console.log(chalk.green(`\n   ✓ Created home directory: ${chosenHomeDir}\n`))
                             }
 
+                            // Derive registry dir from home dir
+                            chosenDir = join(chosenHomeDir, '.o/workspace.foundation')
+                            await mkdir(chosenDir, { recursive: true })
+
+                            await this.$HomeRegistryConfig.setConfigValue(['homeDir'], chosenHomeDir)
                             await this.$HomeRegistryConfig.setConfigValue(['rootDir'], chosenDir)
                         }
 

package/caps/RootKey.ts

@@ -65,7 +65,7 @@ export async function capsule({
                         console.log(chalk.gray(`   Root: ${workspaceConfig?.rootDir || 'unknown'}`))
                         console.log(chalk.gray(''))
                         console.log(chalk.gray('   The root key is an Ed25519 SSH key used to identify this workspace.'))
-                        console.log(chalk.gray('   You can select an existing key from ~/.ssh or create a new one.'))
+                        console.log(chalk.gray(`   You can select an existing key from ${sshDir} or create a new one.`))
                         console.log(chalk.gray(''))
 
                         // Discover existing Ed25519 keys in ~/.ssh

package/caps/SigningKey.ts

@@ -65,7 +65,7 @@ export async function capsule({
                         console.log(chalk.gray(`   Root: ${workspaceConfig?.rootDir || 'unknown'}`))
                         console.log(chalk.gray(''))
                         console.log(chalk.gray('   The signing key is an Ed25519 SSH key used for code and artifact signing.'))
-                        console.log(chalk.gray('   You can select an existing key from ~/.ssh or create a new one.'))
+                        console.log(chalk.gray(`   You can select an existing key from ${sshDir} or create a new one.`))
                         console.log(chalk.gray(''))
 
                         // Discover existing Ed25519 keys in ~/.ssh

package/caps/WorkspaceCli.ts

@@ -93,7 +93,7 @@ export async function capsule({
                         const config = await this.WorkspaceConfig.config as any
 
                         const api: Record<string, any> = {}
-                        for (const propertyName in config.javascript.api) {
+                        for (const propertyName in config?.javascript?.api) {
                             api[propertyName] = config.javascript.api[propertyName]
                         }
                         return api
@@ -107,7 +107,7 @@ export async function capsule({
                         const self = this
 
                         const commands: Record<string, (commandArgs?: any) => Promise<void>> = {}
-                        for (const commandName in cliConfig.cli.commands) {
+                        for (const commandName in cliConfig?.cli?.commands) {
                             const commandConfig = cliConfig.cli.commands[commandName]
 
                             commands[commandName] = async function (commandArgs?: any) {
@@ -355,7 +355,7 @@ export async function capsule({
                         const cliConfig = await this.$config.config
                         const cliCommands = await this.cliCommands as Record<string, (args?: any) => Promise<void>>
 
-                        for (const commandName in cliConfig.cli.commands) {
+                        for (const commandName in cliConfig?.cli?.commands) {
                             const commandConfig = cliConfig.cli.commands[commandName]
                             const { description, arguments: commandArgs } = commandConfig
 

package/caps/WorkspaceConfig.yaml

@@ -1,4 +1,4 @@
-$schema: ../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
+$schema: ../../../../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
 extends:
   - ./WorkspaceShell.yaml
 '#t44/structs/WorkspaceCliConfig':

package/caps/WorkspaceConfigFile.ts

@@ -2,7 +2,6 @@
 import * as yaml from 'js-yaml'
 import { readFile, writeFile, access } from 'fs/promises';
 import { join, resolve, relative, dirname } from 'path'
-import { createRequire } from 'module'
 import chalk from 'chalk'
 
 export async function capsule({
@@ -220,7 +219,7 @@ export async function capsule({
 }
 capsule['#'] = 't44/caps/WorkspaceConfigFile'
 
-function resolveExtendPath(extendPath: string, configDir: string, workspaceRequire: NodeRequire): string {
+function resolveExtendPath(extendPath: string, configDir: string): string {
     if (extendPath.startsWith('.')) {
         return resolve(configDir, extendPath)
     } else {
@@ -243,9 +242,21 @@ function resolveExtendPath(extendPath: string, configDir: string, workspaceRequi
             filePath = parts.slice(1).join('/')
         }
 
-        // Resolve the package's package.json to get its directory
-        const packageJsonPath = workspaceRequire.resolve(`${packageName}/package.json`)
-        const packageDir = join(packageJsonPath, '..')
+        // Walk up from configDir looking for node_modules/<packageName>
+        const { existsSync } = require('fs')
+        let searchDir = configDir
+        let packageDir = ''
+        while (searchDir !== dirname(searchDir)) {
+            const candidate = join(searchDir, 'node_modules', packageName)
+            if (existsSync(join(candidate, 'package.json'))) {
+                packageDir = candidate
+                break
+            }
+            searchDir = dirname(searchDir)
+        }
+        if (!packageDir) {
+            throw new Error(`Cannot resolve package '${packageName}' from '${configDir}'. Ensure it is installed in node_modules.`)
+        }
 
         // Resolve the file path within the package
         return resolve(packageDir, filePath)
@@ -257,9 +268,6 @@ async function loadConfigWithExtends(configPath: string, workspaceRootDir: strin
     const mainConfigDir = join(resolve(configPath), '..')
     let configTree: any = null
 
-    // Create a require function relative to workspace root for module resolution
-    const workspaceRequire = createRequire(join(workspaceRootDir, 'package.json'))
-
     async function loadConfigRecursive(currentPath: string, referencedFrom?: string, chain: string[] = []): Promise<any> {
         const absolutePath = resolve(currentPath)
 
@@ -484,7 +492,7 @@ async function loadConfigWithExtends(configPath: string, workspaceRootDir: strin
         if (config.extends && Array.isArray(config.extends)) {
             for (const extendPath of config.extends) {
                 // Always use configDir for resolution - it's the directory of the file containing the extends
-                const resolvedExtendPath = resolveExtendPath(extendPath, configDir, workspaceRequire)
+                const resolvedExtendPath = resolveExtendPath(extendPath, configDir)
                 const childNode = await loadConfigRecursive(resolvedExtendPath, absolutePath, currentChain)
                 // Store the original extends value for display
                 childNode.extendsValue = extendPath

package/caps/WorkspaceShell.yaml

@@ -1,4 +1,4 @@
-$schema: ../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
+$schema: ../../../../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
 '#t44/structs/WorkspaceShellConfig':
   env:
     default: null

package/lib/key.ts

@@ -272,6 +272,10 @@ export async function generateEd25519Key(
     comment: string
 ): Promise<{ publicKey: string; keyFingerprint: string } | null> {
     const chalk = (await import('chalk')).default
+    const { mkdir } = await import('fs/promises')
+    const { dirname } = await import('path')
+
+    await mkdir(dirname(privateKeyPath), { recursive: true })
 
     try {
         execSync(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "t44",
-    "version": "0.4.0-rc.7",
+    "version": "0.4.0-rc.8",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -85,9 +85,9 @@
         "@ucanto/principal": "^9.0.3",
         "@ucanto/server": "^11.0.3",
         "json-schema-ref-resolver": "^3.0.0",
-        "@stream44.studio/encapsulate": "^0.4.0-rc.8",
-        "@stream44.studio/dco": "^0.3.0-rc.7",
-        "@stream44.studio/t44-blockchaincommons.com": "^0.1.0-rc.9"
+        "@stream44.studio/encapsulate": "^0.4.0-rc.9",
+        "@stream44.studio/dco": "^0.3.0-rc.9",
+        "@stream44.studio/t44-blockchaincommons.com": "^0.1.0-rc.10"
     },
     "devDependencies": {
         "@types/bun": "^1.3.4",

package/structs/HomeRegistryConfig.ts

@@ -13,6 +13,10 @@ export async function capsule({
                         schema: {
                             type: 'object',
                             properties: {
+                                homeDir: {
+                                    type: 'string',
+                                    description: 'Absolute path to the home directory (parent of registry, .ssh, etc).'
+                                },
                                 rootDir: {
                                     type: 'string',
                                     description: 'Absolute path to the home registry root directory.'

package/workspace.yaml

@@ -1,3 +1,3 @@
-$schema: ../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
+$schema: ../../../../../../.~o/workspace.foundation/@t44.sh~t44~caps~JsonSchemas/@t44.sh~t44~structs~WorkspaceConfigFile.json
 extends:
   - ./caps/WorkspaceConfig.yaml