maka-agent 0.2.2-dev.97.20261024 → 0.2.2-dev.99.20261024

package/node_modules/@maka/acp-executor-plugin/dist/acp-catalog.js

@@ -40,6 +40,11 @@ export class AcpCatalog {
         this.drain = drain;
         this.store = store;
     }
+    /** Presentation-only lookup: never probes, launches an Agent, or supplies Session capabilities. */
+    async readCached() {
+        await this.#hydrate();
+        return this.#disposed ? undefined : this.#cached;
+    }
     async get(signal, refresh = false) {
         signal.throwIfAborted();
         if (this.#disposed)

package/node_modules/@maka/acp-executor-plugin/dist/index.js

@@ -23,6 +23,7 @@ import { tmpdir } from 'node:os';
 import { AdmissionLimiter } from '@maka/runtime/admission-limiter';
 import { AcpCatalog } from './acp-catalog.js';
 import { createAcpCatalogStore } from './acp-catalog-store.js';
+import { normalizeCatalogEntry, } from '@maka/core/executor-catalog';
 import { dirname, isAbsolute, join, resolve } from 'node:path';
 import { methods, } from '@agentclientprotocol/sdk';
 import { pluginIdentity } from '@maka/runtime/plugin-runtime';
@@ -159,10 +160,15 @@ export class AcpExecutor {
             return this.#catalogEntry('unavailable');
         if (session && session.cwd !== resolve(input.cwd))
             return this.#catalogEntry('history_only', [], input.configuration);
-        if (session?.restoring)
-            return this.#catalogEntry('restoring', session.configOptions, input.configuration);
-        if (session?.restoreFailed)
-            return this.#catalogEntry('restore_failed', session.configOptions, input.configuration);
+        if (session?.restoring || session?.restoreFailed) {
+            const entry = this.#catalogEntry(session.restoring ? 'restoring' : 'restore_failed', session.configOptions, {
+                model: input.configuration?.model ?? session.record?.confirmedModel,
+                mode: input.configuration?.mode ?? session.record?.confirmedMode,
+            });
+            return session.configOptions.length
+                ? entry
+                : this.#withSavedPresentation(entry, session.record?.presentation);
+        }
         if (session?.historyGap)
             return this.#catalogEntry('history_gap', session.configOptions, input.configuration);
         if (session && !session.lost)
@@ -180,12 +186,49 @@ export class AcpExecutor {
             return this.#catalogEntry('history_only', [], input.configuration);
         if (stored.phase === 'reserved')
             return this.#catalogEntry('history_only', [], input.configuration);
-        return this.#catalogEntry(stored.phase === 'prompt_pending' || stored.phase === 'history_gap'
+        return this.#withSavedPresentation(this.#catalogEntry(stored.phase === 'prompt_pending' || stored.phase === 'history_gap'
             ? 'history_gap'
             : 'restorable', [], {
             model: input.configuration?.model ?? stored.confirmedModel,
             mode: input.configuration?.mode ?? stored.confirmedMode,
-        });
+        }), stored.presentation);
+    }
+    #readPresentation(value) {
+        if (!value || typeof value !== 'object' || value.version !== 1)
+            return;
+        try {
+            // Normalize optional display metadata separately: a corrupt cache must not invalidate continuity.
+            const input = value;
+            const entry = normalizeCatalogEntry({
+                ...this.#catalogEntry('restorable'),
+                models: input.models,
+                modelGroups: input.modelGroups,
+                modes: input.modes,
+            }, this.id);
+            return {
+                version: 1,
+                models: entry.models,
+                modelGroups: entry.modelGroups,
+                modes: entry.modes,
+            };
+        }
+        catch {
+            return;
+        }
+    }
+    async #withSavedPresentation(entry, saved) {
+        const presentation = this.#readPresentation(saved) ?? (await this.#catalog.readCached());
+        if (!presentation)
+            return entry;
+        return {
+            ...entry,
+            ...(entry.currentModel && presentation.models.some((model) => model.id === entry.currentModel)
+                ? { models: presentation.models, modelGroups: presentation.modelGroups }
+                : {}),
+            ...(entry.currentMode && presentation.modes?.some((mode) => mode.id === entry.currentMode)
+                ? { modes: presentation.modes }
+                : {}),
+        };
     }
     async configureConversation(input, signal) {
         if (!input.configuration?.model && !input.configuration?.mode)
@@ -734,7 +777,16 @@ export class AcpExecutor {
     async #persistConfirmedConfig(session, configOptions = session.configOptions) {
         if (!session.record)
             return;
-        const record = withConfirmedConfiguration(session.record, configOptions);
+        let record = withConfirmedConfiguration(session.record, configOptions);
+        const observed = this.#catalogEntry('ready', configOptions);
+        const presentation = this.#readPresentation({
+            version: 1,
+            models: observed.models,
+            modelGroups: observed.modelGroups,
+            modes: observed.modes,
+        });
+        if (presentation && JSON.stringify(record.presentation) !== JSON.stringify(presentation))
+            record = { ...record, presentation };
         if (record === session.record)
             return;
         await this.#state?.write?.(session.conversationKey, record);

package/node_modules/@maka/acp-executor-plugin/dist/plugin.mjs

@@ -120,6 +120,11 @@ var AcpCatalog = class {
   #hydration;
   #writes = Promise.resolve();
   #failure;
+  /** Presentation-only lookup: never probes, launches an Agent, or supplies Session capabilities. */
+  async readCached() {
+    await this.#hydrate();
+    return this.#disposed ? void 0 : this.#cached;
+  }
   async get(signal, refresh = false) {
     signal.throwIfAborted();
     if (this.#disposed) return this.unavailable();
@@ -28085,10 +28090,17 @@ var AcpExecutor = class {
     if (this.#disposed) return this.#catalogEntry("unavailable");
     if (session && session.cwd !== resolve2(input2.cwd))
       return this.#catalogEntry("history_only", [], input2.configuration);
-    if (session?.restoring)
-      return this.#catalogEntry("restoring", session.configOptions, input2.configuration);
-    if (session?.restoreFailed)
-      return this.#catalogEntry("restore_failed", session.configOptions, input2.configuration);
+    if (session?.restoring || session?.restoreFailed) {
+      const entry = this.#catalogEntry(
+        session.restoring ? "restoring" : "restore_failed",
+        session.configOptions,
+        {
+          model: input2.configuration?.model ?? session.record?.confirmedModel,
+          mode: input2.configuration?.mode ?? session.record?.confirmedMode
+        }
+      );
+      return session.configOptions.length ? entry : this.#withSavedPresentation(entry, session.record?.presentation);
+    }
     if (session?.historyGap)
       return this.#catalogEntry("history_gap", session.configOptions, input2.configuration);
     if (session && !session.lost)
@@ -28101,15 +28113,51 @@ var AcpExecutor = class {
       return this.#catalogEntry("history_only", [], input2.configuration);
     if (stored.phase === "reserved")
       return this.#catalogEntry("history_only", [], input2.configuration);
-    return this.#catalogEntry(
-      stored.phase === "prompt_pending" || stored.phase === "history_gap" ? "history_gap" : "restorable",
-      [],
-      {
-        model: input2.configuration?.model ?? stored.confirmedModel,
-        mode: input2.configuration?.mode ?? stored.confirmedMode
-      }
+    return this.#withSavedPresentation(
+      this.#catalogEntry(
+        stored.phase === "prompt_pending" || stored.phase === "history_gap" ? "history_gap" : "restorable",
+        [],
+        {
+          model: input2.configuration?.model ?? stored.confirmedModel,
+          mode: input2.configuration?.mode ?? stored.confirmedMode
+        }
+      ),
+      stored.presentation
     );
   }
+  #readPresentation(value) {
+    if (!value || typeof value !== "object" || value.version !== 1)
+      return;
+    try {
+      const input2 = value;
+      const entry = normalizeCatalogEntry(
+        {
+          ...this.#catalogEntry("restorable"),
+          models: input2.models,
+          modelGroups: input2.modelGroups,
+          modes: input2.modes
+        },
+        this.id
+      );
+      return {
+        version: 1,
+        models: entry.models,
+        modelGroups: entry.modelGroups,
+        modes: entry.modes
+      };
+    } catch {
+      return;
+    }
+  }
+  async #withSavedPresentation(entry, saved) {
+    const presentation = this.#readPresentation(saved) ?? await this.#catalog.readCached();
+    if (!presentation) return entry;
+    return {
+      ...entry,
+      ...entry.currentModel && presentation.models.some((model) => model.id === entry.currentModel) ? { models: presentation.models, modelGroups: presentation.modelGroups } : {},
+      ...entry.currentMode && presentation.modes?.some((mode) => mode.id === entry.currentMode) ? { modes: presentation.modes } : {}
+    };
+  }
   async configureConversation(input2, signal) {
     if (!input2.configuration?.model && !input2.configuration?.mode)
       throw new Error("ACP configuration change is unavailable");
@@ -28620,7 +28668,16 @@ var AcpExecutor = class {
   }
   async #persistConfirmedConfig(session, configOptions = session.configOptions) {
     if (!session.record) return;
-    const record2 = withConfirmedConfiguration(session.record, configOptions);
+    let record2 = withConfirmedConfiguration(session.record, configOptions);
+    const observed = this.#catalogEntry("ready", configOptions);
+    const presentation = this.#readPresentation({
+      version: 1,
+      models: observed.models,
+      modelGroups: observed.modelGroups,
+      modes: observed.modes
+    });
+    if (presentation && JSON.stringify(record2.presentation) !== JSON.stringify(presentation))
+      record2 = { ...record2, presentation };
     if (record2 === session.record) return;
     await this.#state?.write?.(session.conversationKey, record2);
     session.record = record2;

package/node_modules/@maka/core/dist/executor-catalog.js

@@ -19,6 +19,10 @@
 import { isExecutorId } from './executor-id.js';
 import { CATALOG_PROVIDER_TYPES } from './provider-registry.js';
 import { isThinkingLevel } from './model-thinking.js';
+/** Existing conversations restore their external connection as part of execution. */
+export function canExecuteExistingConversation(readiness) {
+    return readiness === 'ready' || readiness === 'restorable' || readiness === 'restore_failed';
+}
 export function isExecutorConfiguration(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
         return false;

package/node_modules/@maka/runtime-host/dist/server/execution-composition.js

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { canExecuteExistingConversation } from '@maka/core/executor-catalog';
 import { readMatterRuntimeEvents } from '../assistant/proactive-matters/settlement-context.js';
 import { markAssistantBackgroundSessions } from '../assistant/background-sessions.js';
 import { PersonalAssistantService, ASSISTANT_LEGACY_PACKAGES } from '../assistant/service.js';
@@ -854,7 +855,7 @@ export async function createExecutionRuntimeHostComposition(context, options = {
                     ...projected,
                     idleOnly: true,
                     supportsAttachments: entry?.supportsAttachments ?? false,
-                    ...(entry?.readiness === 'ready'
+                    ...(canExecuteExistingConversation(entry?.readiness)
                         ? {}
                         : {
                             unavailableReason: entry?.readiness === 'history_only'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maka-agent",
-  "version": "0.2.2-dev.97.20261024",
+  "version": "0.2.2-dev.99.20261024",
   "description": "Apache Maka (Incubating) developer snapshot; not an Apache release.",
   "license": "Apache-2.0",
   "type": "module",