fix: address non-blocking suggestions from PR#47 review

main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, dialog, ipcMain, Menu, screen, shell } = require('electron');
 const { Worker } = require('worker_threads');
 const { execFile } = require('child_process');
 const path = require('path');
 const fs = require('fs');
@@ -16,7 +16,7 @@
 }
 
 // getFolderIndexMtimeMs moved to session-cache.js
 const { startMcpServer, shutdownMcpServer, shutdownAll: shutdownAllMcp, resolvePendingDiff, rekeyMcpServer, cleanStaleLockFiles } = require('./mcp-bridge');
 const { fetchAndTransformUsage } = require('./claude-auth');
 log.transports.file.level = app.isPackaged ? 'info' : 'debug';
 log.transports.console.level = app.isPackaged ? 'info' : 'debug';
@@ -36,7 +36,7 @@
 );
 
 // Shell profiles → shell-profiles.js
 const { discoverShellProfiles, getShellProfiles, resolveShell, isWindows, isWslShell, windowsToWslPath, shellArgs } = require('./shell-profiles');
 const { startScheduler } = require('./schedule-runner');
 const { encodeProjectPath } = require('./encode-project-path');
 
@@ -73,7 +73,7 @@
   getMeta, getAllMeta, toggleStar, setName, setArchived,
   isCachePopulated, getAllCached, getCachedByFolder, getCachedByParent, getCachedFolder, getCachedSession, upsertCachedSessions,
   deleteCachedSession, deleteCachedFolder,
   getFolderMeta, getAllFolderMeta, setFolderMeta,
   upsertSearchEntries, updateSearchTitle, deleteSearchSession, deleteSearchFolder, deleteSearchType,
   searchByType, isSearchIndexPopulated, searchFtsRecreated,
   getSetting, setSetting, deleteSetting,
@@ -289,8 +289,9 @@
     setFolderMeta, getAllFolderMeta, getAllMeta, getAllCached, getSetting, getMeta, setName,
   },
 });
 const { readSessionFile, readFolderFromFilesystem, refreshFolder, populateCacheFromFilesystem,
         buildProjectsFromCache, notifyRendererProjectsChanged, sendStatus, populateCacheViaWorker } = sessionCache;
+const { resolveJsonlPath } = require('./read-session-file');
 
 
 // --- IPC: browse-folder ---
@@ -444,6 +445,26 @@
   });
 });
 
+// --- IPC: worktree-status ---
+ipcMain.handle('worktree-status', (_event, worktreePath) => {
+  return new Promise((resolve) => {
+    const normalizedPath = worktreePath.replace(/\/$/, '');
+    const match = normalizedPath.match(WORKTREE_PATH_RE);
+    if (!match) {
+      return resolve({ ok: false, error: 'Path does not match a recognized worktree layout' });
+    }
+    const parentRepo = match[1];
+
+    execFile('git', ['-C', parentRepo, '-C', normalizedPath, 'status', '--porcelain'], (err, stdout, stderr) => {
+      if (err) {
+        return resolve({ ok: false, error: (stderr || err.message || String(err)).trim() });
+      }
+      const dirty = stdout.split('\n').map(l => l.trimEnd()).filter(Boolean);
+      resolve({ ok: true, dirty, total: dirty.length });
+    });
+  });
+});
+
 // --- IPC: get-projects ---
 ipcMain.handle('open-external', (_event, url) => {
   log.info('[open-external IPC]', url);
@@ -997,7 +1018,7 @@
 ipcMain.handle('read-subagent-jsonl', (_event, parentSessionId, agentId) => {
   const row = getCachedSession('sub:' + parentSessionId + ':' + agentId);
   if (!row) return { error: 'Subagent session not found in cache' };
-  const jsonlPath = path.join(PROJECTS_DIR, row.folder, parentSessionId, 'subagents', 'agent-' + agentId + '.jsonl');
+  const jsonlPath = resolveJsonlPath(PROJECTS_DIR, row);
   try {
     const content = fs.readFileSync(jsonlPath, 'utf-8');
     const entries = [];
@@ -1027,7 +1048,7 @@
 ipcMain.handle('start-subagent-watch', (_event, parentSessionId, agentId) => {
   const row = getCachedSession('sub:' + parentSessionId + ':' + agentId);
   if (!row) return { error: 'Subagent not found in cache' };
-  const filePath = path.join(PROJECTS_DIR, row.folder, parentSessionId, 'subagents', 'agent-' + agentId + '.jsonl');
+  const filePath = resolveJsonlPath(PROJECTS_DIR, row);
 
   const watchId = ++subagentWatcherSeq;
   let offset = 0;
@@ -1127,7 +1148,7 @@
   // WSL profiles only work for plain terminals — Claude CLI sessions need the
   // Windows shell because session data lives on the Windows filesystem.
   const requestedProfile = resolveShell(effectiveProfileId);
   const useWslProfile = isWslShell(requestedProfile.path) && isPlainTerminal;
   const shellProfile = (isWslShell(requestedProfile.path) && !isPlainTerminal)
     ? resolveShell('auto')
     : requestedProfile;

public/jsonl-viewer.js

@@ -259,7 +259,7 @@ const toolRenderers = {
     if (!parentSessionId) return el;
 
     // Determine which Nth match this block is for fanout deduplication
-    const counterKey = parentSessionId + '|' + desc + '|' + type;
+    const counterKey = JSON.stringify([parentSessionId, desc, type]);
     if (agentMatchCounters[counterKey] === undefined) agentMatchCounters[counterKey] = 0;
     const matchIndex = agentMatchCounters[counterKey]++;
 

read-session-file.js

@@ -6,6 +6,8 @@ const fs = require('fs');
  *  exactly like top-level sessions (search, archive, rename, etc).
  */
 function subagentSessionId(parentSessionId, agentId) {
+  if (parentSessionId.includes(':')) throw new TypeError(`parentSessionId must not contain ':': ${parentSessionId}`);
+  if (agentId.includes(':')) throw new TypeError(`agentId must not contain ':': ${agentId}`);
   return `sub:${parentSessionId}:${agentId}`;
 }
 

test/read-session-file.test.js

@@ -33,6 +33,12 @@ test('subagentSessionId formats parent and agent ids into the expected colon-del
   assert.equal(parts[2], agent);
 });
 
+test('subagentSessionId throws TypeError when agentId or parentSessionId contains a colon', () => {
+  assert.throws(() => subagentSessionId('parent:bad', 'agent'), TypeError);
+  assert.throws(() => subagentSessionId('parent', 'agent:bad'), TypeError);
+  assert.throws(() => subagentSessionId('par:ent', 'age:nt'), TypeError);
+});
+
 test('resolveJsonlPath returns top-level path when row has no parent/agent', () => {
   const projectsDir = '/projects';
   const row = { folder: 'foo', sessionId: 'session-1' };