@vedmalex/ai-connect 0.6.0 → 0.8.0

package/dist/node/index.js

@@ -1984,6 +1984,8 @@ function fillConfiguredContextLength(route, models) {
     return {
       ...entry,
       contextLength: configured,
+      // FT-002: typed provenance (canonical) + metadata alias (back-compat).
+      contextWindowSource: "configured",
       metadata: { ...entry.metadata ?? {}, contextWindowSource: "configured" }
     };
   });
@@ -3316,7 +3318,8 @@ function createClient(configOrInput, options = {}) {
           ...catalog.canonicalModelId ? { canonicalModelId: catalog.canonicalModelId } : {},
           ...catalog.resolvedModelId ? { resolvedModelId: catalog.resolvedModelId } : {},
           ...catalog.currentModelId ? { currentModelId: catalog.currentModelId } : {},
-          availableModels: catalog.availableModels
+          availableModels: catalog.availableModels,
+          ...catalog.warnings?.length ? { warnings: catalog.warnings } : {}
         });
         wideAttempts.push({
           index: wideAttempts.length + 1,
@@ -5019,7 +5022,7 @@ function parseOpenAiModelCatalog(route, payload) {
         modelId: entry.id,
         name: typeof entry.display_name === "string" ? entry.display_name : typeof entry.name === "string" ? entry.name : entry.id,
         ...typeof entry.description === "string" ? { description: entry.description } : {},
-        ...contextLength !== void 0 ? { contextLength } : {},
+        ...contextLength !== void 0 ? { contextLength, contextWindowSource: "discovered" } : {},
         ...pricing ? { pricing } : {},
         ...free ? { free } : {},
         ...metadata ? {
@@ -6794,6 +6797,20 @@ var TEXT_EXTENSIONS2 = /* @__PURE__ */ new Set([
 function isRecord2(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
+var ACP_HARNESS_NOISE_PATTERNS = [
+  /^модель переключена на .+?\.?(?:\s*готов к работе[.!…]*)?$/iu,
+  /^готов к работе[.!…]*$/iu,
+  /^жду (?:вашего вопроса|вопроса или задачи|вашей задачи|вашего ответа|явного запроса)[^]*$/iu,
+  /^это сообщение помечено как локальная команда[^]*$/iu,
+  /^<local-command-(?:caveat|stdout|name|message|args)[^>]*>[^]*$/iu
+];
+function isHarnessNoiseLine(line) {
+  const trimmed = line.trim();
+  if (trimmed.length === 0) {
+    return false;
+  }
+  return ACP_HARNESS_NOISE_PATTERNS.some((pattern) => pattern.test(trimmed));
+}
 function splitCommandLine(commandLine) {
   const matches = commandLine.match(/"[^"]*"|'[^']*'|[^\s]+/g) ?? [];
   const parts = matches.map((part) => {
@@ -7630,6 +7647,7 @@ function buildAcpLifecycle(route, authRequest, mode) {
   }
   steps.push("session/new");
   if (mode === "prompt") {
+    steps.push("session/set_model");
     steps.push("session/prompt");
   }
   return { steps, keys };
@@ -7717,6 +7735,9 @@ var AcpConnection = class {
   env;
   timeoutMs;
   permissionMode;
+  selectModel;
+  suppressHarnessNoise;
+  failOnHarnessOnlyTurn;
   command;
   args;
   child;
@@ -7738,6 +7759,9 @@ var AcpConnection = class {
     this.env = options.env;
     this.timeoutMs = options.timeoutMs;
     this.permissionMode = options.permissionMode;
+    this.selectModel = options.selectModel;
+    this.suppressHarnessNoise = options.suppressHarnessNoise;
+    this.failOnHarnessOnlyTurn = options.failOnHarnessOnlyTurn;
     const resolved = splitCommandLine(options.commandLine);
     this.command = resolved.command;
     this.args = resolved.args;
@@ -7770,8 +7794,18 @@ var AcpConnection = class {
         usage: void 0,
         attachments: [],
         warnings: [],
+        suppressNoise: this.suppressHarnessNoise,
+        lineBuffer: "",
+        harnessMarkers: [],
         ...onDelta ? { onDelta } : {}
       };
+      await this.selectSessionModel(
+        sessionId,
+        context.route,
+        session,
+        transport.phases ?? [],
+        this.activePrompt.warnings
+      );
       let stopReason;
       const abortSignal = context.abort.signal;
       let abortListener;
@@ -7814,13 +7848,27 @@ var AcpConnection = class {
         }
         this.bumpIdleTimer();
       }
+      this.flushHarnessLineBuffer();
       const stderrSlice = this.stderr.slice(stderrOffset).trim();
       const warnings = [...this.activePrompt.warnings];
+      if (this.activePrompt.harnessMarkers.length > 0) {
+        warnings.push(
+          `ACP: filtered ${this.activePrompt.harnessMarkers.length} interactive-harness line(s) from the response.`
+        );
+      }
       if (stderrSlice.length > 0) {
         warnings.push(stderrSlice);
       }
+      const text = this.activePrompt.text.trim();
+      if (this.failOnHarnessOnlyTurn && this.activePrompt.harnessMarkers.length > 0 && text.length === 0) {
+        this.activePrompt = void 0;
+        throw new AiConnectError(
+          "temporary_unavailable",
+          "ACP turn returned only interactive-harness output (no task output)."
+        );
+      }
       const result = {
-        text: this.activePrompt.text.trim(),
+        text,
         attachments: [...this.activePrompt.attachments],
         warnings,
         ...this.activePrompt.usage ? { usage: this.activePrompt.usage } : {},
@@ -8127,6 +8175,108 @@ var AcpConnection = class {
       }
     });
   }
+  /**
+   * Select the route's model through the ACP protocol (TASK-033 / UR-002).
+   * Best-effort matrix: skip when disabled / no model / no advertised catalog /
+   * already current; warn (not silently default) when the requested model is not
+   * in the agent's `availableModels`; otherwise `session/set_model` and surface
+   * any error as a warning. Never throws — a failed protocol selection must not
+   * fail the generation.
+   */
+  async selectSessionModel(sessionId, route, sessionResult, phases, warnings) {
+    if (!this.selectModel) {
+      return;
+    }
+    const desiredModel = route.model?.trim();
+    if (!desiredModel) {
+      return;
+    }
+    const catalog = modelCatalogFromSession(sessionResult);
+    if (!catalog) {
+      return;
+    }
+    if (catalog.currentModelId === desiredModel) {
+      return;
+    }
+    const available = catalog.availableModels ?? [];
+    if (available.length > 0 && !available.some((entry) => entry.modelId === desiredModel)) {
+      warnings.push(
+        `ACP agent's available models [${available.map((entry) => entry.modelId).join(", ")}] do not include route model "${desiredModel}"; model not switched via protocol.`
+      );
+      return;
+    }
+    try {
+      await measurePhase(
+        phases,
+        "session/set_model",
+        async () => this.request("session/set_model", {
+          sessionId,
+          modelId: desiredModel
+        })
+      );
+    } catch (error) {
+      const message = error instanceof Error ? error.message : isRecord2(error) && typeof error.message === "string" ? error.message : String(error);
+      warnings.push(
+        `ACP session/set_model("${desiredModel}") failed: ${message}`
+      );
+    }
+  }
+  /**
+   * Append `agent_message_chunk` text (TASK-033 / UR-003). With suppression off
+   * (legacy) the chunk streams + accumulates raw. With suppression on, the chunk
+   * is line-buffered: each COMPLETE line is classified and either dropped (a
+   * harness marker — no delta, no accumulation) or emitted; the trailing partial
+   * line waits in `lineBuffer` for the next chunk or the end-of-turn flush.
+   */
+  appendAgentText(chunk) {
+    const state = this.activePrompt;
+    if (!state) {
+      return;
+    }
+    if (!state.suppressNoise) {
+      state.onDelta?.(chunk);
+      state.text += chunk;
+      return;
+    }
+    state.lineBuffer += chunk;
+    let newlineIndex = state.lineBuffer.indexOf("\n");
+    while (newlineIndex !== -1) {
+      const line = state.lineBuffer.slice(0, newlineIndex + 1);
+      state.lineBuffer = state.lineBuffer.slice(newlineIndex + 1);
+      this.emitAgentLine(line);
+      newlineIndex = state.lineBuffer.indexOf("\n");
+    }
+  }
+  /** Flush any trailing partial line through the harness-noise classifier. */
+  flushHarnessLineBuffer() {
+    const state = this.activePrompt;
+    if (!state || !state.suppressNoise) {
+      return;
+    }
+    const remaining = state.lineBuffer;
+    state.lineBuffer = "";
+    if (remaining.length > 0) {
+      this.emitAgentLine(remaining);
+    }
+  }
+  /**
+   * Emit one classified line: a curated harness marker is recorded + dropped
+   * (no delta, no accumulation); any other line streams + accumulates. `line`
+   * may carry a trailing newline — classification runs on the content.
+   */
+  emitAgentLine(line) {
+    const state = this.activePrompt;
+    if (!state) {
+      return;
+    }
+    const content = line.endsWith("\n") ? line.slice(0, -1) : line;
+    if (isHarnessNoiseLine(content)) {
+      state.harnessMarkers.push(content.trim());
+      return;
+    }
+    state.onDelta?.(line);
+    state.text += line;
+  }
   handleNotification(message) {
     if (message.method !== "session/update" || !this.activePrompt) {
       return;
@@ -8141,8 +8291,7 @@ var AcpConnection = class {
     }
     const chunk = extractTextChunk(update);
     if (update.sessionUpdate === "agent_message_chunk" && chunk) {
-      this.activePrompt.onDelta?.(chunk);
-      this.activePrompt.text += chunk;
+      this.appendAgentText(chunk);
     }
     if (update.sessionUpdate === "agent_thought_chunk" && chunk) {
       this.activePrompt.warnings.push(chunk);
@@ -8329,7 +8478,10 @@ function createAcpTransportManager(options) {
       cwd: runtime.cwd,
       env: runtime.env,
       timeoutMs: promptTimeout(options),
-      permissionMode: options?.permissionMode ?? "deny-all"
+      permissionMode: options?.permissionMode ?? "deny-all",
+      selectModel: options?.selectModel ?? true,
+      suppressHarnessNoise: options?.suppressHarnessNoise ?? true,
+      failOnHarnessOnlyTurn: options?.failOnHarnessOnlyTurn ?? true
     };
   }
   function getPool(key) {
@@ -9015,16 +9167,20 @@ function buildCliDiscoveryInvocation(route, command, options) {
     parameterKeys
   };
 }
-function buildStaticCliCatalog(route) {
+function buildStaticCliCatalog(route, warning) {
   const models = route.advertisedModels.map((id) => ({
     modelId: id,
     name: id
   }));
-  return buildModelCatalog(
+  const catalog = buildModelCatalog(
     route,
     models,
     currentModelIdForRoute(route, route.advertisedModels)
   );
+  if (warning) {
+    catalog.warnings = [...catalog.warnings ?? [], warning];
+  }
+  return catalog;
 }
 function statsToUsage(stats) {
   if (!stats || typeof stats !== "object") {
@@ -9167,7 +9323,9 @@ function modelInfoFromRecord(record, selector) {
     modelId,
     name,
     ...description ? { description } : {},
-    ...contextLength !== void 0 ? { contextLength } : {}
+    // FT-002: a contextLength read from the list-command output is a discovered
+    // value (consistent with the API parsers), so tag its provenance.
+    ...contextLength !== void 0 ? { contextLength, contextWindowSource: "discovered" } : {}
   };
 }
 function parseCliModelList(stdout, parser, selector) {
@@ -9438,13 +9596,20 @@ function createCliTransportManager(options) {
             throw error;
           }
           if (source.fallback === "static") {
-            return buildStaticCliCatalog(context.route);
+            const detail = error instanceof Error ? error.message : String(error);
+            return buildStaticCliCatalog(
+              context.route,
+              `CLI discovery command for "${context.route.transport.id}" failed (${detail}); fell back to the static models[] catalog.`
+            );
           }
           throw error;
         }
         if (models.length === 0) {
           if (source.fallback === "static") {
-            return buildStaticCliCatalog(context.route);
+            return buildStaticCliCatalog(
+              context.route,
+              `CLI discovery command for "${context.route.transport.id}" returned no models; fell back to the static models[] catalog.`
+            );
           }
           throw new AiConnectError(
             "temporary_unavailable",