osborn 0.9.24 → 0.9.26

package/dist/config.js

@@ -649,31 +649,45 @@ export async function listAllClaudeSessions(limit = 100) {
             ]);
             if (preview.messageCount < 2)
                 continue;
-            // SLUG-FIRST: prefer the slug-derived path over the content cwd.
+            // TWO FIELDS — two distinct purposes. The dashboard uses each for
+            // exactly one thing:
             //
-            // Claude Code's `--resume <id>` looks up sessions by file LOCATION
-            // (slug folder under ~/.claude/projects/), not by the cwd field inside
-            // the JSONL. The JSONL content cwd is immutable historical metadata —
-            // it's where the session was ORIGINALLY recorded (e.g. sprite path
-            // /home/sprite/workspace or /workspaces/codespaces-blank). On migration
-            // (sprite → fly), files were finalized into a new slug but their
-            // content still records the original cwd.
+            //   `projectPath` ← content cwd from JSONL.
+            //     What the session ORIGINALLY recorded as its working directory.
+            //     For native fly sessions that's the same as the slug-derived
+            //     path. For imported sessions (migrated from sprite, copied from
+            //     Codespaces, synced from a Mac) it's the source machine's cwd —
+            //     a path that may not exist on this host. The dashboard groups
+            //     by this so a user who imported sessions from 4 different
+            //     places sees 4 project cards, named after where each came from.
             //
-            // The dashboard forwards this field as `workingDirectory` to the
-            // agent, which uses it as Claude Code's spawn cwd. If it doesn't
-            // match the slug, the spawn lands in the wrong folder and resume
-            // errors with "No conversation found". The slug is the source of
-            // truth for where the file lives on disk; use it.
+            //   `cwd` ← slug-derived. File LOCATION on disk.
+            //     Forwarded to the agent as `workingDirectory` so Claude Code's
+            //     `--resume` finds the JSONL — Claude Code looks up sessions
+            //     by slug folder, not by content cwd. Always points at the
+            //     real on-disk location regardless of what the JSONL records.
             //
-            // Content cwd is kept as a last-resort fallback only when slug
-            // reversal fails (slugToPath validates with existsSync and returns
-            // '' on ambiguous encodings like dir names containing literal '-').
+            // Why NOT use content cwd for routing too: imported sessions still
+            // live in the LOCAL slug after migration. A session whose content
+            // cwd is `/workspaces/codespaces-blank` was put in slug `-workspace/`
+            // when we synced it onto fly, so `--resume` needs cwd=/workspace to
+            // find it. Forwarding the content cwd would send Claude Code to a
+            // slug that doesn't exist on this host.
+            //
+            // Why NOT use slug-derived path for grouping too: that collapses all
+            // imported sessions into one "Workspace" card on the dashboard,
+            // losing the "this came from Codespaces, that came from sprite"
+            // organization the user thinks of when finding old conversations.
+            //
+            // Each field falls back to the other if its preferred source is
+            // empty — slugToPath returns '' for ambiguous slug encodings, and
+            // some old JSONL files don't carry a cwd field at all.
             const slugPath = slugToPath(c.slug);
             sessions.push({
                 sessionId: c.sessionId,
                 projectSlug: c.slug,
-                projectPath: slugPath || cwd,
-                cwd: slugPath || cwd,
+                projectPath: cwd || slugPath, // display / group key (original cwd)
+                cwd: slugPath || cwd, // resume routing (file location)
                 timestamp: c.mtime,
                 lastMessage: preview.lastMessage,
                 messageCount: preview.messageCount,

package/dist/index.js

@@ -164,6 +164,14 @@ function startApiServer(workingDir, port) {
                 const limit = parseInt(url.searchParams.get('limit') || '100', 10);
                 const sessions = await listAllClaudeSessions(limit);
                 const payload = {
+                    // The agent's working directory at launch — the BASE LAYER of all
+                    // project organization. The dashboard groups sessions relative to
+                    // this path: a session whose cwd === baseCwd is a "Workspace"
+                    // session (the base); a session at `${baseCwd}/<name>` is a
+                    // project called "<name>". Replaces the dashboard's previously-
+                    // hardcoded base-path list — agent self-describes its base so
+                    // the UI doesn't have to keep a sync'd copy.
+                    baseCwd: workingDir,
                     sessions: sessions.map(s => ({
                         sessionId: s.sessionId,
                         projectSlug: s.projectSlug,
@@ -3100,6 +3108,11 @@ async function main() {
                     const sessions = await listAllClaudeSessions(100);
                     await sendToFrontend({
                         type: 'sessions_list',
+                        // See `/sessions` HTTP handler — baseCwd is the agent's
+                        // workingDir, the base layer the dashboard groups against.
+                        // Sent here too so the in-chat session list grouping stays
+                        // consistent with the dashboard's grouping.
+                        baseCwd: workingDir,
                         sessions: sessions.map(s => ({
                             sessionId: s.sessionId,
                             projectSlug: s.projectSlug,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osborn",
-  "version": "0.9.24",
+  "version": "0.9.26",
   "description": "Voice AI coding assistant - local agent that connects to Osborn frontend",
   "type": "module",
   "bin": {