@yunazgr/pi-companion 0.3.6 → 0.3.7

package/README.md

@@ -2,7 +2,7 @@
 
 Lightweight, local-first remote control for Pi sessions.
 
-**New in 0.3.6:** The extension automatically ensures the background daemon is available, while sessions stay private until `/remote-control`. Per-user services restart the daemon; concurrent startup is locked and upgrades verify the replacement first. Subscription limits are tracked separately for supported OAuth providers, and provider failures appear as clear messages in the activity feed.
+**New in 0.3.7:** Resuming a previously shared Pi session reconnects automatically under the same dashboard identity. Explicit `/remote-control off` survives resume; new and forked sessions stay private. Unnamed session titles now reflect the first user prompt, refresh with branch context, and remain editable with `/name`.
 
 When a session is shared, Companion fetches OpenAI Codex and Anthropic subscription usage via Pi's existing OAuth resolver, independently per provider with five-minute caching and failure backoff. Credentials are never sent to the browser or stored by the daemon. API-key accounts and unsupported providers have no built-in subscription lookup; extensions can still publish the neutral telemetry contract. Provider rate-limit, quota and authentication failures are shown in the activity feed with safe remediation guidance rather than raw provider payloads.
 
@@ -192,7 +192,7 @@ Each paired device shows a live **Connected** / **Disconnected** status (with th
 
 Paired devices (name, browser user agent, pairing and last-seen times, credential hash) and settings survive daemon restarts. They are stored in `~/.pi/agent/pi-companion/state.json`, created with mode 0600 inside a 0700 directory and replaced atomically; a looser mode found on startup is tightened. Override the directory with `PI_COMPANION_HOME`.
 
-A phone pairs once with the daemon. Individual Pi sessions opt in using `/remote-control`.
+A phone pairs once with the daemon. Individual Pi sessions opt in using `/remote-control`. This choice is saved in Pi session history: resuming that same session restores sharing unless you used `/remote-control off`. New sessions and forks do not inherit another session's opt-in. After upgrading from 0.3.6 or earlier, enable sharing once to save this choice; older versions did not record it.
 
 Network loss and daemon restarts reconnect automatically with bounded backoff. Heartbeats detect silent connections, and returning to the foreground or restoring network access retries immediately. Pairing credentials and unsent drafts survive outages; session snapshots, pending questions, and previously loaded upload lists refresh on reconnect. Recent activity is replayed from the daemon’s bounded log, but prompts/answers are never automatically resent. A deliberate **Disconnect** waits for the device’s explicit retry; **Revoke** removes access and requires pairing again.
 
@@ -294,6 +294,8 @@ A previously cached PWA shell can also explain gateway failures on reload. If th
 
 ## Session identity
 
+Companion uses Pi's persistent session ID, so restarting, resuming, or re-enabling sharing replaces the same dashboard entry instead of creating a duplicate. Unnamed sessions use the first text-bearing user prompt in the current branch as their title (whitespace-normalized and capped at 120 characters), with the project folder as a fallback before a prompt exists. `/name` overrides that title and updates the dashboard live; clearing the name restores the prompt-derived title.
+
 Every registered Pi session publishes a compact display model to the daemon:
 
 - session name
@@ -304,7 +306,7 @@ Every registered Pi session publishes a compact display model to the daemon:
 - working directory and process id
 - remote-control state
 
-Stopped sessions remain visible in the daemon registry so the dashboard does not lose context when a Pi process exits. Their controls are disabled and their temporary sandbox is cleaned after the reconnect grace period. Use **Archive session** on the list or in the session menu to remove a disconnected/stopped entry. The daemon rejects removal of active, idle, waiting, or otherwise connected sessions. Archiving removes only the daemon entry; it never deletes Pi history, project files or other files on disk. Temporary uploads still follow the existing disconnect cleanup lifecycle. Reopening the Pi session and running `/companion` can register it again.
+Stopped sessions remain visible in the daemon registry so the dashboard does not lose context when a Pi process exits. Their controls are disabled and their temporary sandbox is cleaned after the reconnect grace period. Use **Archive session** on the list or in the session menu to remove a disconnected/stopped entry. The daemon rejects removal of active, idle, waiting, or otherwise connected sessions. Archiving removes only the daemon entry; it never deletes Pi history, project files or other files on disk. Temporary uploads still follow the existing disconnect cleanup lifecycle. Reopening a previously shared Pi session registers it again automatically; otherwise use `/companion`. Entries created by older versions with random IDs can be archived once disconnected.
 
 ## UI
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yunazgr/pi-companion",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Local-first remote control for Pi sessions: live activity feed, steering, git diff, file drop and phone pairing from a single Rust daemon.",
   "keywords": [
     "pi-package",

package/src/bridge.ts

@@ -12,7 +12,7 @@ import type { AskAnswers, AskRequest, BridgeMessage, ServerMessage, SessionSnaps
 const execFileAsync = promisify(execFile);
 
 export class CompanionBridge implements AskChannel {
-  readonly sessionId = randomUUID();
+  private pendingPrompt?: string;
   /** Relays question tools that ask through ctx.ui.custom (fed from tool_execution_* events). */
   readonly toolDialogs = new ToolDialogRelay(this);
   readonly popups = new PopupRelay(popups => {
@@ -39,7 +39,7 @@ export class CompanionBridge implements AskChannel {
   private asks = new Map<string, { request: AskRequest; settle: (answers: AskAnswers | null) => void }>();
   private pendingDeletes = new Map<string, { resolve: (result: { ok: boolean; error?: string }) => void; timer: NodeJS.Timeout }>();
   private snapshot: SessionSnapshot = {
-    id: this.sessionId,
+    id: "",
     cwd: process.cwd(),
     pid: process.pid,
     shortTitle: process.cwd().split(/[\\/]/).filter(Boolean).pop() ?? "Pi",
@@ -49,7 +49,9 @@ export class CompanionBridge implements AskChannel {
     asks: []
   };
 
-  constructor(private readonly pi: ExtensionAPI) {}
+  constructor(private readonly pi: ExtensionAPI, readonly sessionId: string = randomUUID()) {
+    this.snapshot.id = sessionId;
+  }
 
   setContext(ctx: ExtensionContext) {
     this.ctx = ctx;
@@ -59,10 +61,32 @@ export class CompanionBridge implements AskChannel {
 
   setName(name?: string) {
     this.snapshot.name = name ?? null;
-    this.snapshot.shortTitle = name?.trim() || this.snapshot.cwd.split(/[\\/]/).filter(Boolean).pop() || "Pi";
+    this.snapshot.shortTitle = this.contextTitle(name, this.snapshot.cwd);
     this.send({ type: "session.update", session: { name: name ?? null, shortTitle: this.snapshot.shortTitle } });
   }
 
+  /** Input arrives before Pi appends the user message to session history. */
+  setPrompt(text: string) {
+    if (text.trim()) this.pendingPrompt ??= text;
+    this.refreshMetadata();
+  }
+
+  private contextTitle(name: string | null | undefined, cwd: string) {
+    if (name?.trim()) return name.trim();
+    const entries = this.ctx?.sessionManager?.getBranch?.() ?? [];
+    let prompt = this.pendingPrompt;
+    for (const entry of entries) {
+      if (entry.type !== "message" || entry.message.role !== "user") continue;
+      const content = entry.message.content;
+      const text = typeof content === "string" ? content : content
+        .filter(part => part.type === "text").map(part => part.text).join(" ");
+      if (text.trim()) { prompt = text; break; }
+    }
+    const title = prompt?.replace(/\s+/g, " ").trim();
+    if (title) return title.length > 120 ? title.slice(0, 119) + "…" : title;
+    return cwd.split(/[\\/]/).filter(Boolean).pop() || "Pi";
+  }
+
   /** Context getters remain live while idle; send only changed metadata, including explicit clears. */
   refreshMetadata() {
     const ctx = this.ctx;
@@ -72,7 +96,7 @@ export class CompanionBridge implements AskChannel {
     if ((this.snapshot.mainModel ?? null) !== (ctx.model?.id ?? null)) this.telemetry.invalidateContext();
     const next = {
       name, cwd,
-      shortTitle: name?.trim() || cwd.split(/[\\/]/).filter(Boolean).pop() || "Pi",
+      shortTitle: this.contextTitle(name, cwd),
       mainModel: ctx.model?.id ?? null,
       effort: ctx.thinkingLevel ?? this.pi.getThinkingLevel?.() ?? null,
       telemetry: this.telemetry.snapshot(ctx),
@@ -91,6 +115,7 @@ export class CompanionBridge implements AskChannel {
   }
 
   invalidateContext() {
+    this.pendingPrompt = undefined;
     this.telemetry.invalidateContext();
   }
 

package/src/index.ts

@@ -92,15 +92,23 @@ export default function companionExtension(pi: ExtensionAPI) {
   }
 
   pi.on("session_start", (_event, ctx) => {
-    // Switching or starting a Pi session must not inherit the previous opt-in.
+    // Restore only this session's explicit opt-in, never the previous session's.
     sharingGeneration += 1;
     quotas.stop();
     quotas = new ProviderQuotaPoller(value => bridge.ingestTelemetry(value, 'subscription limits'));
     bridge.close();
-    bridge = new CompanionBridge(pi);
+    bridge = new CompanionBridge(pi, ctx.sessionManager?.getSessionId?.());
     bridge.setContext(ctx);
     bridge.emit("session.start", { cwd: ctx.cwd });
-    void checkDaemon(ctx);
+    const sharing = ctx.sessionManager?.getEntries?.().filter(entry =>
+      entry.type === "custom" && entry.customType === "companion:sharing"
+    ).at(-1);
+    const saved = sharing?.type === "custom" ? sharing.data as { enabled?: boolean; sessionId?: string } | undefined : undefined;
+    if (saved?.enabled === true && saved.sessionId === bridge.sessionId) {
+      void setSharing(true, ctx, false);
+    } else {
+      void checkDaemon(ctx);
+    }
     if (daemonMonitor) clearInterval(daemonMonitor);
     daemonMonitor = setInterval(() => {
       void checkDaemon(ctx);
@@ -108,6 +116,10 @@ export default function companionExtension(pi: ExtensionAPI) {
     }, 30_000);
     daemonMonitor.unref();
   });
+  pi.on("input", (event, ctx) => {
+    bridge.setContext(ctx);
+    bridge.setPrompt(event.text);
+  });
   pi.on("session_info_changed", (event, ctx) => {
     bridge.setContext(ctx);
     bridge.setName(event.name);
@@ -306,10 +318,11 @@ export default function companionExtension(pi: ExtensionAPI) {
     }
   });
 
-  async function setSharing(enabled: boolean, ctx: ExtensionContext) {
+  async function setSharing(enabled: boolean, ctx: ExtensionContext, persist = true) {
     const generation = ++sharingGeneration;
     bridge.setContext(ctx);
     if (!enabled) {
+      if (persist) pi.appendEntry("companion:sharing", { enabled: false, sessionId: bridge.sessionId });
       bridge.setRemoteEnabled(false);
       ctx.ui.notify("Remote control disabled; Pi continues locally. The daemon remains available.", "info");
       return;
@@ -321,6 +334,7 @@ export default function companionExtension(pi: ExtensionAPI) {
       ctx.ui.notify("Pi Companion daemon is not reachable at " + adminHttpUrl(), "warning");
       return;
     }
+    if (persist) pi.appendEntry("companion:sharing", { enabled: true, sessionId: bridge.sessionId });
     bridge.activate();
     bridge.setRemoteEnabled(true);
     void quotas.refresh(ctx);