@rcrsr/rill 0.17.0 → 0.18.0

package/dist/ext/fs/index.js

@@ -8,8 +8,8 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { RuntimeError } from '../../error-classes.js';
 import { toCallable } from '../../runtime/core/callable.js';
-import { rillTypeToTypeValue, } from '../../runtime/core/values.js';
-import { resolvePath, matchesGlob, initializeMount, } from './sandbox.js';
+import { structureToTypeValue } from '../../runtime/core/values.js';
+import { resolvePath, matchesGlob, initializeMount, parseMountPath, } from './sandbox.js';
 export const configSchema = {
     mounts: { type: 'string', required: true },
 };
@@ -76,8 +76,7 @@ export function createFsExtension(config) {
     // ctx and location not used but required by CallableFn signature
     ) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const filePath = args['path'];
+        const { mountName, relativePath: filePath } = parseMountPath(args['path'], mounts);
         // EC-5: Catch file not found from resolvePath
         let resolvedPath;
         try {
@@ -102,8 +101,7 @@ export function createFsExtension(config) {
      */
     const write = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const filePath = args['path'];
+        const { mountName, relativePath: filePath } = parseMountPath(args['path'], mounts);
         const content = args['content'];
         const resolvedPath = await resolvePath(mountName, filePath, mounts, 'write', true // createMode: resolve parent directory
         );
@@ -121,8 +119,7 @@ export function createFsExtension(config) {
      */
     const append = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const filePath = args['path'];
+        const { mountName, relativePath: filePath } = parseMountPath(args['path'], mounts);
         const content = args['content'];
         const resolvedPath = await resolvePath(mountName, filePath, mounts, 'write', true // createMode: allow new files
         );
@@ -158,8 +155,7 @@ export function createFsExtension(config) {
      */
     const list = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const dirPath = args['path'] ?? '';
+        const { mountName, relativePath: dirPath } = parseMountPath(args['path'], mounts);
         const resolvedPath = await resolvePath(mountName, dirPath, mounts, 'read');
         const entries = await fs.readdir(resolvedPath, { withFileTypes: true });
         const result = [];
@@ -180,13 +176,20 @@ export function createFsExtension(config) {
      */
     const find = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
+        const { mountName, relativePath: searchBase } = parseMountPath(args['path'], mounts);
         const pattern = args['pattern'] ?? '*';
         const mount = mounts[mountName];
         if (!mount || !mount.resolvedPath) {
             throw new RuntimeError('RILL-R004', `mount "${mountName}" not configured`, undefined, { mountName });
         }
-        const basePath = mount.resolvedPath;
+        let basePath;
+        if (searchBase) {
+            // Validate searchBase through sandbox resolver to prevent path traversal
+            basePath = await resolvePath(mountName, searchBase, mounts, 'read');
+        }
+        else {
+            basePath = mount.resolvedPath;
+        }
         const results = [];
         // Recursive directory traversal
         const traverse = async (currentPath) => {
@@ -198,7 +201,7 @@ export function createFsExtension(config) {
                 }
                 else if (matchesGlob(entry.name, pattern)) {
                     // Return path relative to mount base
-                    const relativePath = path.relative(basePath, fullPath);
+                    const relativePath = path.relative(mount.resolvedPath, fullPath);
                     results.push(relativePath);
                 }
             }
@@ -212,8 +215,7 @@ export function createFsExtension(config) {
      */
     const exists = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const filePath = args['path'];
+        const { mountName, relativePath: filePath } = parseMountPath(args['path'], mounts);
         try {
             await resolvePath(mountName, filePath, mounts, 'read');
             return true;
@@ -232,8 +234,7 @@ export function createFsExtension(config) {
      */
     const remove = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const filePath = args['path'];
+        const { mountName, relativePath: filePath } = parseMountPath(args['path'], mounts);
         // Catch file not found from resolvePath
         let resolvedPath;
         try {
@@ -265,8 +266,7 @@ export function createFsExtension(config) {
      */
     const stat = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const filePath = args['path'];
+        const { mountName, relativePath: filePath } = parseMountPath(args['path'], mounts);
         // Catch file not found from resolvePath
         let resolvedPath;
         try {
@@ -295,8 +295,7 @@ export function createFsExtension(config) {
      */
     const mkdir = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const dirPath = args['path'];
+        const { mountName, relativePath: dirPath } = parseMountPath(args['path'], mounts);
         const mount = mounts[mountName];
         if (!mount || !mount.resolvedPath) {
             throw new RuntimeError('RILL-R004', `mount "${mountName}" not configured`, undefined, { mountName });
@@ -345,9 +344,13 @@ export function createFsExtension(config) {
      */
     const copy = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const srcPath = args['src'];
-        const destPath = args['dest'];
+        const { mountName: srcMountName, relativePath: srcPath } = parseMountPath(args['src'], mounts);
+        const { mountName: destMountName, relativePath: destPath } = parseMountPath(args['dest'], mounts);
+        const mountName = srcMountName;
+        // Verify same mount
+        if (srcMountName !== destMountName) {
+            throw new RuntimeError('RILL-R004', `copy requires same mount for src and dest`, undefined, { src: args['src'], dest: args['dest'] });
+        }
         const resolvedSrc = await resolvePath(mountName, srcPath, mounts, 'read');
         const resolvedDest = await resolvePath(mountName, destPath, mounts, 'write', true // createMode
         );
@@ -374,9 +377,13 @@ export function createFsExtension(config) {
      */
     const move = async (args) => {
         await ensureInitialized();
-        const mountName = args['mount'];
-        const srcPath = args['src'];
-        const destPath = args['dest'];
+        const { mountName: srcMountName, relativePath: srcPath } = parseMountPath(args['src'], mounts);
+        const { mountName: destMountName, relativePath: destPath } = parseMountPath(args['dest'], mounts);
+        const mountName = srcMountName;
+        // Verify same mount
+        if (srcMountName !== destMountName) {
+            throw new RuntimeError('RILL-R004', `move requires same mount for src and dest`, undefined, { src: args['src'], dest: args['dest'] });
+        }
         const resolvedSrc = await resolvePath(mountName, srcPath, mounts, 'read');
         const resolvedDest = await resolvePath(mountName, destPath, mounts, 'write', true // createMode
         );
@@ -416,36 +423,28 @@ export function createFsExtension(config) {
         value: {
             read: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'File path relative to mount' },
+                        annotations: {
+                            description: 'Mount-prefixed file path (e.g. "/mount/file.txt")',
+                        },
                     },
                 ],
                 fn: read,
                 annotations: { description: 'Read file contents' },
-                returnType: rillTypeToTypeValue({ kind: 'string' }),
+                returnType: structureToTypeValue({ kind: 'string' }),
             }),
             write: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'File path relative to mount' },
+                        annotations: {
+                            description: 'Mount-prefixed file path (e.g. "/mount/file.txt")',
+                        },
                     },
                     {
                         name: 'content',
@@ -456,21 +455,17 @@ export function createFsExtension(config) {
                 ],
                 fn: write,
                 annotations: { description: 'Write file, replacing if exists' },
-                returnType: rillTypeToTypeValue({ kind: 'string' }),
+                returnType: structureToTypeValue({ kind: 'string' }),
             }),
             append: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'File path relative to mount' },
+                        annotations: {
+                            description: 'Mount-prefixed file path (e.g. "/mount/file.txt")',
+                        },
                     },
                     {
                         name: 'content',
@@ -481,34 +476,42 @@ export function createFsExtension(config) {
                 ],
                 fn: append,
                 annotations: { description: 'Append content to file' },
-                returnType: rillTypeToTypeValue({ kind: 'string' }),
+                returnType: structureToTypeValue({ kind: 'string' }),
             }),
             list: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
-                        defaultValue: '',
-                        annotations: { description: 'Directory path relative to mount' },
+                        defaultValue: undefined,
+                        annotations: {
+                            description: 'Mount-prefixed directory path (e.g. "/mount/subdir")',
+                        },
                     },
                 ],
                 fn: list,
                 annotations: { description: 'List directory contents' },
-                returnType: rillTypeToTypeValue({ kind: 'list' }),
+                returnType: structureToTypeValue({
+                    kind: 'list',
+                    element: {
+                        kind: 'dict',
+                        fields: {
+                            name: { type: { kind: 'string' } },
+                            type: { type: { kind: 'string' } },
+                            size: { type: { kind: 'number' } },
+                        },
+                    },
+                }),
             }),
             find: toCallable({
                 params: [
                     {
-                        name: 'mount',
+                        name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
+                        annotations: {
+                            description: 'Mount-prefixed base path (e.g. "/mount" or "/mount/subdir")',
+                        },
                     },
                     {
                         name: 'pattern',
@@ -519,139 +522,123 @@ export function createFsExtension(config) {
                 ],
                 fn: find,
                 annotations: { description: 'Recursive file search' },
-                returnType: rillTypeToTypeValue({ kind: 'list' }),
+                returnType: structureToTypeValue({
+                    kind: 'list',
+                    element: { kind: 'string' },
+                }),
             }),
             exists: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'File path relative to mount' },
+                        annotations: {
+                            description: 'Mount-prefixed file path (e.g. "/mount/file.txt")',
+                        },
                     },
                 ],
                 fn: exists,
                 annotations: { description: 'Check file existence' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             remove: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'File path relative to mount' },
+                        annotations: {
+                            description: 'Mount-prefixed file path (e.g. "/mount/file.txt")',
+                        },
                     },
                 ],
                 fn: remove,
                 annotations: { description: 'Delete file' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             stat: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'File path relative to mount' },
+                        annotations: {
+                            description: 'Mount-prefixed file path (e.g. "/mount/file.txt")',
+                        },
                     },
                 ],
                 fn: stat,
                 annotations: { description: 'Get file metadata' },
-                returnType: rillTypeToTypeValue({ kind: 'dict' }),
+                returnType: structureToTypeValue({
+                    kind: 'dict',
+                    fields: {
+                        name: { type: { kind: 'string' } },
+                        type: { type: { kind: 'string' } },
+                        size: { type: { kind: 'number' } },
+                        created: { type: { kind: 'string' } },
+                        modified: { type: { kind: 'string' } },
+                    },
+                }),
             }),
             mkdir: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'path',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'Directory path relative to mount' },
+                        annotations: {
+                            description: 'Mount-prefixed directory path (e.g. "/mount/subdir")',
+                        },
                     },
                 ],
                 fn: mkdir,
                 annotations: { description: 'Create directory' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             copy: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'src',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'Source file path' },
+                        annotations: { description: 'Mount-prefixed source path' },
                     },
                     {
                         name: 'dest',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'Destination file path' },
+                        annotations: { description: 'Mount-prefixed destination path' },
                     },
                 ],
                 fn: copy,
                 annotations: { description: 'Copy file within mount' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             move: toCallable({
                 params: [
-                    {
-                        name: 'mount',
-                        type: { kind: 'string' },
-                        defaultValue: undefined,
-                        annotations: { description: 'Mount name' },
-                    },
                     {
                         name: 'src',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'Source file path' },
+                        annotations: { description: 'Mount-prefixed source path' },
                     },
                     {
                         name: 'dest',
                         type: { kind: 'string' },
                         defaultValue: undefined,
-                        annotations: { description: 'Destination file path' },
+                        annotations: { description: 'Mount-prefixed destination path' },
                     },
                 ],
                 fn: move,
                 annotations: { description: 'Move file within mount' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             mounts: toCallable({
                 params: [],
                 fn: mountsList,
                 annotations: { description: 'List configured mounts' },
-                returnType: rillTypeToTypeValue({ kind: 'list' }),
+                returnType: structureToTypeValue({ kind: 'list' }),
             }),
         },
     };

package/dist/ext/fs/sandbox.d.ts

@@ -75,3 +75,21 @@ export declare function checkMode(mode: 'read' | 'write' | 'read-write', operati
  * @throws RuntimeError - If mount path invalid or inaccessible
  */
 export declare function initializeMount(mount: MountConfig): Promise<void>;
+/**
+ * Parses a mount-prefixed path into mount name and relative path.
+ *
+ * Uses longest-first prefix matching to support mount names containing slashes.
+ * Strips a leading `/` before matching.
+ * Example: "/workspace/my/file.txt" → { mountName: "workspace", relativePath: "my/file.txt" }
+ * Example: "/the/mount/file.txt" → { mountName: "the/mount", relativePath: "file.txt" }
+ * Example: "/workspace" → { mountName: "workspace", relativePath: "" }
+ *
+ * @param fullPath - Path with leading `/` and mount prefix
+ * @param mounts - Mount configuration map
+ * @returns Parsed mount name and relative path
+ * @throws RuntimeError - If no mount matches the path prefix
+ */
+export declare function parseMountPath(fullPath: string, mounts: Record<string, MountConfig>): {
+    mountName: string;
+    relativePath: string;
+};

package/dist/ext/fs/sandbox.js

@@ -205,3 +205,36 @@ export async function initializeMount(mount) {
         throw error;
     }
 }
+// ============================================================
+// MOUNT PATH PARSING
+// ============================================================
+/**
+ * Parses a mount-prefixed path into mount name and relative path.
+ *
+ * Uses longest-first prefix matching to support mount names containing slashes.
+ * Strips a leading `/` before matching.
+ * Example: "/workspace/my/file.txt" → { mountName: "workspace", relativePath: "my/file.txt" }
+ * Example: "/the/mount/file.txt" → { mountName: "the/mount", relativePath: "file.txt" }
+ * Example: "/workspace" → { mountName: "workspace", relativePath: "" }
+ *
+ * @param fullPath - Path with leading `/` and mount prefix
+ * @param mounts - Mount configuration map
+ * @returns Parsed mount name and relative path
+ * @throws RuntimeError - If no mount matches the path prefix
+ */
+export function parseMountPath(fullPath, mounts) {
+    const normalized = fullPath.startsWith('/') ? fullPath.slice(1) : fullPath;
+    const sortedNames = Object.keys(mounts).sort((a, b) => b.length - a.length);
+    for (const mountName of sortedNames) {
+        if (normalized === mountName) {
+            return { mountName, relativePath: '' };
+        }
+        if (normalized.startsWith(mountName + '/')) {
+            return {
+                mountName,
+                relativePath: normalized.slice(mountName.length + 1),
+            };
+        }
+    }
+    throw new RuntimeError('RILL-R017', `no mount matches path "${fullPath}"`, undefined, { path: fullPath });
+}

package/dist/ext/kv/index.js

@@ -8,7 +8,7 @@ import { RuntimeError } from '../../error-classes.js';
 import { toCallable } from '../../runtime/core/callable.js';
 import { isDict } from '../../runtime/core/callable.js';
 import { createStore } from './store.js';
-import { rillTypeToTypeValue, } from '../../runtime/core/values.js';
+import { structureToTypeValue } from '../../runtime/core/values.js';
 export const configSchema = {
     store: { type: 'string' },
     mounts: { type: 'string' },
@@ -299,7 +299,7 @@ export function createKvExtension(config) {
                 ],
                 fn: get,
                 annotations: { description: 'Get value or schema default' },
-                returnType: rillTypeToTypeValue({ kind: 'any' }),
+                returnType: structureToTypeValue({ kind: 'any' }),
             }),
             get_or: toCallable({
                 params: [
@@ -326,7 +326,7 @@ export function createKvExtension(config) {
                 annotations: {
                     description: 'Get value or return fallback if key missing',
                 },
-                returnType: rillTypeToTypeValue({ kind: 'any' }),
+                returnType: structureToTypeValue({ kind: 'any' }),
             }),
             set: toCallable({
                 params: [
@@ -351,7 +351,7 @@ export function createKvExtension(config) {
                 ],
                 fn: set,
                 annotations: { description: 'Set value with validation' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             merge: toCallable({
                 params: [
@@ -378,7 +378,7 @@ export function createKvExtension(config) {
                 annotations: {
                     description: 'Merge partial dict into existing dict value',
                 },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             delete: toCallable({
                 params: [
@@ -397,7 +397,7 @@ export function createKvExtension(config) {
                 ],
                 fn: deleteKey,
                 annotations: { description: 'Delete key' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             keys: toCallable({
                 params: [
@@ -410,7 +410,7 @@ export function createKvExtension(config) {
                 ],
                 fn: keys,
                 annotations: { description: 'Get all keys in mount' },
-                returnType: rillTypeToTypeValue({ kind: 'list' }),
+                returnType: structureToTypeValue({ kind: 'list' }),
             }),
             has: toCallable({
                 params: [
@@ -429,7 +429,7 @@ export function createKvExtension(config) {
                 ],
                 fn: has,
                 annotations: { description: 'Check key existence' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             clear: toCallable({
                 params: [
@@ -442,7 +442,7 @@ export function createKvExtension(config) {
                 ],
                 fn: clear,
                 annotations: { description: 'Clear all keys in mount' },
-                returnType: rillTypeToTypeValue({ kind: 'bool' }),
+                returnType: structureToTypeValue({ kind: 'bool' }),
             }),
             getAll: toCallable({
                 params: [
@@ -455,7 +455,7 @@ export function createKvExtension(config) {
                 ],
                 fn: getAll,
                 annotations: { description: 'Get all entries as dict' },
-                returnType: rillTypeToTypeValue({ kind: 'dict' }),
+                returnType: structureToTypeValue({ kind: 'dict' }),
             }),
             schema: toCallable({
                 params: [
@@ -468,13 +468,13 @@ export function createKvExtension(config) {
                 ],
                 fn: schema,
                 annotations: { description: 'Get schema information' },
-                returnType: rillTypeToTypeValue({ kind: 'list' }),
+                returnType: structureToTypeValue({ kind: 'list' }),
             }),
             mounts: toCallable({
                 params: [],
                 fn: mountsList,
                 annotations: { description: 'Get list of mount metadata' },
-                returnType: rillTypeToTypeValue({ kind: 'list' }),
+                returnType: structureToTypeValue({ kind: 'list' }),
             }),
         },
         dispose,

package/dist/ext/kv/store.d.ts

@@ -4,7 +4,7 @@
  * Provides JSON-based key-value persistence with schema validation.
  * Lifecycle: Load (read store file) -> Execute (in-memory operations) -> Flush (atomic write on dispose)
  */
-import type { RillValue } from '../../runtime/core/values.js';
+import type { RillValue } from '../../runtime/core/types/structures.js';
 /** Schema entry defining type and default for a key */
 export interface SchemaEntry {
     type: 'string' | 'number' | 'bool' | 'list' | 'dict';

package/dist/ext/kv/store.js

@@ -7,7 +7,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { RuntimeError } from '../../error-classes.js';
-import { deserializeValue } from '../../runtime/core/type-registrations.js';
+import { deserializeValue } from '../../runtime/core/types/registrations.js';
 // ============================================================
 // STORE IMPLEMENTATION
 // ============================================================

package/dist/generated/version-data.d.ts

@@ -10,7 +10,7 @@ export interface VersionInfo {
 /**
  * Version string from package.json
  */
-export declare const VERSION = "0.17.0";
+export declare const VERSION = "0.18.0";
 /**
  * Parsed version components
  */

package/dist/generated/version-data.js

@@ -3,13 +3,13 @@
 /**
  * Version string from package.json
  */
-export const VERSION = '0.17.0';
+export const VERSION = '0.18.0';
 /**
  * Parsed version components
  */
 export const VERSION_INFO = {
     major: 0,
-    minor: 17,
+    minor: 18,
     patch: 0,
     prerelease: undefined,
 };