@loicngr/kobo 1.7.3 → 1.7.5

package/dist/server/services/agent/orchestrator.js

@@ -4,7 +4,9 @@ import { getDb } from '../../db/index.js';
 import { ensureKoboHome, getCompiledMcpServerPath, getDbPath, getKoboHome, getMcpServerSourcePath, getSettingsPath, getSkillsPath, } from '../../utils/paths.js';
 import { unregisterProcess } from '../../utils/process-tracker.js';
 import * as autoLoopService from '../auto-loop-service.js';
+import * as quotaBackoffService from '../quota-backoff-service.js';
 import { getEffectiveSettings } from '../settings-service.js';
+import { refreshNow } from '../usage/poller.js';
 import * as wakeupService from '../wakeup-service.js';
 import { emit, emitEphemeral } from '../websocket-service.js';
 import { getWorkspace as getWs, markWorkspaceUnread, updateWorkspaceStatus, } from '../workspace-service.js';
@@ -137,8 +139,6 @@ let availableSkills = (() => {
 const retryCounts = new Map();
 /** Tracks workspaces where the current session failed due to a stale --resume session ID. */
 const resumeFailedSet = new Set();
-/** workspaceId -> backoff timer */
-const backoffTimers = new Map();
 // ── Watchdog ──────────────────────────────────────────────────────────────────
 const WATCHDOG_INTERVAL_MS = 30_000;
 let watchdogTimer = null;
@@ -469,7 +469,7 @@ function handleEvent(workspaceId, agentSessionId, ev) {
         }
     }
     if (ev.kind === 'error' && ev.category === 'quota') {
-        handleQuota(workspaceId, agentSessionId);
+        void handleQuota(workspaceId, agentSessionId);
     }
     if (ev.kind === 'error' && ev.category === 'resume_failed') {
         resumeFailedSet.add(workspaceId);
@@ -569,14 +569,11 @@ function onSessionEnded(workspaceId, agentSessionId, exitCode, reason, resumeFai
     if (wasStopping)
         return;
     // When the session hit quota, handleQuota() already transitioned the
-    // workspace to `quota` and armed the retry timer. Keep that timer alive
-    // and preserve the `quota` status so auto-loop can resume after reset.
+    // workspace to `quota` and armed the retry via quotaBackoffService.
+    // Preserve that pending backoff in the quota path; otherwise clear any
+    // stale entry (defensive — shouldn't normally exist on a non-quota end).
     if (!preserveQuotaBackoff) {
-        const pendingBackoff = backoffTimers.get(workspaceId);
-        if (pendingBackoff) {
-            clearTimeout(pendingBackoff);
-            backoffTimers.delete(workspaceId);
-        }
+        quotaBackoffService.cancel(workspaceId, 'completed');
     }
     if (preserveQuotaBackoff) {
         try {
@@ -774,11 +771,8 @@ export function stopAgent(workspaceId) {
     // session:ended handler checks identity before removing, so a new controller
     // started in the meantime is preserved.
     controllers.delete(workspaceId);
-    const timer = backoffTimers.get(workspaceId);
-    if (timer) {
-        clearTimeout(timer);
-        backoffTimers.delete(workspaceId);
-    }
+    // Manual stop should also drop any pending quota auto-resume.
+    quotaBackoffService.cancel(workspaceId, 'user');
     // Fire-and-forget: controller.stop is async but we don't block callers.
     void ctrl.stop().catch((err) => {
         console.error('[orchestrator] controller.stop failed:', err);
@@ -1098,12 +1092,14 @@ const QUOTA_FALLBACK_LADDER_MINUTES = [15, 30, 60, 180, 300];
 /**
  * Compute the delay before retrying a workspace hit by quota.
  *
- * Prefers the `resetsAt` of the saturated bucket with the furthest-future
- * reset (a tighter bucket will unlock by then anyway). Falls back to a
- * fixed ladder (15 → 30 → 60 → 180 → 300 min) whenever the rate_limit
- * info is missing, malformed, or implausible.
+ * Prefers (1) the `resetsAt` of the saturated bucket with the furthest-future
+ * reset reported by the agent's `rate_limit` event, then (1.5) the official
+ * Anthropic usage API (`five_hour` bucket) when it reports saturation, and
+ * finally (2) a fixed ladder (15 → 30 → 60 → 180 → 300 min) whenever neither
+ * source is usable.
  */
-export function computeQuotaBackoffMs(workspaceId, retryCount) {
+export async function computeQuotaBackoffMs(workspaceId, retryCount) {
+    // 1. Prefer the rate_limit event from the agent stream — most recent + most precise.
     const info = latestRateLimitInfo.get(workspaceId);
     if (info?.buckets?.length) {
         const candidates = info.buckets
@@ -1119,15 +1115,38 @@ export function computeQuotaBackoffMs(workspaceId, retryCount) {
             }
         }
     }
+    // 1.5. Try the official usage API (Claude subscription). Best-effort; never throws.
+    try {
+        const snap = await refreshNow('claude-code');
+        if (snap) {
+            const fiveHour = snap.buckets.find((b) => b.id === 'five_hour');
+            if (fiveHour &&
+                typeof fiveHour.usedPct === 'number' &&
+                fiveHour.usedPct >= QUOTA_SATURATION_THRESHOLD_PCT &&
+                typeof fiveHour.resetsAt === 'string') {
+                const resetTs = Date.parse(fiveHour.resetsAt);
+                const delta = resetTs - Date.now() + QUOTA_SAFETY_MARGIN_MS;
+                if (delta > 0 && delta <= QUOTA_MAX_BACKOFF_MS) {
+                    return { delayMs: delta, resetsAt: fiveHour.resetsAt, source: 'usage_api' };
+                }
+            }
+        }
+    }
+    catch (err) {
+        console.warn('[orchestrator] computeQuotaBackoffMs — usage API call failed:', err);
+    }
+    // 2. Hard-coded ladder.
     const idx = Math.min(Math.max(0, retryCount), QUOTA_FALLBACK_LADDER_MINUTES.length - 1);
     const backoffMinutes = QUOTA_FALLBACK_LADDER_MINUTES[idx];
-    return { delayMs: backoffMinutes * 60 * 1000, source: 'exponential_fallback' };
+    return { delayMs: backoffMinutes * 60 * 1000, source: 'fallback_ladder' };
 }
+/** @internal test-only — re-export of `computeQuotaBackoffMs` to anchor a stable seam. */
+export const _computeQuotaBackoffMs = computeQuotaBackoffMs;
 /** @internal Test-only. */
 export function _test_setRateLimitInfo(workspaceId, info) {
     latestRateLimitInfo.set(workspaceId, info);
 }
-function handleQuota(workspaceId, _agentSessionId) {
+async function handleQuota(workspaceId, _agentSessionId) {
     try {
         updateWorkspaceStatus(workspaceId, 'quota');
     }
@@ -1135,53 +1154,39 @@ function handleQuota(workspaceId, _agentSessionId) {
         // May fail if transition is not valid
     }
     const retryCount = retryCounts.get(workspaceId) ?? 0;
-    const { delayMs, resetsAt, source } = computeQuotaBackoffMs(workspaceId, retryCount);
-    const backoffMs = delayMs;
+    const { delayMs, resetsAt, source } = await computeQuotaBackoffMs(workspaceId, retryCount);
     retryCounts.set(workspaceId, retryCount + 1);
-    // Surface the backoff schedule as an ephemeral event so the UI can display
-    // retry count / wait time without polluting the persistent event log.
-    emitEphemeral(workspaceId, 'agent:quota-backoff', {
-        retryCount: retryCount + 1,
-        backoffMinutes: Math.round(delayMs / 60_000),
-        resetsAt,
-        source,
-    });
-    const timer = setTimeout(() => {
-        backoffTimers.delete(workspaceId);
-        if (!controllers.has(workspaceId)) {
-            const freshWs = getWs(workspaceId);
-            if (!freshWs || freshWs.archivedAt !== null || freshWs.status !== 'quota') {
-                return;
-            }
-            try {
-                if (freshWs.autoLoop) {
-                    autoLoopService.onQuotaBackoffExpired(workspaceId);
-                }
-                else {
-                    const freshWorkingDir = freshWs.worktreePath;
-                    startAgent(workspaceId, freshWorkingDir, 'Continue the previous task where you left off.', undefined, true);
-                }
-            }
-            catch (err) {
-                console.error(`[orchestrator] Quota retry for workspace '${workspaceId}' failed:`, err);
-                const msg = err instanceof Error ? err.message : String(err);
-                try {
-                    updateWorkspaceStatus(workspaceId, 'error');
-                }
-                catch {
-                    // transition may not be valid
-                }
-                routeEvent(workspaceId, '', {
-                    kind: 'error',
-                    category: 'other',
-                    message: `Quota retry failed: ${msg}`,
-                });
-            }
-        }
-    }, backoffMs);
-    timer.unref?.();
-    backoffTimers.set(workspaceId, timer);
+    // The quotaBackoffService owns the timer + the persistent row + the
+    // 'agent:quota-backoff' WS emit. Hand off everything to it.
+    quotaBackoffService.arm(workspaceId, delayMs, { resetsAt: resetsAt ?? null, source });
 }
+/** @internal test-only — re-export of `handleQuota` for direct testing. */
+export const _handleQuota = handleQuota;
+/**
+ * Rebuild the in-memory `retryCounts` map from the persisted `pending_quota_backoffs`
+ * rows. Called from `index.ts` at boot, before `quotaBackoffService.restoreOnBoot`.
+ * Without this, an arm() after restart would compute the next backoff from
+ * `retryCount=0`, undoing the ladder progression.
+ */
+export function restoreRetryCountsFromDb() {
+    for (const pending of quotaBackoffService.listPending()) {
+        retryCounts.set(pending.workspaceId, pending.retryCount);
+    }
+}
+// One-time wire: when the persisted backoff timer fires (or a row is
+// restored at boot), hand the workspace off to auto-loop. The auto-loop
+// service decides whether to spawn the next iteration or fall back to a
+// manual resume.
+//
+// IMPORTANT — behavioural contract: only auto-loop workspaces auto-resume
+// after a quota backoff. `onQuotaBackoffExpired` no-ops if `auto_loop !== 1`
+// (see auto-loop-service). Workspaces hit by quota WITHOUT auto-loop stay
+// in `quota` status and require manual user action (resume / new message)
+// to leave that state. This is intentional: without an auto-loop intent,
+// firing a fresh agent run in the user's absence would surprise them.
+quotaBackoffService.setOnFireCallback((workspaceId) => {
+    autoLoopService.onQuotaBackoffExpired(workspaceId);
+});
 // ── Testing utilities ─────────────────────────────────────────────────────────
 /** @internal test-only */
 export function _getControllers() {
@@ -1192,10 +1197,6 @@ export function _getRetryCounts() {
     return retryCounts;
 }
 /** @internal test-only */
-export function _getBackoffTimers() {
-    return backoffTimers;
-}
-/** @internal test-only */
 export function _getSessionIds() {
     return sessionIds;
 }

package/dist/server/services/auto-loop-service.js

@@ -309,6 +309,14 @@ function spawnNextIteration(workspaceId, opts = {}) {
  * Called by orchestrator.handleQuota's backoff timer when auto-loop is enabled.
  * Spawns the next auto-loop iteration if the workspace is still in quota status
  * with auto_loop active; no-ops otherwise (race-safe).
+ *
+ * No-op cases — these all leave the workspace in `quota` status awaiting
+ * manual user action:
+ *   - workspace was deleted between arm and fire
+ *   - `auto_loop !== 1` (workspace was never an auto-loop target, OR the user
+ *     toggled the loop off during the backoff window)
+ *   - `status !== 'quota'` (user already manually resumed, or another path
+ *     transitioned the workspace)
  */
 export function onQuotaBackoffExpired(workspaceId) {
     const row = getRow(workspaceId);

package/dist/server/services/quota-backoff-service.js

@@ -0,0 +1,127 @@
+import { getDb } from '../db/index.js';
+import { emitEphemeral } from './websocket-service.js';
+import { getWorkspace } from './workspace-service.js';
+const timers = new Map();
+let onFireCallback = null;
+function rowToPending(row) {
+    return {
+        workspaceId: row.workspace_id,
+        targetAt: row.target_at,
+        resetsAt: row.resets_at,
+        source: row.source,
+        retryCount: row.retry_count,
+        createdAt: row.created_at,
+    };
+}
+/**
+ * Schedule (or reschedule) the auto-resume timer for a workspace that just
+ * hit a Claude quota. Persists the target time so it survives restarts and
+ * keeps the in-RAM `setTimeout` alive for the current process.
+ *
+ * `delayMs` is the "fire-now-plus-delta" offset; it MUST already include
+ * any safety margin the caller wants. orchestrator.handleQuota owns that math.
+ */
+export function arm(workspaceId, delayMs, meta) {
+    const db = getDb();
+    const now = new Date();
+    const targetAt = new Date(now.getTime() + delayMs).toISOString();
+    const existing = db
+        .prepare('SELECT retry_count FROM pending_quota_backoffs WHERE workspace_id = ?')
+        .get(workspaceId);
+    const retryCount = (existing?.retry_count ?? 0) + 1;
+    db.prepare(`INSERT INTO pending_quota_backoffs (workspace_id, target_at, resets_at, source, retry_count, created_at)
+     VALUES (?, ?, ?, ?, ?, ?)
+     ON CONFLICT(workspace_id) DO UPDATE SET
+       target_at = excluded.target_at,
+       resets_at = excluded.resets_at,
+       source = excluded.source,
+       retry_count = excluded.retry_count,
+       created_at = excluded.created_at`).run(workspaceId, targetAt, meta.resetsAt, meta.source, retryCount, now.toISOString());
+    const previous = timers.get(workspaceId);
+    if (previous)
+        clearTimeout(previous);
+    const timer = setTimeout(() => fireOrSkip(workspaceId), Math.max(0, delayMs));
+    timer.unref?.();
+    timers.set(workspaceId, timer);
+    emitEphemeral(workspaceId, 'agent:quota-backoff', {
+        targetAt,
+        resetsAt: meta.resetsAt,
+        source: meta.source,
+        retryCount,
+    });
+}
+/**
+ * Cancel the pending backoff for a workspace. Returns true if a row existed
+ * (and was deleted), false if there was nothing to cancel. Idempotent.
+ */
+export function cancel(workspaceId, reason) {
+    const db = getDb();
+    const result = db.prepare('DELETE FROM pending_quota_backoffs WHERE workspace_id = ?').run(workspaceId);
+    const existed = result.changes > 0;
+    const previous = timers.get(workspaceId);
+    if (previous) {
+        clearTimeout(previous);
+        timers.delete(workspaceId);
+    }
+    if (existed) {
+        emitEphemeral(workspaceId, 'agent:quota-backoff-cancelled', { reason });
+    }
+    return existed;
+}
+export function getPending(workspaceId) {
+    const db = getDb();
+    const row = db.prepare('SELECT * FROM pending_quota_backoffs WHERE workspace_id = ?').get(workspaceId);
+    return row ? rowToPending(row) : null;
+}
+export function listPending() {
+    const db = getDb();
+    const rows = db.prepare('SELECT * FROM pending_quota_backoffs').all();
+    return rows.map(rowToPending);
+}
+export function setOnFireCallback(fn) {
+    onFireCallback = fn;
+}
+/**
+ * Re-arm timers for rows persisted across restart. Future rows get a fresh
+ * `setTimeout`; past rows fire immediately (delay = 0). Rows pointing at
+ * archived or missing workspaces are deleted without firing.
+ */
+export function restoreOnBoot(onFire) {
+    setOnFireCallback(onFire);
+    const db = getDb();
+    const rows = db.prepare('SELECT * FROM pending_quota_backoffs').all();
+    for (const row of rows) {
+        const ws = getWorkspace(row.workspace_id);
+        if (!ws || ws.archivedAt !== null) {
+            db.prepare('DELETE FROM pending_quota_backoffs WHERE workspace_id = ?').run(row.workspace_id);
+            continue;
+        }
+        const delta = new Date(row.target_at).getTime() - Date.now();
+        const timer = setTimeout(() => fireOrSkip(row.workspace_id), Math.max(0, delta));
+        timer.unref?.();
+        timers.set(row.workspace_id, timer);
+    }
+}
+/** Internal — invoked when a timer fires. */
+function fireOrSkip(workspaceId) {
+    timers.delete(workspaceId);
+    // Final archive check before firing — workspace might have been archived
+    // between the timer being armed and now.
+    const ws = getWorkspace(workspaceId);
+    if (!ws || ws.archivedAt !== null) {
+        cancel(workspaceId, 'archive');
+        return;
+    }
+    // Consume the persisted row BEFORE invoking the callback. If the server
+    // crashes during the spawn the callback triggers, restoreOnBoot won't see
+    // a stale row with target_at in the past and re-fire on the next start
+    // (which would cause a double spawn). The cb's downstream effects (next
+    // iteration, status transitions) are tracked by their own state.
+    getDb().prepare('DELETE FROM pending_quota_backoffs WHERE workspace_id = ?').run(workspaceId);
+    const cb = onFireCallback;
+    if (!cb)
+        return;
+    cb(workspaceId);
+}
+/** @internal test-only */
+export const _timers = timers;

package/dist/server/services/settings-service.js

@@ -62,7 +62,9 @@ export const DEFAULT_FINALIZATION_PROMPT = `Run final quality checks before clos
 1. Verify all other tasks are marked \`done\`. If any remain \`pending\`, stop and report.
 2. Run the project's linters, type-checkers, and tests (see CLAUDE.md or package.json scripts).
 3. If any check fails, create a new regular task at the end of the list with a title like \`Fix lint failure in X\` (NO \`[FINAL]\` or \`[E2E]\` prefix — it must use the default iteration prompt) and mark this \`[FINAL]\` task as \`done\`. The auto-loop will pick up the fix on the next iteration. The finalization mechanism is single-shot per grooming pass; if you want quality checks to re-run after the fix, mark the fix task \`done\` and re-trigger grooming manually.
-4. If everything passes, mark this task as \`done\`.`;
+4. If everything passes, mark this task as \`done\`.
+
+HARD RULE: Do NOT open a pull request, do NOT run \`gh pr create\` or any equivalent command. The finalization step never opens a PR — that is a separate, explicit user action via the "Open PR" button.`;
 /** Default workspace tags seeded on fresh install and on settings upgrade. */
 export const DEFAULT_WORKSPACE_TAGS = [
     'bug',

package/dist/server/services/workspace-service.js

@@ -3,7 +3,9 @@ import { getDb } from '../db/index.js';
 import { resolveWorkspaceWorktreePath } from '../utils/worktree-paths.js';
 import * as orchestrator from './agent/orchestrator.js';
 import * as autoLoopService from './auto-loop-service.js';
+import * as quotaBackoffService from './quota-backoff-service.js';
 import * as wakeupService from './wakeup-service.js';
+import { emitEphemeral } from './websocket-service.js';
 /** Allowed status transitions per current status. Enforced by updateWorkspaceStatus. */
 const VALID_TRANSITIONS = {
     created: ['extracting', 'brainstorming', 'idle', 'error'],
@@ -51,6 +53,8 @@ function mapWorkspace(row) {
         archivedAt: row.archived_at,
         favoritedAt: row.favorited_at,
         tags: parseTags(row.tags),
+        description: row.description,
+        agentDescription: row.agent_description,
         engine: row.engine ?? 'claude-code',
         autoLoop: row.auto_loop === 1,
         autoLoopReady: row.auto_loop_ready === 1,
@@ -270,6 +274,66 @@ export function updateAgentPermissionMode(id, mode) {
     }
     return getWorkspace(id);
 }
+/**
+ * Update a workspace's short description (≤ 200 chars after trim).
+ * Empty string (after trim) or `null` clears the column.
+ *
+ * Emits an ephemeral `workspace:description-updated` WebSocket event so every
+ * subscribed client (sidebar + the workspace header) refreshes in real-time
+ * without a manual reload. The truth lives in the DB; sync replay on
+ * reconnect re-fetches via GET /api/workspaces.
+ *
+ * @throws when the description exceeds 200 chars after trim or the workspace
+ *   does not exist.
+ */
+export function updateWorkspaceDescription(id, description) {
+    const trimmed = description == null ? null : description.trim();
+    if (trimmed !== null && trimmed.length > 200) {
+        throw new Error(`Description must be 200 characters or fewer (got ${trimmed.length})`);
+    }
+    const stored = trimmed && trimmed.length > 0 ? trimmed : null;
+    const db = getDb();
+    const result = db
+        .prepare('UPDATE workspaces SET description = ?, updated_at = ? WHERE id = ?')
+        .run(stored, new Date().toISOString(), id);
+    if (result.changes === 0) {
+        throw new Error(`Workspace '${id}' not found`);
+    }
+    emitEphemeral(id, 'workspace:description-updated', { description: stored });
+    return getWorkspace(id);
+}
+/**
+ * Update a workspace's agent-side description (≤ 200 chars after trim).
+ * Empty string (after trim) or `null` clears the column.
+ *
+ * Mirror of `updateWorkspaceDescription` but writes the `agent_description`
+ * column, which is exclusively the agent's to set via the
+ * `set_workspace_agent_description` MCP tool. The user's `description`
+ * column is untouched.
+ *
+ * Emits an ephemeral `workspace:agent-description-updated` event so every
+ * subscribed client (sidebar fallback display + workspace header read-only
+ * line) refreshes in real-time.
+ *
+ * @throws when the description exceeds 200 chars after trim or the workspace
+ *   does not exist.
+ */
+export function updateWorkspaceAgentDescription(id, description) {
+    const trimmed = description == null ? null : description.trim();
+    if (trimmed !== null && trimmed.length > 200) {
+        throw new Error(`Description must be 200 characters or fewer (got ${trimmed.length})`);
+    }
+    const stored = trimmed && trimmed.length > 0 ? trimmed : null;
+    const db = getDb();
+    const result = db
+        .prepare('UPDATE workspaces SET agent_description = ?, updated_at = ? WHERE id = ?')
+        .run(stored, new Date().toISOString(), id);
+    if (result.changes === 0) {
+        throw new Error(`Workspace '${id}' not found`);
+    }
+    emitEphemeral(id, 'workspace:agent-description-updated', { agentDescription: stored });
+    return getWorkspace(id);
+}
 /** Update the dev-server status column for a workspace. */
 export function updateDevServerStatus(id, status) {
     const db = getDb();
@@ -291,6 +355,14 @@ export function deleteWorkspace(id) {
     // The DB row is removed via ON DELETE CASCADE, but the timer would
     // otherwise fire and hit an empty workspace.
     wakeupService.cancel(id, 'deleted');
+    // Same for any pending quota backoff. Best-effort: failure must not
+    // block delete. The DB row is also removed via ON DELETE CASCADE.
+    try {
+        quotaBackoffService.cancel(id, 'deleted');
+    }
+    catch (err) {
+        console.error('[workspace-service] cancel quota backoff on delete failed:', err);
+    }
     // Drop the cached rate_limit.info so memory doesn't leak on workspace
     // churn. The Map has no FK to clean up for it automatically.
     orchestrator.forgetRateLimitInfo(id);
@@ -383,6 +455,14 @@ export function archiveWorkspace(id) {
     }
     // Cancel any pending wakeup — archived workspaces should not wake up.
     wakeupService.cancel(id, 'archived');
+    // Cancel any pending quota backoff — archived workspaces should not auto-resume.
+    // Best-effort: failure here must not block archive.
+    try {
+        quotaBackoffService.cancel(id, 'archive');
+    }
+    catch (err) {
+        console.error('[workspace-service] cancel quota backoff on archive failed:', err);
+    }
     // Disable auto-loop — archived workspaces should not keep looping.
     // Idempotent: no-op if auto_loop was already 0.
     autoLoopService.disable(id, 'user-action');

package/dist/server/utils/git-ops.js

@@ -4,7 +4,14 @@ import { join } from 'node:path';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFileCb);
 function git(repoPath, args) {
-    return execFileSync('git', args, { cwd: repoPath, encoding: 'utf-8' }).trim();
+    // `trimEnd` (not `trim`): some git outputs are column-aligned and the LEADING
+    // space carries information. The classic case is `git status --porcelain`,
+    // where each line is `XY filename` and X is " " when the index has no
+    // change. Stripping that leading space silently shifts every column by one
+    // and makes `line.substring(3)` chop the first character of the filename
+    // (e.g. `front/foo` → `ront/foo`). Trailing whitespace (the final `\n` git
+    // always appends) still goes — that's what every caller expects.
+    return execFileSync('git', args, { cwd: repoPath, encoding: 'utf-8' }).trimEnd();
 }
 /** Return the name of the currently checked-out branch. */
 export function getCurrentBranch(repoPath) {
@@ -676,17 +683,38 @@ export function getWorkingTreeStatus(repoPath) {
         return { staged: 0, modified: 0, untracked: 0 };
     }
 }
-/** Count commits ahead of upstream. Returns -1 if no upstream is set. */
-export function getUnpushedCount(repoPath) {
+/**
+ * Count commits ahead of `origin/<workingBranch>`. Returns `-1` when the remote
+ * ref does not exist (i.e. the branch has never been pushed).
+ *
+ * We deliberately use `origin/<workingBranch>` instead of the local `@{u}`
+ * upstream pointer: Kōbō creates worktrees with `git worktree add -b <new>
+ * <path> origin/<sourceBranch>`, so `@{u}` points at `origin/<sourceBranch>`,
+ * NOT at the working branch's remote sibling. Comparing HEAD with that wrong
+ * upstream silently reported "0 unpushed" for never-pushed branches that
+ * happened to be aligned with their source — surfacing as a false "Pushé"
+ * label in the GitPanel.
+ */
+export function getUnpushedCount(repoPath, workingBranch) {
+    const remoteRef = `origin/${workingBranch}`;
     try {
-        const output = execFileSync('git', ['rev-list', '@{u}..HEAD', '--count'], {
+        execFileSync('git', ['rev-parse', '--verify', remoteRef], {
+            cwd: repoPath,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+    }
+    catch {
+        return -1; // branch never pushed (no remote ref)
+    }
+    try {
+        const output = execFileSync('git', ['rev-list', `${remoteRef}..HEAD`, '--count'], {
             cwd: repoPath,
             encoding: 'utf-8',
         }).trim();
         return parseInt(output, 10) || 0;
     }
     catch {
-        return -1; // no upstream
+        return -1;
     }
 }
 /** Return raw `git diff --shortstat` output between two refs (three-dot). */
@@ -749,17 +777,28 @@ export async function getPrStatusAsync(repoPath, branchName) {
         return null;
     }
 }
-/** Async version of getUnpushedCount. Returns -1 if no upstream is set. */
-export async function getUnpushedCountAsync(repoPath) {
+/**
+ * Async version of `getUnpushedCount`. Same `origin/<workingBranch>` semantic:
+ * returns `-1` when the remote ref does not exist (never pushed), `0` when
+ * pushed and aligned, `>0` when pushed but ahead.
+ */
+export async function getUnpushedCountAsync(repoPath, workingBranch) {
+    const remoteRef = `origin/${workingBranch}`;
+    try {
+        await execFileAsync('git', ['rev-parse', '--verify', remoteRef], { cwd: repoPath });
+    }
+    catch {
+        return -1; // branch never pushed (no remote ref)
+    }
     try {
-        const { stdout } = await execFileAsync('git', ['rev-list', '@{u}..HEAD', '--count'], {
+        const { stdout } = await execFileAsync('git', ['rev-list', `${remoteRef}..HEAD`, '--count'], {
             cwd: repoPath,
             encoding: 'utf-8',
         });
         return parseInt(stdout.trim(), 10) || 0;
     }
     catch {
-        return -1; // no upstream
+        return -1;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loicngr/kobo",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "Kōbō — multi-workspace agent manager for Claude Code. Orchestrates isolated git worktrees with dev servers, Notion integration, and MCP tools.",
   "type": "module",
   "license": "GPL-3.0-or-later",

package/src/client/dist/spa/assets/{ActivityFeed-CroojlsI.css → ActivityFeed-DVBfmJWJ.css}

@@ -1 +1 @@
-.markdown-message[data-v-1b7bd8ca]{color:#e0e0e0;word-break:break-word;overflow-wrap:anywhere;min-width:0;max-width:100%;font-size:13px;line-height:1.55}.markdown-message[data-v-1b7bd8ca] *{max-width:100%}.markdown-message[data-v-1b7bd8ca] p{margin:0 0 .5em}.markdown-message[data-v-1b7bd8ca] p:last-child{margin-bottom:0}.markdown-message[data-v-1b7bd8ca] pre{background:#00000059;border-radius:4px;margin:.5em 0;padding:.5em .75em;overflow-x:auto}.markdown-message[data-v-1b7bd8ca] code{word-break:break-all;background:#0000004d;border-radius:3px;padding:.1em .3em;font-size:.9em}.markdown-message[data-v-1b7bd8ca] pre code{background:0 0;padding:0}.markdown-message[data-v-1b7bd8ca] ul,.markdown-message[data-v-1b7bd8ca] ol{margin:.25em 0 .5em;padding-left:1.5em}.markdown-message[data-v-1b7bd8ca] li{margin:.15em 0}.markdown-message[data-v-1b7bd8ca] a{color:#7986cb;text-decoration:underline}.markdown-message[data-v-1b7bd8ca] .document-link{color:#9fa8da;cursor:pointer;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}.markdown-message[data-v-1b7bd8ca] .document-link:hover{color:#c5cae9;-webkit-text-decoration:underline;text-decoration:underline}.markdown-message[data-v-1b7bd8ca] h1,.markdown-message[data-v-1b7bd8ca] h2,.markdown-message[data-v-1b7bd8ca] h3,.markdown-message[data-v-1b7bd8ca] h4,.markdown-message[data-v-1b7bd8ca] h5,.markdown-message[data-v-1b7bd8ca] h6{margin:.5em 0 .3em;font-weight:600;line-height:1.3}.markdown-message[data-v-1b7bd8ca] h1{font-size:1.25em}.markdown-message[data-v-1b7bd8ca] h2{font-size:1.15em}.markdown-message[data-v-1b7bd8ca] h3{font-size:1.08em}.markdown-message[data-v-1b7bd8ca] h4,.markdown-message[data-v-1b7bd8ca] h5,.markdown-message[data-v-1b7bd8ca] h6{font-size:1em}.markdown-message[data-v-1b7bd8ca] blockquote{color:#ffffffb3;border-left:3px solid #fff3;margin:.5em 0;padding-left:.75em}.markdown-message[data-v-1b7bd8ca] table{border-collapse:collapse;margin:.5em 0}.markdown-message[data-v-1b7bd8ca] th,.markdown-message[data-v-1b7bd8ca] td{border:1px solid #ffffff26;padding:.25em .5em}.markdown-thinking[data-v-7f45ed94] p{margin:0 0 .4em}.markdown-thinking[data-v-7f45ed94] p:last-child{margin-bottom:0}.markdown-thinking[data-v-7f45ed94] code{background:#ffffff14;border-radius:3px;padding:.1em .3em}.tool-row[data-v-b1fcd20d]{border-radius:4px;margin:0;font-size:12px}.tool-header[data-v-b1fcd20d]{color:#bbb;cursor:default;align-items:center;gap:10px;min-width:0;padding:5px 10px;display:flex}.tool-row:not(.tool-row-generic) .tool-header[data-v-b1fcd20d],.tool-row--toggleable .tool-header[data-v-b1fcd20d]{cursor:pointer}.tool-row:has(.tool-diff) .tool-header[data-v-b1fcd20d]{cursor:pointer}.tool-row:not(.tool-row-generic) .tool-header[data-v-b1fcd20d]:hover,.tool-row--toggleable .tool-header[data-v-b1fcd20d]:hover{background:#ffffff08}.tool-icon[data-v-b1fcd20d]{color:#9fbce0;flex-shrink:0}.tool-name[data-v-b1fcd20d]{color:#d0d0d0;flex-shrink:0;font-weight:600}.tool-arg[data-v-b1fcd20d],.tool-path[data-v-b1fcd20d]{color:#999;text-overflow:ellipsis;white-space:nowrap;min-width:0;max-width:100%;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11.5px;overflow:hidden}.tool-path[data-v-b1fcd20d],.tool-arg[data-v-b1fcd20d]{flex:1}.tool-stat-add[data-v-b1fcd20d]{color:#66bb6a;flex-shrink:0;font-size:11px;font-weight:600}.tool-stat-del[data-v-b1fcd20d]{color:#ef5350;flex-shrink:0;font-size:11px;font-weight:600}.tool-diff[data-v-b1fcd20d]{background:#0003;border-radius:4px;max-height:400px;margin-top:4px;padding:8px 0;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11px;line-height:1.5;overflow:auto}.diff-line[data-v-b1fcd20d]{white-space:pre;color:#bbb;padding:0 12px}.diff-sign[data-v-b1fcd20d]{color:#555;-webkit-user-select:none;user-select:none;width:14px;display:inline-block}.diff-add[data-v-b1fcd20d]{color:#c8e6c9;background:#66bb6a1a}.diff-add .diff-sign[data-v-b1fcd20d]{color:#66bb6a}.diff-del[data-v-b1fcd20d]{color:#ffcdd2;background:#ef53501a}.diff-del .diff-sign[data-v-b1fcd20d]{color:#ef5350}.tool-output[data-v-b1fcd20d]{color:#aaa;white-space:pre-wrap;background:#00000026;border-radius:4px;max-height:8em;margin-top:4px;padding:6px 10px;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11px;overflow:auto}.markdown-message[data-v-f34be4c5]{color:#e0e0e0;word-break:break-word;overflow-wrap:anywhere;min-width:0;max-width:100%;font-size:13px;line-height:1.55}.markdown-message[data-v-f34be4c5] *{max-width:100%}.markdown-message[data-v-f34be4c5] img{-o-object-fit:contain;object-fit:contain;cursor:zoom-in;background:#0003;border-radius:4px;max-width:180px;max-height:100px;margin:.3em 0;display:block}.markdown-message[data-v-f34be4c5] code{word-break:break-all}.markdown-message[data-v-f34be4c5] p{margin:0 0 .4em}.markdown-message[data-v-f34be4c5] p:last-child{margin-bottom:0}.markdown-message[data-v-f34be4c5] code{background:#00000040;border-radius:3px;padding:.1em .3em}.markdown-message[data-v-f34be4c5] h1,.markdown-message[data-v-f34be4c5] h2,.markdown-message[data-v-f34be4c5] h3,.markdown-message[data-v-f34be4c5] h4,.markdown-message[data-v-f34be4c5] h5,.markdown-message[data-v-f34be4c5] h6{margin:.4em 0 .25em;font-weight:600;line-height:1.3}.markdown-message[data-v-f34be4c5] h1{font-size:1.25em}.markdown-message[data-v-f34be4c5] h2{font-size:1.15em}.markdown-message[data-v-f34be4c5] h3{font-size:1.08em}.markdown-message[data-v-f34be4c5] h4,.markdown-message[data-v-f34be4c5] h5,.markdown-message[data-v-f34be4c5] h6{font-size:1em}.markdown-user-prompt[data-v-f34be4c5]{color:#aaa;font-size:12px;font-style:italic}.markdown-user-prompt[data-v-f34be4c5] p{margin:0 0 .4em}.markdown-user-prompt[data-v-f34be4c5] code{background:#ffffff14;border-radius:3px;padding:.1em .3em;font-style:normal}.image-lightbox-img{-o-object-fit:contain;object-fit:contain;cursor:zoom-out;background:#0000004d;border-radius:4px;max-width:92vw;max-height:92vh;display:block}.turn-card[data-v-4729e0cc]{border:1px solid #ffffff14;border-left:3px solid var(--turn-accent);background:#ffffff05;border-radius:6px;min-width:0;max-width:100%;margin:14px 0;overflow:hidden}.turn-header[data-v-4729e0cc]{color:#888;background:#ffffff08;border-bottom:1px solid #ffffff0d;align-items:center;gap:8px;padding:8px 14px;font-size:11px;display:flex}.turn-badge[data-v-4729e0cc]{letter-spacing:.3px;border-radius:3px;padding:2px 8px;font-size:11px;font-weight:700}.turn-badge-user[data-v-4729e0cc]{color:#ce93d8;background:#ce93d826}.turn-badge-agent[data-v-4729e0cc]{color:#7986cb;background:#7986cb26}.turn-badge-system[data-v-4729e0cc]{color:#bdbdbd;background:#75757533;font-style:italic}.turn-badge-session[data-v-4729e0cc]{color:#9e9e9e;background:#61616133}.turn-time[data-v-4729e0cc]{color:#666;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11px}.turn-time-arrow[data-v-4729e0cc]{opacity:.7;margin:0 -2px}.turn-time-updated[data-v-4729e0cc]{color:#8891a3}.turn-actions[data-v-4729e0cc]{color:#777;font-size:11px}.turn-body[data-v-4729e0cc]{flex-direction:column;gap:12px;min-width:0;padding:14px 18px;display:flex}.turn-body[data-v-4729e0cc]>*{min-width:0;max-width:100%}.turn-body[data-v-4729e0cc] .tool-row+.tool-row{margin-top:-8px}.turn-scroll-top[data-v-4729e0cc]{justify-content:flex-start;padding:0 8px 6px;display:flex}.turn-scroll-top-btn[data-v-4729e0cc]{opacity:.5;transition:opacity .15s}.turn-scroll-top-btn[data-v-4729e0cc]:hover{opacity:1}.activity-feed-wrap[data-v-890bdcbd]{width:100%;height:100%;position:relative}.activity-feed-scroll[data-v-890bdcbd]{width:100%;height:100%}.activity-feed-nav-cluster[data-v-890bdcbd]{z-index:2;align-items:center;gap:8px;display:flex;position:absolute;bottom:14px;right:14px}.activity-feed-nav-btn[data-v-890bdcbd]{opacity:.8;transition:opacity .12s}.activity-feed-nav-btn[data-v-890bdcbd]:hover{opacity:1}.content-origin-marker[data-v-890bdcbd]{pointer-events:none;width:0;height:0;margin:0;padding:0}.activity-feed-scroll[data-v-890bdcbd] .q-scrollarea__content{max-width:100%;overflow-x:hidden}.activity-feed-switching[data-v-890bdcbd]{justify-content:center;align-items:center;width:100%;height:100%;display:flex}
+.markdown-message[data-v-1b7bd8ca]{color:#e0e0e0;word-break:break-word;overflow-wrap:anywhere;min-width:0;max-width:100%;font-size:13px;line-height:1.55}.markdown-message[data-v-1b7bd8ca] *{max-width:100%}.markdown-message[data-v-1b7bd8ca] p{margin:0 0 .5em}.markdown-message[data-v-1b7bd8ca] p:last-child{margin-bottom:0}.markdown-message[data-v-1b7bd8ca] pre{background:#00000059;border-radius:4px;margin:.5em 0;padding:.5em .75em;overflow-x:auto}.markdown-message[data-v-1b7bd8ca] code{word-break:break-all;background:#0000004d;border-radius:3px;padding:.1em .3em;font-size:.9em}.markdown-message[data-v-1b7bd8ca] pre code{background:0 0;padding:0}.markdown-message[data-v-1b7bd8ca] ul,.markdown-message[data-v-1b7bd8ca] ol{margin:.25em 0 .5em;padding-left:1.5em}.markdown-message[data-v-1b7bd8ca] li{margin:.15em 0}.markdown-message[data-v-1b7bd8ca] a{color:#7986cb;text-decoration:underline}.markdown-message[data-v-1b7bd8ca] .document-link{color:#9fa8da;cursor:pointer;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}.markdown-message[data-v-1b7bd8ca] .document-link:hover{color:#c5cae9;-webkit-text-decoration:underline;text-decoration:underline}.markdown-message[data-v-1b7bd8ca] h1,.markdown-message[data-v-1b7bd8ca] h2,.markdown-message[data-v-1b7bd8ca] h3,.markdown-message[data-v-1b7bd8ca] h4,.markdown-message[data-v-1b7bd8ca] h5,.markdown-message[data-v-1b7bd8ca] h6{margin:.5em 0 .3em;font-weight:600;line-height:1.3}.markdown-message[data-v-1b7bd8ca] h1{font-size:1.25em}.markdown-message[data-v-1b7bd8ca] h2{font-size:1.15em}.markdown-message[data-v-1b7bd8ca] h3{font-size:1.08em}.markdown-message[data-v-1b7bd8ca] h4,.markdown-message[data-v-1b7bd8ca] h5,.markdown-message[data-v-1b7bd8ca] h6{font-size:1em}.markdown-message[data-v-1b7bd8ca] blockquote{color:#ffffffb3;border-left:3px solid #fff3;margin:.5em 0;padding-left:.75em}.markdown-message[data-v-1b7bd8ca] table{border-collapse:collapse;margin:.5em 0}.markdown-message[data-v-1b7bd8ca] th,.markdown-message[data-v-1b7bd8ca] td{border:1px solid #ffffff26;padding:.25em .5em}.markdown-thinking[data-v-7f45ed94] p{margin:0 0 .4em}.markdown-thinking[data-v-7f45ed94] p:last-child{margin-bottom:0}.markdown-thinking[data-v-7f45ed94] code{background:#ffffff14;border-radius:3px;padding:.1em .3em}.tool-row[data-v-b1fcd20d]{border-radius:4px;margin:0;font-size:12px}.tool-header[data-v-b1fcd20d]{color:#bbb;cursor:default;align-items:center;gap:10px;min-width:0;padding:5px 10px;display:flex}.tool-row:not(.tool-row-generic) .tool-header[data-v-b1fcd20d],.tool-row--toggleable .tool-header[data-v-b1fcd20d]{cursor:pointer}.tool-row:has(.tool-diff) .tool-header[data-v-b1fcd20d]{cursor:pointer}.tool-row:not(.tool-row-generic) .tool-header[data-v-b1fcd20d]:hover,.tool-row--toggleable .tool-header[data-v-b1fcd20d]:hover{background:#ffffff08}.tool-icon[data-v-b1fcd20d]{color:#9fbce0;flex-shrink:0}.tool-name[data-v-b1fcd20d]{color:#d0d0d0;flex-shrink:0;font-weight:600}.tool-arg[data-v-b1fcd20d],.tool-path[data-v-b1fcd20d]{color:#999;text-overflow:ellipsis;white-space:nowrap;min-width:0;max-width:100%;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11.5px;overflow:hidden}.tool-path[data-v-b1fcd20d],.tool-arg[data-v-b1fcd20d]{flex:1}.tool-stat-add[data-v-b1fcd20d]{color:#66bb6a;flex-shrink:0;font-size:11px;font-weight:600}.tool-stat-del[data-v-b1fcd20d]{color:#ef5350;flex-shrink:0;font-size:11px;font-weight:600}.tool-diff[data-v-b1fcd20d]{background:#0003;border-radius:4px;max-height:400px;margin-top:4px;padding:8px 0;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11px;line-height:1.5;overflow:auto}.diff-line[data-v-b1fcd20d]{white-space:pre;color:#bbb;padding:0 12px}.diff-sign[data-v-b1fcd20d]{color:#555;-webkit-user-select:none;user-select:none;width:14px;display:inline-block}.diff-add[data-v-b1fcd20d]{color:#c8e6c9;background:#66bb6a1a}.diff-add .diff-sign[data-v-b1fcd20d]{color:#66bb6a}.diff-del[data-v-b1fcd20d]{color:#ffcdd2;background:#ef53501a}.diff-del .diff-sign[data-v-b1fcd20d]{color:#ef5350}.tool-output[data-v-b1fcd20d]{color:#aaa;white-space:pre-wrap;background:#00000026;border-radius:4px;max-height:8em;margin-top:4px;padding:6px 10px;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11px;overflow:auto}.markdown-message[data-v-f34be4c5]{color:#e0e0e0;word-break:break-word;overflow-wrap:anywhere;min-width:0;max-width:100%;font-size:13px;line-height:1.55}.markdown-message[data-v-f34be4c5] *{max-width:100%}.markdown-message[data-v-f34be4c5] img{-o-object-fit:contain;object-fit:contain;cursor:zoom-in;background:#0003;border-radius:4px;max-width:180px;max-height:100px;margin:.3em 0;display:block}.markdown-message[data-v-f34be4c5] code{word-break:break-all}.markdown-message[data-v-f34be4c5] p{margin:0 0 .4em}.markdown-message[data-v-f34be4c5] p:last-child{margin-bottom:0}.markdown-message[data-v-f34be4c5] code{background:#00000040;border-radius:3px;padding:.1em .3em}.markdown-message[data-v-f34be4c5] h1,.markdown-message[data-v-f34be4c5] h2,.markdown-message[data-v-f34be4c5] h3,.markdown-message[data-v-f34be4c5] h4,.markdown-message[data-v-f34be4c5] h5,.markdown-message[data-v-f34be4c5] h6{margin:.4em 0 .25em;font-weight:600;line-height:1.3}.markdown-message[data-v-f34be4c5] h1{font-size:1.25em}.markdown-message[data-v-f34be4c5] h2{font-size:1.15em}.markdown-message[data-v-f34be4c5] h3{font-size:1.08em}.markdown-message[data-v-f34be4c5] h4,.markdown-message[data-v-f34be4c5] h5,.markdown-message[data-v-f34be4c5] h6{font-size:1em}.markdown-user-prompt[data-v-f34be4c5]{color:#aaa;font-size:12px;font-style:italic}.markdown-user-prompt[data-v-f34be4c5] p{margin:0 0 .4em}.markdown-user-prompt[data-v-f34be4c5] code{background:#ffffff14;border-radius:3px;padding:.1em .3em;font-style:normal}.image-lightbox-img{-o-object-fit:contain;object-fit:contain;cursor:zoom-out;background:#0000004d;border-radius:4px;max-width:92vw;max-height:92vh;display:block}.turn-card[data-v-4729e0cc]{border:1px solid #ffffff14;border-left:3px solid var(--turn-accent);background:#ffffff05;border-radius:6px;min-width:0;max-width:100%;margin:14px 0;overflow:hidden}.turn-header[data-v-4729e0cc]{color:#888;background:#ffffff08;border-bottom:1px solid #ffffff0d;align-items:center;gap:8px;padding:8px 14px;font-size:11px;display:flex}.turn-badge[data-v-4729e0cc]{letter-spacing:.3px;border-radius:3px;padding:2px 8px;font-size:11px;font-weight:700}.turn-badge-user[data-v-4729e0cc]{color:#ce93d8;background:#ce93d826}.turn-badge-agent[data-v-4729e0cc]{color:#7986cb;background:#7986cb26}.turn-badge-system[data-v-4729e0cc]{color:#bdbdbd;background:#75757533;font-style:italic}.turn-badge-session[data-v-4729e0cc]{color:#9e9e9e;background:#61616133}.turn-time[data-v-4729e0cc]{color:#666;font-family:SF Mono,Menlo,Consolas,monospace;font-size:11px}.turn-time-arrow[data-v-4729e0cc]{opacity:.7;margin:0 -2px}.turn-time-updated[data-v-4729e0cc]{color:#8891a3}.turn-actions[data-v-4729e0cc]{color:#777;font-size:11px}.turn-body[data-v-4729e0cc]{flex-direction:column;gap:12px;min-width:0;padding:14px 18px;display:flex}.turn-body[data-v-4729e0cc]>*{min-width:0;max-width:100%}.turn-body[data-v-4729e0cc] .tool-row+.tool-row{margin-top:-8px}.turn-scroll-top[data-v-4729e0cc]{justify-content:flex-start;padding:0 8px 6px;display:flex}.turn-scroll-top-btn[data-v-4729e0cc]{opacity:.5;transition:opacity .15s}.turn-scroll-top-btn[data-v-4729e0cc]:hover{opacity:1}.activity-feed-wrap[data-v-2cb1aa26]{width:100%;height:100%;position:relative}.activity-feed-scroll[data-v-2cb1aa26]{width:100%;height:100%}.activity-feed-nav-cluster[data-v-2cb1aa26]{z-index:2;align-items:center;gap:8px;display:flex;position:absolute;bottom:14px;right:14px}.activity-feed-nav-btn[data-v-2cb1aa26]{opacity:.8;transition:opacity .12s}.activity-feed-nav-btn[data-v-2cb1aa26]:hover{opacity:1}.content-origin-marker[data-v-2cb1aa26]{pointer-events:none;width:0;height:0;margin:0;padding:0}.activity-feed-scroll[data-v-2cb1aa26] .q-scrollarea__content{max-width:100%;overflow-x:hidden}.activity-feed-switching[data-v-2cb1aa26]{justify-content:center;align-items:center;width:100%;height:100%;display:flex}