@songsid/agend 2.1.12-beta.3 → 2.1.12-beta.5

package/dist/spawn-gate.js

@@ -21,7 +21,7 @@ export class SpawnGate {
     memoryPressure;
     stopMemoryUpdates;
     onMemoryUpdate = (snapshot) => {
-        if (!this.memoryPressure.allowsUnknown(snapshot))
+        if (!this.memoryPressure.advisoryOnly())
             return;
         this.pressureHeld = false;
         this.pressureRetryMs = 5_000;
@@ -84,7 +84,8 @@ export class SpawnGate {
                 if (this.nestedQueue.length === 0 && index < 0)
                     return;
                 // Explicit zero preserves the existing deterministic test/embedding opt-out.
-                const sample = this.options.lowMemoryBytes === 0 ? null : this.memoryPressure.sampleForAdmission();
+                // macOS memory is advisory (#1256): admission neither waits for a sample nor reads one.
+                const sample = this.options.lowMemoryBytes === 0 || this.memoryPressure.advisoryOnly() ? null : this.memoryPressure.sampleForAdmission();
                 if (sample instanceof Promise) {
                     this.awaitingMemory = true;
                     void sample.finally(() => {
@@ -94,7 +95,7 @@ export class SpawnGate {
                     });
                     return;
                 }
-                let pressure = sample === null || this.memoryPressure.allowsUnknown(sample) ? "normal" : sample.level;
+                let pressure = sample === null ? "normal" : sample.level;
                 if (this.stopped)
                     return;
                 if (pressure === "critical") {

package/dist/spawn-gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"spawn-gate.js","sourceRoot":"","sources":["../src/spawn-gate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA+B,MAAM,sBAAsB,CAAC;AA2BnF,qFAAqF;AACrF,MAAM,OAAO,SAAS;IAgCS;IA/BrB,KAAK,GAAiB,EAAE,CAAC;IACzB,WAAW,GAAiB,EAAE,CAAC;IAC/B,MAAM,GAAG,CAAC,CAAC;IACX,cAAc,GAAG,CAAC,CAAC;IACnB,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,aAAa,GAAG,CAAC,CAAC;IAClB,KAAK,GAAyC,IAAI,CAAC;IACnD,YAAY,GAAG,KAAK,CAAC;IACrB,UAAU,GAAG,KAAK,CAAC;IACnB,OAAO,GAAG,KAAK,CAAC;IAChB,OAAO,GAAG,KAAK,CAAC;IAChB,cAAc,GAAG,KAAK,CAAC;IACvB,eAAe,GAAG,KAAK,CAAC;IACxB,YAAY,GAAG,KAAK,CAAC;IACZ,MAAM,CAAe;IACrB,cAAc,CAAiB;IAC/B,iBAAiB,CAAa;IAC9B,cAAc,GAAG,CAAC,QAAgC,EAAE,EAAE;QACrE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC;YAAE,OAAO;QACzD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC,CAAC;IACe,YAAY,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAElD,YAA6B,OAAyB;QAAzB,YAAO,GAAP,OAAO,CAAkB;QACpD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QAC5C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,IAAI,cAAc,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;QAC9G,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3E,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACpD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IAED,GAAG,CAAI,IAAe,EAAE,SAA2B;QACjD,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;QAClF,qEAAqE;QACrE,4EAA4E;QAC5E,uEAAuE;QACvE,6EAA6E;QAC7E,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1F,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAgB,CAAC,CAAC;YACpE,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,KAAK;YAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAClE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC;IAEO,IAAI,CAAC,EAAU,EAAE,YAAY,GAAG,KAAK,EAAE,UAAU,GAAG,KAAK;QAC/D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;IACvB,CAAC;IAEO,IAAI;QACV,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE;YAAE,OAAO;QACrH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBACpG,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC;oBAAE,OAAO;gBACvD,6EAA6E;gBAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC;gBACnG,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;oBAC9B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;oBAC3B,KAAK,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;wBACvB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;wBAC5B,IAAI,CAAC,IAAI,CAAC,OAAO;4BAAE,IAAI,CAAC,IAAI,EAAE,CAAC;oBACjC,CAAC,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;gBACD,IAAI,QAAQ,GAAG,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBACtG,IAAI,IAAI,CAAC,OAAO;oBAAE,OAAO;gBACzB,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;oBAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;oBACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;oBAClE,OAAO;gBACT,CAAC;gBACD,qEAAqE;gBACrE,qEAAqE;gBACrE,IAAI,IAAI,CAAC,YAAY,IAAI,QAAQ,KAAK,QAAQ;oBAAE,QAAQ,GAAG,UAAU,CAAC;gBACtE,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;gBAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;gBACzE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAC/G,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC3C,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,WAAW,CAAC;gBAC/F,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;oBACjE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC7B,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;oBACpC,iEAAiE;oBACjE,6DAA6D;oBAC7D,IAAI,QAAQ,KAAK,QAAQ;wBAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBACxD,OAAO;gBACT,CAAC;gBACD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC3G,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnF,sEAAsE;gBACtE,MAAM,KAAK,GAAG,MAAM,IAAI,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACpH,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;oBAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC;oBAAC,OAAO;gBAAC,CAAC;gBAC1E,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACpF,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;oBAC1C,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC5B,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;oBACvD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACnD,CAAC;gBACD,IAAI,QAAQ;oBAAE,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAChC,IAAI,SAA2B,CAAC;gBAChC,IAAI,CAAC;oBAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAAC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAAC,CAAC;gBAChF,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC1D,IAAI,QAAQ;wBAAE,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpC,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,IAAI,CAAC,MAAM,EAAE,CAAC;wBACd,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;wBAC1D,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBACtD,CAAC;oBACD,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;wBACpC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;wBAClB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;oBAC5B,CAAC;oBACD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"spawn-gate.js","sourceRoot":"","sources":["../src/spawn-gate.ts"],"names":[],"mappings":"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"}

package/dist/target-queue-worker.d.ts

@@ -1,5 +1,5 @@
 /**
- * Phase 2c (docs/design/phase2-submit-contract.md §1.1, §1.5, §4 2c): the
+ * Phase 2c (docs/design/929-durable-outbox.md §4): the
  * per-target owner of a durable delivery lane when `delivery_worker: on`.
  *
  * ENSURE_AWAKE belongs to the WakeCoordinator (2b); this worker only runs

package/dist/topic-commands.d.ts

@@ -10,6 +10,61 @@ type ExecutionFleetContext = FleetContext & {
 };
 /** Sanitize a directory name into a valid instance name. Keeps Unicode letters (incl. CJK). */
 export declare function sanitizeInstanceName(name: string): string;
+/** Digits of the topic id kept in a fresh instance-name suffix; lengthened on collision. */
+export declare const INSTANCE_NAME_SUFFIX_DIGITS = 6;
+/**
+ * Build `<base>-t<last N digits of topicId>` (#1301): when the full-id form
+ * is free, N starts at 6 and lengthens on collision, up to the full id.
+ * `exists` must cover fleet.yaml keys and instance dirs (a stale tmux window
+ * with no config or dir is an orphan that startup cleanup kills — the
+ * `-t<digits>` shape is what its matcher recognises). Every name this
+ * allocator emits matches the orphan predicate (`isOrphanInstanceWindowName`),
+ * so a deleted instance's leftover window is always reaped.
+ *
+ * A taken candidate is reused as-is ONLY when `isSameTopic` proves the
+ * existing entry belongs to this same topic (retry/rebind of a partially
+ * created instance keeps the deterministic old path instead of opening a
+ * second entry) — this applies to the full form and to every short or
+ * lengthened form, so a rebind never allocates a duplicate entry for one
+ * topic (#1305 P2-2). A name owned by a *different* topic — including a
+ * short suffix that happens to equal another topic's full id (e.g. Discord
+ * `blog-t123456` vs Telegram topic `123456`) — is never reused. When even
+ * the full-id form is taken by a different topic, allocation refuses with an
+ * error (use a different `topic_name`) instead of inventing a non-`-t<digits>`
+ * name, so one topic's bind can never overwrite another topic's
+ * `working_directory`/`topic_id` (#1305 P1). When `isSameTopic` is omitted
+ * the legacy rule applies (a taken full form is reused, taken short forms
+ * are skipped); production callers always pass it. A dir-only collision (no
+ * config) can never prove same-topic, so callers must report it as a
+ * different topic.
+ */
+export declare function uniqueInstanceName(base: string, topicId: number | string, exists: (name: string) => boolean, isSameTopic?: (name: string) => boolean): string;
+/**
+ * Base user-facing label for one instance name (#1301): an explicit
+ * display_name wins; otherwise only a full snowflake-length `-t<digits>`
+ * suffix (19+ digits, the pre-2.1.12 form) is shortened to its last 6,
+ * keeping the `-t` shape. Allocator-lengthened suffixes (7–18 digits, #1301
+ * collision path) are shown whole. This is only the *base* label — two
+ * legacy 19-digit names sharing tail6 still shorten identically, so every
+ * fleet renderer must go through `assignDisplayLabels`, which disambiguates
+ * against the whole fleet (#1305 P2-1). Agent-facing uses (the `[from:…]`
+ * header, logs, lookups) keep the real name — agents address by it.
+ */
+export declare function displayInstanceName(name: string, displayName?: string | null): string;
+/**
+ * Fleet-wide effective display labels (#1305 P2-1). The base label is
+ * shortened only while it stays unique across every entry's effective label
+ * — legacy (19-digit), new short, lengthened, and explicit `display_name`
+ * entries all compete in one namespace. On collision a `-t<digits>` name
+ * lengthens its shown tail just enough to be unique; an explicit
+ * `display_name` collision (or an exhausted digit tail) is qualified with the
+ * real name. Lookup names are untouched — only the shown label changes.
+ * Entries are processed in name order so the result is deterministic.
+ */
+export declare function assignDisplayLabels(entries: {
+    name: string;
+    displayName?: string | null;
+}[]): Map<string, string>;
 /** Allowed filename for /save and /load (no path separators, no shell/inject chars). */
 export declare const SAVE_FILENAME_RE: RegExp;
 /** Backends with a native side-question command that does not steer the active turn. */
@@ -210,11 +265,13 @@ export declare class TopicCommands {
     private handleLoginCommand;
     private handleTipsCommand;
     private handleStatusCommand;
-    /** Compact label for status/sysinfo tables: prefer display_name, else strip the
-     * `-t<topicId>` suffix (e.g. doupo-server-t1503381916525793300 → doupo-server).
-     * Keeps rows short so a large fleet's table fits Discord's 2000-char limit. The
-     * FULL name is still used for all lookups — only the displayed label changes. */
-    private shortInstanceName;
+    /** Fleet-wide display labels for status/sysinfo tables (#1305 P2-1):
+     * display_name first, else a 19+-digit `-t<digits>` suffix shortened to its
+     * last 6 — lengthened only while the label stays unique across every
+     * instance, so same-tail legacy entries remain distinguishable. Keeps rows
+     * short so a large fleet's table fits Discord's 2000-char limit. The FULL
+     * name is still used for all lookups — only the displayed label changes. */
+    private displayLabels;
     /** Get fleet status as markdown text (shared by TG + DC) */
     getStatusText(): Promise<string>;
     private handleSysInfoCommand;
@@ -240,6 +297,8 @@ export declare class TopicCommands {
         backendCliVersions?: BackendCliVersionSnapshot;
     }): string;
     private handleUpdateCommand;
+    /** #1302: `/visibility [full|summary|hidden]` in the General topic. */
+    private handleVisibilityCommand;
     private handleDoctorCommand;
     /** Reply with redirect when message arrives in an unbound topic */
     handleUnboundTopic(msg: InboundMessage): Promise<void>;

package/dist/topic-commands.js

@@ -11,6 +11,7 @@ import { truncateDisplay, MODEL_DISPLAY_WIDTH_MAX } from "./ls-rows.js";
 import { getTmuxSocketName, getTmuxSessionName } from "./paths.js";
 import { t, getLocale } from "./locale.js";
 import { telegramMenu } from "./command-table.js";
+import { runVisibilityCommand } from "./cross-instance-notice.js";
 import { clampContextPercent, parseContextPercent, parseTokenContextRatio, } from "./context-percent.js";
 import { isGeneralInstance } from "./general-instance.js";
 import { backendSupportsSteer } from "./steer-capability.js";
@@ -25,6 +26,130 @@ export function sanitizeInstanceName(name) {
     const sanitized = name.toLowerCase().replace(/[^\p{L}\d-]/gu, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
     return sanitized || "project";
 }
+/** Digits of the topic id kept in a fresh instance-name suffix; lengthened on collision. */
+export const INSTANCE_NAME_SUFFIX_DIGITS = 6;
+/**
+ * Build `<base>-t<last N digits of topicId>` (#1301): when the full-id form
+ * is free, N starts at 6 and lengthens on collision, up to the full id.
+ * `exists` must cover fleet.yaml keys and instance dirs (a stale tmux window
+ * with no config or dir is an orphan that startup cleanup kills — the
+ * `-t<digits>` shape is what its matcher recognises). Every name this
+ * allocator emits matches the orphan predicate (`isOrphanInstanceWindowName`),
+ * so a deleted instance's leftover window is always reaped.
+ *
+ * A taken candidate is reused as-is ONLY when `isSameTopic` proves the
+ * existing entry belongs to this same topic (retry/rebind of a partially
+ * created instance keeps the deterministic old path instead of opening a
+ * second entry) — this applies to the full form and to every short or
+ * lengthened form, so a rebind never allocates a duplicate entry for one
+ * topic (#1305 P2-2). A name owned by a *different* topic — including a
+ * short suffix that happens to equal another topic's full id (e.g. Discord
+ * `blog-t123456` vs Telegram topic `123456`) — is never reused. When even
+ * the full-id form is taken by a different topic, allocation refuses with an
+ * error (use a different `topic_name`) instead of inventing a non-`-t<digits>`
+ * name, so one topic's bind can never overwrite another topic's
+ * `working_directory`/`topic_id` (#1305 P1). When `isSameTopic` is omitted
+ * the legacy rule applies (a taken full form is reused, taken short forms
+ * are skipped); production callers always pass it. A dir-only collision (no
+ * config) can never prove same-topic, so callers must report it as a
+ * different topic.
+ */
+export function uniqueInstanceName(base, topicId, exists, isSameTopic) {
+    const clean = sanitizeInstanceName(base);
+    const id = String(topicId);
+    const full = `${clean}-t${id}`;
+    const candidates = [];
+    for (let n = Math.min(INSTANCE_NAME_SUFFIX_DIGITS, id.length); n < id.length; n++) {
+        candidates.push(`${clean}-t${id.slice(-n)}`);
+    }
+    candidates.push(full);
+    // First pass: reuse any candidate already owned by this same topic
+    // (retry/rebind keeps the deterministic old path instead of opening a
+    // second entry). Every candidate is scanned before anything is allocated:
+    // a freed shorter form must not shadow a longer form this topic still owns.
+    // Without a proof function the legacy rule applies (a taken full form is
+    // reused, taken short forms are skipped).
+    for (const name of candidates) {
+        if (exists(name) && (isSameTopic?.(name) ?? name === full))
+            return name;
+    }
+    // Second pass: the first free candidate, short first.
+    for (const name of candidates) {
+        if (!exists(name))
+            return name;
+    }
+    // Even the full-id form is owned by a different topic: refuse. Callers
+    // surface this (handleCreate responds an error and rolls back the topic;
+    // bindAndStart throws), so creation fails closed with a clear hint.
+    throw new Error(`Instance name "${full}" is already used by a different topic; ` +
+        `use a different topic_name for topic "${id}".`);
+}
+/**
+ * Base user-facing label for one instance name (#1301): an explicit
+ * display_name wins; otherwise only a full snowflake-length `-t<digits>`
+ * suffix (19+ digits, the pre-2.1.12 form) is shortened to its last 6,
+ * keeping the `-t` shape. Allocator-lengthened suffixes (7–18 digits, #1301
+ * collision path) are shown whole. This is only the *base* label — two
+ * legacy 19-digit names sharing tail6 still shorten identically, so every
+ * fleet renderer must go through `assignDisplayLabels`, which disambiguates
+ * against the whole fleet (#1305 P2-1). Agent-facing uses (the `[from:…]`
+ * header, logs, lookups) keep the real name — agents address by it.
+ */
+export function displayInstanceName(name, displayName) {
+    const dn = displayName?.trim();
+    if (dn)
+        return dn;
+    return name.replace(/-t(\d{19,})$/, (_, digits) => `-t${digits.slice(-6)}`);
+}
+/**
+ * Fleet-wide effective display labels (#1305 P2-1). The base label is
+ * shortened only while it stays unique across every entry's effective label
+ * — legacy (19-digit), new short, lengthened, and explicit `display_name`
+ * entries all compete in one namespace. On collision a `-t<digits>` name
+ * lengthens its shown tail just enough to be unique; an explicit
+ * `display_name` collision (or an exhausted digit tail) is qualified with the
+ * real name. Lookup names are untouched — only the shown label changes.
+ * Entries are processed in name order so the result is deterministic.
+ */
+export function assignDisplayLabels(entries) {
+    const sorted = [...entries].sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
+    const used = new Set();
+    const out = new Map();
+    for (const { name, displayName } of sorted) {
+        const explicit = displayName?.trim() || undefined;
+        let label = explicit ?? displayInstanceName(name);
+        if (used.has(label))
+            label = disambiguateLabel(name, explicit, label, used);
+        used.add(label);
+        out.set(name, label);
+    }
+    return out;
+}
+function disambiguateLabel(name, explicit, base, used) {
+    if (!explicit) {
+        const m = name.match(/^(.*-t)(\d+)$/);
+        if (m) {
+            const [, prefix, digits] = m;
+            const shown = digits.length >= 19 ? 6 : digits.length;
+            for (let len = shown + 1; len <= digits.length; len++) {
+                const candidate = `${prefix}${digits.slice(-len)}`;
+                if (!used.has(candidate))
+                    return candidate;
+            }
+        }
+    }
+    // Every fallback is checked against the same namespace: real names are
+    // unique, but they are NOT unique against arbitrary display_name strings,
+    // so even the real-name-shaped fallback must be verified. The numbered
+    // loop always terminates (i is unbounded) and is deterministic for a
+    // given fleet, since entries are processed in name order.
+    const short = displayInstanceName(name);
+    let candidate = `${base} (${short})`;
+    for (let i = 2; used.has(candidate); i++) {
+        candidate = `${base} (${short}) (#${i})`;
+    }
+    return candidate;
+}
 /** Allowed filename for /save and /load (no path separators, no shell/inject chars). */
 export const SAVE_FILENAME_RE = /^[\w.-]+$/;
 /** Backends with a native side-question command that does not steer the active turn. */
@@ -58,7 +183,7 @@ export function parsePauseWakeCommand(text) {
  * The in-session compact/context-reset command for a backend NAME (the fleet
  * process routes /compact via IPC and only has the backend string, not a
  * CliBackend instance). Keep in sync with each backend's getCompactCommand().
- * Most CLIs (claude-code, kiro-cli, codex, opencode, gemini-cli) use "/compact".
+ * Most CLIs (claude-code, kiro-cli, codex, opencode) use "/compact".
  * Antigravity (agy) has NO summarizing compact — its only manual context-reset
  * is "/clear" (a full reset; it also auto-summarizes at a token threshold).
  */
@@ -166,7 +291,6 @@ export function clearCommandForBackend(backend) {
             return "/clear";
         case "grok":
             return "/new";
-        case "gemini-cli":
         default:
             return null;
     }
@@ -393,6 +517,11 @@ export class TopicCommands {
             await this.handleDashboardCommand(msg);
             return true;
         }
+        const visibility = text.match(/^\/visibility(?:@\S+)?(?:\s+([\s\S]*))?$/i);
+        if (visibility) {
+            await this.handleVisibilityCommand(msg, visibility[1] ?? "");
+            return true;
+        }
         return false;
     }
     /**
@@ -1022,15 +1151,21 @@ export class TopicCommands {
         const text = await this.getStatusText();
         await adapter.sendText(msg.chatId, text, { threadId: msg.threadId });
     }
-    /** Compact label for status/sysinfo tables: prefer display_name, else strip the
-     * `-t<topicId>` suffix (e.g. doupo-server-t1503381916525793300 → doupo-server).
-     * Keeps rows short so a large fleet's table fits Discord's 2000-char limit. The
-     * FULL name is still used for all lookups — only the displayed label changes. */
-    shortInstanceName(name) {
-        const dn = this.ctx.fleetConfig?.instances[name]?.display_name;
-        if (dn && dn.trim())
-            return dn.trim();
-        return name.replace(/-t\d+$/, "");
+    /** Fleet-wide display labels for status/sysinfo tables (#1305 P2-1):
+     * display_name first, else a 19+-digit `-t<digits>` suffix shortened to its
+     * last 6 — lengthened only while the label stays unique across every
+     * instance, so same-tail legacy entries remain distinguishable. Keeps rows
+     * short so a large fleet's table fits Discord's 2000-char limit. The FULL
+     * name is still used for all lookups — only the displayed label changes. */
+    displayLabels() {
+        const instances = this.ctx.fleetConfig?.instances ?? {};
+        const names = new Set(Object.keys(instances));
+        for (const ch of this.ctx.classicChannels?.getAll() ?? [])
+            names.add(ch.instanceName);
+        return assignDisplayLabels([...names].map((name) => ({
+            name,
+            displayName: instances[name]?.display_name,
+        })));
     }
     /** Get fleet status as markdown text (shared by TG + DC) */
     async getStatusText() {
@@ -1045,6 +1180,7 @@ export class TopicCommands {
                 .filter(ch => !fleetNames.has(ch.instanceName))
                 .map(ch => ({ name: ch.instanceName, classic: true })),
         ];
+        const labels = this.displayLabels();
         for (const { name, classic } of instances) {
             const status = this.ctx.getInstanceStatus(name);
             const executionState = status === "paused" ? "paused"
@@ -1076,7 +1212,7 @@ export class TopicCommands {
                                     // Running but no execution snapshot yet: the old Status
                                     // column showed 🟢 here — say running, never idle or "—".
                                     : `🟢 ${t("state.running")}`;
-            const displayName = this.shortInstanceName(name);
+            const displayName = labels.get(name) ?? name;
             // Model: same source as /ctx — live statusline for claude-code, the
             // effective resolver otherwise — capped so one long name cannot blow
             // the table wider.
@@ -1238,6 +1374,19 @@ export class TopicCommands {
         child.once("error", err => this.ctx.failUpdateProgress?.(err.message));
         child.unref();
     }
+    /** #1302: `/visibility [full|summary|hidden]` in the General topic. */
+    async handleVisibilityCommand(msg, arg) {
+        const adapter = this.getReplyAdapter(msg);
+        if (!adapter || !this.ctx.fleetConfig)
+            return;
+        // Same rule as /doctor: this adapter's fleet admins only, and an empty list is "nobody", not "everybody".
+        if (!this.ctx.hasFleetAdmins(msg.adapterId) || !this.ctx.isFleetAdmin(msg.userId, msg.adapterId)) {
+            await adapter.sendText(msg.chatId, t("not_authorized"), { threadId: msg.threadId });
+            return;
+        }
+        const reply = runVisibilityCommand(this.ctx.fleetConfig, arg, () => this.ctx.saveFleetConfig());
+        await adapter.sendText(msg.chatId, reply, { threadId: msg.threadId });
+    }
     async handleDoctorCommand(msg) {
         const adapter = this.getReplyAdapter(msg);
         if (!adapter)
@@ -1296,12 +1445,21 @@ export class TopicCommands {
     async bindAndStart(dirPath, topicId) {
         if (!this.ctx.fleetConfig)
             throw new Error("Fleet config not loaded");
-        const instanceName = `${sanitizeInstanceName(basename(dirPath))}-t${topicId}`;
+        // Short unique suffix (#1301), same rule as create_instance. Reuse of a
+        // taken name requires proof it belongs to this same topic (#1305 P1):
+        // full topic_id string equality; a dir-only collision (no config entry)
+        // can never prove that, so it counts as a different topic.
+        const instances = this.ctx.fleetConfig?.instances ?? {};
+        const wanted = String(topicId);
+        const instanceName = uniqueInstanceName(basename(dirPath), topicId, (candidate) => candidate in instances
+            || existsSync(this.ctx.getInstanceDir(candidate)), (candidate) => {
+            const owner = instances[candidate];
+            return owner != null && String(owner.topic_id) === wanted;
+        });
         this.ctx.fleetConfig.instances[instanceName] = {
             working_directory: dirPath,
             topic_id: topicId,
             restart_policy: this.ctx.fleetConfig.defaults.restart_policy ?? DEFAULT_INSTANCE_CONFIG.restart_policy,
-            context_guardian: this.ctx.fleetConfig.defaults.context_guardian ?? DEFAULT_INSTANCE_CONFIG.context_guardian,
             log_level: this.ctx.fleetConfig.defaults.log_level ?? DEFAULT_INSTANCE_CONFIG.log_level,
         };
         this.ctx.saveFleetConfig();