@alas-ide/codex-acp 2.2.2-alas.2 → 2.2.2-alas.3

package/dist/index.js

@@ -34392,7 +34392,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.2.2-alas.2",
+  version: "2.2.2-alas.3",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -34469,7 +34469,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.2.2",
     upstreamCommit: "202e66e63343ec4f5a5e35ab590251d813d129ca",
-    sourceCommit: "f431e5cac0d2972bcb8295f8967d6f27f6633eea"
+    sourceCommit: "2be0ccf63ad9c18131815207511597bb34d6adc0"
   }
 };
 
@@ -40217,9 +40217,6 @@ function titleSource(text) {
   return text.slice(0, end);
 }
 
-// src/SessionIndexService.ts
-import path13 from "node:path";
-
 // src/SessionIndex.ts
 var AIR_SESSION_INDEX_KEY = "sessionIndex";
 var AIR_SESSION_ARCHIVE_KEY = "sessionArchive";
@@ -40240,6 +40237,32 @@ var AIR_FORKED_FROM_KEY = "forkedFrom";
 var DEFAULT_SESSION_INDEX_LIMIT = 50;
 var MAX_SESSION_INDEX_LIMIT = 100;
 var AIR_ARCHIVED_KEY = "archived";
+var NEUTRAL_SESSION_INDEX_META_KEY = "sessionIndex";
+var NEUTRAL_SESSION_INDEX_VERSION = 1;
+var AIR_SESSION_INDEX_META = {
+  read: (meta3) => asRecord3(asRecord3(asRecord3(meta3)[JETBRAINS_META_KEY])[AIR_META_KEY]),
+  write: withAirMeta
+};
+var NEUTRAL_SESSION_INDEX_META = {
+  read: (meta3) => asRecord3(asRecord3(meta3)[NEUTRAL_SESSION_INDEX_META_KEY]),
+  write: (meta3, key, value) => {
+    const root = asRecord3(meta3);
+    return { ...root, [NEUTRAL_SESSION_INDEX_META_KEY]: { ...asRecord3(root[NEUTRAL_SESSION_INDEX_META_KEY]), [key]: value } };
+  }
+};
+function sessionIndexMetaOf(capabilities) {
+  if (isAirClient(capabilities)) {
+    return clientSupportsAirCapability(capabilities, AIR_SESSION_INDEX_KEY) ? AIR_SESSION_INDEX_META : null;
+  }
+  const declared = capabilities?._meta?.[NEUTRAL_SESSION_INDEX_META_KEY];
+  if (declared === null || typeof declared !== "object" || Array.isArray(declared)) return null;
+  const version2 = declared["version"];
+  return typeof version2 === "number" && Number.isInteger(version2) && version2 >= 1 ? NEUTRAL_SESSION_INDEX_META : null;
+}
+function sessionIndexRowFields(row) {
+  const air = AIR_SESSION_INDEX_META.read(row._meta);
+  return Object.keys(air).length > 0 ? air : NEUTRAL_SESSION_INDEX_META.read(row._meta);
+}
 var ARCHIVED_FILTERS = ["unarchived", "archived", "all"];
 function archivedSides(filter) {
   switch (filter) {
@@ -40265,9 +40288,8 @@ var sessionListSubscriptionParamsParser = external_exports.preprocess(
   (params) => params ?? {},
   external_exports.record(external_exports.string(), external_exports.unknown())
 );
-function readSessionIndexListOptions(meta3) {
-  const jetbrains = asRecord3(asRecord3(meta3)[JETBRAINS_META_KEY]);
-  const list = asRecord3(asRecord3(jetbrains[AIR_META_KEY])[AIR_SESSION_LIST_KEY]);
+function readSessionIndexListOptions(meta3, namespace = AIR_SESSION_INDEX_META) {
+  const list = asRecord3(namespace.read(meta3)[AIR_SESSION_LIST_KEY]);
   return {
     limit: readLimit(list["limit"]),
     archived: readArchivedFilter(list["archived"]),
@@ -40453,7 +40475,7 @@ function decodeAdapterCursor(cursor) {
 function invalidCursorError(cursor) {
   return RequestError.invalidParams({ cursor }, "invalid cursor");
 }
-function sessionIndexSessionInfo(thread, archived, activity) {
+function sessionIndexSessionInfo(thread, archived, activity, namespace = AIR_SESSION_INDEX_META) {
   const airFields = { [AIR_ARCHIVED_KEY]: archived };
   if (thread.recencyAt !== null) airFields[AIR_LAST_PROMPT_AT_KEY] = isoTime(thread.recencyAt);
   if (thread.model) airFields[AIR_MODEL_KEY] = thread.model;
@@ -40462,7 +40484,7 @@ function sessionIndexSessionInfo(thread, archived, activity) {
   if (activity?.lastTurnEndedAt !== void 0) airFields[AIR_LAST_TURN_ENDED_AT_KEY] = activity.lastTurnEndedAt;
   let meta3;
   for (const [key, value] of Object.entries(airFields)) {
-    meta3 = withAirMeta(meta3, key, value);
+    meta3 = namespace.write(meta3, key, value);
   }
   return {
     sessionId: thread.id,
@@ -40550,7 +40572,7 @@ var SessionIndexActivity = class {
   }
 };
 function sessionIndexRowSignature(row) {
-  const air = asRecord3(asRecord3(asRecord3(row._meta)[JETBRAINS_META_KEY])[AIR_META_KEY]);
+  const air = sessionIndexRowFields(row);
   return JSON.stringify([
     row.title ?? null,
     air[AIR_LAST_PROMPT_AT_KEY] ?? null,
@@ -40565,6 +40587,9 @@ function asRecord3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
 
+// src/SessionIndexService.ts
+import path13 from "node:path";
+
 // src/SessionIndexWorktrees.ts
 import fs8 from "node:fs";
 import path9 from "node:path";
@@ -41292,10 +41317,7 @@ var SessionListSubscriptions = class {
   refreshLoadedThreads(threadIds) {
     this.appServerGeneration++;
     if (this.subscriptions.size === 0) return;
-    const loaded = [...this.groups.values()].flatMap((group) => [...group.rows].filter(([, { row }]) => {
-      const meta3 = row._meta;
-      return meta3?.["jetbrains"]?.["air"]?.["state"] !== void 0;
-    }).map(([threadId]) => threadId));
+    const loaded = [...this.groups.values()].flatMap((group) => [...group.rows].filter(([, { row }]) => sessionIndexRowFields(row)[AIR_STATE_KEY] !== void 0).map(([threadId]) => threadId));
     for (const threadId of /* @__PURE__ */ new Set([...threadIds, ...loaded])) this.threadChanged(threadId);
     if (this.pendingThreads.size > 0) this.requestThreads(this.timings.ownChangeDelayMs);
   }
@@ -41771,8 +41793,8 @@ var SessionIndexService = class {
     });
   }
   host;
-  /** The client declared the AIR `sessionIndex` capability. */
-  enabled = false;
+  /** Where this client's session index metadata goes, or `null` when it did not declare `sessionIndex`. */
+  meta = null;
   activity;
   writes = new SessionWriteQueue();
   titles;
@@ -41785,14 +41807,25 @@ var SessionIndexService = class {
   rowsWithState = /* @__PURE__ */ new Set();
   /** Reads the client capabilities of `initialize`. */
   configure(clientCapabilities) {
-    this.enabled = clientSupportsAirCapability(clientCapabilities, AIR_SESSION_INDEX_KEY);
+    this.meta = sessionIndexMetaOf(clientCapabilities);
+  }
+  /** The client declared `sessionIndex`, as AIR or as a client-neutral opt-in. */
+  get enabled() {
+    return this.meta !== null;
   }
   /**
-   * The AIR capabilities to answer: only a client that declares `sessionIndex` gets them. `sessionArchive` and
-   * `sessionRename` name the requests that come with it; the client need not declare them.
+   * The AIR capabilities to answer: only an AIR client that declares `sessionIndex` gets them. `sessionArchive`
+   * and `sessionRename` name the requests that come with it; the client need not declare them.
    */
   agentCapabilities() {
-    return this.enabled ? [AIR_SESSION_INDEX_KEY, AIR_SESSION_ARCHIVE_KEY, AIR_SESSION_RENAME_KEY, AIR_SESSION_LIST_SUBSCRIBE_KEY] : [];
+    return this.meta === AIR_SESSION_INDEX_META ? [AIR_SESSION_INDEX_KEY, AIR_SESSION_ARCHIVE_KEY, AIR_SESSION_RENAME_KEY, AIR_SESSION_LIST_SUBSCRIBE_KEY] : [];
+  }
+  /** The `_meta.sessionIndex` answer of `initialize` to a client-neutral opt-in, or `null`. */
+  neutralCapability() {
+    return this.meta === NEUTRAL_SESSION_INDEX_META ? {
+      version: NEUTRAL_SESSION_INDEX_VERSION,
+      capabilities: [AIR_SESSION_ARCHIVE_KEY, AIR_SESSION_RENAME_KEY, AIR_SESSION_LIST_SUBSCRIBE_KEY]
+    } : null;
   }
   /**
    * Feeds the thread notifications of an app-server, for every thread, to the session index. Each client is
@@ -41826,7 +41859,7 @@ var SessionIndexService = class {
    * reads the local state DB and works without one.
    */
   async list(params) {
-    const options = readSessionIndexListOptions(params._meta);
+    const options = readSessionIndexListOptions(params._meta, this.requireMeta());
     const cwd = params.cwd?.trim() || null;
     return await this.readRows(cwd, options, params.cursor ?? null);
   }
@@ -41901,13 +41934,13 @@ var SessionIndexService = class {
     if (archived ? open3 : this.host.session(sessionId) !== void 0) {
       await new ACPSessionConnection(this.host.connection(), sessionId).update({
         sessionUpdate: "session_info_update",
-        _meta: withAirMeta(void 0, AIR_ARCHIVED_KEY, archived)
+        _meta: this.requireMeta().write(void 0, AIR_ARCHIVED_KEY, archived)
       });
     }
     return {};
   }
   /**
-   * Deletes the thread for `session/delete`: AIR then means "delete", not "done", because it has
+   * Deletes the thread for `session/delete`: a `sessionIndex` client then means "delete", not "done", because it has
    * `_session/archive` for that. A thread that this connection had open but Codex never persisted (no
    * prompt yet) is gone with the close, so it counts as deleted.
    */
@@ -41939,6 +41972,10 @@ var SessionIndexService = class {
       throw RequestError.methodNotFound(method);
     }
   }
+  requireMeta() {
+    if (this.meta === null) throw new Error("The client did not declare sessionIndex");
+    return this.meta;
+  }
   async readRows(cwd, options, cursor) {
     const relativeCwd = cwd !== null && !isAbsolutePathLike(cwd) ? cwd : null;
     const cwds = cwd === null || relativeCwd !== null ? null : options.includeWorktrees ? linkedWorktreeCwds(cwd) : canonicalCwds(cwd);
@@ -41964,7 +42001,7 @@ var SessionIndexService = class {
       if (activity?.state !== void 0) this.rowsWithState.add(thread.id);
       else this.rowsWithState.delete(thread.id);
       return this.withActiveAdditionalDirectories(
-        sessionIndexSessionInfo(thread, entry.archived, activity)
+        sessionIndexSessionInfo(thread, entry.archived, activity, this.requireMeta())
       );
     });
   }
@@ -42449,7 +42486,7 @@ var CodexAcpServer = class {
   recovery;
   initializeRequest = null;
   providerUpdate = null;
-  /** The AIR `sessionIndex` extension, see `SessionIndexService.ts`. */
+  /** The `sessionIndex` extension, for AIR or a client-neutral opt-in, see `SessionIndexService.ts`. */
   sessionIndex = new SessionIndexService({
     connection: () => this.connection,
     client: () => this.codexAcpClient,
@@ -42533,6 +42570,7 @@ var CodexAcpServer = class {
       controlMethod: GOAL_CONTROL_METHOD,
       actions: [...GOAL_CONTROL_ACTIONS]
     };
+    const neutralSessionIndex = this.sessionIndex.neutralCapability();
     const sessionCapabilities = {
       resume: {},
       list: {},
@@ -42583,6 +42621,9 @@ var CodexAcpServer = class {
         ...this.capabilities.asyncTasks && !this.capabilities.airClient ? {
           "async-tasks": asyncTaskCapability()
         } : {},
+        ...neutralSessionIndex ? {
+          [NEUTRAL_SESSION_INDEX_META_KEY]: neutralSessionIndex
+        } : {},
         // Only AIR gets the AIR extension, see `docs/air-extensions.md`.
         ...this.capabilities.airClient ? {
           [JETBRAINS_META_KEY]: {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.2.2-alas.2",
+  "version": "2.2.2-alas.3",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -80,6 +80,6 @@
   "alasDownstream": {
     "upstreamVersion": "2.2.2",
     "upstreamCommit": "202e66e63343ec4f5a5e35ab590251d813d129ca",
-    "sourceCommit": "f431e5cac0d2972bcb8295f8967d6f27f6633eea"
+    "sourceCommit": "2be0ccf63ad9c18131815207511597bb34d6adc0"
   }
 }