pi-note 0.33.1 → 0.33.3

package/README.md

@@ -96,8 +96,11 @@ Pi's working directory before exiting, so Kitty closes its dedicated tab (or the
 standalone window's last tab). It never merges, rebases or stashes local changes.
 If Git fails, times out (30 seconds), or the session/draft changes, Pi stays open;
 the task remains completed and is not retried. Check Git manually, then `/quit`.
-Non-Git directories or branches without an upstream also stay open after the
-failed pull. `/quit` and Exit without completing do not pull.
+With pi-note 0.33.3+, directories outside Git, repositories without remotes, and
+branches without a configured upstream skip the pull and exit without a warning.
+Broken Git configuration, detached HEAD in a remote-backed repository, and failures
+to pull a configured upstream still keep Pi open.
+`/quit` and Exit without completing do not pull.
 This ownership survives `/reload`, but not `/new`, resume, fork, tree navigation
 or process restart. Completing a different task or an externally completed task
 does not pull or close Pi; failed/uncertain completion stays open.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-note",
-  "version": "0.33.1",
+  "version": "0.33.3",
   "description": "Persistent pinote tasks, Markdown handoffs, and task status for Pi",
   "license": "MIT",
   "type": "module",

package/remote/exit.ts

@@ -1,3 +1,4 @@
+import { spawnSync } from 'node:child_process';
 import { CustomEditor, type ExtensionAPI, type ExtensionContext } from '@earendil-works/pi-coding-agent';
 import { truncateToWidth } from '@earendil-works/pi-tui';
 import { clean } from './protocol.ts';
@@ -10,8 +11,24 @@ export async function pullBeforeExit(pi: ExtensionAPI, ctx: ExtensionContext, si
   const unchanged = () => current() && !signal.aborted && ctx.isIdle() &&
     ctx.sessionManager.getSessionId() === sessionId && ctx.sessionManager.getLeafId() === branch && ctx.ui.getEditorText() === draft;
   if (!unchanged()) return false;
-  ctx.ui.notify('Task completed. Running git pull --ff-only before closing Pi…', 'info');
   try {
+    const git = (args: string[]) => spawnSync('git', args, {
+      cwd: ctx.cwd, encoding: 'utf8', timeout: 3000, env: { ...process.env, LC_ALL: 'C' },
+    });
+    const repository = git(['rev-parse', '--show-toplevel']);
+    if (!repository.error && repository.status === 128 && repository.stderr.startsWith('fatal: not a git repository (or any ')) return unchanged();
+    if (repository.error || repository.status !== 0 || !unchanged()) throw new Error('Git repository check failed');
+    const remotes = git(['remote']);
+    if (remotes.error || remotes.status !== 0) throw new Error('Git remote check failed');
+    if (!remotes.stdout.trim()) return unchanged();
+    const branch = git(['symbolic-ref', '--quiet', 'HEAD']);
+    if (branch.error || branch.status !== 0 || !branch.stdout.startsWith('refs/heads/')) throw new Error('Git branch check failed');
+    const branchName = branch.stdout.trim().slice('refs/heads/'.length);
+    const upstream = git(['config', '--get', `branch.${branchName}.merge`]);
+    if (upstream.error || (upstream.status !== 0 && upstream.status !== 1)) throw new Error('Git upstream check failed');
+    if (upstream.status === 1) return unchanged();
+    if (!upstream.stdout.trim() || !unchanged()) throw new Error('Git upstream or session changed');
+    ctx.ui.notify('Task completed. Running git pull --ff-only before closing Pi…', 'info');
     const result = await pi.exec('git', ['pull', '--ff-only', '--no-rebase', '--no-autostash'], { cwd: ctx.cwd, signal, timeout: 30_000 });
     if (result.code === 0 && !result.killed && unchanged()) return true;
   } catch { /* Completion succeeded; only the local pull failed. */ }