@myagentroam/node 0.11.36 → 0.11.37

package/dist/database.js

@@ -3,7 +3,7 @@ import { NODE_SCHEMA_MIGRATION_V18 } from './migrations/v018.js';
 import { NODE_SCHEMA_MIGRATION_V19 } from './migrations/v019.js';
 import { NODE_SCHEMA_MIGRATION_V20 } from './migrations/v020.js';
 import { NODE_SCHEMA_MIGRATION_V21 } from './migrations/v021.js';
-import { normalizeSessionPrompt } from './util/personal-instructions.js';
+import { normalizeSessionPrompt } from './runner/personal-instructions.js';
 import { randomUUID } from 'node:crypto';
 import { closeSync, existsSync, mkdirSync, openSync, rmSync } from 'node:fs';
 import { dirname } from 'node:path';
@@ -381,7 +381,7 @@ export class NodeDatabase {
             .get(sessionId);
         return row === undefined ? undefined : sessionRecord(row);
     }
-    movePinnedSession(sessionId, direction) {
+    movePinnedSession(sessionId, direction, target) {
         const current = this.raw
             .prepare('SELECT workspace_id, pin_order FROM agent_sessions WHERE id = ?')
             .get(sessionId);
@@ -389,21 +389,41 @@ export class NodeDatabase {
             throw new Error('SESSION_NOT_PINNED');
         const order = numberValue(current, 'pin_order');
         const workspaceId = stringValue(current, 'workspace_id');
-        const adjacent = this.raw
-            .prepare(direction === 'up'
-            ? 'SELECT id, pin_order FROM agent_sessions WHERE workspace_id = ? AND pin_order < ? ORDER BY pin_order DESC LIMIT 1'
-            : 'SELECT id, pin_order FROM agent_sessions WHERE workspace_id = ? AND pin_order > ? ORDER BY pin_order ASC LIMIT 1')
-            .get(workspaceId, order);
-        if (adjacent === undefined)
+        const destination = target === undefined
+            ? this.raw
+                .prepare(direction === 'up'
+                ? 'SELECT id, pin_order FROM agent_sessions WHERE workspace_id = ? AND pin_order < ? ORDER BY pin_order DESC LIMIT 1'
+                : 'SELECT id, pin_order FROM agent_sessions WHERE workspace_id = ? AND pin_order > ? ORDER BY pin_order ASC LIMIT 1')
+                .get(workspaceId, order)
+            : this.raw
+                .prepare('SELECT id, pin_order FROM agent_sessions WHERE workspace_id = ? AND id = ? AND pin_order IS NOT NULL')
+                .get(workspaceId, target.sessionId);
+        if (target !== undefined && destination === undefined)
+            throw new Error('SESSION_PIN_MOVE_INVALID');
+        if (destination === undefined)
+            return workspaceId;
+        const targetOrder = numberValue(destination, 'pin_order');
+        if (targetOrder === order)
+            return workspaceId;
+        const excludedTargetId = target !== undefined &&
+            ((targetOrder > order && target.position === 'before') ||
+                (targetOrder < order && target.position === 'after'))
+            ? target.sessionId
+            : null;
+        const displaced = this.raw
+            .prepare(`SELECT id, pin_order FROM agent_sessions WHERE workspace_id = ? AND pin_order BETWEEN ? AND ? AND id != ? AND (? IS NULL OR id != ?) ORDER BY pin_order ${targetOrder < order ? 'DESC' : 'ASC'}`)
+            .all(workspaceId, Math.min(order, targetOrder), Math.max(order, targetOrder), sessionId, excludedTargetId, excludedTargetId);
+        if (displaced.length === 0)
             return workspaceId;
         this.raw.exec('BEGIN IMMEDIATE');
         try {
-            this.raw
-                .prepare('UPDATE agent_sessions SET pin_order = ? WHERE id = ?')
-                .run(order, stringValue(adjacent, 'id'));
-            this.raw
-                .prepare('UPDATE agent_sessions SET pin_order = ? WHERE id = ?')
-                .run(numberValue(adjacent, 'pin_order'), sessionId);
+            const update = this.raw.prepare('UPDATE agent_sessions SET pin_order = ? WHERE id = ?');
+            let nextOrder = order;
+            for (const row of displaced) {
+                update.run(nextOrder, stringValue(row, 'id'));
+                nextOrder = numberValue(row, 'pin_order');
+            }
+            update.run(nextOrder, sessionId);
             this.raw.exec('COMMIT');
         }
         catch (error) {

package/dist/git-askpass.js

@@ -1,4 +1,4 @@
-import { gitCredentialRequest } from './util/git-credential-client.js';
+import { gitCredentialRequest } from './workspace/git-credential-client.js';
 // SSH_ASKPASS points to node itself; NODE_OPTIONS imports this before its prompt argument.
 try {
     const result = await gitCredentialRequest('/passphrase', { id: process.env.MAR_GIT_KEY_ID });

package/dist/git-execution-helper.js

@@ -1,7 +1,7 @@
 import { spawn, execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { gitCredentialRequest, originalGitEnvironment } from './util/git-credential-client.js';
+import { gitCredentialRequest, originalGitEnvironment } from './workspace/git-credential-client.js';
 async function run(command, args, options = {}) {
     return new Promise((resolve, reject) => {
         const child = spawn(command, args, {

package/dist/hosting/hosted-conversation-file-identity.js

@@ -0,0 +1,27 @@
+import { constants } from 'node:fs';
+import { lstat, open } from 'node:fs/promises';
+export async function assertRegularFile(path, expectedSize) {
+    const metadata = await regularFileMetadata(path);
+    if (metadata.size !== expectedSize)
+        throw new Error('HOSTED_CONVERSATION_FILE_INVALID');
+}
+export async function openRegularFile(path) {
+    return open(path, constants.O_RDONLY | constants.O_NOFOLLOW).catch(() => {
+        throw new Error('HOSTED_CONVERSATION_FILE_INVALID');
+    });
+}
+export async function regularFileMetadata(path) {
+    const metadata = await lstat(path).catch(() => {
+        throw new Error('HOSTED_CONVERSATION_FILE_INVALID');
+    });
+    assertRegularFileMetadata(metadata);
+    return metadata;
+}
+export function assertRegularFileMetadata(metadata) {
+    if (!metadata.isFile() ||
+        metadata.isSymbolicLink() ||
+        metadata.nlink !== 1 ||
+        !Number.isSafeInteger(metadata.size) ||
+        metadata.size < 0)
+        throw new Error('HOSTED_CONVERSATION_FILE_INVALID');
+}

package/dist/hosting/hosted-conversation-file-operations.js

@@ -0,0 +1,44 @@
+/** Owns file mutation admission and deletion conflict lifetimes. */
+export class HostedConversationFileOperations {
+    writes = new Map();
+    deletes = new Set();
+    busy(conversationId) {
+        return this.writes.has(conversationId);
+    }
+    async write(conversationId, uploadId, operation) {
+        const writes = this.writes.get(conversationId) ?? new Set();
+        if (uploadId !== undefined && [...writes].some((write) => write.uploadId === uploadId))
+            throw new Error('HOSTED_CONVERSATION_FILE_CONFLICT');
+        // Admission precedes the operation's first asynchronous preparation.
+        const write = {
+            ...(uploadId === undefined ? {} : { uploadId }),
+            completion: Promise.resolve().then(operation)
+        };
+        writes.add(write);
+        this.writes.set(conversationId, writes);
+        try {
+            return await write.completion;
+        }
+        finally {
+            writes.delete(write);
+            if (writes.size === 0)
+                this.writes.delete(conversationId);
+        }
+    }
+    beginDelete(key) {
+        if (this.deletes.has(key))
+            throw new Error('HOSTED_CONVERSATION_FILE_CONFLICT');
+        this.deletes.add(key);
+    }
+    endDelete(key) {
+        this.deletes.delete(key);
+    }
+    async wait(conversationId) {
+        const writes = this.writes.get(conversationId);
+        if (writes)
+            await Promise.allSettled([...writes].map((write) => write.completion));
+    }
+    async close() {
+        await Promise.all([...this.writes.keys()].map((id) => this.wait(id)));
+    }
+}