@staff0rd/assist 0.298.1 → 0.299.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.298.1",
+  version: "0.299.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -18517,6 +18517,7 @@ function toSessionInfo({
   assistArgs,
   cwd,
   restored,
+  error,
   activity: activity2,
   autoRun,
   autoAdvance
@@ -18532,6 +18533,7 @@ function toSessionInfo({
     assistArgs,
     cwd,
     restored,
+    error,
     activity: activity2,
     autoRun,
     autoAdvance
@@ -18722,12 +18724,6 @@ function makeStatusChangeHandler(dismiss, notify2, reuseForRun) {
   return (s, status2, exitCode) => applyStatusChange(s, status2, exitCode, dismiss, notify2, reuseForRun);
 }
 
-// src/commands/sessions/daemon/backlogRunArgs.ts
-function backlogRunArgs(persisted) {
-  const args = ["assist", ...persisted.assistArgs];
-  return persisted.claudeSessionId ? [...args, "--resume-session", persisted.claudeSessionId] : args;
-}
-
 // src/commands/sessions/daemon/restoreBase.ts
 function restoreBase(id2, persisted) {
   return {
@@ -18742,6 +18738,26 @@ function restoreBase(id2, persisted) {
   };
 }
 
+// src/commands/sessions/daemon/errorSession.ts
+function errorSession(id2, persisted, error) {
+  return {
+    ...restoreBase(id2, persisted),
+    status: "error",
+    startedAt: persisted.startedAt,
+    pty: null,
+    runName: persisted.runName,
+    runArgs: persisted.runArgs,
+    error,
+    restored: false
+  };
+}
+
+// src/commands/sessions/daemon/backlogRunArgs.ts
+function backlogRunArgs(persisted) {
+  const args = ["assist", ...persisted.assistArgs];
+  return persisted.claudeSessionId ? [...args, "--resume-session", persisted.claudeSessionId] : args;
+}
+
 // src/commands/sessions/daemon/runningSession.ts
 function runningSession(base, persisted, pty2) {
   return {
@@ -18769,6 +18785,13 @@ function restoreSession(id2, persisted) {
     });
     return runningSession(base, persisted, pty2);
   }
+  if (persisted.commandType === "claude") {
+    return errorSession(
+      id2,
+      persisted,
+      "no claude session id was recorded before the daemon stopped, so the conversation cannot be resumed"
+    );
+  }
   return {
     ...base,
     status: "done",
@@ -18783,6 +18806,28 @@ function isBacklogRun(persisted) {
   return persisted.commandType === "assist" && persisted.assistArgs?.[0] === "backlog" && persisted.assistArgs?.[1] === "run";
 }
 
+// src/commands/sessions/daemon/restoreOne.ts
+function restoreOne(persisted, spawn12, sessions) {
+  try {
+    const id2 = spawn12((sid) => restoreSession(sid, persisted));
+    logUnresumable(persisted.name, id2, sessions.get(id2));
+  } catch (error) {
+    const reason = logRestoreError(persisted.name, error);
+    spawn12((id2) => errorSession(id2, persisted, reason));
+  }
+}
+function logUnresumable(name, id2, session) {
+  if (session?.status === "error")
+    daemonLog(
+      `could not resume restored session "${name}" (id ${id2}): ${session.error}`
+    );
+}
+function logRestoreError(name, error) {
+  const reason = error instanceof Error ? error.message : String(error);
+  daemonLog(`failed to restore session "${name}": ${reason}`);
+  return reason;
+}
+
 // src/commands/sessions/daemon/resumeSession.ts
 function resumeSession(id2, sessionId, cwd, name) {
   return {
@@ -18874,7 +18919,14 @@ function wirePtyEvents(session, clients, onStatusChange) {
   session.pty.onExit(({ exitCode }) => {
     clearIdle(session);
     refreshActivity(session);
-    onStatusChange(session, "done", exitCode);
+    const failedResume = session.restored === true && exitCode !== 0 && session.scrollback.length === 0;
+    if (failedResume) {
+      session.error = `resume process exited with code ${exitCode} before producing any output`;
+      daemonLog(
+        `could not resume restored session "${session.name}" (id ${session.id}): ${session.error}`
+      );
+    }
+    onStatusChange(session, failedResume ? "error" : "done", exitCode);
   });
   scheduleIdle(session, () => onStatusChange(session, "waiting"));
 }
@@ -19778,7 +19830,7 @@ var SessionManager = class {
   }
   restore() {
     return loadPersistedSessions().map((persisted) => {
-      this.spawnWith((id2) => restoreSession(id2, persisted));
+      restoreOne(persisted, this.spawnWith, this.sessions);
       return persisted.name;
     });
   }
@@ -19788,9 +19840,7 @@ var SessionManager = class {
     watchActivity(session, this.notify);
     return session.id;
   }
-  spawnWith(create) {
-    return this.add(create(String(this.nextId++)));
-  }
+  spawnWith = (create) => this.add(create(String(this.nextId++)));
   spawn(prompt, cwd) {
     return this.spawnWith((id2) => createSession(id2, prompt, cwd));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.298.1",
+	"version": "0.299.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {