osborn 0.9.18 → 0.9.20

package/dist/index.js

@@ -187,8 +187,32 @@ function startApiServer(workingDir, port) {
             return;
         }
         if (req.method === 'GET' && url.pathname === '/health') {
+            // Include osborn version — primary signal used by machines.readInstalledOsbornVersion()
+            // to detect which agent version is running. Without this the consumer falls back to
+            // parsing the Docker image tag (e.g. ":latest" → rejected) and returns null, which
+            // breaks the dashboard's version badge + the upgrade-needed comparison.
+            // Read once at module load? No — package.json is small and resolveFromPackage() handles
+            // both `dist/` (installed) and `src/` (local dev) layouts.
+            let version;
+            try {
+                // Walk up from this file's dirname to find package.json. Works whether running
+                // from src/ (tsx local dev) or dist/ (compiled npm install).
+                const { readFileSync } = await import('node:fs');
+                const { join } = await import('node:path');
+                for (const rel of ['../package.json', '../../package.json']) {
+                    try {
+                        const pkg = JSON.parse(readFileSync(join(__dirname, rel), 'utf8'));
+                        if (pkg.name === 'osborn' && pkg.version) {
+                            version = pkg.version;
+                            break;
+                        }
+                    }
+                    catch { /* try next */ }
+                }
+            }
+            catch { /* version optional */ }
             res.writeHead(200, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify({ status: 'ok', workingDir }));
+            res.end(JSON.stringify({ status: 'ok', workingDir, version }));
             return;
         }
         // POST /webhook/recall — Recall.ai real-time transcript webhooks
@@ -373,9 +397,22 @@ function startApiServer(workingDir, port) {
                 const destSlug = join(projectsDir, effectiveSlug);
                 mkdirSync(destSlug, { recursive: true });
                 const sourceSlugPath = join(effectiveSource, sourceSlug);
-                const sourceCwd = slugToCwd(sourceSlug);
+                // Always rewrite EVERY `"cwd":"<anything>"` to the target workspace dir
+                // when targetWorkDir is provided. Earlier version tried to derive the
+                // source cwd from the slug name via dash-to-slash substitution, but
+                // slug encoding is ambiguous (hyphens in path components like
+                // `codespaces-blank` get expanded into directory boundaries). That
+                // version only caught the canonical sprite cwd and missed laptop +
+                // codespaces references inside the JSONL bodies. Migration test on
+                // bj2zgt → fly machine found 12 files still pointing at /Users/...
+                // or /workspaces/codespaces-blank after the old rewrite. The brute-
+                // force regex below is bulletproof: any `cwd` reference becomes the
+                // runtime workspace dir, period.
                 const destCwd = targetWorkDir ?? slugToCwd(effectiveSlug);
-                const needsCwdRewrite = sourceCwd !== destCwd;
+                const needsCwdRewrite = !!targetWorkDir;
+                void sourceSlugPath; // silence linter — used below in walk
+                const cwdRewriteRe = /"cwd":"[^"]*"/g;
+                const cwdReplacement = `"cwd":"${destCwd}"`;
                 // Walk the source slug directory and copy files individually so we can:
                 //   (a) skip AppleDouble per-file too (in case nested)
                 //   (b) rewrite cwd inside .jsonl files when remapping across workspaces
@@ -408,12 +445,11 @@ function startApiServer(workingDir, port) {
                             if (!shouldWrite)
                                 continue;
                             if (needsCwdRewrite && e.name.endsWith('.jsonl')) {
-                                // Read, rewrite "cwd" field, write. JSONL is line-delimited;
-                                // string match on `"cwd":"<sourceCwd>"` is precise enough.
+                                // Regex-rewrite every `"cwd":"<anything>"` → target. Catches all
+                                // possible source cwds in one pass (laptop, codespaces, sprite,
+                                // etc.) without depending on slug-derived heuristics.
                                 const content = readFileSync(sp, 'utf8');
-                                const find = `"cwd":"${sourceCwd}"`;
-                                const replace = `"cwd":"${destCwd}"`;
-                                const rewritten = content.split(find).join(replace);
+                                const rewritten = content.replace(cwdRewriteRe, cwdReplacement);
                                 writeFileSync(dp, rewritten);
                             }
                             else {

package/package.json

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