pwragent 1.3.10 → 1.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pwragent",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "private": false,
   "type": "module",
   "description": "Experimental headless PwrAgent daemon and command-line client.",
@@ -53,6 +53,7 @@
   "devDependencies": {
     "@pwragent/federation": "workspace:*",
     "@pwragent/shared": "workspace:*",
+    "@pwragent/owner-core": "workspace:*",
     "esbuild": "0.28.2",
     "@pwragent/agent-tools": "workspace:*"
   },
@@ -63,7 +64,7 @@
     "node-pty"
   ],
   "pwragentRelease": {
-    "tag": "v1.3.10",
-    "commit": "ff9b702144786e162b3e91c78d79791761944350"
+    "tag": "v1.3.11",
+    "commit": "7b787f4a90bfff4811f1d41b04ae025f0cfe6ebf"
   }
 }

package/src/federation-backend.js

@@ -1,7 +1,6 @@
-import { randomUUID } from "node:crypto";
 import { readFileSync } from "node:fs";
 import path from "node:path";
-import { FEDERATION_BACKEND_METHOD_CAPABILITIES, FEDERATION_MAX_FRAME_BYTES, fitThreadReplayWithinByteBudget, mergeCausalMessagingContext, pageThreadReplay, shortenDerivedThreadTitle } from "../dist/federation-core.js";
+import { buildThreadIdentityKey, NavigationQueryStore, FEDERATION_BACKEND_METHOD_CAPABILITIES, FEDERATION_MAX_FRAME_BYTES, fitThreadReplayWithinByteBudget, mergeCausalMessagingContext, pageThreadReplay, shortenDerivedThreadTitle } from "../dist/federation-core.js";
 import { ACTIVE, atomicJson, digest } from "./store.js";
 
 // The owner methods this outpost serves. Each one's capability comes from the
@@ -47,11 +46,17 @@ function textInput(input) {
 export class HeadlessBackend {
   constructor(runtime, publish) {
     this.runtime = runtime;
-    this.publish = publish;
-    this.epoch = randomUUID();
+    this.navigation = new NavigationQueryStore();
+    this.publish = (event, eventClass) => {
+      const thread = this.threads.get(event.notification.params.threadId);
+      // Acknowledging an older displayed update does not mark newer work read.
+      if (event.notification.method !== "navigation/thread/seen" || (thread && !this.summary(thread).inbox.inInbox)) {
+        this.navigation.observeAttentionEvent(event);
+      }
+      publish(event, eventClass);
+    };
     // Same headroom as desktop's FEDERATION_RESPONSE_BYTE_BUDGET.
     this.replayByteBudget = FEDERATION_MAX_FRAME_BYTES - 64 * 1024;
-    this.attentionViews = new Map();
     this.file = path.join(path.dirname(runtime.store.directory), "threads.json");
     try {
       const data = JSON.parse(readFileSync(this.file, "utf8"));
@@ -120,7 +125,16 @@ export class HeadlessBackend {
     }
     if (message.method === "headless/jobChanged") {
       this.syncJobs([message.params]);
-      if (message.params.threadId) this.forgetSeenAttentionMember(message.params.threadId);
+      const job = message.params;
+      if (job.threadId && this.latest(job.threadId) === job) {
+        const active = ACTIVE.has(job.status);
+        // An accepted job starts before Codex assigns its turn ID. Let the
+        // shared reducer adopt that ID without allocating another start rank.
+        this.navigation.observeAttentionEvent({ backend: "codex", notification: {
+          method: active ? "turn/started" : "turn/completed",
+          params: { threadId: job.threadId, turnId: job.turnId || (active ? undefined : job.id) },
+        } });
+      }
       this.publish({ backend: "codex", notification: { method: "navigation/invalidated", params: { threadId: message.params.threadId, sourceMethod: "turn/completed" } } }, "navigation");
       return;
     }
@@ -146,7 +160,11 @@ export class HeadlessBackend {
     switch (name) {
       case "listBackends": return this.listBackends();
       case "listThreads": return { backend: "codex", fetchedAt: Date.now(), threads: [...this.threads.values()].filter((thread) => !thread.archived).map((thread) => this.summary(thread)), workspaceRoots: this.runtime.projects.list().map((project) => project.path) };
-      case "getNavigationQueryPage": return this.query(params);
+      case "getNavigationQueryPage": {
+        if (params.inventory === "viewer") throw new Error("Expected owner navigation protocol 2");
+        return this.navigation.readPage({ request: params, scopeKey: envelope.sourceInstanceId || "local",
+          loadIndex: async () => this.navigationIndex() });
+      }
       case "getNavigationLaunchpadConfig": {
         if (params.protocol !== 2) throw new Error("Unsupported navigation protocol");
         if (params.directoryKey !== undefined) this.runtime.projects.resolve(params.directoryKey);
@@ -155,7 +173,7 @@ export class HeadlessBackend {
       }
       case "getNavigationSelectedDetail": return { protocol: 2, ref: params.ref, revision: digest(this.summary(this.owned(params.ref.threadId))), readiness: "ready", identity: "present", thread: this.summary(this.owned(params.ref.threadId)), collections: [] };
       case "getNavigationQueueProjection": return { protocol: 2, ref: params.ref, revision: "no-queue", readiness: "ready", complete: true, entries: [] };
-      case "releaseNavigationAttentionView": this.attentionViews.delete(params.viewId); return {};
+      case "releaseNavigationAttentionView": this.navigation.releaseAttentionView(envelope.sourceInstanceId || "local", params.viewId); return {};
       case "resolveThread": return this.threads.has(params.threadId) ? { thread: this.summary(this.owned(params.threadId)) } : {};
       case "resolveThreadAdmissionState": {
         const thread = this.summary(this.owned(params.threadId));
@@ -217,7 +235,6 @@ export class HeadlessBackend {
         const thread = this.owned(params.threadId);
         const title = params.title || params.name;
         if (typeof title !== "string" || !title.trim() || title.length > 200) throw new Error("Invalid title");
-        thread.updatedAt = Date.now();
         this.setTitle(thread, title.trim(), "explicit");
         return { backend: "codex", threadId: thread.id, title: thread.title };
       }
@@ -232,7 +249,6 @@ export class HeadlessBackend {
         thread.seenUpdatedAt = params.seenUpdatedAt ?? thread.seenUpdatedAt ?? thread.seenAt ?? 0;
         thread.seenAt = params.seenAt ?? Date.now();
         this.persist();
-        this.forgetSeenAttentionMember(thread.id);
         this.publish({ backend: "codex", notification: { method: "navigation/thread/seen",
           params: { threadId: thread.id, ...(params.seenUpdatedAt !== undefined ? { seenUpdatedAt: params.seenUpdatedAt } : {}) } } }, "transcript");
         this.invalidate(thread.id, "navigation/thread/seen");
@@ -400,120 +416,18 @@ export class HeadlessBackend {
         pagination: { supportsPagination: false, hasPreviousPage: false } } };
   }
 
-  forgetSeenAttentionMember(id) {
-    const thread = this.threads.get(id);
-    if (!thread) return;
-    const row = this.summary(thread);
-    if (row.threadStatus !== "active" && !row.inbox.inInbox) {
-      for (const view of this.attentionViews.values()) view.members.delete(id);
-    }
-  }
-
-  attentionOrder(rows, options = { id: "default", promoteOnTurnEnd: true }) {
-    if (typeof options.id !== "string" || !options.id || options.id.length > 256
-      || typeof options.promoteOnTurnEnd !== "boolean") throw new Error("Invalid Attention view");
-    let view = this.attentionViews.get(options.id);
-    if (!view) {
-      if (this.attentionViews.size >= 128) throw new Error("Attention view limit reached; release an unused view");
-      view = { members: new Map(), nextRank: 1 };
-      this.attentionViews.set(options.id, view);
-    }
-    const members = new Map();
-    // Bootstrap oldest turn first. Subsequent ranks follow turn identities and
-    // active/terminal transitions, never mutable thread or job activity stamps.
-    const eligible = rows.filter((row) => row.threadStatus === "active" || row.inbox.inInbox)
-      .sort((a, b) => (Date.parse(this.latest(a.id)?.createdAt) || a.createdAt)
-        - (Date.parse(this.latest(b.id)?.createdAt) || b.createdAt) || a.id.localeCompare(b.id));
-    for (const row of eligible) {
-      const previous = view.members.get(row.id);
-      const job = this.latest(row.id);
-      const turnKey = job?.id;
-      const active = row.threadStatus === "active";
-      const newTurn = turnKey !== previous?.turnKey;
-      const started = active && (!previous?.active || newTurn);
-      const finished = !active && (previous?.active || newTurn);
-      const rank = !previous || started || (finished && options.promoteOnTurnEnd) ? view.nextRank++ : previous.rank;
-      members.set(row.id, { rank, active, turnKey });
-    }
-    view.members = members;
-    return members;
-  }
-
-  query(request) {
-    if (request.protocol !== 2 || !request.query || request.inventory === "viewer") throw new Error("Expected owner navigation protocol 2");
-    let rows = [...this.threads.values()].filter((thread) => !thread.archived).map((thread) => this.summary(thread));
-    const counts = { total: rows.length, active: rows.filter((row) => row.threadStatus === "active").length,
-      unread: rows.filter((row) => row.inbox.inInbox).length, review: rows.filter((row) => row.inbox.inInbox && row.threadStatus !== "active").length, pinned: 0 };
-    const directories = this.runtime.projects.list().map((project) => {
-      const members = rows.filter((row) => row.projectKey === project.path);
-      return { key: project.path, kind: "directory", label: project.label, path: project.path,
-        counts: { total: members.length, active: members.filter((row) => row.threadStatus === "active").length,
-          unread: members.filter((row) => row.inbox.inInbox).length, review: members.filter((row) => row.inbox.inInbox && row.threadStatus !== "active").length, pinned: 0 },
-        pinnedRootCount: 0, unpinnedRootCount: members.length, launchpadPresent: true, launchpadBackend: "codex" };
-    });
-    const query = request.query;
-    const attention = query.kind === "lens" && query.lens === "attention" ? this.attentionOrder(rows, request.attentionView) : undefined;
-    if (!["exact", "children", "group-members", "directory", "lens", "search", "directory-index", "messaging-projects", "messaging-threads", "model-inventory", "star-map", "star-map-geometry"].includes(query.kind)) throw new Error("Unsupported navigation query");
-    if (request.backend && !["codex", "all"].includes(request.backend)) rows = [];
-    if (query.kind === "exact") rows = rows.filter((row) => query.identities?.some((ref) => ref.backend === "codex" && ref.threadId === row.id));
-    else if (["children", "group-members"].includes(query.kind) || query.roots === "pinned") rows = [];
-    else if (query.kind === "directory") rows = rows.filter((row) => row.projectKey === query.directoryKey);
-    else if (query.kind === "lens" && query.lens === "attention") rows = rows.filter((row) => row.threadStatus === "active" || row.inbox.inInbox);
-    if (query.agentOnly || (query.allowedBackends && !query.allowedBackends.includes("codex"))) rows = [];
-    if (query.projectKey) rows = rows.filter((row) => row.projectKey === query.projectKey);
-    if (query.directoryKey) rows = rows.filter((row) => row.projectKey === query.directoryKey);
-    if (query.kind === "star-map") {
-      for (const [key, selection] of Object.entries(query.filters || {})) {
-        if (selection === "neutral") continue;
-        rows = rows.filter((row) => {
-          const matches = key === "attention" && (row.threadStatus === "active" || row.inbox.inInbox);
-          return selection === "include" ? matches : !matches;
-        });
-      }
-    }
-    const filter = query.filter || query.text;
-    if (filter) rows = rows.filter((row) => row.title.toLowerCase().includes(filter.toLowerCase()));
-    const creationOrder = query.kind === "directory" || (query.kind === "lens" && query.lens === "recents");
-    rows.sort((a, b) => (attention ? attention.get(b.id).rank - attention.get(a.id).rank
-      : creationOrder ? b.createdAt - a.createdAt : b.updatedAt - a.updatedAt) || a.id.localeCompare(b.id));
-    const queryKey = digest({ backend: request.backend, query, ...(attention ? { attentionView: request.attentionView } : {}) });
-    const generation = digest(attention ? rows.map((row) => ({ ...row, attentionRank: attention.get(row.id).rank })) : rows);
-    const countsRevision = digest(counts);
-    let offset = 0;
-    if (request.cursor) {
-      const cursor = JSON.parse(Buffer.from(request.cursor, "base64url").toString());
-      if (cursor.queryKey !== queryKey || cursor.generation !== generation || cursor.countsRevision !== countsRevision || cursor.epoch !== this.epoch
-        || !Number.isInteger(cursor.offset) || cursor.offset < 0) throw new Error("Navigation cursor expired; refresh the collection");
-      offset = cursor.offset;
-    } else if (request.anchor?.kind === "thread") {
-      const index = rows.findIndex((row) => row.id === request.anchor.ref.threadId && request.anchor.ref.backend === "codex");
-      if (index >= 0) offset = index;
-    }
-    const limit = Math.min(100, Math.max(1, Number.isInteger(request.pageSize) ? request.pageSize : 50));
-    const page = rows.slice(offset, offset + limit);
-    const complete = offset + page.length >= rows.length;
-    const result = { protocol: 2, queryKey, generation, ownerEpoch: this.epoch, countsRevision, coverage: { state: "complete" }, counts,
-      collectionSize: rows.length, rangeStart: offset, complete,
-      entries: page.map((row, index) => ({ row: { ...row, ref: { backend: "codex", threadId: row.id }, rowRevision: digest(row),
-        ordinaryChildCount: 0, nativeSubAgentGroupPresent: false, queueCount: 0, queueState: "ready" }, orderKey: String(offset + index).padStart(8, "0"),
-        ...(attention ? { attentionRank: attention.get(row.id).rank } : {}), placement: { kind: "root" } })),
-      ...(!complete ? { nextCursor: Buffer.from(JSON.stringify({ queryKey, generation, countsRevision, epoch: this.epoch, offset: offset + page.length })).toString("base64url") } : {}) };
-    if (["directory-index", "messaging-projects", "star-map-geometry"].includes(query.kind)) {
-      result.directories = directories.filter((directory) => (!query.keys || query.keys.includes(directory.key)) && (!query.paths || query.paths.includes(directory.path))
-        && (!query.directoryKey || query.directoryKey === directory.key)
-        && (!query.allowedBackends || query.allowedBackends.includes("codex")) && !query.agentOnly
-        && (!filter || `${directory.label} ${directory.path}`.toLowerCase().includes(filter.toLowerCase())));
-      result.collectionSize = result.directories.length;
-      result.entries = []; result.complete = true; delete result.nextCursor;
-    }
-    if (query.kind === "model-inventory") {
-      const groups = new Map();
-      for (const row of rows) { const key = row.model || ""; groups.set(key, { backend: "codex", model: row.model, threadCount: (groups.get(key)?.threadCount || 0) + 1, fastThreadCount: 0 }); }
-      result.modelGroups = [...groups.values()]; result.collectionSize = groups.size;
-      result.entries = []; result.complete = true; delete result.nextCursor;
+  navigationIndex() {
+    const threads = [...this.threads.values()].filter((thread) => !thread.archived).map((thread) => this.summary(thread));
+    const byProject = new Map();
+    for (const thread of threads) {
+      let keys = byProject.get(thread.projectKey);
+      if (!keys) { keys = []; byProject.set(thread.projectKey, keys); }
+      keys.push(buildThreadIdentityKey(thread.source, thread.id));
     }
-    if (query.kind === "directory") result.selectionDirectory = directories.find((directory) => query.directoryKey === directory.key);
-    if (Buffer.byteLength(JSON.stringify(result)) > 256 * 1024) throw new Error("Navigation page exceeds its byte budget; request fewer rows");
-    return result;
+    return { threads, directories: this.runtime.projects.list().map((project) => ({
+      key: project.path, kind: "directory", label: project.label, path: project.path,
+      threadKeys: byProject.get(project.path) || [], needsAttentionCount: 0,
+      launchpad: { backend: "codex" },
+    })) };
   }
 }

package/src/federation-core.ts

@@ -23,3 +23,6 @@ export { resolveMessagingOutboundFile, validateMessagingFileMetadata } from "@pw
 
 export * from "@pwragent/federation/federation-replacement-receiver";
 export { FEDERATION_BACKEND_METHOD_CAPABILITIES } from "@pwragent/federation/federation-backend-methods";
+
+export { NavigationQueryStore } from "@pwragent/owner-core/navigation-query-store";
+export { buildThreadIdentityKey, NAVIGATION_QUERY_MAX_RESULT_BYTES } from "@pwragent/shared";

package/src/federation.js

@@ -142,12 +142,12 @@ export class HeadlessFederation {
   }
 
   async invite({ port = 47831, label }) {
-    if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error("Federation port must be between 1 and 65535");
+    if (!Number.isInteger(port) || port < 0 || port > 65535) throw new Error("Federation port must be between 0 and 65535 (0 chooses an available port)");
     this.ensureIdentity(label);
     if (!this.router) this.setupRouter();
-    if (this.state.listenPort !== undefined && this.state.listenPort !== port) throw new Error("Restart with the existing listener port; it cannot change while serving");
+    if (port !== 0 && this.state.listenPort !== undefined && this.state.listenPort !== port) throw new Error("Restart with the existing listener port; it cannot change while serving");
     await this.listen(port);
-    this.state.listenPort = port;
+    this.state.listenPort = this.listenerAddress.port;
     const token = randomBytes(32).toString("base64url");
     const now = Date.now();
     const entry = { id: randomUUID(), status: "pending", generatedAt: now, expiresAt: now + 15 * 60_000,