@zgeoff/atc 2.15.0 → 2.15.1

package/src/protocol/sort-session-views.ts

@@ -0,0 +1,41 @@
+import type { SessionState } from './session-state';
+import type { SortableSessionView } from './sortable-session-view';
+
+// Overlay order: pinned sessions first in most-recently-attached order, then
+// everyone else by urgency — who needs you, finished turns, busy, dead —
+// with most-recently-attached breaking ties inside each state. A
+// sub-session sits directly under its parent, ranked among its siblings
+// alone, so its attention never moves the parent's row; a sub-session whose
+// parent is not listed ranks as a top-level row.
+export function sortSessionViews<T extends SortableSessionView>(list: readonly T[]): T[] {
+  const rank: Record<SessionState, number> = {
+    needs_you: 0,
+    done: 1,
+    running: 2,
+    exited: 3,
+  };
+
+  const ranked = [...list].toSorted((a, b) => {
+    if (a.pinned !== b.pinned) {
+      return a.pinned ? -1 : 1;
+    }
+
+    const recency = b.lastAttachedAt - a.lastAttachedAt || b.createdAt - a.createdAt;
+
+    return a.pinned ? recency : rank[a.state] - rank[b.state] || recency;
+  });
+
+  const listed = new Set(ranked.map((s) => s.id));
+
+  const sorted: T[] = [];
+
+  for (const s of ranked) {
+    if (s.parent !== null && listed.has(s.parent)) {
+      continue;
+    }
+
+    sorted.push(s, ...ranked.filter((child) => child.parent === s.id));
+  }
+
+  return sorted;
+}

package/src/protocol/sortable-session-view.ts

@@ -0,0 +1,13 @@
+import type { SessionState } from './session-state';
+
+/**
+ * The fields of a session row that the overlay orders by.
+ */
+export interface SortableSessionView {
+  readonly id: string;
+  readonly parent: string | null;
+  readonly state: SessionState;
+  readonly pinned: boolean;
+  readonly lastAttachedAt: number;
+  readonly createdAt: number;
+}

package/src/shared/agent-id.ts

@@ -0,0 +1,6 @@
+/**
+ * Which agent a session runs under: the key the adapter registry is looked
+ * up by. Every agent CLI supplies one, and so does every configured backend
+ * that drives a CLI it does not own, so two ids can share one kind.
+ */
+export type AgentID = string;

package/src/shared/collect-gateways.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import type { AgentID } from '../agents/agent-adapter';
+import type { AgentID } from './agent-id';
 import { buildOptionalStringArray } from './build-optional-string-array';
 import { isRecord } from './report';
 

package/src/shared/to-agent-id.ts

@@ -0,0 +1,11 @@
+import type { AgentID } from './agent-id';
+
+/**
+ * Missing and empty values become Claude so a fleet written before the agent
+ * column still restores as Claude. Any other string is returned as it stands,
+ * registered or not: an id whose adapter is gone must reach the caller intact
+ * so the session can be shown and refused, never quietly run as Claude.
+ */
+export function toAgentID(raw: unknown): AgentID {
+  return typeof raw === 'string' && raw !== '' ? raw : 'claude';
+}

package/src/store/fleet-entry.ts

@@ -1,12 +1,12 @@
 import { z } from 'zod';
-import { toAgentID } from '../agents/agent-adapter';
-import type { AgentID } from '../agents/agent-adapter';
+import type { AgentID } from '../shared/agent-id';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import { buildOptionalBoolean } from '../shared/build-optional-boolean';
 import { buildOptionalString } from '../shared/build-optional-string';
 import type { DaemonID } from '../shared/daemon-id';
 import { isRecord } from '../shared/report';
 import type { SessionID } from '../shared/session-id';
+import { toAgentID } from '../shared/to-agent-id';
 import { toAgentSessionID } from '../shared/to-agent-session-id';
 import type { SessionWorkspace } from './workspace-materialization';
 

package/src/store/state-store.ts

@@ -3,19 +3,20 @@ import { randomUUID } from 'node:crypto';
 import { existsSync, readFileSync } from 'node:fs';
 import { Kysely, SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler, sql } from 'kysely';
 import type { Expression, ExpressionBuilder, SqlBool, Transaction } from 'kysely';
-import { toAgentID } from '../agents/agent-adapter';
-import type { AdapterEvent, AgentID } from '../agents/agent-adapter';
-import type { HookEvent } from '../daemon/hooks';
+import type { AdapterEvent } from '../protocol/adapter-event';
 import { DaemonError } from '../protocol/daemon-error';
+import type { HookEvent } from '../protocol/hook-event';
+import type { AgentID } from '../shared/agent-id';
 import type { AgentSessionID } from '../shared/agent-session-id';
+import { BunSqliteDriver } from '../shared/bun-sqlite-driver';
 import type { DaemonID } from '../shared/daemon-id';
 import type { MessageID } from '../shared/message-id';
 import type { SessionID } from '../shared/session-id';
+import { toAgentID } from '../shared/to-agent-id';
 import { toAgentSessionID } from '../shared/to-agent-session-id';
 import { toDaemonID } from '../shared/to-daemon-id';
 import { toMessageID } from '../shared/to-message-id';
 import { toSessionID } from '../shared/to-session-id';
-import { BunSqliteDriver } from './bun-sqlite-driver';
 import { parseFleetEntry } from './fleet-entry';
 import type { FleetEntry, FleetEntryUpdate, LegacyFleetEntry } from './fleet-entry';
 import type { EffectTarget, IdempotencyClaim, IdempotencyRecord } from './idempotency-record';