instabox 0.8.5 → 0.8.7

package/cli/SHA256SUMS

@@ -1,6 +1,6 @@
-bb0a348729f8f2c8cda23b77293e8969ddaf83670e28a6bdf7b3ec0c3fb96a9c  instabox-darwin-amd64
-fdd071db9d874768f2d5224ae96c734364d7405d80388e7cb667b158953a6172  instabox-darwin-arm64
-9c24a0c66325038f0ad48bbcf1d9ed2549bb240c05d949dc147cdc79540bdd66  instabox-linux-amd64
-ce9c867bd3704513c71d3f4c48f0aa5619dd7e0bbc3059c28e744850303709ea  instabox-linux-arm64
-7fa9be21247482f1b2a757d353f9ca7aa99dadd03ffc8ad5e6ade6cd393ca551  instabox-windows-amd64.exe
-f8cc9f6cbe9c8a9f6f7899188651f135d3f52d25d805ddca3b009a393c5c6443  instabox-windows-arm64.exe
+27fa581ad33ebabce3229045ebb12d9a760be0ccd363139a57b580d7aa3dac0a  instabox-darwin-amd64
+0c5620128fa44dbda291bdafbfa2178b909d8457a5ad0751a428044e6adc25e5  instabox-darwin-arm64
+c47e1086ee1e532340b95ff116cc58b31e8a1bddb8ab7e7aaf76454e6f8d5ab5  instabox-linux-amd64
+32c8096ecb7a782f2a51341b1b75b65b305c773597982976fb1888215fe773b0  instabox-linux-arm64
+940bed7319b187ff873a939d25738e02e44f5f5e71948cf901be5f5d05e0295e  instabox-windows-amd64.exe
+8a6ec5b8daf403a969dc89d87f4180f276cdfbeee335c8469f466fdade9fec61  instabox-windows-arm64.exe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabox",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "A cloud box for your coding agent, the instabox CLI and its agent skills in one command: npx instabox@latest",
   "type": "module",
   "bin": {

package/skills/instabox-move-repo/SKILL.md

@@ -38,6 +38,7 @@ Before starting, tell the user plainly:
 Run with **bash**, anywhere inside the repo or one of its worktrees:
 
 ```bash
+export MSYS2_ARG_CONV_EXCL=/data/                 # Git Bash on Windows: keep box paths as they are
 instabox whoami                                   # signed in? otherwise: instabox login
 S=~/.claude/skills/instabox-move-repo/scripts     # or ~/.agents/skills/instabox-move-repo/scripts: wherever this file is
 W=$(mktemp -d)
@@ -58,7 +59,7 @@ Show the user the plan in short: the worktrees with their sizes and state, the t
 SKIP=()            # one --skip-worktree per worktree the user unchecked: SKIP+=(--skip-worktree /path/to/it)
 KEEP=()            # one --keep per excluded name the user wants copied anyway: KEEP+=(--keep build)
 node "$S/repo-files.mjs" "${SKIP[@]}" "${KEEP[@]}" --json > "$W/plan.json"
-DEST=$(jq -r .main.box "$W/plan.json")
+DEST=$(jq -r .main.box "$W/plan.json" | tr -d '\r')   # tr: Windows jq.exe ends lines in CRLF
 jq -r '.totals' "$W/plan.json"                    # sendBytes must fit well inside /data: instabox usage
 ```
 
@@ -81,7 +82,7 @@ The main checkout first (it carries `.git`), then each worktree, each as its own
 ```bash
 export COPYFILE_DISABLE=1                                   # macOS tar: no ._ AppleDouble files
 X='tar -xzf - --warning=no-unknown-keyword'                 # the box runs GNU tar
-jq -r '.main, (.worktrees[] | select(.move)) | [.src, .box] | @tsv' "$W/plan.json" |
+jq -r '.main, (.worktrees[] | select(.move)) | [.src, .box] | @tsv' "$W/plan.json" | tr -d '\r' |
 while IFS=$'\t' read -r src box; do
   echo "== $src -> $box"
   node "$S/repo-files.mjs" --list0 "$src" "${SKIP[@]}" "${KEEP[@]}" </dev/null |
@@ -93,7 +94,7 @@ done
 Then point the worktrees at their new places (each worktree's `.git` file and `.git/worktrees/<id>/gitdir` still name the local paths; `git worktree repair` with the new paths rewrites both sides):
 
 ```bash
-WTS=$(jq -r '[.worktrees[] | select(.move) | .box] | join(" ")' "$W/plan.json")
+WTS=$(jq -r '[.worktrees[] | select(.move) | .box] | join(" ")' "$W/plan.json" | tr -d '\r')
 [ -z "$WTS" ] || instabox ssh "$BOX" -- "cd '$DEST' && git worktree repair $WTS"
 ```
 
@@ -102,7 +103,7 @@ Box paths contain only letters, digits and `._-/`, so they are safe unquoted the
 Check that every checkout has the same state, and the same worktrees:
 
 ```bash
-jq -r '.main, (.worktrees[] | select(.move)) | [.src, .box] | @tsv' "$W/plan.json" |
+jq -r '.main, (.worktrees[] | select(.move)) | [.src, .box] | @tsv' "$W/plan.json" | tr -d '\r' |
 while IFS=$'\t' read -r src box; do
   echo "== $box"
   diff <(cd "$src" && { git status --porcelain | sort; git rev-parse HEAD; }) \
@@ -119,7 +120,7 @@ The only allowed differences are `<` lines starting with `??` for what the plan
 H=$(mktemp -d)
 node "$S/history.mjs" --plan "$W/plan.json" --out "$H" > "$W/history.json"   # --no-claude / --no-codex to skip one
 jq '{claude: .claude | {sessions, bytes, recent}, codex: .codex | {sessions, bytes, recent}}' "$W/history.json"   # null: skipped
-tar -C "$H" -czf - $(jq -r '.entries[]' "$W/history.json") | instabox ssh "$BOX" -- "$X --no-overwrite-dir -C ~"
+tar -C "$H" -czf - $(jq -r '.entries[]' "$W/history.json" | tr -d '\r') | instabox ssh "$BOX" -- "$X --no-overwrite-dir -C ~"
 instabox ssh "$BOX" -- 'bash ~/.cache/instabox-move-repo/apply-history.sh'
 rm -rf "$H"
 ```

package/skills/instabox-move-repo/scripts/repo-files.mjs

@@ -21,7 +21,7 @@
 // difference is `??` lines for what was left out. File contents are never read, only names and sizes.
 import { spawnSync } from 'node:child_process';
 import { lstatSync, readdirSync, readFileSync, realpathSync } from 'node:fs';
-import { basename, dirname, join, relative, resolve } from 'node:path';
+import { basename, dirname, join, relative, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 // Directory names that hold build output, dependencies or caches: regenerated on the box.
@@ -161,10 +161,10 @@ function treeBytes(p, skip = new Set()) {
   return { bytes, files };
 }
 
-// Every path under dir (directories too, for tar --no-recursion), relative to base, sorted.
-function walk(dir, base, skip, out = []) {
+// Archive names are joined with '/' whatever the host separator.
+function walk(dir, rel, skip, out = []) {
   if (skip.has(dir)) return out;
-  out.push(relative(base, dir));
+  out.push(rel);
   let names = [];
   try {
     names = readdirSync(dir).sort();
@@ -173,8 +173,8 @@ function walk(dir, base, skip, out = []) {
     const p = join(dir, n);
     const st = lstat(p);
     if (!st || skip.has(p)) continue;
-    if (st.isDirectory()) walk(p, base, skip, out);
-    else out.push(relative(base, p));
+    if (st.isDirectory()) walk(p, `${rel}/${n}`, skip, out);
+    else out.push(`${rel}/${n}`);
   }
   return out;
 }
@@ -217,7 +217,8 @@ const real = (p) => {
     return resolve(p);
   }
 };
-const inside = (p, dir) => p === dir || p.startsWith(dir + '/');
+// s: sep for native paths, '/' for git's.
+const inside = (p, dir, s = sep) => p === dir || p.startsWith(dir + s);
 
 // `git worktree list --porcelain -z`, parsed. The first entry is the main checkout.
 export function listWorktrees(cwd) {
@@ -258,14 +259,14 @@ function checkoutFiles(top, { keep, nested = [] }) {
   }
   const trackedFiles = files.length;
   const tracked = new Set(files);
-  const nestedRel = nested.map((p) => relative(top, p));
+  const nestedRel = nested.map((p) => relative(top, p).split(sep).join('/'));
 
   let untrackedBytes = 0;
   let untrackedFiles = 0;
   const groups = new Map();
   for (const f of split0(git(['ls-files', '-z', '--others', '--exclude-standard'], top))) {
     const bare = f.replace(/\/$/, '');
-    if (tracked.has(f) || nestedRel.some((n) => inside(bare, n))) continue;
+    if (tracked.has(f) || nestedRel.some((n) => inside(bare, n, '/'))) continue;
     const st = lstat(join(top, bare));
     if (!st) continue;
     const isDir = st.isDirectory();
@@ -286,7 +287,7 @@ function checkoutFiles(top, { keep, nested = [] }) {
   // .env files git ignores (names only): they stay behind too, and the user should know.
   const ignoredEnv = split0(git(['ls-files', '-z', '--others', '--ignored', '--exclude-standard', '--directory'], top))
     .filter((f) => !f.endsWith('/') && isEnvName(f))
-    .filter((f) => !nestedRel.some((n) => inside(f, n)));
+    .filter((f) => !nestedRel.some((n) => inside(f, n, '/')));
   const left = [...groups.entries()]
     .map(([path, g]) => ({ path, ...g }))
     .sort((a, b) => b.bytes - a.bytes || a.path.localeCompare(b.path));
@@ -377,7 +378,7 @@ export function planRepo(cwd = process.cwd(), { dest, keep = [], skip = [], lite
     }
     // Box paths are safe in a single-quoted shell word: [A-Za-z0-9._-/] only.
     let box = inside(src, mainSrc)
-      ? `${dest}/${relative(mainSrc, src).split('/').map(safeName).join('/')}`
+      ? `${dest}/${relative(mainSrc, src).split(sep).map(safeName).join('/')}`
       : `${dest}.worktrees/${safeName(basename(src))}`;
     for (let i = 2, b = box; used.has(box); i++) box = `${b}-${i}`;
     entry.box = box;
@@ -456,7 +457,7 @@ export function listFor(path, { keep = [], skip = [] } = {}) {
   if (!isMain) return ['.git', ...files];
   // The admin dirs of worktrees that stay behind (unchecked, prunable, missing) stay too.
   const skipAdmin = new Set(plan.worktrees.filter((x) => !x.move && x.adminDir).map((x) => x.adminDir));
-  return [...walk(real(join(top, '.git')), top, skipAdmin), ...files];
+  return [...walk(real(join(top, '.git')), '.git', skipAdmin), ...files];
 }
 
 function describe(w) {