myrlin-workbook 0.8.3 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myrlin-workbook",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Browser-based project manager for Claude Code sessions - session discovery, multi-terminal, cost tracking, docs, and kanban board",
   "main": "src/index.js",
   "bin": {

package/src/state/store.js

@@ -310,7 +310,7 @@ class Store extends EventEmitter {
 
   // ─── Session CRUD ────────────────────────────────────────
 
-  createSession({ name, workspaceId, workingDir = '', topic = '', command = 'claude', resumeSessionId = null, tags = [] }) {
+  createSession({ name, workspaceId, workingDir = '', topic = '', command = 'claude', resumeSessionId = null, tags = [], initialPrompt = null, flags = [] }) {
     if (!this._state.workspaces[workspaceId]) return null;
     const id = crypto.randomUUID();
     const now = new Date().toISOString();
@@ -325,6 +325,8 @@ class Store extends EventEmitter {
       status: 'stopped', // 'running' | 'stopped' | 'error' | 'idle'
       pid: null,
       tags: Array.isArray(tags) ? tags : [],
+      initialPrompt: initialPrompt || null,
+      flags: Array.isArray(flags) ? flags : [],
       createdAt: now,
       lastActive: now,
       logs: [],

package/src/web/pty-manager.js

@@ -125,7 +125,7 @@ class PtySessionManager {
    * @param {boolean} [options.bypassPermissions=false] - If true, adds --dangerously-skip-permissions
    * @returns {PtySession} The PTY session object
    */
-  spawnSession(sessionId, { command = 'claude', cwd, cols = 120, rows = 30, bypassPermissions = false, resumeSessionId = null, verbose = false, model = null, agentTeams = false, shell: requestedShell = null, newSession = false } = {}) {
+  spawnSession(sessionId, { command = 'claude', cwd, cols = 120, rows = 30, bypassPermissions = false, resumeSessionId = null, verbose = false, model = null, agentTeams = false, shell: requestedShell = null, newSession = false, initialPrompt = null, flags = [] } = {}) {
     // Return existing session if already alive
     const existing = this.sessions.get(sessionId);
     if (existing && existing.alive) {
@@ -154,11 +154,30 @@ class PtySessionManager {
     if (resumeSessionId) {
       fullCommand += ' --resume ' + resumeSessionId;
     } else if (cwd && !newSession) {
-      // No explicit session to resume - use --continue to pick up most recent
-      // conversation in this working directory. On a fresh dir with no history,
-      // Claude will start a new conversation (same as bare `claude`).
-      // Skip --continue when newSession is true (user explicitly wants a fresh session).
-      fullCommand += ' --continue';
+      // Only add --continue when there is actually conversation history for this
+      // working directory. `claude --continue` exits with code 1 ("No conversation
+      // found to continue") on a fresh directory — e.g. a brand-new git worktree.
+      // Scan ~/.claude/projects/ for any JSONL file whose encoded path matches cwd.
+      let hasHistory = false;
+      try {
+        const claudeDir = path.join(os.homedir(), '.claude', 'projects');
+        if (fs.existsSync(claudeDir)) {
+          const normalizedCwd = cwd.replace(/[/\\]/g, path.sep);
+          const match = fs.readdirSync(claudeDir).find(d => {
+            try {
+              return decodeURIComponent(d).replace(/[/\\]/g, path.sep) === normalizedCwd;
+            } catch (_) { return false; }
+          });
+          if (match) {
+            const projDir = path.join(claudeDir, match);
+            hasHistory = fs.readdirSync(projDir).some(f => f.endsWith('.jsonl'));
+          }
+        }
+      } catch (_) { /* filesystem error — fall through, don't add --continue */ }
+      if (hasHistory) {
+        fullCommand += ' --continue';
+      }
+      // If no history, run bare `claude` — starts a fresh session without error.
     }
     if (bypassPermissions) {
       fullCommand += ' --dangerously-skip-permissions';
@@ -169,6 +188,19 @@ class PtySessionManager {
     if (model) {
       fullCommand += ' --model ' + model;
     }
+    // Extra flags (e.g. from worktree task checkboxes), validated upstream
+    if (Array.isArray(flags)) {
+      for (const f of flags) {
+        if (f && /^[a-zA-Z0-9-]+$/.test(f)) {
+          fullCommand += ' --' + f;
+        }
+      }
+    }
+    // Initial prompt: appended as the last argument on first launch only
+    if (initialPrompt && typeof initialPrompt === 'string') {
+      const escaped = initialPrompt.replace(/'/g, "'\\''");
+      fullCommand += " '" + escaped + "'";
+    }
 
     // Validate cwd exists. If the provided path is invalid (e.g. an encoded
     // directory name like "-Users-jane-project"), resolve the real cwd from
@@ -479,6 +511,8 @@ class PtySessionManager {
             model: storeSession.model || null,
             agentTeams: storeSession.agentTeams || false,
             resumeSessionId: storeSession.resumeSessionId || null,
+            initialPrompt: storeSession.resumeSessionId ? null : (storeSession.initialPrompt || null),
+            flags: storeSession.resumeSessionId ? [] : (storeSession.flags || []),
             ...spawnOpts,
           });
         } else {

package/src/web/public/index.html

@@ -1239,9 +1239,9 @@
         <div class="form-group">
           <label class="form-label">Flags</label>
           <div class="form-checkboxes" id="new-task-flags">
-            <label class="form-checkbox"><input type="checkbox" value="--dangerously-skip-permissions" /> Skip Permissions</label>
-            <label class="form-checkbox"><input type="checkbox" value="--verbose" /> Verbose</label>
-            <label class="form-checkbox"><input type="checkbox" value="--agent-teams" id="new-task-agent-teams" /> Agent Teams</label>
+            <label class="form-checkbox"><input type="checkbox" value="dangerously-skip-permissions" /> Skip Permissions</label>
+            <label class="form-checkbox"><input type="checkbox" value="verbose" /> Verbose</label>
+            <label class="form-checkbox"><input type="checkbox" value="agent-teams" id="new-task-agent-teams" /> Agent Teams</label>
           </div>
         </div>
         <details class="form-help-details" style="margin-top: 4px; margin-bottom: 8px;">

package/src/web/server.js

@@ -3219,7 +3219,8 @@ app.post('/api/sessions/:id/spinoff-batch', requireAuth, async (req, res) => {
 
         // Create session
         const sessionName = (t.branch || t.title).replace(/^feat\//, '') + ' (spinoff)';
-        const newSession = store.createSession(workspaceId, {
+        const newSession = store.createSession({
+          workspaceId,
           name: sessionName,
           workingDir: worktreePath,
           command: 'claude',
@@ -4767,7 +4768,7 @@ app.get('/api/worktree-tasks', requireAuth, async (req, res) => {
  * Create a worktree task: creates git worktree, session, and task record.
  */
 app.post('/api/worktree-tasks', requireAuth, async (req, res) => {
-  const { workspaceId, repoDir, branch, description, baseBranch, featureId, model, tags, startNow } = req.body || {};
+  const { workspaceId, repoDir, branch, description, baseBranch, featureId, model, tags, startNow, prompt, flags } = req.body || {};
   if (!workspaceId) return res.status(400).json({ error: 'workspaceId is required' });
   if (!repoDir) return res.status(400).json({ error: 'repoDir is required' });
   if (!branch) return res.status(400).json({ error: 'branch is required' });
@@ -4807,7 +4808,7 @@ app.post('/api/worktree-tasks', requireAuth, async (req, res) => {
     const root = await gitRepoRoot(repoDir);
     if (!root) return res.status(400).json({ error: 'Not a git repository' });
     const repoName = path.basename(root);
-    const worktreePath = path.join(path.dirname(root), `${repoName}-wt`, branch.replace(/\//g, '-'));
+    let worktreePath = path.join(path.dirname(root), `${repoName}-wt`, branch.replace(/\//g, '-'));
 
     let branchExists = false;
     try {
@@ -4815,11 +4816,44 @@ app.post('/api/worktree-tasks', requireAuth, async (req, res) => {
       branchExists = true;
     } catch {}
 
-    const args = ['worktree', 'add'];
-    if (!branchExists) args.push('-b', branch);
-    args.push(worktreePath);
-    if (branchExists) args.push(branch);
-    await gitExec(args, root);
+    // Check existing worktrees to avoid two fatal git errors:
+    //   1. "already exists"  — target path is already a registered worktree
+    //   2. "already checked out" — the branch is checked out in a different worktree
+    // Parse `git worktree list --porcelain` once and handle both cases.
+    let skipWorktreeAdd = false;
+    try {
+      const listOut = await gitExec(['worktree', 'list', '--porcelain'], root);
+
+      // Case 1: exact path already registered — reuse it as-is
+      if (listOut.includes(`worktree ${worktreePath}`)) {
+        skipWorktreeAdd = true;
+      }
+
+      // Case 2: branch already checked out in a *different* worktree path —
+      // redirect worktreePath to that existing location so the rest of task
+      // creation (session, record) still succeeds pointing at the right dir.
+      if (!skipWorktreeAdd) {
+        const branchRef = `refs/heads/${branch}`;
+        const blocks = listOut.split('\n\n').filter(Boolean);
+        for (const block of blocks) {
+          const pathMatch = block.match(/^worktree (.+)$/m);
+          const branchMatch = block.match(/^branch (.+)$/m);
+          if (pathMatch && branchMatch && branchMatch[1].trim() === branchRef) {
+            worktreePath = pathMatch[1].trim();
+            skipWorktreeAdd = true;
+            break;
+          }
+        }
+      }
+    } catch {}
+
+    if (!skipWorktreeAdd) {
+      const args = ['worktree', 'add'];
+      if (!branchExists) args.push('-b', branch);
+      args.push(worktreePath);
+      if (branchExists) args.push(branch);
+      await gitExec(args, root);
+    }
 
     // 1.5. Run init hooks (copy_files and init_script) if configured
     const initHooks = store.getWorktreeInitHooks();
@@ -4855,11 +4889,16 @@ app.post('/api/worktree-tasks', requireAuth, async (req, res) => {
 
     // 2. Create a session in this workspace pointing at the worktree
     const sessionName = branch.replace(/^feat\//, '') + ' (worktree task)';
-    const session = store.createSession(workspaceId, {
+    const safePrompt = (typeof prompt === 'string' && prompt.trim()) ? prompt.trim() : null;
+    const safeFlags = Array.isArray(flags) ? flags.filter(f => typeof f === 'string' && /^[a-zA-Z0-9-]+$/.test(f)) : [];
+    const session = store.createSession({
+      workspaceId,
       name: sessionName,
       workingDir: worktreePath,
       command: 'claude',
       model: model || undefined,
+      initialPrompt: safePrompt,
+      flags: safeFlags,
     });
     if (!session) {
       return res.status(500).json({ error: 'Failed to create session' });