agl 22.0.0 → 22.0.2

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.2',
   description: 'Agent Gateway Layer for OpenCode and FlexHarness sessions'
 }

package/ts_web/elements.harnesscontrollerapp.ts

@@ -796,6 +796,9 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
   @plugins.deesElement.state()
   accessor workspaceError = '';
 
+  @plugins.deesElement.state()
+  accessor sessionLayoutError = '';
+
   @plugins.deesElement.state()
   accessor workspaceNotice = '';
 
@@ -1403,6 +1406,11 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
         line-height: 1.4;
       }
 
+      .sessionLayoutError {
+        flex: 0 0 auto;
+        margin: 0 var(--dees-spacing-sm) var(--dees-spacing-xs);
+      }
+
       .sidebarHeader {
         display: flex;
         align-items: center;
@@ -2042,6 +2050,7 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
     this.draftSessionActive = false;
     this.activeMutationId = undefined;
     this.workspaceError = '';
+    this.sessionLayoutError = '';
     this.workspaceNotice = '';
     this.clearAnsweredCardCaches();
     this.clearSubagentModalState();
@@ -2565,6 +2574,7 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
         this.invalidateDetailLoad();
         this.invalidateSlashCatalog();
         this.sessionDetail = undefined;
+        this.sessionLayoutError = '';
       }
     } catch (error) {
       if (requestId === this.projectsRequestId && this.isCurrentConnection(generation)) {
@@ -7241,8 +7251,17 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
       this.confirmedSessionLayouts.set(projectId, layout);
       this.applySessionLayout(layout);
       this.groupsLoadedForProjectId = projectId;
-    } catch {
-      // Groups are sidebar decoration; the chat list works without them.
+      this.sessionLayoutError = '';
+    } catch (error) {
+      if (
+        requestId === this.layoutRequestId
+        && this.authenticated
+        && this.isCurrentConnection(generation)
+        && this.selectedProjectId === projectId
+        && this.projects.some((project) => project.id === projectId)
+      ) {
+        this.sessionLayoutError = `Conversation groups could not be loaded: ${errorMessage(error)}`;
+      }
     }
   }
 
@@ -8183,6 +8202,7 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
     this.sessionGroups = [];
     this.ungroupedSessionIds = [];
     this.groupsLoadedForProjectId = '';
+    this.sessionLayoutError = '';
     this.terminals = [];
     this.resources = [];
     this.selectedResourceId = '';
@@ -8264,6 +8284,7 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
         this.draftSessionDetailReadyId = undefined;
         this.draftSessionActive = false;
         this.selectedProjectId = '';
+        this.sessionLayoutError = '';
         this.selectedSessionId = undefined;
         this.invalidateDetailLoad();
         this.invalidateSlashCatalog();
@@ -8372,6 +8393,7 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
       this.draftSessionDetailReadyId = undefined;
       this.draftSessionActive = false;
       this.selectedProjectId = response.project.id;
+      this.sessionLayoutError = '';
       this.selectedSessionId = undefined;
       this.invalidateDetailLoad();
       this.invalidateSlashCatalog();
@@ -10545,6 +10567,14 @@ export class HarnessControllerApp extends plugins.deesElement.DeesElement {
                 New
               </dees-button>
             </div>
+            ${this.sessionLayoutError
+              ? plugins.deesElement.html`
+                  <div class="projectCreateError sessionLayoutError" role="alert">
+                    <dees-icon icon="lucide:TriangleAlert" iconSize="13"></dees-icon>
+                    <span>${this.sessionLayoutError}</span>
+                  </div>
+                `
+              : ''}
             <dees-harness-session-list
               .sessions=${sessionMetas}
               .selectedSessionId=${selectedUiKey}