ness-dev
diff --git a/‎package-lock.json‎
Lines changed: 450 additions & 2 deletions b/‎package-lock.json‎
Lines changed: 450 additions & 2 deletions
diff --git a/‎package.json‎
Lines changed: 1 addition & 0 deletions b/‎package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎scripts/release.sh‎
Lines changed: 11 additions & 4 deletions b/‎scripts/release.sh‎
Lines changed: 11 additions & 4 deletions
diff --git a/‎src/main/editor.ts‎
Lines changed: 74 additions & 0 deletions b/‎src/main/editor.ts‎
Lines changed: 74 additions & 0 deletions
diff --git a/‎src/main/github.ts‎
Lines changed: 37 additions & 7 deletions b/‎src/main/github.ts‎
Lines changed: 37 additions & 7 deletions
diff --git a/‎src/main/hooks.ts‎
Lines changed: 38 additions & 15 deletions b/‎src/main/hooks.ts‎
Lines changed: 38 additions & 15 deletions
@@ -90,6 +90,7 @@
     }
   },
   "dependencies": {
+    "@radix-ui/react-tooltip": "^1.2.8",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-serialize": "^0.14.0",
     "@xterm/addon-webgl": "^0.19.0",
 
@@ -104,14 +104,21 @@ if [ "$confirm" != "y" ] && [ "$confirm" != "Y" ]; then
 fi
 
 # ---- Bump version ----
-step "Bumping package.json to ${VERSION}"
+step "Bumping package.json and package-lock.json to ${VERSION}"
 node -e "
 const fs = require('fs');
+const v = '${VERSION}';
 const pkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
-pkg.version = '${VERSION}';
+pkg.version = v;
 fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+if (fs.existsSync('package-lock.json')) {
+  const lock = JSON.parse(fs.readFileSync('package-lock.json', 'utf-8'));
+  lock.version = v;
+  if (lock.packages && lock.packages['']) lock.packages[''].version = v;
+  fs.writeFileSync('package-lock.json', JSON.stringify(lock, null, 2) + '\n');
+}
 "
-ok "package.json updated"
+ok "package.json and package-lock.json updated"
 
 # ---- Update README and landing page download links ----
 step "Updating download links in README and docs/index.html"
@@ -130,7 +137,7 @@ for (const f of files) {
 "
 ok "Download links updated"
 
-git add package.json README.md docs/index.html
+git add package.json package-lock.json README.md docs/index.html
 git commit -m "Release v${VERSION}"
 ok "Committed version bump and download link updates"
 
 
@@ -0,0 +1,74 @@
+import { spawn } from 'child_process'
+import { join, isAbsolute } from 'path'
+import { log } from './debug'
+
+export interface EditorDef {
+  id: string
+  name: string
+  /** Shell command used to launch the editor. Must be on the user's PATH. */
+  cmd: string
+}
+
+/** Known GUI editors. Each is invoked as `<cmd> <worktreePath> [<filePath>]`,
+ * which is the universal form for VS Code-family editors, Zed, Sublime Text,
+ * and the JetBrains launchers. The command must be installed on the user's
+ * PATH — we spawn via a login shell so homebrew/nvm/etc. are picked up. */
+export const AVAILABLE_EDITORS: EditorDef[] = [
+  { id: 'vscode', name: 'VS Code', cmd: 'code' },
+  { id: 'cursor', name: 'Cursor', cmd: 'cursor' },
+  { id: 'windsurf', name: 'Windsurf', cmd: 'windsurf' },
+  { id: 'zed', name: 'Zed', cmd: 'zed' },
+  { id: 'sublime', name: 'Sublime Text', cmd: 'subl' },
+  { id: 'idea', name: 'IntelliJ IDEA', cmd: 'idea' },
+  { id: 'webstorm', name: 'WebStorm', cmd: 'webstorm' },
+  { id: 'pycharm', name: 'PyCharm', cmd: 'pycharm' },
+  { id: 'goland', name: 'GoLand', cmd: 'goland' },
+  { id: 'rubymine', name: 'RubyMine', cmd: 'mine' },
+  { id: 'rustrover', name: 'RustRover', cmd: 'rustrover' },
+  { id: 'rider', name: 'Rider', cmd: 'rider' }
+]
+
+export const DEFAULT_EDITOR_ID = 'vscode'
+
+function findEditor(id: string): EditorDef | null {
+  return AVAILABLE_EDITORS.find((e) => e.id === id) || null
+}
+
+/** Shell-escape a single argument for use inside zsh -ilc. */
+function shellEscape(s: string): string {
+  return `'${s.replace(/'/g, `'\\''`)}'`
+}
+
+/** Launch the configured editor, opening `worktreePath`. If `filePath` is
+ * given (relative to the worktree), the file is also opened. Spawns
+ * detached so the editor outlives the renderer and doesn't block. */
+export function openInEditor(
+  editorId: string,
+  worktreePath: string,
+  filePath?: string
+): { ok: true } | { ok: false; error: string } {
+  const editor = findEditor(editorId)
+  if (!editor) return { ok: false, error: `Unknown editor: ${editorId}` }
+
+  const args: string[] = [worktreePath]
+  if (filePath) {
+    args.push(isAbsolute(filePath) ? filePath : join(worktreePath, filePath))
+  }
+
+  const shellCmd = `${editor.cmd} ${args.map(shellEscape).join(' ')}`
+  log('editor', `launching ${editor.id}: ${shellCmd}`)
+
+  try {
+    const child = spawn('/bin/zsh', ['-ilc', shellCmd], {
+      detached: true,
+      stdio: 'ignore'
+    })
+    child.on('error', (err) => log('editor', `spawn error: ${err.message}`))
+    child.unref()
+    return { ok: true }
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err)
+    log('editor', `failed to spawn ${editor.cmd}: ${msg}`)
+    return { ok: false, error: msg }
+  }
+}
@@ -9,6 +9,10 @@ export interface CheckStatus {
   name: string
   state: 'success' | 'failure' | 'pending' | 'neutral' | 'skipped' | 'error'
   description: string
+  /** Longer failure summary from the check's output (markdown, may be multi-line) */
+  summary?: string
+  /** External URL to the check's log / details page */
+  detailsUrl?: string
 }
 
 export interface PRStatus {
@@ -19,6 +23,8 @@ export interface PRStatus {
   branch: string
   checks: CheckStatus[]
   checksOverall: 'success' | 'failure' | 'pending' | 'none'
+  /** true = has conflicts with base, false = mergeable, null = still computing */
+  hasConflict: boolean | null
 }
 
 function getToken(): string | null {
@@ -92,11 +98,18 @@ interface ApiPR {
   head: { ref: string; sha: string }
 }
 
+interface ApiPRDetail extends ApiPR {
+  mergeable: boolean | null
+  mergeable_state: string
+}
+
 interface ApiCheckRun {
   name: string
   status: 'queued' | 'in_progress' | 'completed' | 'waiting' | 'requested' | 'pending'
   conclusion: 'success' | 'failure' | 'neutral' | 'cancelled' | 'skipped' | 'timed_out' | 'action_required' | null
-  output?: { title?: string | null }
+  html_url?: string | null
+  details_url?: string | null
+  output?: { title?: string | null; summary?: string | null }
 }
 
 interface ApiCheckRunsResponse {
@@ -108,6 +121,7 @@ interface ApiStatus {
   state: 'error' | 'failure' | 'pending' | 'success'
   context: string
   description: string | null
+  target_url: string | null
 }
 
 interface ApiCombinedStatus {
@@ -185,25 +199,40 @@ export async function getPRStatus(worktreePath: string): Promise<PRStatus | null
     const pr = prList[0]
     const sha = pr.head.sha
 
-    // Fetch check runs AND status contexts for the SHA in parallel
-    const [checkRunsRes, combinedRes] = await Promise.all([
+    // Fetch check runs, status contexts, and PR detail (for mergeable) in parallel.
+    // The /pulls/{n} endpoint triggers GitHub's background mergeability computation
+    // and returns the result if it's ready — otherwise mergeable is null.
+    const [checkRunsRes, combinedRes, prDetail] = await Promise.all([
       githubFetch(`https://api.github.com/repos/${owner}/${repo}/commits/${sha}/check-runs?per_page=100`) as Promise<ApiCheckRunsResponse>,
-      githubFetch(`https://api.github.com/repos/${owner}/${repo}/commits/${sha}/status`) as Promise<ApiCombinedStatus>
+      githubFetch(`https://api.github.com/repos/${owner}/${repo}/commits/${sha}/status`) as Promise<ApiCombinedStatus>,
+      githubFetch(`https://api.github.com/repos/${owner}/${repo}/pulls/${pr.number}`) as Promise<ApiPRDetail>
     ])
 
+    // mergeable_state 'dirty' is the definitive conflict signal. mergeable===false
+    // alone can also indicate conflicts. Null/unknown means GitHub hasn't finished
+    // computing yet, so we report null and the UI hides the conflict indicator.
+    let hasConflict: boolean | null
+    if (prDetail.mergeable_state === 'dirty') hasConflict = true
+    else if (prDetail.mergeable === false) hasConflict = true
+    else if (prDetail.mergeable === true) hasConflict = false
+    else hasConflict = null
+
     const checks: CheckStatus[] = []
     for (const run of checkRunsRes.check_runs || []) {
       checks.push({
         name: run.name,
         state: normalizeCheckState(run.status, run.conclusion),
-        description: run.output?.title || ''
+        description: run.output?.title || '',
+        summary: run.output?.summary || undefined,
+        detailsUrl: run.html_url || run.details_url || undefined
       })
     }
     for (const s of combinedRes.statuses || []) {
       checks.push({
         name: s.context,
         state: normalizeStatusState(s.state),
-        description: s.description || ''
+        description: s.description || '',
+        detailsUrl: s.target_url || undefined
       })
     }
 
@@ -221,7 +250,8 @@ export async function getPRStatus(worktreePath: string): Promise<PRStatus | null
       url: pr.html_url,
       branch: branchName,
       checks,
-      checksOverall: computeOverall(checks)
+      checksOverall: computeOverall(checks),
+      hasConflict
     }
   } catch (err) {
     log('github', `getPRStatus failed for ${branchName}`, err instanceof Error ? err.message : err)
 
@@ -7,18 +7,29 @@ import { log } from './debug'
 const STATUS_DIR = '/tmp/harness-status'
 const HARNESS_HOOK_MARKER = '__claude_harness__'
 // Bump this when the hook format changes to force reinstallation
-const HARNESS_HOOK_VERSION = 4
+const HARNESS_HOOK_VERSION = 5
 
 // Per-event hook commands. Each event type gets its own simple command
 // that writes the appropriate status. No jq dependency — these don't need
 // to parse stdin, they just know what event they're attached to.
 // Uses CLAUDE_HARNESS_ID env var (set by our PTY manager) to key the file.
+//
+// The write is atomic: content goes to a temp file and is then renamed over
+// the target. fs.watch on macOS otherwise fires mid-write during the
+// truncate-then-write window, which caused status transitions to be lost
+// (JSON.parse on an empty file). With rename the watcher only ever sees the
+// completed file.
 function makeHookCommand(status: string): string {
-  return (
-    'bash -c \'hid="$CLAUDE_HARNESS_ID"; [ -z "$hid" ] && exit 0; ' +
-    'mkdir -p ' + STATUS_DIR + '; ' +
-    'echo "{\\"status\\":\\"' + status + '\\",\\"ts\\":$(date +%s)}" > ' + STATUS_DIR + '/$hid.json\''
-  )
+  const payload = `{"status":"${status}","ts":%s}`
+  // Inner bash script. Single quotes inside a single-quoted shell string are
+  // escaped via the classic '\'' dance (close, literal quote, reopen).
+  const inner =
+    `hid="$CLAUDE_HARNESS_ID"; [ -z "$hid" ] && exit 0; ` +
+    `d=${STATUS_DIR}; mkdir -p "$d"; ` +
+    `t="$d/.$hid.$$.tmp"; ` +
+    `printf '\\''${payload}'\\'' "$(date +%s)" > "$t" && ` +
+    `mv -f "$t" "$d/$hid.json"`
+  return `bash -c '${inner}'`
 }
 
 // For Notification we need to distinguish idle_prompt vs permission_prompt.
@@ -141,24 +152,36 @@ export function watchStatusDir(
 
   const watcher = watch(STATUS_DIR, (eventType, filename) => {
     if (!filename || !filename.endsWith('.json')) return
+    // Skip the atomic-rename temp files the hook writes (".<id>.<pid>.tmp")
+    if (filename.startsWith('.')) return
     const terminalId = filename.replace('.json', '')
     const win = getWindowForTerminal(terminalId)
     if (!win) {
       log('hooks', `status file changed for unknown terminal: ${filename}`)
       return
     }
 
-    try {
-      const raw = readFileSync(join(STATUS_DIR, filename), 'utf-8')
-      const data = JSON.parse(raw)
-      const status = data.status as PtyStatus
-      log('hooks', `status update: terminal=${terminalId} status=${status}`, data)
-      if (status) {
-        win.webContents.send('terminal:status', terminalId, status)
+    // Read with a small retry in case we race the writer (shouldn't happen
+    // now that hooks write via rename, but cheap insurance against future
+    // hook-script regressions).
+    const tryRead = (attempt: number): void => {
+      try {
+        const raw = readFileSync(join(STATUS_DIR, filename), 'utf-8')
+        const data = JSON.parse(raw)
+        const status = data.status as PtyStatus
+        log('hooks', `status update: terminal=${terminalId} status=${status}`, data)
+        if (status) {
+          win.webContents.send('terminal:status', terminalId, status)
+        }
+      } catch (err) {
+        if (attempt < 2) {
+          setTimeout(() => tryRead(attempt + 1), 25)
+        } else {
+          log('hooks', `failed to read status file after retries: ${filename}`, err instanceof Error ? err.message : err)
+        }
       }
-    } catch (err) {
-      log('hooks', `failed to read status file: ${filename}`, err instanceof Error ? err.message : err)
     }
+    tryRead(0)
   })
 
   return () => watcher.close()
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@`
`90`	`90`	`}`
`91`	`91`	`},`
`92`	`92`	`"dependencies": {`
	`93`	`+ "@radix-ui/react-tooltip": "^1.2.8",`
`93`	`94`	`"@xterm/addon-fit": "^0.11.0",`
`94`	`95`	`"@xterm/addon-serialize": "^0.14.0",`
`95`	`96`	`"@xterm/addon-webgl": "^0.19.0",`