sh3-core 0.20.2 → 0.21.0

package/dist/shell-shard/verbs/xfer.js

@@ -3,7 +3,8 @@ export const xferVerb = {
     name: 'xfer',
     summary: [
         'Transfer docs across scopes. Usage: xfer [-R] [-C] <src> <dst>',
-        '  Scopes: @me | @project-<slug>  (e.g. @project-acme:notes/draft.md)',
+        '  Scopes: @me | @project-<slug>  (e.g. @me:notes/draft.md, @project-acme:notes/draft.md)',
+        '  Either side may be @me or @project-<slug>; bare paths resolve to the active scope.',
         '  -R  recursive (src is a folder prefix)',
         '  -C  copy only, do not delete source',
     ].join('\n'),
@@ -14,12 +15,10 @@ export const xferVerb = {
             ctx.scrollback.push({ kind: 'status', text: 'xfer: document capability not available', level: 'error', ts });
             return;
         }
-        const scope = ctx.sh3.getActiveScope();
-        if (!scope.isProject) {
-            ctx.scrollback.push({ kind: 'status', text: 'xfer: only available when a project scope is active', level: 'error', ts });
+        if (!ctx.docs.transferBetweenScopes) {
+            ctx.scrollback.push({ kind: 'status', text: 'xfer: write permission not granted', level: 'error', ts });
             return;
         }
-        // Parse flags
         let recursive = false;
         let copy = false;
         const positional = [];
@@ -38,16 +37,13 @@ export const xferVerb = {
             ctx.scrollback.push({ kind: 'status', text: 'usage: xfer [-R] [-C] <src> <dst>', level: 'error', ts });
             return;
         }
-        if (!ctx.docs.transferToScope) {
-            ctx.scrollback.push({ kind: 'status', text: 'xfer: write permission not granted', level: 'error', ts });
-            return;
-        }
         const srcParsed = parseScopePath(positional[0]);
         const dstParsed = parseScopePath(positional[1]);
         if (!srcParsed || !dstParsed) {
             ctx.scrollback.push({ kind: 'status', text: 'xfer: invalid path', level: 'error', ts });
             return;
         }
+        const scope = ctx.sh3.getActiveScope();
         let srcTenant;
         let dstTenant;
         try {
@@ -58,33 +54,23 @@ export const xferVerb = {
             ctx.scrollback.push({ kind: 'status', text: `xfer: ${e.message}`, level: 'error', ts });
             return;
         }
-        // transferToScope always reads from the active tenant; reject if src doesn't match.
-        if (srcTenant !== scope.id) {
-            ctx.scrollback.push({
-                kind: 'status',
-                text: 'xfer: source must be the active project scope in v1 — switch to the source scope first',
-                level: 'error',
-                ts,
-            });
-            return;
-        }
-        const opts = { delete: !copy, targetShardId: dstParsed.shardId };
+        const moveOpts = { delete: !copy };
         if (!recursive) {
             if (!srcParsed.path) {
                 ctx.scrollback.push({ kind: 'status', text: 'xfer: path required (use -R for folder recursion)', level: 'error', ts });
                 return;
             }
-            await ctx.docs.transferToScope(srcParsed.shardId, srcParsed.path, dstTenant, opts);
+            if (srcTenant === dstTenant && srcParsed.shardId === dstParsed.shardId && srcParsed.path === dstParsed.path) {
+                ctx.scrollback.push({ kind: 'status', text: 'xfer: source and destination are the same', level: 'error', ts });
+                return;
+            }
+            await ctx.docs.transferBetweenScopes(srcTenant, srcParsed.shardId, srcParsed.path, dstTenant, dstParsed.shardId, dstParsed.path, moveOpts);
             const verb = copy ? 'copied' : 'moved';
             ctx.scrollback.push({ kind: 'status', text: `xfer: ${verb} ${positional[0]} → ${positional[1]}`, level: 'info', ts });
             return;
         }
-        // Recursive: list all docs in srcTenant matching the prefix
-        // transferToScope uses getTenantId() (active scope) — to read from srcTenant
-        // we rely on the src scope being the active tenant or the capability seeing it.
-        // For v1 we use listDocuments (active tenant) and filter by shard + prefix.
         const prefix = srcParsed.path;
-        const allDocs = await ctx.docs.listDocuments();
+        const allDocs = await ctx.docs.listDocumentsIn(srcTenant);
         const matching = allDocs.filter((d) => d.shardId === srcParsed.shardId && (!prefix || d.path.startsWith(prefix)));
         if (matching.length === 0) {
             ctx.scrollback.push({ kind: 'status', text: `xfer: no documents found under ${positional[0]}`, level: 'info', ts });
@@ -92,7 +78,7 @@ export const xferVerb = {
         }
         let count = 0;
         for (const doc of matching) {
-            await ctx.docs.transferToScope(doc.shardId, doc.path, dstTenant, opts);
+            await ctx.docs.transferBetweenScopes(srcTenant, doc.shardId, doc.path, dstTenant, dstParsed.shardId, doc.path, moveOpts);
             count++;
         }
         const verb = copy ? 'copied' : 'moved';

package/dist/shell-shard/verbs/xfer.test.js

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi } from 'vitest';
 import { xferVerb } from './xfer';
 function makeDocs(overrides = {}) {
-    return Object.assign({ listDocuments: vi.fn(async () => []), listShards: vi.fn(async () => []), watchDocuments: vi.fn(() => () => { }), transferToScope: vi.fn(async () => { }) }, overrides);
+    return Object.assign({ listDocuments: vi.fn(async () => []), listShards: vi.fn(async () => []), watchDocuments: vi.fn(() => () => { }), transferToScope: vi.fn(async () => { }), listDocumentsIn: vi.fn(async () => []), transferBetweenScopes: vi.fn(async () => { }) }, overrides);
 }
 function makeSh3(scope) {
     return {
@@ -32,13 +32,15 @@ describe('xfer verb', () => {
         const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
         expect(err).toBeDefined();
     });
-    it('emits error when active scope is not a project', async () => {
+    it('works from personal (non-project) scope', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(personalScope);
-        const { ctx, pushed } = makeCtx(makeDocs(), sh3);
-        await xferVerb.run(ctx, ['notes/draft.md', '@me:notes/draft.md']);
-        const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
-        expect(err).toBeDefined();
-        expect(err.text).toMatch(/project/i);
+        const { ctx, pushed } = makeCtx(docs, sh3);
+        await xferVerb.run(ctx, ['@me:notes/draft.md', '@project-proj-abc:notes/draft.md']);
+        expect(transferBetweenScopes).toHaveBeenCalledWith('user-me', 'notes', 'draft.md', 'proj-abc', 'notes', 'draft.md', expect.objectContaining({ delete: true }));
+        const ok = pushed.find((e) => e.kind === 'status' && e.level === 'info');
+        expect(ok).toBeDefined();
     });
     it('emits usage error when fewer than two args', async () => {
         const sh3 = makeSh3(projectScope);
@@ -47,50 +49,59 @@ describe('xfer verb', () => {
         const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
         expect(err.text).toMatch(/usage/i);
     });
-    it('moves (default) a doc from project to personal scope', async () => {
-        const transferToScope = vi.fn(async () => { });
-        const docs = makeDocs({ transferToScope });
+    it('moves a doc from project to personal scope', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(projectScope);
         const { ctx, pushed } = makeCtx(docs, sh3);
         await xferVerb.run(ctx, ['@project-proj-abc:notes/draft.md', '@me:notes/draft.md']);
-        expect(transferToScope).toHaveBeenCalledWith('notes', 'draft.md', 'user-me', expect.objectContaining({ delete: true }));
+        expect(transferBetweenScopes).toHaveBeenCalledWith('proj-abc', 'notes', 'draft.md', 'user-me', 'notes', 'draft.md', expect.objectContaining({ delete: true }));
         const ok = pushed.find((e) => e.kind === 'status' && e.level === 'info');
         expect(ok).toBeDefined();
     });
     it('-C flag copies without deleting source', async () => {
-        const transferToScope = vi.fn(async () => { });
-        const docs = makeDocs({ transferToScope });
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(projectScope);
         const { ctx } = makeCtx(docs, sh3);
         await xferVerb.run(ctx, ['-C', '@project-proj-abc:notes/draft.md', '@me:notes/draft.md']);
-        expect(transferToScope).toHaveBeenCalledWith('notes', 'draft.md', 'user-me', expect.objectContaining({ delete: false }));
+        expect(transferBetweenScopes).toHaveBeenCalledWith('proj-abc', 'notes', 'draft.md', 'user-me', 'notes', 'draft.md', expect.objectContaining({ delete: false }));
     });
-    it('rejects when src scope is not the active project (v1 limitation)', async () => {
-        const transferToScope = vi.fn(async () => { });
-        const docs = makeDocs({ transferToScope });
+    it('allows @me as source when project scope is active', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(projectScope);
         const { ctx, pushed } = makeCtx(docs, sh3);
-        // @me src while project is active → src tenant differs from active
         await xferVerb.run(ctx, ['@me:notes/draft.md', '@project-proj-abc:notes/draft.md']);
-        expect(transferToScope).not.toHaveBeenCalled();
+        expect(transferBetweenScopes).toHaveBeenCalledWith('user-me', 'notes', 'draft.md', 'proj-abc', 'notes', 'draft.md', expect.objectContaining({ delete: true }));
+        const ok = pushed.find((e) => e.kind === 'status' && e.level === 'info');
+        expect(ok).toBeDefined();
+    });
+    it('emits error when source and destination are identical', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
+        const sh3 = makeSh3(projectScope);
+        const { ctx, pushed } = makeCtx(docs, sh3);
+        await xferVerb.run(ctx, ['@project-proj-abc:notes/draft.md', '@project-proj-abc:notes/draft.md']);
+        expect(transferBetweenScopes).not.toHaveBeenCalled();
         const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
-        expect(err).toBeDefined();
+        expect(err.text).toMatch(/same/i);
     });
     it('-R flag recurses over all docs matching src prefix', async () => {
-        const transferToScope = vi.fn(async () => { });
+        const transferBetweenScopes = vi.fn(async () => { });
         const allDocs = [
             { shardId: 'notes', path: 'ideas/a.md', size: 1, lastModified: 0 },
             { shardId: 'notes', path: 'ideas/b.md', size: 1, lastModified: 0 },
             { shardId: 'notes', path: 'other.md', size: 1, lastModified: 0 },
         ];
         const docs = makeDocs({
-            transferToScope,
-            listDocuments: vi.fn(async () => allDocs),
+            transferBetweenScopes,
+            listDocumentsIn: vi.fn(async () => allDocs),
         });
         const sh3 = makeSh3(projectScope);
         const { ctx } = makeCtx(docs, sh3);
         await xferVerb.run(ctx, ['-R', '@project-proj-abc:notes/ideas', '@me:notes/ideas']);
-        // Only the two docs under ideas/ should be transferred
-        expect(transferToScope).toHaveBeenCalledTimes(2);
+        expect(transferBetweenScopes).toHaveBeenCalledTimes(2);
+        expect(transferBetweenScopes).toHaveBeenCalledWith('proj-abc', 'notes', 'ideas/a.md', 'user-me', 'notes', 'ideas/a.md', expect.objectContaining({ delete: true }));
     });
 });

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 /** Auto-generated from package.json — do not edit manually. */
-export declare const VERSION = "0.20.2";
+export declare const VERSION = "0.21.0";

package/dist/version.js

@@ -1,2 +1,2 @@
 /** Auto-generated from package.json — do not edit manually. */
-export const VERSION = '0.20.2';
+export const VERSION = '0.21.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh3-core",
-  "version": "0.20.2",
+  "version": "0.21.0",
   "type": "module",
   "files": [
     "dist"
@@ -39,7 +39,8 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "esm-env": "^1.1.0"
+    "esm-env": "^1.1.0",
+    "fflate": "^0.8.3"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",