@sentropic/h2a-runtime 0.81.0

package/dist/relaunch.js

@@ -0,0 +1,76 @@
+/**
+ * `remote relaunch` — bring back local tmux sessions whose CLI has dropped to a
+ * shell (in situ, keeping the windows), each resuming ITS OWN conversation.
+ *
+ * Why a dedicated command: closing the terminal windows does NOT kill the tmux
+ * sessions, and `remote restore` goes through `remote run -r`, which the
+ * single-writer guard refuses while the (idle) session still holds the
+ * conversation. This relaunches the CLI inside the existing session — no
+ * `remote run`, no guard fight — and crucially resumes each session's OWN
+ * convId (from the registry), never "most recent", so the N sessions that share
+ * a cwd never collide on one .jsonl.
+ */
+import { isCliProfile, resolveProfile, resumeArgsFor } from "./profiles.js";
+/** The shell command that resumes `convId` for `profile`, or undefined if the */
+/** profile has no resume form (e.g. shell). */
+export function resumeCommandFor(profile, convId) {
+    if (!isCliProfile(profile))
+        return undefined;
+    const cfg = resolveProfile(profile);
+    const args = resumeArgsFor(cfg, convId);
+    if (args.length === 0)
+        return undefined;
+    return [cfg.command, ...args].join(" ");
+}
+/**
+ * Decide what to relaunch. Pure: takes fully-resolved candidates (idle flag +
+ * convId already gathered) so it is unit-testable without tmux/registry I/O.
+ * Skips running sessions (never disturb a live CLI), sessions with no known
+ * convId (relaunch by hand rather than guess and risk a collision), and
+ * profiles with no resume form. Also refuses to point two sessions at the SAME
+ * convId (defensive: the registry should already be 1:1).
+ */
+export function planRelaunch(candidates) {
+    const actions = [];
+    const skipped = [];
+    const claimed = new Map(); // convId -> slug that took it
+    for (const c of candidates) {
+        if (!c.idle) {
+            skipped.push({ slug: c.slug, reason: "CLI is running — left alone" });
+            continue;
+        }
+        if (!c.convId) {
+            skipped.push({
+                slug: c.slug,
+                reason: "no convId in the registry — relaunch manually",
+            });
+            continue;
+        }
+        const prior = claimed.get(c.convId);
+        if (prior) {
+            skipped.push({
+                slug: c.slug,
+                reason: `conversation ${c.convId} already taken by ${prior} — would collide`,
+            });
+            continue;
+        }
+        const cmd = resumeCommandFor(c.profile, c.convId);
+        if (!cmd) {
+            skipped.push({
+                slug: c.slug,
+                reason: `profile "${c.profile}" has no resume form`,
+            });
+            continue;
+        }
+        claimed.set(c.convId, c.slug);
+        actions.push({
+            slug: c.slug,
+            name: c.name,
+            profile: c.profile,
+            convId: c.convId,
+            cmd,
+        });
+    }
+    return { actions, skipped };
+}
+//# sourceMappingURL=relaunch.js.map

package/dist/relaunch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"relaunch.js","sourceRoot":"","sources":["../src/relaunch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE5E,iFAAiF;AACjF,+CAA+C;AAC/C,MAAM,UAAU,gBAAgB,CAC9B,OAAe,EACf,MAAc;IAEd,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7C,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1C,CAAC;AA8BD;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC1B,UAA4C;IAE5C,MAAM,OAAO,GAAqB,EAAE,CAAC;IACrC,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC,CAAC,8BAA8B;IACzE,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC,CAAC;YACtE,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,MAAM,EAAE,+CAA+C;aACxD,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,MAAM,EAAE,gBAAgB,CAAC,CAAC,MAAM,qBAAqB,KAAK,kBAAkB;aAC7E,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,MAAM,GAAG,GAAG,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,MAAM,EAAE,YAAY,CAAC,CAAC,OAAO,sBAAsB;aACpD,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC"}

package/dist/restore.d.ts

@@ -0,0 +1,165 @@
+/**
+ * `remote restore` — relaunch recent local dev sessions (claude/codex) in their
+ * layout, each tab a remote-managed tmux session (durable, live-named).
+ *
+ * This OWNS the launcher logic in the CLI (discovery + grouping + layout +
+ * terminal launch), so `~/bin/resume-dev-sessions` is just `exec remote
+ * restore`. SCW sessions and persisted positions come later.
+ */
+import { type LayoutConfig } from "./config.js";
+import { type RegistryEntry } from "./registry.js";
+export type DiscoveredSession = {
+    project: string;
+    mtimeMs: number;
+    tool: "claude" | "codex" | "agy";
+    sid: string;
+    cwd: string;
+    /** "registry" = enrolled live session (reliable); "scan" = mtime guess. */
+    origin?: "registry" | "scan";
+    /** Preferred tab label (registry entries carry a reliable one). */
+    label?: string;
+    /** Pinned llm-mesh gateway posture (from an explicit --gw/--no-gw at launch). */
+    gatewayMode?: "gateway" | "direct";
+};
+export type LayoutTab = {
+    cwd: string;
+    label: string;
+    /** local resume (claude/codex tmux) */
+    tool?: string;
+    sid?: string;
+    /** SCW session attached via `remote attach <id> --exec` */
+    remoteId?: string;
+    /** discovery provenance, shown as [registry]/[guess] in --dry-run */
+    origin?: "registry" | "scan";
+    /** Pinned llm-mesh gateway posture; re-emitted as --gw/--no-gw on restore. */
+    gatewayMode?: "gateway" | "direct";
+};
+export type LayoutWindow = {
+    title: string;
+    tabs: LayoutTab[];
+};
+/** A pre-resolved SCW tab for a remote group (built by the caller from `remote ls`). */
+export type RemoteTab = {
+    id: string;
+    label: string;
+    cwd: string;
+};
+/** Discover claude + codex sessions under ~/src/* newer than maxAgeMs. */
+export declare function discoverSessions(maxAgeMs: number, home?: string): DiscoveredSession[];
+/**
+ * REGISTRY-FIRST discovery: live registry entries (local kinds) mapped to
+ * discovered sessions. label/cwd/convId come straight from enrolment, no
+ * mtime guessing. `entries` is injectable for tests (defaults to listLive()).
+ */
+export declare function registrySessions(home?: string, entries?: RegistryEntry[]): DiscoveredSession[];
+/**
+ * Merge discovery sources: registry entries win; the filesystem scan only
+ * completes projects that have NO registry entry (tagged origin "scan").
+ */
+export declare function mergeDiscovered(registry: DiscoveredSession[], scanned: DiscoveredSession[]): DiscoveredSession[];
+/**
+ * Identity slug used to dedup a LOCAL discovered session against a REMOTE tab
+ * (bug #3). Both sides are reduced to lowercase alnum runs so "Sentropic
+ * Remote"/"sentropic-remote"/"sentropic_remote" collapse to one key. A `#N`
+ * fan-out suffix is kept distinct (it is a different session).
+ */
+export declare function sessionIdentitySlug(name: string): string;
+/**
+ * Bug #3 — a session that was MOVED to a remote Pod keeps reappearing as a fresh
+ * LOCAL tmux because the local conversation files (claude .jsonl / codex
+ * rollout) and any stale local registry entry survive the move, so the local
+ * discovery still emits a tab for that project. Drop every local discovered
+ * session whose project/label identity is already covered by a REMOTE tab: the
+ * remote group owns it, and re-launching it locally would spawn a ghost
+ * duplicate. Match is by identity slug of the local `label` (else `project`)
+ * against the remote tab `label` — the remote tab's cwd is the Pod path (often
+ * absent locally) so cwd can't be the key; the friendly name is. Pure; the
+ * remote-backed locals are returned separately so the caller can report them.
+ */
+export declare function dropRemoteBackedLocals(locals: DiscoveredSession[], remoteTabs: ReadonlyArray<{
+    label: string;
+}>): {
+    kept: DiscoveredSession[];
+    dropped: DiscoveredSession[];
+};
+/**
+ * Group discovered sessions into terminal windows per the layout config:
+ *   - explicit groups first (their projects leave the shared pool),
+ *   - the rest round-robin into `sharedWindows` windows,
+ *   - capped at `maxPerWindow` tabs each,
+ *   - keeping the N most recent sessions per project (`multiSession`, def 1).
+ */
+export declare function groupSessions(sessions: DiscoveredSession[], cfg: LayoutConfig): {
+    windows: LayoutWindow[];
+    dropped: number;
+};
+/**
+ * Per-tab command: SCW via `attach --exec`; a LOCAL session that is already
+ * live → `remote attach <slug>` (do NOT `remote run -r`, which the single-writer
+ * guard refuses while that session still holds the conversation — this is what
+ * broke a `restore` over still-detached sessions); otherwise create it via
+ * `remote run … --resume …` (which attaches by default). `liveSlugs` = slugs of
+ * currently-live local tmux sessions (empty for the reproducible layout snapshot).
+ */
+export declare function tabCommand(tab: LayoutTab, liveSlugs?: ReadonlySet<string>, opts?: {
+    forceGateway?: "gateway" | "direct";
+}): string;
+/**
+ * Launch the layout in gnome-terminal: one window per group, one tab per session.
+ *
+ * Default behaviour (reattach=false): sessions already live in tmux are SKIPPED —
+ * no new terminal tab is opened for them. The assumption is that if a tmux session
+ * exists, the user either has a terminal showing it or intentionally left it running.
+ * Use reattach=true (--reattach flag) to reopen a terminal tab for every session
+ * regardless of its current tmux state.
+ */
+export declare function launchLayout(windows: LayoutWindow[], stderr?: NodeJS.WriteStream, opts?: {
+    reattach?: boolean;
+    forceGateway?: "gateway" | "direct";
+}): {
+    opened: number;
+    skippedLive: string[];
+};
+export type RestoreOptions = {
+    dryRun?: boolean;
+    /** Launch only the group whose title matches (exact or slug-normalized). */
+    group?: string;
+    /** Pre-resolved SCW tabs (from `remote ls`), used to fill `remote: true` groups. */
+    remoteTabs?: RemoteTab[];
+    /**
+     * When true, open a new terminal tab even for sessions already live in tmux.
+     * Default (false): sessions already in tmux are skipped — no redundant tab.
+     */
+    reattach?: boolean;
+    /**
+     * Force the llm-mesh gateway posture for the WHOLE restore, overriding every
+     * session's pinned gatewayMode. Live sessions on the wrong posture are
+     * relaunched (--replace) so the switch actually takes effect.
+     */
+    forceGateway?: "gateway" | "direct";
+    stderr?: NodeJS.WriteStream;
+};
+/** Full restore: discover (local) + inject SCW (remote) -> order -> filter -> launch. */
+export declare function restore(opts?: RestoreOptions): {
+    windows: LayoutWindow[];
+    total: number;
+    dropped: number;
+};
+export type LastLayout = {
+    at: string;
+    group?: string;
+    windows: Array<{
+        title: string;
+        tabs: Array<{
+            cwd: string;
+            label: string;
+            cmd: string;
+        }>;
+    }>;
+};
+export declare function lastLayoutPath(): string;
+/** Persist the just-launched layout to <configDir>/layout-last.json (atomic). */
+export declare function writeLastLayout(windows: LayoutWindow[], group?: string): void;
+/** Read the recorded layout, or undefined when none was launched yet. */
+export declare function readLastLayout(): LastLayout | undefined;
+//# sourceMappingURL=restore.d.ts.map

package/dist/restore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../src/restore.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAeH,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAY,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAG7D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,2EAA2E;IAC3E,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAC7B,mEAAmE;IACnE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iFAAiF;IACjF,WAAW,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAC7B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,SAAS,EAAE,CAAA;CAAE,CAAC;AAEhE,wFAAwF;AACxF,MAAM,MAAM,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAOnE,0EAA0E;AAC1E,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,MAAkB,GACvB,iBAAiB,EAAE,CA4DrB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,GAAE,MAAkB,EACxB,OAAO,GAAE,aAAa,EAAe,GACpC,iBAAiB,EAAE,CAsBrB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,OAAO,EAAE,iBAAiB,EAAE,GAC3B,iBAAiB,EAAE,CAQrB;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,iBAAiB,EAAE,EAC3B,UAAU,EAAE,aAAa,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,GAC3C;IAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAAC,OAAO,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAa7D;AAkCD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,GAAG,EAAE,YAAY,GAChB;IAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAyE9C;AAMD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,SAAS,EACd,SAAS,GAAE,WAAW,CAAC,MAAM,CAAa,EAC1C,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAO,GACjD,MAAM,CA4BR;AA4BD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,YAAY,EAAE,EACvB,MAAM,GAAE,MAAM,CAAC,WAA4B,EAC3C,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAO,GACrE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CA8E3C;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,4EAA4E;IAC5E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oFAAoF;IACpF,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC;CAC7B,CAAC;AAQF,yFAAyF;AACzF,wBAAgB,OAAO,CACrB,IAAI,GAAE,cAAmB,GACxB;IAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CA4E7D;AAMD,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KAC1D,CAAC,CAAC;CACJ,CAAC;AAEF,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAC7B,OAAO,EAAE,YAAY,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,GACb,IAAI,CAkBN;AAED,yEAAyE;AACzE,wBAAgB,cAAc,IAAI,UAAU,GAAG,SAAS,CAQvD"}