@songsid/agend 2.1.8-beta.7 → 2.1.8-beta.8

package/dist/cross-instance-envelope.d.ts

@@ -2,5 +2,12 @@
 export declare const MAX_ASSEMBLED_CROSS_INSTANCE_MESSAGE_BYTES = 16000;
 /** Render metadata carried in a cross-instance handoff. */
 export declare function renderCrossInstanceHandoffMetadata(meta: Record<string, string>): string;
+/**
+ * A task_summary that merely echoes the body is noise in the injected block
+ * (#1037): senders auto-derive it from the first 200 chars when none is
+ * given. It is redundant iff the body already opens with it — an explicit
+ * summary carrying anything beyond the body is still shown.
+ */
+export declare function isRedundantTaskSummary(content: string, taskSummary: string | undefined): boolean;
 /** Exact cross-instance block pasted by the receiving daemon. */
 export declare function formatCrossInstanceInboundMessage(content: string, meta: Record<string, string>): string;

package/dist/cross-instance-envelope.js

@@ -16,12 +16,30 @@ export function renderCrossInstanceHandoffMetadata(meta) {
     add("attachment_file_id", meta.attachment_file_id);
     return rows.length ? `\n(${rows.join(" | ")})` : "";
 }
+/**
+ * A task_summary that merely echoes the body is noise in the injected block
+ * (#1037): senders auto-derive it from the first 200 chars when none is
+ * given. It is redundant iff the body already opens with it — an explicit
+ * summary carrying anything beyond the body is still shown.
+ */
+export function isRedundantTaskSummary(content, taskSummary) {
+    const summary = (taskSummary ?? "").trim();
+    if (!summary)
+        return false;
+    const body = (content ?? "").trim();
+    return body.length > 0 && body.startsWith(summary);
+}
 /** Exact cross-instance block pasted by the receiving daemon. */
 export function formatCrossInstanceInboundMessage(content, meta) {
     const fromInstance = meta.from_instance || "unknown";
     const fromLabel = meta.from_display ? `${meta.from_display} (${fromInstance})` : fromInstance;
     let formatted = `[from:${fromLabel}] ${content}`;
-    formatted += renderCrossInstanceHandoffMetadata(meta);
+    // Dedup only the injected block — logs and Telegram labels keep the raw
+    // task_summary exactly as the sender provided it.
+    const renderMeta = isRedundantTaskSummary(content, meta.task_summary)
+        ? { ...meta, task_summary: "" }
+        : meta;
+    formatted += renderCrossInstanceHandoffMetadata(renderMeta);
     formatted += meta.requires_reply === "true"
         ? "\n(A reply IS required: use report_result with the correlation_id above — or send_to_instance. Not direct text.)"
         : "\n(If you need to reply, use send_to_instance tool, NOT direct text. If there is nothing to add, you may stay silent.)";

package/dist/cross-instance-envelope.js.map

@@ -1 +1 @@
-{"version":3,"file":"cross-instance-envelope.js","sourceRoot":"","sources":["../src/cross-instance-envelope.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAC5F,MAAM,CAAC,MAAM,0CAA0C,GAAG,MAAM,CAAC;AAEjE,2DAA2D;AAC3D,MAAM,UAAU,kCAAkC,CAAC,IAA4B;IAC7E,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,KAAyB,EAAE,EAAE;QACvD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC;IACF,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3C,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjD,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACtD,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,iCAAiC,CAAC,OAAe,EAAE,IAA4B;IAC7F,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC;IAC9F,IAAI,SAAS,GAAG,SAAS,SAAS,KAAK,OAAO,EAAE,CAAC;IACjD,SAAS,IAAI,kCAAkC,CAAC,IAAI,CAAC,CAAC;IACtD,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM;QACzC,CAAC,CAAC,kHAAkH;QACpH,CAAC,CAAC,wHAAwH,CAAC;IAC7H,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"cross-instance-envelope.js","sourceRoot":"","sources":["../src/cross-instance-envelope.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAC5F,MAAM,CAAC,MAAM,0CAA0C,GAAG,MAAM,CAAC;AAEjE,2DAA2D;AAC3D,MAAM,UAAU,kCAAkC,CAAC,IAA4B;IAC7E,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,KAAyB,EAAE,EAAE;QACvD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC;IACF,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3C,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjD,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAe,EAAE,WAA+B;IACrF,MAAM,OAAO,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACrD,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,iCAAiC,CAAC,OAAe,EAAE,IAA4B;IAC7F,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC;IAC9F,IAAI,SAAS,GAAG,SAAS,SAAS,KAAK,OAAO,EAAE,CAAC;IACjD,wEAAwE;IACxE,kDAAkD;IAClD,MAAM,UAAU,GAAG,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC;QACnE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE;QAC/B,CAAC,CAAC,IAAI,CAAC;IACT,SAAS,IAAI,kCAAkC,CAAC,UAAU,CAAC,CAAC;IAC5D,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM;QACzC,CAAC,CAAC,kHAAkH;QACpH,CAAC,CAAC,wHAAwH,CAAC;IAC7H,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/fleet-manager.d.ts

@@ -1674,7 +1674,14 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     /** `/install-cli cancel` — abort the active install and remove its window. */
     cancelInstallSession(): Promise<string>;
     /** `command -v` on a login shell, so PATH additions from rc files count. */
-    private verifyBinaryOnLoginShell;
+    /**
+     * The absolute path a fresh login shell resolves `binary` to, or null. Only
+     * a real executable file counts: `command -v` also answers with an alias
+     * definition or a function name, neither of which a spawn could run.
+     */
+    private locateBinaryOnLoginShell;
+    /** Put an installed binary's directory on the fleet's PATH (#1059), once. */
+    private adoptBinaryDirectory;
     /** "Sign in now?" button after a successful install. */
     private handleInstallLoginConfirm;
     /** Discord native `/login` slash — shared by every adapter dispatch block. */

package/dist/fleet-manager.js

@@ -1,10 +1,10 @@
-import { existsSync, readFileSync, mkdirSync, writeFileSync, unlinkSync, rmSync, readdirSync, renameSync, copyFileSync, chmodSync, statSync } from "node:fs";
+import { existsSync, readFileSync, mkdirSync, writeFileSync, unlinkSync, rmSync, readdirSync, renameSync, copyFileSync, chmodSync, statSync, accessSync, constants as fsConstants } from "node:fs";
 import { randomBytes, randomUUID } from "node:crypto";
 import { spawnSync } from "node:child_process";
 import { freemem, totalmem, cpus } from "node:os";
 import { createServer } from "node:http";
 import { Worker } from "node:worker_threads";
-import { join, dirname, basename } from "node:path";
+import { join, dirname, basename, delimiter, isAbsolute } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getAgendHome, ensureWorkspaceGit } from "./paths.js";
 import { beginFullRestartProgress as persistFullRestartProgress, beginUpdateProgress as persistUpdateProgress, clearUpdateMarker, isUpdateInProgress, readUpdateProgress, setUpdateProgressStage, updateProgressOperation, } from "./update-marker.js";
@@ -7115,7 +7115,7 @@ export class FleetManager {
      * An empty emoji removes that status's override.
      */
     async setPersonaEmoji(instanceName, args) {
-        const self = this.fleetConfig?.instances[instanceName];
+        const self = this.ownInstanceConfig(instanceName);
         if (!self)
             return { error: this.personaEmojiMissing(instanceName) };
         const status = (args.status ?? "delivered");
@@ -7160,8 +7160,9 @@ export class FleetManager {
         // Re-read after the validation above, which may have waited on Discord:
         // another set_persona_emoji or a Settings save can have changed another
         // status, or replaced this instance's config object, meanwhile. Change
-        // only this one key on what is there now.
-        const current = this.fleetConfig?.instances[instanceName];
+        // only this one key on what is there now. Ownership must still hold:
+        // removal during the await must not fall through to an inherited entry.
+        const current = this.ownInstanceConfig(instanceName);
         if (!current)
             return { error: this.personaEmojiMissing(instanceName) };
         const map = { ...(current.status_emojis ?? {}) };
@@ -9688,10 +9689,16 @@ export class FleetManager {
                 }
                 // The installer may only have added the binary to a profile PATH; a
                 // fresh login shell sees that, the fleet process's PATH may not.
-                if (!this.verifyBinaryOnLoginShell(info.binary)) {
+                const installedAt = this.locateBinaryOnLoginShell(info.binary);
+                if (!installedAt) {
                     await chat.adapter.sendText(chat.chatId, t("install.verify_failed", backend, info.binary), { threadId: chat.threadId }).catch(() => { });
                     return;
                 }
+                // #1059: make it reachable from this process too. `/login` lists what
+                // `which` finds on the fleet's own PATH, and instances resolve their
+                // binary the same way, so a binary only a login shell could see was
+                // installed, reported as verified, and then offered nowhere.
+                this.adoptBinaryDirectory(installedAt, backend);
                 if (!LOGIN_FLOWS[backend]) {
                     await chat.adapter.sendText(chat.chatId, t("install.success_no_login", backend), { threadId: chat.threadId }).catch(() => { });
                     return;
@@ -9751,15 +9758,35 @@ export class FleetManager {
         return t("install.cancelled", backend);
     }
     /** `command -v` on a login shell, so PATH additions from rc files count. */
-    verifyBinaryOnLoginShell(binary) {
+    /**
+     * The absolute path a fresh login shell resolves `binary` to, or null. Only
+     * a real executable file counts: `command -v` also answers with an alias
+     * definition or a function name, neither of which a spawn could run.
+     */
+    locateBinaryOnLoginShell(binary) {
         try {
-            const result = spawnSync("bash", ["-lc", `command -v ${binary}`], { timeout: 10_000, stdio: "pipe" });
-            return result.status === 0;
+            const result = spawnSync("bash", ["-lc", `command -v ${binary}`], { timeout: 10_000, stdio: "pipe", encoding: "utf8" });
+            if (result.status !== 0)
+                return null;
+            const path = String(result.stdout ?? "").trim().split("\n").pop()?.trim() ?? "";
+            if (!isAbsolute(path))
+                return null;
+            accessSync(path, fsConstants.X_OK);
+            return statSync(path).isFile() ? path : null;
         }
         catch {
-            return false;
+            return null;
         }
     }
+    /** Put an installed binary's directory on the fleet's PATH (#1059), once. */
+    adoptBinaryDirectory(binaryPath, backend) {
+        const dir = dirname(binaryPath);
+        const entries = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
+        if (entries.includes(dir))
+            return;
+        process.env.PATH = [dir, ...entries].join(delimiter);
+        this.logger.info({ backend, dir }, "Added the installed CLI's directory to the fleet PATH");
+    }
     /** "Sign in now?" button after a successful install. */
     async handleInstallLoginConfirm(data, callbackAdapterId, receivingAdapter) {
         const claimed = this.consumeNonceCallback(INSTALL_LOGIN_CALLBACK_PREFIX, /^install-login:([0-9a-f]+):(go|later)$/, data, callbackAdapterId, receivingAdapter);