agl 22.0.0 → 22.0.1

package/dist_ts_migration/classes.documentmigrationrunner.js

@@ -3,6 +3,7 @@ import { ProtocolV6DocumentMigration } from './v6_protocoldocumentmigration.js';
 import { ProtocolV18ResourceLayoutMigration } from './v18_resourcelayoutmigration.js';
 import { ProtocolV22ProjectFilesystemIdentityMigration } from './v22_projectfilesystemidentitymigration.js';
 import { RuntimeConfigV23Migration } from './v23_runtimeconfig.js';
+import { LegacyTerminalLayoutV24Migration } from './v24_legacyterminallayoutmigration.js';
 export class PostDatabaseDocumentMigrationRunner {
     database;
     migrations;
@@ -10,6 +11,7 @@ export class PostDatabaseDocumentMigrationRunner {
         this.database = database;
         this.migrations = [
             new RuntimeConfigV23Migration(this.database),
+            new LegacyTerminalLayoutV24Migration(this.database),
             new ProtocolV6DocumentMigration(this.database),
             new ProtocolV18ResourceLayoutMigration(this.database),
         ];
@@ -23,4 +25,4 @@ export class PostDatabaseDocumentMigrationRunner {
         await new ProtocolV22ProjectFilesystemIdentityMigration(this.database, controllerIdArg).run();
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kb2N1bWVudG1pZ3JhdGlvbnJ1bm5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX21pZ3JhdGlvbi9jbGFzc2VzLmRvY3VtZW50bWlncmF0aW9ucnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDaEYsT0FBTyxFQUFFLGtDQUFrQyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDdEYsT0FBTyxFQUFFLDZDQUE2QyxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDNUcsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFNbkUsTUFBTSxPQUFPLG1DQUFtQztJQUdqQjtJQUZaLFVBQVUsQ0FBdUI7SUFFbEQsWUFBNkIsUUFBbUQ7UUFBbkQsYUFBUSxHQUFSLFFBQVEsQ0FBMkM7UUFDOUUsSUFBSSxDQUFDLFVBQVUsR0FBRztZQUNoQixJQUFJLHlCQUF5QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDNUMsSUFBSSwyQkFBMkIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1lBQzlDLElBQUksa0NBQWtDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztTQUN0RCxDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxHQUFHO1FBQ2QsS0FBSyxNQUFNLFNBQVMsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDeEMsTUFBTSxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDeEIsQ0FBQztJQUNILENBQUM7SUFFTSxLQUFLLENBQUMsNEJBQTRCLENBQUMsZUFBdUI7UUFDL0QsTUFBTSxJQUFJLDZDQUE2QyxDQUNyRCxJQUFJLENBQUMsUUFBUSxFQUNiLGVBQWUsQ0FDaEIsQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNWLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kb2N1bWVudG1pZ3JhdGlvbnJ1bm5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX21pZ3JhdGlvbi9jbGFzc2VzLmRvY3VtZW50bWlncmF0aW9ucnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDaEYsT0FBTyxFQUFFLGtDQUFrQyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDdEYsT0FBTyxFQUFFLDZDQUE2QyxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDNUcsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDbkUsT0FBTyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFNMUYsTUFBTSxPQUFPLG1DQUFtQztJQUdqQjtJQUZaLFVBQVUsQ0FBdUI7SUFFbEQsWUFBNkIsUUFBbUQ7UUFBbkQsYUFBUSxHQUFSLFFBQVEsQ0FBMkM7UUFDOUUsSUFBSSxDQUFDLFVBQVUsR0FBRztZQUNoQixJQUFJLHlCQUF5QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDNUMsSUFBSSxnQ0FBZ0MsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1lBQ25ELElBQUksMkJBQTJCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztZQUM5QyxJQUFJLGtDQUFrQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7U0FDdEQsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsR0FBRztRQUNkLEtBQUssTUFBTSxTQUFTLElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ3hDLE1BQU0sU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ3hCLENBQUM7SUFDSCxDQUFDO0lBRU0sS0FBSyxDQUFDLDRCQUE0QixDQUFDLGVBQXVCO1FBQy9ELE1BQU0sSUFBSSw2Q0FBNkMsQ0FDckQsSUFBSSxDQUFDLFFBQVEsRUFDYixlQUFlLENBQ2hCLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDVixDQUFDO0NBQ0YifQ==

package/dist_ts_migration/index.d.ts

@@ -12,3 +12,5 @@ export * from './v19_flexprojectmanagement.js';
 export * from './v22_projectfilesystemidentitymigration.js';
 export * from './v23_runtimeconfig.js';
 export * from './v23_aglhome.js';
+export * from './v24_legacyterminallayout.js';
+export * from './v24_legacyterminallayoutmigration.js';

package/dist_ts_migration/index.js

@@ -12,4 +12,6 @@ export * from './v19_flexprojectmanagement.js';
 export * from './v22_projectfilesystemidentitymigration.js';
 export * from './v23_runtimeconfig.js';
 export * from './v23_aglhome.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19taWdyYXRpb24vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLGtDQUFrQyxDQUFDO0FBQ2pELGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxrQ0FBa0MsQ0FBQztBQUNqRCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyw2Q0FBNkMsQ0FBQztBQUM1RCxjQUFjLGdDQUFnQyxDQUFDO0FBQy9DLGNBQWMsNkNBQTZDLENBQUM7QUFDNUQsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLGtCQUFrQixDQUFDIn0=
+export * from './v24_legacyterminallayout.js';
+export * from './v24_legacyterminallayoutmigration.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19taWdyYXRpb24vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLGtDQUFrQyxDQUFDO0FBQ2pELGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxrQ0FBa0MsQ0FBQztBQUNqRCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyw2Q0FBNkMsQ0FBQztBQUM1RCxjQUFjLGdDQUFnQyxDQUFDO0FBQy9DLGNBQWMsNkNBQTZDLENBQUM7QUFDNUQsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyx3Q0FBd0MsQ0FBQyJ9

package/dist_ts_migration/v24_legacyterminallayout.d.ts

@@ -0,0 +1,18 @@
+export interface IV24LegacySessionGroup {
+    id: string;
+    name: string;
+    sessionIds: unknown[];
+}
+export interface IV24LegacySessionGroupsDocument {
+    id: string;
+    controllerId: string;
+    projectId: string;
+    groups: IV24LegacySessionGroup[];
+    ungroupedSessionIds?: unknown[];
+    revision?: number;
+}
+export interface IV24LayoutMigrationResult {
+    document: IV24LegacySessionGroupsDocument;
+    migrated: boolean;
+}
+export declare const migrateV24LegacyTerminalLayoutDocument: (valueArg: unknown) => IV24LayoutMigrationResult;

package/dist_ts_migration/v24_legacyterminallayout.js

@@ -0,0 +1,79 @@
+const legacyOpenCodePtyIdPattern = /^pty_[0-9a-f]{12}[0-9A-Za-z]{14}$/;
+const legacyControllerTerminalIdPattern = /^terminal_[A-Za-z0-9_-]{22}$/;
+const isPlainObject = (valueArg) => {
+    if (typeof valueArg !== 'object' || valueArg === null || Array.isArray(valueArg))
+        return false;
+    const prototype = Object.getPrototypeOf(valueArg);
+    return prototype === Object.prototype || prototype === null;
+};
+const hasExactKeys = (valueArg, requiredArg, optionalArg = []) => {
+    const allowed = new Set([...requiredArg, ...optionalArg]);
+    return requiredArg.every((key) => Object.hasOwn(valueArg, key))
+        && Object.keys(valueArg).every((key) => allowed.has(key));
+};
+const isCanonicalControllerTerminalId = (valueArg) => {
+    if (!legacyControllerTerminalIdPattern.test(valueArg))
+        return false;
+    const suffix = valueArg.slice('terminal_'.length);
+    const decoded = Buffer.from(suffix, 'base64url');
+    return decoded.length === 16 && decoded.toString('base64url') === suffix;
+};
+const isLegacyTerminalNativeId = (valueArg) => (typeof valueArg === 'string'
+    && (legacyOpenCodePtyIdPattern.test(valueArg)
+        || isCanonicalControllerTerminalId(valueArg)));
+const isLegacyTerminalLayoutReference = (valueArg) => {
+    if (typeof valueArg === 'string')
+        return isLegacyTerminalNativeId(valueArg);
+    if (!isPlainObject(valueArg)
+        || Object.keys(valueArg).length !== 2
+        || !Object.hasOwn(valueArg, 'harnessId')
+        || !Object.hasOwn(valueArg, 'nativeId')
+        || typeof valueArg.nativeId !== 'string')
+        return false;
+    if (valueArg.harnessId === 'controller')
+        return true;
+    return valueArg.harnessId === 'opencode' && isLegacyTerminalNativeId(valueArg.nativeId);
+};
+export const migrateV24LegacyTerminalLayoutDocument = (valueArg) => {
+    if (!isPlainObject(valueArg)
+        || !hasExactKeys(valueArg, ['id', 'controllerId', 'projectId', 'groups'], ['ungroupedSessionIds', 'revision'])
+        || !Array.isArray(valueArg.groups)) {
+        throw new Error('Invalid legacy terminal layout migration document.');
+    }
+    const sourceGroups = valueArg.groups;
+    const groups = sourceGroups.map((groupArg) => {
+        if (!isPlainObject(groupArg)
+            || !hasExactKeys(groupArg, ['id', 'name', 'sessionIds'])
+            || !Array.isArray(groupArg.sessionIds)) {
+            throw new Error('Invalid legacy terminal layout group.');
+        }
+        return {
+            ...groupArg,
+            sessionIds: groupArg.sessionIds.filter((sessionId) => (!isLegacyTerminalLayoutReference(sessionId))),
+        };
+    });
+    const hasUngroupedSessionIds = Object.hasOwn(valueArg, 'ungroupedSessionIds');
+    if (hasUngroupedSessionIds && !Array.isArray(valueArg.ungroupedSessionIds)) {
+        throw new Error('Invalid legacy terminal ungrouped layout list.');
+    }
+    const ungroupedSessionIds = hasUngroupedSessionIds
+        ? valueArg.ungroupedSessionIds.filter((sessionId) => (!isLegacyTerminalLayoutReference(sessionId)))
+        : undefined;
+    const migrated = groups.some((group, index) => (group.sessionIds.length !== sourceGroups[index].sessionIds.length)) || (hasUngroupedSessionIds
+        && ungroupedSessionIds.length !== valueArg.ungroupedSessionIds.length);
+    if (!migrated) {
+        return {
+            document: valueArg,
+            migrated: false,
+        };
+    }
+    return {
+        document: {
+            ...valueArg,
+            groups,
+            ...(hasUngroupedSessionIds ? { ungroupedSessionIds } : {}),
+        },
+        migrated: true,
+    };
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjI0X2xlZ2FjeXRlcm1pbmFsbGF5b3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfbWlncmF0aW9uL3YyNF9sZWdhY3l0ZXJtaW5hbGxheW91dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLDBCQUEwQixHQUFHLG1DQUFtQyxDQUFDO0FBQ3ZFLE1BQU0saUNBQWlDLEdBQUcsOEJBQThCLENBQUM7QUFzQnpFLE1BQU0sYUFBYSxHQUFHLENBQUMsUUFBaUIsRUFBdUIsRUFBRTtJQUMvRCxJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVEsSUFBSSxRQUFRLEtBQUssSUFBSSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDL0YsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNsRCxPQUFPLFNBQVMsS0FBSyxNQUFNLENBQUMsU0FBUyxJQUFJLFNBQVMsS0FBSyxJQUFJLENBQUM7QUFDOUQsQ0FBQyxDQUFDO0FBRUYsTUFBTSxZQUFZLEdBQUcsQ0FDbkIsUUFBaUIsRUFDakIsV0FBOEIsRUFDOUIsY0FBaUMsRUFBRSxFQUMxQixFQUFFO0lBQ1gsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxHQUFHLFdBQVcsRUFBRSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUM7SUFDMUQsT0FBTyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztXQUMxRCxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0FBQzlELENBQUMsQ0FBQztBQUVGLE1BQU0sK0JB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

package/dist_ts_migration/v24_legacyterminallayoutmigration.d.ts

@@ -0,0 +1,6 @@
+import * as plugins from '../dist_ts/plugins.js';
+export declare class LegacyTerminalLayoutV24Migration {
+    private readonly database;
+    constructor(database: plugins.smartdata.SmartdataDb | undefined);
+    run(): Promise<void>;
+}

package/dist_ts_migration/v24_legacyterminallayoutmigration.js

@@ -0,0 +1,67 @@
+import * as plugins from '../dist_ts/plugins.js';
+import { assertControllerSessionGroupsDocument, ControllerSessionGroupsModel, } from '../dist_ts/classes.authmodels.js';
+import { AuthError } from '../dist_ts/interfaces.auth.js';
+import { migrateProtocolV6SessionGroupsDocument } from './v6_protocoldocuments.js';
+import { migrateV24LegacyTerminalLayoutDocument } from './v24_legacyterminallayout.js';
+const migrationPageLimit = 128;
+const persistedBodyFromRawDocument = (valueArg) => {
+    const body = { ...valueArg };
+    delete body._id;
+    delete body._smartdataRevision;
+    return body;
+};
+const assertProtocolV6NormalizableLayout = (valueArg) => {
+    const normalized = migrateProtocolV6SessionGroupsDocument(valueArg);
+    assertControllerSessionGroupsDocument(normalized.document);
+};
+export class LegacyTerminalLayoutV24Migration {
+    database;
+    constructor(database) {
+        this.database = database;
+    }
+    async run() {
+        if (!this.database) {
+            throw new AuthError('not_initialized', 'The authentication store database is unavailable.');
+        }
+        const collection = ControllerSessionGroupsModel.collection.mongoDbCollection;
+        let lastId;
+        while (true) {
+            const cursor = collection.find(lastId ? { _id: { $gt: lastId } } : {})
+                .sort({ _id: 1 })
+                .limit(migrationPageLimit);
+            let documents;
+            try {
+                documents = await cursor.toArray();
+            }
+            finally {
+                await cursor.close();
+            }
+            for (const raw of documents) {
+                const migration = migrateV24LegacyTerminalLayoutDocument(persistedBodyFromRawDocument(raw));
+                if (!migration.migrated)
+                    continue;
+                assertProtocolV6NormalizableLayout(migration.document);
+                const selector = raw._smartdataRevision === undefined
+                    ? { _id: raw._id, _smartdataRevision: { $exists: false } }
+                    : { _id: raw._id, _smartdataRevision: raw._smartdataRevision };
+                const replaced = await collection.findOneAndReplace(selector, { _id: raw._id, ...migration.document, _smartdataRevision: plugins.crypto.randomUUID() }, { returnDocument: 'after', includeResultMetadata: false, upsert: false });
+                if (!replaced) {
+                    const concurrent = await collection.findOne({ _id: raw._id });
+                    if (!concurrent) {
+                        throw new AuthError('concurrent_change', 'The legacy terminal layout migration changed concurrently.');
+                    }
+                    const remaining = migrateV24LegacyTerminalLayoutDocument(persistedBodyFromRawDocument(concurrent));
+                    assertProtocolV6NormalizableLayout(remaining.document);
+                    if (remaining.migrated) {
+                        throw new AuthError('concurrent_change', 'The legacy terminal layout migration changed concurrently.');
+                    }
+                }
+            }
+            const last = documents.at(-1);
+            if (!last || documents.length < migrationPageLimit)
+                break;
+            lastId = last._id;
+        }
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjI0X2xlZ2FjeXRlcm1pbmFsbGF5b3V0bWlncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfbWlncmF0aW9uL3YyNF9sZWdhY3l0ZXJtaW5hbGxheW91dG1pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBQzVDLE9BQU8sRUFDTCxxQ0FBcUMsRUFDckMsNEJBQTRCLEdBQzdCLE1BQU0sNkJBQTZCLENBQUM7QUFDckMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXJELE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ25GLE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBR3ZGLE1BQU0sa0JBQWtCLEdBQUcsR0FBRyxDQUFDO0FBRS9CLE1BQU0sNEJBQTRCLEdBQUcsQ0FDbkMsUUFBaUMsRUFDQSxFQUFFO0lBQ25DLE1BQU0sSUFBSSxHQUFHLEVBQUUsR0FBRyxRQUFRLEVBQUUsQ0FBQztJQUM3QixPQUFPLElBQUksQ0FBQyxHQUFHLENBQUM7SUFDaEIsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUM7SUFDL0IsT0FBTyxJQUFrRCxDQUFDO0FBQzVELENBQUMsQ0FBQztBQUVGLE1BQU0sa0NBQWtDLEdBQUcsQ0FDekMsUUFBeUMsRUFDbkMsRUFBRTtJQUNSLE1BQU0sVUFBVSxHQUFHLHNDQUFzQyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3BFLHFDQUFxQyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUM3RCxDQUFDLENBQUM7QUFFRixNQUFNLE9BQU8sZ0NBQWdDO0lBQ2Q7SUFBN0IsWUFBNkIsUUFBbUQ7UUFBbkQsYUFBUSxHQUFSLFFBQVEsQ0FBMkM7SUFBRyxDQUFDO0lBRTdFLEtBQUssQ0FBQyxHQUFHO1FBQ2QsSUFBSSxDQUFDLElBQUksQ0FB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agl",
-  "version": "22.0.0",
+  "version": "22.0.1",
   "controllerUpgradeManagementVersion": 2,
   "private": false,
   "description": "Agent Gateway Layer for OpenCode and FlexHarness sessions",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: 'agl',
-  version: '22.0.0',
+  version: '22.0.1',
   description: 'Agent Gateway Layer for OpenCode and FlexHarness sessions'
 }

package/ts/classes.authstore.ts

@@ -47,7 +47,6 @@ import type {
   IControllerRuntimeId,
   IControllerSessionGroup,
   IControllerSessionLayout,
-  TControllerTerminalId,
   TControllerResourceKind,
   TControllerSessionId,
   IControllerIntelligenceExchange,
@@ -1946,20 +1945,6 @@ export class SmartDataAuthStore implements IAuthStore {
     );
   }
 
-  public async pruneTerminalLayoutEntries(
-    projectIdArg: string,
-    liveTerminalIdsArg: readonly TControllerTerminalId[],
-  ): Promise<boolean> {
-    const liveTerminalKeys = new Set(liveTerminalIdsArg.map(controllerRuntimeIdKey));
-    return this.filterSessionLayout(
-      projectIdArg,
-      (layoutItemId) => (
-        layoutItemId.harnessId !== 'controller'
-        || liveTerminalKeys.has(controllerRuntimeIdKey(layoutItemId))
-      ),
-    );
-  }
-
   public async pruneArchivedSessionLayoutEntries(
     projectIdArg: string,
     archivedSessionIdsArg: readonly IControllerRuntimeId[],

package/ts/classes.controller.ts

@@ -1378,6 +1378,13 @@ interface IControllerHarnessSessionEnumeration {
   flex: PromiseSettledResult<IControllerSession[]>;
 }
 
+interface IControllerHarnessSessionEnumerationTask {
+  task: Promise<IControllerHarnessSessionEnumeration>;
+  invalidated: boolean;
+  settled: boolean;
+  waiterCount: number;
+}
+
 export class OpenCodeController {
   public readonly options: IControllerStartOptions;
 
@@ -1509,7 +1516,7 @@ export class OpenCodeController {
   private readonly activeOperations = new Set<Promise<unknown>>();
   private readonly harnessSessionEnumerationTasks = new Map<
     string,
-    Promise<IControllerHarnessSessionEnumeration>
+    IControllerHarnessSessionEnumerationTask
   >();
   private readonly sessionLayoutOperationTails = new Map<string, Promise<void>>();
   private readonly sessionLayoutOperationDepths = new Map<string, number>();
@@ -2015,12 +2022,6 @@ export class OpenCodeController {
     );
     const startupProjectState = await this.reconcileProjectState(false);
     for (const project of pendingProjectRemovals) this.retiringProjectIds.add(project.id);
-    for (const project of startupProjectState.projects) {
-      await this.runSessionLayoutOperation(
-        project.id,
-        () => authStore.pruneTerminalLayoutEntries(project.id, []),
-      );
-    }
     const startupSettings = await authStore.getSettings();
     this.defaultModels = startupSettings.defaultModels;
     this.autoAcceptPermissions = startupSettings.autoAcceptPermissions === true;
@@ -7360,31 +7361,55 @@ export class OpenCodeController {
     }
   }
 
-  private enumerateHarnessSessions(
+  private async enumerateHarnessSessions(
     projectIdArg: string,
     directoryArg: string,
     signalArg: AbortSignal,
   ): Promise<IControllerHarnessSessionEnumeration> {
-    signalArg.throwIfAborted();
-    let sharedTask = this.harnessSessionEnumerationTasks.get(projectIdArg);
-    if (!sharedTask) {
-      const lifecycleSignal = this.operationAbortController.signal;
-      const operation = Promise.allSettled([
-        Promise.resolve().then(() => (
-          this.requireOpenCodeClient().listSessions(directoryArg, lifecycleSignal)
-        )),
-        Promise.resolve().then(() => this.listFlexSessions(projectIdArg, lifecycleSignal)),
-      ]).then(([openCode, flex]) => ({ openCode, flex }));
-      let trackedTask!: Promise<IControllerHarnessSessionEnumeration>;
-      trackedTask = this.trackOperationPromise(operation, () => {
-        if (this.harnessSessionEnumerationTasks.get(projectIdArg) === trackedTask) {
+    while (true) {
+      signalArg.throwIfAborted();
+      let shared = this.harnessSessionEnumerationTasks.get(projectIdArg);
+      if (!shared || shared.invalidated) {
+        const lifecycleSignal = this.operationAbortController.signal;
+        const operation = Promise.allSettled([
+          Promise.resolve().then(() => (
+            this.requireOpenCodeClient().listSessions(directoryArg, lifecycleSignal)
+          )),
+          Promise.resolve().then(() => this.listFlexSessions(projectIdArg, lifecycleSignal)),
+        ]).then(([openCode, flex]) => ({ openCode, flex }));
+        let taskRecord!: IControllerHarnessSessionEnumerationTask;
+        let trackedTask!: Promise<IControllerHarnessSessionEnumeration>;
+        trackedTask = this.trackOperationPromise(operation, () => {
+          taskRecord.settled = true;
+          const current = this.harnessSessionEnumerationTasks.get(projectIdArg);
+          if (current === taskRecord && taskRecord.waiterCount === 0) {
+            this.harnessSessionEnumerationTasks.delete(projectIdArg);
+          }
+        });
+        taskRecord = {
+          task: trackedTask,
+          invalidated: false,
+          settled: false,
+          waiterCount: 0,
+        };
+        shared = taskRecord;
+        this.harnessSessionEnumerationTasks.set(projectIdArg, shared);
+      }
+      shared.waiterCount += 1;
+      try {
+        const result = await this.waitForPromiseWithSignal(shared.task, signalArg);
+        if (!shared.invalidated) return result;
+      } finally {
+        shared.waiterCount -= 1;
+        if (
+          shared.settled
+          && shared.waiterCount === 0
+          && this.harnessSessionEnumerationTasks.get(projectIdArg) === shared
+        ) {
           this.harnessSessionEnumerationTasks.delete(projectIdArg);
         }
-      });
-      this.harnessSessionEnumerationTasks.set(projectIdArg, trackedTask);
-      sharedTask = trackedTask;
+      }
     }
-    return this.waitForPromiseWithSignal(sharedTask, signalArg);
   }
 
   private toFlexSession(
@@ -11720,7 +11745,7 @@ export class OpenCodeController {
     signalArg?: AbortSignal,
   ): Promise<IControllerSession> {
     if (sessionIdArg.harnessId === 'opencode') {
-      return this.requireOpenCodeClient().getSession(
+      return this.requireOpenCodeClient().getSessionSnapshot(
         directoryArg,
         sessionIdArg.nativeId,
         signalArg,
@@ -11977,6 +12002,9 @@ export class OpenCodeController {
     projectIdArg: string,
     sessionIdArg: IControllerRuntimeId,
   ): void {
+    const enumeration = this.harnessSessionEnumerationTasks.get(projectIdArg);
+    if (enumeration) enumeration.invalidated = true;
+    this.harnessSessionEnumerationTasks.delete(projectIdArg);
     if (sessionIdArg.harnessId === 'opencode') {
       this.purgeOpenCodeStreamStateForSession(projectIdArg, sessionIdArg);
     } else if (sessionIdArg.harnessId === 'flex') {

package/ts_migration/classes.documentmigrationrunner.ts

@@ -3,6 +3,7 @@ import { ProtocolV6DocumentMigration } from './v6_protocoldocumentmigration.js';
 import { ProtocolV18ResourceLayoutMigration } from './v18_resourcelayoutmigration.js';
 import { ProtocolV22ProjectFilesystemIdentityMigration } from './v22_projectfilesystemidentitymigration.js';
 import { RuntimeConfigV23Migration } from './v23_runtimeconfig.js';
+import { LegacyTerminalLayoutV24Migration } from './v24_legacyterminallayoutmigration.js';
 
 interface IDocumentMigration {
   run(): Promise<void>;
@@ -14,6 +15,7 @@ export class PostDatabaseDocumentMigrationRunner {
   constructor(private readonly database: plugins.smartdata.SmartdataDb | undefined) {
     this.migrations = [
       new RuntimeConfigV23Migration(this.database),
+      new LegacyTerminalLayoutV24Migration(this.database),
       new ProtocolV6DocumentMigration(this.database),
       new ProtocolV18ResourceLayoutMigration(this.database),
     ];

package/ts_migration/index.ts

@@ -12,3 +12,5 @@ export * from './v19_flexprojectmanagement.js';
 export * from './v22_projectfilesystemidentitymigration.js';
 export * from './v23_runtimeconfig.js';
 export * from './v23_aglhome.js';
+export * from './v24_legacyterminallayout.js';
+export * from './v24_legacyterminallayoutmigration.js';

package/ts_migration/v24_legacyterminallayout.ts

@@ -0,0 +1,131 @@
+type TObject = Record<string, unknown>;
+
+const legacyOpenCodePtyIdPattern = /^pty_[0-9a-f]{12}[0-9A-Za-z]{14}$/;
+const legacyControllerTerminalIdPattern = /^terminal_[A-Za-z0-9_-]{22}$/;
+
+export interface IV24LegacySessionGroup {
+  id: string;
+  name: string;
+  sessionIds: unknown[];
+}
+
+export interface IV24LegacySessionGroupsDocument {
+  id: string;
+  controllerId: string;
+  projectId: string;
+  groups: IV24LegacySessionGroup[];
+  ungroupedSessionIds?: unknown[];
+  revision?: number;
+}
+
+export interface IV24LayoutMigrationResult {
+  document: IV24LegacySessionGroupsDocument;
+  migrated: boolean;
+}
+
+const isPlainObject = (valueArg: unknown): valueArg is TObject => {
+  if (typeof valueArg !== 'object' || valueArg === null || Array.isArray(valueArg)) return false;
+  const prototype = Object.getPrototypeOf(valueArg);
+  return prototype === Object.prototype || prototype === null;
+};
+
+const hasExactKeys = (
+  valueArg: TObject,
+  requiredArg: readonly string[],
+  optionalArg: readonly string[] = [],
+): boolean => {
+  const allowed = new Set([...requiredArg, ...optionalArg]);
+  return requiredArg.every((key) => Object.hasOwn(valueArg, key))
+    && Object.keys(valueArg).every((key) => allowed.has(key));
+};
+
+const isCanonicalControllerTerminalId = (valueArg: string): boolean => {
+  if (!legacyControllerTerminalIdPattern.test(valueArg)) return false;
+  const suffix = valueArg.slice('terminal_'.length);
+  const decoded = Buffer.from(suffix, 'base64url');
+  return decoded.length === 16 && decoded.toString('base64url') === suffix;
+};
+
+const isLegacyTerminalNativeId = (valueArg: unknown): valueArg is string => (
+  typeof valueArg === 'string'
+  && (
+    legacyOpenCodePtyIdPattern.test(valueArg)
+    || isCanonicalControllerTerminalId(valueArg)
+  )
+);
+
+const isLegacyTerminalLayoutReference = (valueArg: unknown): boolean => {
+  if (typeof valueArg === 'string') return isLegacyTerminalNativeId(valueArg);
+  if (
+    !isPlainObject(valueArg)
+    || Object.keys(valueArg).length !== 2
+    || !Object.hasOwn(valueArg, 'harnessId')
+    || !Object.hasOwn(valueArg, 'nativeId')
+    || typeof valueArg.nativeId !== 'string'
+  ) return false;
+  if (valueArg.harnessId === 'controller') return true;
+  return valueArg.harnessId === 'opencode' && isLegacyTerminalNativeId(valueArg.nativeId);
+};
+
+export const migrateV24LegacyTerminalLayoutDocument = (
+  valueArg: unknown,
+): IV24LayoutMigrationResult => {
+  if (
+    !isPlainObject(valueArg)
+    || !hasExactKeys(
+      valueArg,
+      ['id', 'controllerId', 'projectId', 'groups'],
+      ['ungroupedSessionIds', 'revision'],
+    )
+    || !Array.isArray(valueArg.groups)
+  ) {
+    throw new Error('Invalid legacy terminal layout migration document.');
+  }
+
+  const sourceGroups = valueArg.groups;
+  const groups = sourceGroups.map((groupArg) => {
+    if (
+      !isPlainObject(groupArg)
+      || !hasExactKeys(groupArg, ['id', 'name', 'sessionIds'])
+      || !Array.isArray(groupArg.sessionIds)
+    ) {
+      throw new Error('Invalid legacy terminal layout group.');
+    }
+    return {
+      ...groupArg,
+      sessionIds: groupArg.sessionIds.filter((sessionId) => (
+        !isLegacyTerminalLayoutReference(sessionId)
+      )),
+    } as unknown as IV24LegacySessionGroup;
+  });
+
+  const hasUngroupedSessionIds = Object.hasOwn(valueArg, 'ungroupedSessionIds');
+  if (hasUngroupedSessionIds && !Array.isArray(valueArg.ungroupedSessionIds)) {
+    throw new Error('Invalid legacy terminal ungrouped layout list.');
+  }
+  const ungroupedSessionIds = hasUngroupedSessionIds
+    ? (valueArg.ungroupedSessionIds as unknown[]).filter((sessionId) => (
+        !isLegacyTerminalLayoutReference(sessionId)
+      ))
+    : undefined;
+  const migrated = groups.some((group, index) => (
+    group.sessionIds.length !== (sourceGroups[index] as TObject & { sessionIds: unknown[] }).sessionIds.length
+  )) || (
+    hasUngroupedSessionIds
+    && ungroupedSessionIds!.length !== (valueArg.ungroupedSessionIds as unknown[]).length
+  );
+  if (!migrated) {
+    return {
+      document: valueArg as unknown as IV24LegacySessionGroupsDocument,
+      migrated: false,
+    };
+  }
+  return {
+    document: {
+      ...valueArg,
+      groups,
+      ...(hasUngroupedSessionIds ? { ungroupedSessionIds } : {}),
+    } as unknown as IV24LegacySessionGroupsDocument,
+    migrated: true,
+  };
+};

package/ts_migration/v24_legacyterminallayoutmigration.ts

@@ -0,0 +1,88 @@
+import * as plugins from '../ts/plugins.js';
+import {
+  assertControllerSessionGroupsDocument,
+  ControllerSessionGroupsModel,
+} from '../ts/classes.authmodels.js';
+import { AuthError } from '../ts/interfaces.auth.js';
+import type { IControllerSessionGroupsDocument } from '../ts/interfaces.projects.js';
+import { migrateProtocolV6SessionGroupsDocument } from './v6_protocoldocuments.js';
+import { migrateV24LegacyTerminalLayoutDocument } from './v24_legacyterminallayout.js';
+import type { IV24LegacySessionGroupsDocument } from './v24_legacyterminallayout.js';
+
+const migrationPageLimit = 128;
+
+const persistedBodyFromRawDocument = (
+  valueArg: Record<string, unknown>,
+): IV24LegacySessionGroupsDocument => {
+  const body = { ...valueArg };
+  delete body._id;
+  delete body._smartdataRevision;
+  return body as unknown as IV24LegacySessionGroupsDocument;
+};
+
+const assertProtocolV6NormalizableLayout = (
+  valueArg: IV24LegacySessionGroupsDocument,
+): void => {
+  const normalized = migrateProtocolV6SessionGroupsDocument(valueArg);
+  assertControllerSessionGroupsDocument(normalized.document);
+};
+
+export class LegacyTerminalLayoutV24Migration {
+  constructor(private readonly database: plugins.smartdata.SmartdataDb | undefined) {}
+
+  public async run(): Promise<void> {
+    if (!this.database) {
+      throw new AuthError('not_initialized', 'The authentication store database is unavailable.');
+    }
+    const collection = ControllerSessionGroupsModel.collection.mongoDbCollection;
+    let lastId: plugins.smartdata.TStoredDocument<IControllerSessionGroupsDocument>['_id'] | undefined;
+    while (true) {
+      const cursor = collection.find(lastId ? { _id: { $gt: lastId } } : {})
+        .sort({ _id: 1 })
+        .limit(migrationPageLimit);
+      let documents: Awaited<ReturnType<typeof cursor.toArray>>;
+      try {
+        documents = await cursor.toArray();
+      } finally {
+        await cursor.close();
+      }
+      for (const raw of documents) {
+        const migration = migrateV24LegacyTerminalLayoutDocument(
+          persistedBodyFromRawDocument(raw),
+        );
+        if (!migration.migrated) continue;
+        assertProtocolV6NormalizableLayout(migration.document);
+        const selector = raw._smartdataRevision === undefined
+          ? { _id: raw._id, _smartdataRevision: { $exists: false } }
+          : { _id: raw._id, _smartdataRevision: raw._smartdataRevision };
+        const replaced = await collection.findOneAndReplace(
+          selector,
+          { _id: raw._id, ...migration.document, _smartdataRevision: plugins.crypto.randomUUID() },
+          { returnDocument: 'after', includeResultMetadata: false, upsert: false },
+        );
+        if (!replaced) {
+          const concurrent = await collection.findOne({ _id: raw._id });
+          if (!concurrent) {
+            throw new AuthError(
+              'concurrent_change',
+              'The legacy terminal layout migration changed concurrently.',
+            );
+          }
+          const remaining = migrateV24LegacyTerminalLayoutDocument(
+            persistedBodyFromRawDocument(concurrent),
+          );
+          assertProtocolV6NormalizableLayout(remaining.document);
+          if (remaining.migrated) {
+            throw new AuthError(
+              'concurrent_change',
+              'The legacy terminal layout migration changed concurrently.',
+            );
+          }
+        }
+      }
+      const last = documents.at(-1);
+      if (!last || documents.length < migrationPageLimit) break;
+      lastId = last._id;
+    }
+  }
+}

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: 'agl',
-  version: '22.0.0',
+  version: '22.0.1',
   description: 'Agent Gateway Layer for OpenCode and FlexHarness sessions'
 }