@alas-ide/codex-acp 2.6.0-alas.1 → 2.6.0-alas.2

package/dist/index.js

@@ -36335,6 +36335,109 @@ function hasOnlyKeys(value, allowed) {
   return Object.keys(value).every((key) => allowedKeys.has(key));
 }
 
+// src/PromptSuggestionGenerator.ts
+var PROMPT_SUGGESTIONS_META_KEY = "promptSuggestions";
+var SUGGESTION_EFFORT = "high";
+var SUGGESTION_SCHEMA = {
+  type: "object",
+  properties: { suggestion: { type: ["string", "null"] } },
+  required: ["suggestion"],
+  additionalProperties: false
+};
+var SUGGESTION_PROMPT = "This is an app-generated request for a suggested next user message. The user did not write this message.\n\nYour suggestion will appear in the user's empty message composer. They can accept it, edit it, or ignore it; it will not be sent automatically.\n\nPredict the single message this user is most likely to type next from the visible conversation. Use the whole conversation to understand their current intent and the latest exchange. Choose the action and specific object that best continue that intent, rather than a generally useful follow-up. Express its core naturally in the user's voice, keeping the requirements needed to retain its meaning. Choose the strongest grounded move even if several continuations are possible; uncertainty about exact wording or incidental details is not a reason to return null. Use null only when the conversation offers no grounded next move at all.\n\nSet suggestion to exactly one natural user message, one line, at most 240 characters, or null. No alternatives or explanation.\n\nReturn only JSON matching this schema: " + JSON.stringify(SUGGESTION_SCHEMA);
+function promptSuggestionsEnabled(env = process.env) {
+  return env["CODEX_ACP_PROMPT_SUGGESTIONS"]?.trim().toLowerCase() !== "false";
+}
+function promptSuggestionsMeta(text, requestId) {
+  return {
+    [PROMPT_SUGGESTIONS_META_KEY]: {
+      suggestions: text === null ? [] : [{ text }],
+      ...requestId !== void 0 ? { id: requestId } : {}
+    }
+  };
+}
+function promptSuggestionsRequestId(meta3) {
+  if (meta3 === null || typeof meta3 !== "object") return void 0;
+  const value = meta3[PROMPT_SUGGESTIONS_META_KEY];
+  if (value === null || typeof value !== "object") return void 0;
+  const id = value["id"];
+  return typeof id === "string" && id.length > 0 && id.length <= 256 ? id : void 0;
+}
+var PromptSuggestionGenerator = class {
+  constructor(client, publish) {
+    this.client = client;
+    this.publish = publish;
+  }
+  client;
+  publish;
+  generation = 0;
+  lastPublished = null;
+  /**
+   * Fire-and-forget hook, called after a turn ends normally. A newer turn or {@link invalidate} drops its result.
+   * With a `requestId` the result always goes out with it, an empty list when the sample gives nothing or fails,
+   * so a client-neutral client waiting for that id can stop.
+   */
+  onTurnCompleted(threadId, turnId, requestId) {
+    const generation = ++this.generation;
+    this.generateAndPublish(generation, threadId, turnId, requestId).catch(async () => {
+      if (requestId === void 0 || generation !== this.generation) return;
+      await this.publishAnswer(null, requestId).catch(() => {
+      });
+    });
+  }
+  /** A new prompt started or the session closed: a result still being generated is dropped. */
+  invalidate() {
+    this.generation++;
+  }
+  /**
+   * Drops a result in flight and clears the suggestion the client holds. Returns `null` when nothing is held,
+   * so the caller does not wait a tick for nothing.
+   */
+  clear() {
+    this.invalidate();
+    if (this.lastPublished === null) return null;
+    return this.publishIfChanged(null).catch(() => {
+    });
+  }
+  /** The app-server restarted: later generations go to `client`. A generation in flight ends with the old one. */
+  rebindAppServer(client) {
+    this.client = client;
+  }
+  async generateAndPublish(generation, threadId, turnId, requestId) {
+    const client = this.client;
+    const response = await client.threadSample({
+      threadId,
+      expectedTurnId: turnId,
+      prompt: SUGGESTION_PROMPT,
+      effort: SUGGESTION_EFFORT
+    });
+    if (generation !== this.generation) return;
+    const text = parseSuggestion(response.text);
+    if (requestId !== void 0) await this.publishAnswer(text, requestId);
+    else await this.publishIfChanged(text);
+  }
+  /** Answers a client-neutral request: it goes out even when it repeats the text the client holds. */
+  async publishAnswer(text, requestId) {
+    this.lastPublished = text;
+    await this.publish(text, requestId);
+  }
+  async publishIfChanged(text) {
+    if (text === this.lastPublished) return;
+    this.lastPublished = text;
+    await this.publish(text);
+  }
+};
+function parseSuggestion(text) {
+  if (!text?.trim()) return null;
+  try {
+    const value = JSON.parse(text).suggestion;
+    if (typeof value !== "string") return null;
+    return value.trim() || null;
+  } catch {
+    return null;
+  }
+}
+
 // src/tool-calls/ClientCapabilities.ts
 var ClientCapabilities = class _ClientCapabilities {
   static DEFAULT = new _ClientCapabilities({
@@ -36353,7 +36456,8 @@ var ClientCapabilities = class _ClientCapabilities {
     neutralPermissionPresentation: false,
     neutralQuestionCustomAnswer: false,
     neutralRecommendedConfigValue: false,
-    neutralCommandPresentation: false
+    neutralCommandPresentation: false,
+    neutralPromptSuggestions: false
   });
   /** The client declares `_meta.jetbrains.air`. */
   airClient;
@@ -36383,6 +36487,11 @@ var ClientCapabilities = class _ClientCapabilities {
   neutralRecommendedConfigValue;
   /** Available commands carry `_meta.commandPresentation`. Only ACP v1 reads the opt-in. */
   neutralCommandPresentation;
+  /**
+   * A prompt that names `_meta.promptSuggestions.id` gets the predicted follow-up prompt of its turn.
+   * Only ACP v1 reads the opt-in.
+   */
+  neutralPromptSuggestions;
   constructor(values) {
     this.airClient = values.airClient;
     this.airToolCallContract = values.airToolCallContract;
@@ -36400,6 +36509,11 @@ var ClientCapabilities = class _ClientCapabilities {
     this.neutralQuestionCustomAnswer = values.neutralQuestionCustomAnswer;
     this.neutralRecommendedConfigValue = values.neutralRecommendedConfigValue;
     this.neutralCommandPresentation = values.neutralCommandPresentation;
+    this.neutralPromptSuggestions = values.neutralPromptSuggestions;
+  }
+  /** Whether the client reads predicted follow-up prompts, in any form. */
+  get predictsPrompts() {
+    return this.airClient || this.neutralPromptSuggestions;
   }
   static from(capabilities) {
     const airClient = isAirClient(capabilities);
@@ -36428,7 +36542,8 @@ var ClientCapabilities = class _ClientCapabilities {
       neutralPermissionPresentation: clientRequestsNeutralPresentation(capabilities, NEUTRAL_PERMISSION_PRESENTATION_META_KEY),
       neutralQuestionCustomAnswer: clientRequestsNeutralPresentation(capabilities, NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY),
       neutralRecommendedConfigValue: clientRequestsNeutralPresentation(capabilities, NEUTRAL_RECOMMENDED_CONFIG_VALUE_META_KEY),
-      neutralCommandPresentation: clientRequestsNeutralPresentation(capabilities, NEUTRAL_COMMAND_PRESENTATION_META_KEY)
+      neutralCommandPresentation: clientRequestsNeutralPresentation(capabilities, NEUTRAL_COMMAND_PRESENTATION_META_KEY),
+      neutralPromptSuggestions: clientRequestsNeutralPresentation(capabilities, PROMPT_SUGGESTIONS_META_KEY)
     });
   }
   /**
@@ -36459,7 +36574,8 @@ var ClientCapabilities = class _ClientCapabilities {
       neutralPermissionPresentation: false,
       neutralQuestionCustomAnswer: false,
       neutralRecommendedConfigValue: false,
-      neutralCommandPresentation: false
+      neutralCommandPresentation: false,
+      neutralPromptSuggestions: false
     });
   }
   /**
@@ -42151,7 +42267,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.6.0-alas.1",
+  version: "2.6.0-alas.2",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -42229,7 +42345,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.6.0",
     upstreamCommit: "f3208913693bd4d5171d6c6b9be5ec1ff96c6431",
-    sourceCommit: "7010b594e77f4f941a0712bea03aae93a8bc20dc"
+    sourceCommit: "e8e45a368d0d1f832fbd5307e1c08e879d1c9de3"
   }
 };
 
@@ -50759,83 +50875,6 @@ function titleSource(text) {
   return text.slice(0, end);
 }
 
-// src/PromptSuggestionGenerator.ts
-var PROMPT_SUGGESTIONS_META_KEY = "promptSuggestions";
-var SUGGESTION_EFFORT = "high";
-var SUGGESTION_SCHEMA = {
-  type: "object",
-  properties: { suggestion: { type: ["string", "null"] } },
-  required: ["suggestion"],
-  additionalProperties: false
-};
-var SUGGESTION_PROMPT = "This is an app-generated request for a suggested next user message. The user did not write this message.\n\nYour suggestion will appear in the user's empty message composer. They can accept it, edit it, or ignore it; it will not be sent automatically.\n\nPredict the single message this user is most likely to type next from the visible conversation. Use the whole conversation to understand their current intent and the latest exchange. Choose the action and specific object that best continue that intent, rather than a generally useful follow-up. Express its core naturally in the user's voice, keeping the requirements needed to retain its meaning. Choose the strongest grounded move even if several continuations are possible; uncertainty about exact wording or incidental details is not a reason to return null. Use null only when the conversation offers no grounded next move at all.\n\nSet suggestion to exactly one natural user message, one line, at most 240 characters, or null. No alternatives or explanation.\n\nReturn only JSON matching this schema: " + JSON.stringify(SUGGESTION_SCHEMA);
-function promptSuggestionsEnabled(env = process.env) {
-  return env["CODEX_ACP_PROMPT_SUGGESTIONS"]?.trim().toLowerCase() !== "false";
-}
-function promptSuggestionsMeta(text) {
-  return { [PROMPT_SUGGESTIONS_META_KEY]: { suggestions: text === null ? [] : [{ text }] } };
-}
-var PromptSuggestionGenerator = class {
-  constructor(client, publish) {
-    this.client = client;
-    this.publish = publish;
-  }
-  client;
-  publish;
-  generation = 0;
-  lastPublished = null;
-  /** Fire-and-forget hook, called after a turn ends normally. A newer turn or {@link invalidate} drops its result. */
-  onTurnCompleted(threadId, turnId) {
-    const generation = ++this.generation;
-    this.generateAndPublish(generation, threadId, turnId).catch(() => {
-    });
-  }
-  /** A new prompt started or the session closed: a result still being generated is dropped. */
-  invalidate() {
-    this.generation++;
-  }
-  /**
-   * Drops a result in flight and clears the suggestion the client holds. Returns `null` when nothing is held,
-   * so the caller does not wait a tick for nothing.
-   */
-  clear() {
-    this.invalidate();
-    if (this.lastPublished === null) return null;
-    return this.publishIfChanged(null).catch(() => {
-    });
-  }
-  /** The app-server restarted: later generations go to `client`. A generation in flight ends with the old one. */
-  rebindAppServer(client) {
-    this.client = client;
-  }
-  async generateAndPublish(generation, threadId, turnId) {
-    const client = this.client;
-    const response = await client.threadSample({
-      threadId,
-      expectedTurnId: turnId,
-      prompt: SUGGESTION_PROMPT,
-      effort: SUGGESTION_EFFORT
-    });
-    if (generation !== this.generation) return;
-    await this.publishIfChanged(parseSuggestion(response.text));
-  }
-  async publishIfChanged(text) {
-    if (text === this.lastPublished) return;
-    this.lastPublished = text;
-    await this.publish(text);
-  }
-};
-function parseSuggestion(text) {
-  if (!text?.trim()) return null;
-  try {
-    const value = JSON.parse(text).suggestion;
-    if (typeof value !== "string") return null;
-    return value.trim() || null;
-  } catch {
-    return null;
-  }
-}
-
 // src/SessionIndex.ts
 var AIR_SESSION_INDEX_KEY = "sessionIndex";
 var AIR_SESSION_BATCH_GET_KEY = "sessionBatchGet";
@@ -53901,6 +53940,10 @@ var CodexAcpServer = class {
       ...this.capabilities.neutralCommandPresentation ? {
         [NEUTRAL_COMMAND_PRESENTATION_META_KEY]: neutralPresentationCapability()
       } : {},
+      // Only while the adapter predicts at all: `CODEX_ACP_PROMPT_SUGGESTIONS=false` turns it off.
+      ...this.capabilities.neutralPromptSuggestions && promptSuggestionsEnabled() ? {
+        [PROMPT_SUGGESTIONS_META_KEY]: neutralPresentationCapability()
+      } : {},
       // The session index for a client that opted in without AIR, see `docs/air-extensions.md`.
       ...neutralSessionIndex ? {
         [NEUTRAL_SESSION_INDEX_META_KEY]: neutralSessionIndex
@@ -56673,13 +56716,13 @@ You have been logged out. Please try again.`);
     return null;
   }
   createPromptSuggestions(sessionState) {
-    if (!sessionState.clientCapabilities.airClient || !promptSuggestionsEnabled()) return void 0;
+    if (!sessionState.clientCapabilities.predictsPrompts || !promptSuggestionsEnabled()) return void 0;
     return new PromptSuggestionGenerator(
       this.codexAcpClient.appServerClient,
-      async (text) => {
+      async (text, requestId) => {
         await new ACPSessionConnection(this.connection, sessionState.sessionId).update({
           sessionUpdate: "session_info_update",
-          _meta: promptSuggestionsMeta(text)
+          _meta: promptSuggestionsMeta(text, requestId)
         });
       }
     );
@@ -57863,7 +57906,14 @@ You have been logged out. Please try again.`);
       );
       const promptText = params.prompt.filter((b) => b.type === "text").map((b) => b.text).join(" ").trim();
       sessionState.titleGen?.onTurnCompleted(promptText);
-      if (turnCompleted.turn.status === "completed" && sessionState.collaborationMode !== PLAN_COLLABORATION_MODE) sessionState.promptSuggestions?.onTurnCompleted(sessionState.sessionId, turnCompleted.turn.id);
+      const promptSuggestionRequestId = sessionState.clientCapabilities.neutralPromptSuggestions ? promptSuggestionsRequestId(params._meta) : void 0;
+      if (turnCompleted.turn.status === "completed" && sessionState.collaborationMode !== PLAN_COLLABORATION_MODE && (sessionState.clientCapabilities.airClient || promptSuggestionRequestId !== void 0)) {
+        sessionState.promptSuggestions?.onTurnCompleted(
+          sessionState.sessionId,
+          turnCompleted.turn.id,
+          promptSuggestionRequestId
+        );
+      }
       if (pendingInsertion === void 0) {
         await this.publishFallbackSessionTitle(
           sessionState,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.6.0-alas.1",
+  "version": "2.6.0-alas.2",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -81,6 +81,6 @@
   "alasDownstream": {
     "upstreamVersion": "2.6.0",
     "upstreamCommit": "f3208913693bd4d5171d6c6b9be5ec1ff96c6431",
-    "sourceCommit": "7010b594e77f4f941a0712bea03aae93a8bc20dc"
+    "sourceCommit": "e8e45a368d0d1f832fbd5307e1c08e879d1c9de3"
   }
 }