megit-app 0.5.2 → 0.7.0

package/CHANGELOG.md

@@ -9,6 +9,28 @@ surface, and the HTTP API may change in any minor release.
 
 ## [Unreleased]
 
+## [0.7.0] - 2026-08-19
+
+### Added
+
+- A search box filters the recent-repositories list in the picker. It matches the full
+  path, not just the folder name, so two checkouts of the same repo stay distinguishable.
+
+### Changed
+
+- The recent-repositories list keeps 12 entries instead of 10.
+
+## [0.6.0] - 2026-08-16
+
+### Added
+
+- `megit start` runs the server in the background and `megit stop` shuts it down, so the
+  terminal that launched megit can be closed. Output goes to `~/.config/megit/megit.log`.
+
+### Removed
+
+- The `[repo-path]` argument is gone — open repositories from the picker in the app.
+
 ## [0.5.2] - 2026-08-12
 
 ### Fixed
@@ -190,7 +212,11 @@ First public release.
 - Windows (arm64, x64): builds and runs, but untested on real hardware — recursive `fs.watch` crashes the test worker there, so auto-refresh is not covered by CI
 - Linux: everything except the terminal — node-pty is an optionalDependency with no Linux prebuild, and the terminal button is hidden when it is unavailable
 
-[Unreleased]: https://github.com/vuongvu1/megit/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/vuongvu1/megit/compare/v0.7.0...HEAD
+[0.7.0]: https://github.com/vuongvu1/megit/compare/v0.6.0...v0.7.0
+[0.6.0]: https://github.com/vuongvu1/megit/compare/v0.5.2...v0.6.0
+[0.5.2]: https://github.com/vuongvu1/megit/compare/v0.5.1...v0.5.2
+[0.5.1]: https://github.com/vuongvu1/megit/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/vuongvu1/megit/compare/v0.4.1...v0.5.0
 [0.4.1]: https://github.com/vuongvu1/megit/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/vuongvu1/megit/compare/v0.3.0...v0.4.0

package/README.md

@@ -12,22 +12,20 @@ It writes, too: stage/unstage/discard, commit and amend, branch and tag create/d
 
 Requires Node ≥ 22. The package is 1.8 MB, with `ws` as its only runtime dependency and no install scripts.
 
-**Run it once, without installing:**
-
 ```bash
 npx megit-app
 ```
 
-**Or install it, and run `megit` from anywhere:**
+That starts the server on port 3411 — set `PORT` to change that — and opens your browser at it. <kbd>Ctrl</kbd><kbd>C</kbd> stops it.
+
+**To keep it running after you close the terminal:**
 
 ```bash
-npm i -g megit-app
-megit
+npx megit-app start
+npx megit-app stop
 ```
 
-Upgrade later with `npm i -g megit-app@latest`.
-
-Either way the server starts on port 3411 — set `PORT` to change that — and opens your browser at it.
+Or install it once with `npm i -g megit-app` and run `megit`, `megit start` and `megit stop` from anywhere; upgrade later with `npm i -g megit-app@latest`.
 
 <sub>The package is `megit-app`; `megit` on npm is unrelated, so keep the `-app`. The installed command is still `megit`.</sub>
 

package/bin/megit.js

@@ -1,22 +1,23 @@
 #!/usr/bin/env node
-// megit CLI — start the local server, open the browser at it, and register the
-// repo path given as an argument (if any) by POSTing to our own /api/repos, so
-// path validation stays in one place.
-import { execFile } from 'node:child_process'
+// megit CLI — run the local server in this terminal, or detach it with
+// `start`/`stop` so it outlives the terminal that launched it.
+import { execFile, spawn } from 'node:child_process'
+import { mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
-import { resolve } from 'node:path'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 
-const arg = process.argv[2]
+const cmd = process.argv[2]
 
 // handled before importing the server, so --help never binds a port
-if (arg === '-h' || arg === '--help') {
+if (cmd === '-h' || cmd === '--help') {
   console.log(`megit — git repository viewer in the browser
 
 Usage:
-  megit [repo-path]
-
-Arguments:
-  repo-path        open this repository in a tab (default: reopen last session)
+  megit            run in this terminal
+  megit start      run in the background
+  megit stop       stop the background server
 
 Options:
   -h, --help       show this message
@@ -27,7 +28,7 @@ Environment:
   process.exit(0)
 }
 
-if (arg === '-v' || arg === '--version') {
+if (cmd === '-v' || cmd === '--version') {
   console.log(createRequire(import.meta.url)('../package.json').version)
   process.exit(0)
 }
@@ -35,19 +36,110 @@ if (arg === '-v' || arg === '--version') {
 const port = Number(process.env.PORT) || 3411
 const url = `http://127.0.0.1:${port}`
 
-const { server } = await import('../dist-server/index.js')
-if (!server.listening) await new Promise(r => server.once('listening', r))
+const dir = join(homedir(), '.config', 'megit')
+const stateFile = join(dir, 'daemon.json')
+const logFile = join(dir, 'megit.log')
+
+const readState = () => {
+  try {
+    return JSON.parse(readFileSync(stateFile, 'utf8'))
+  } catch {
+    return null
+  }
+}
+
+const pidAlive = pid => {
+  try {
+    process.kill(pid, 0) // signal 0 tests for existence, sends nothing
+    return true
+  } catch {
+    return false
+  }
+}
+
+// "Is megit up?" is answered by megit answering, not by a PID existing. A PID
+// can be reused after an unclean exit, and a port can be held by anything.
+const megitAnswers = async p => {
+  try {
+    const r = await fetch(`http://127.0.0.1:${p}/api/config`, { signal: AbortSignal.timeout(1000) })
+    return r.ok && 'hasTerminal' in (await r.json())
+  } catch {
+    return false
+  }
+}
+
+if (cmd === 'start') {
+  const prev = readState()
+  if (prev && pidAlive(prev.pid) && (await megitAnswers(prev.port))) {
+    // ponytail: one daemon is tracked, so a second PORT is a conflict rather than
+    // a second server. Key the state file by port if anyone actually wants two.
+    if (prev.port === port) {
+      console.log(`megit already running → http://127.0.0.1:${prev.port}`)
+      process.exit(0)
+    }
+    console.error(`megit: already running on http://127.0.0.1:${prev.port} — run 'megit stop' first`)
+    process.exit(1)
+  }
 
-if (arg) {
-  await fetch(`${url}/api/repos`, {
-    method: 'POST',
-    headers: { 'content-type': 'application/json' },
-    body: JSON.stringify({ path: resolve(arg) }),
+  mkdirSync(dir, { recursive: true })
+  // Without a log, a daemon that dies during startup dies invisibly.
+  const log = openSync(logFile, 'a')
+  // Re-run this same script with no arguments: the foreground path below is the
+  // one startup sequence, and the daemon must not diverge from it. `detached`
+  // gives the child its own process group so the shell's SIGHUP on exit misses
+  // it; `unref` lets this process leave without waiting.
+  const child = spawn(process.execPath, [fileURLToPath(import.meta.url)], {
+    detached: true,
+    stdio: ['ignore', log, log],
+    windowsHide: true,
   })
-    .then(async r => { if (!r.ok) console.error(`megit: ${(await r.json()).error}`) })
-    .catch(() => {})
+  child.unref()
+
+  // unref() only stops the child from holding this process open — 'exit' still
+  // fires, which turns the common failure (port already in use) into an
+  // immediate answer instead of five seconds of polling a corpse.
+  let died = false
+  child.once('exit', () => (died = true))
+
+  // Poll rather than assume: a failed bind would otherwise be reported as success.
+  for (let i = 0; i < 50 && !died; i++) {
+    if (await megitAnswers(port)) {
+      writeFileSync(stateFile, JSON.stringify({ pid: child.pid, port }))
+      console.log(`megit → ${url}`)
+      process.exit(0)
+    }
+    await new Promise(r => setTimeout(r, 100))
+  }
+  console.error(`megit: server did not come up on ${url} — see ${logFile}`)
+  process.exit(1)
+}
+
+if (cmd === 'stop') {
+  const state = readState()
+  if (!state || !pidAlive(state.pid)) {
+    rmSync(stateFile, { force: true })
+    console.log('megit: no background server running')
+    process.exit(0)
+  }
+  if (!(await megitAnswers(state.port))) {
+    rmSync(stateFile, { force: true })
+    console.error(`megit: stale state file — PID ${state.pid} is not megit, leaving it alone`)
+    process.exit(1)
+  }
+  process.kill(state.pid, 'SIGTERM')
+  rmSync(stateFile, { force: true })
+  console.log('megit stopped')
+  process.exit(0)
 }
 
+if (cmd) {
+  console.error(`megit: unknown command '${cmd}' — try 'megit --help'`)
+  process.exit(1)
+}
+
+const { server } = await import('../dist-server/index.js')
+if (!server.listening) await new Promise(r => server.once('listening', r))
+
 // ponytail: no `open` dependency — three platform names cover what it does.
 const opener = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'explorer' : 'xdg-open'
 execFile(opener, [url], () => {}) // exit code ignored: explorer.exe returns 1 on success

package/dist/assets/{ConflictView-DB6LAnvd.js → ConflictView-CHWx-7wL.js}

@@ -1 +1 @@
-import{a as e,i as t,n,r}from"./index-BZBjYCd4.js";var i=e(),a=/^<<<<<<< ?(.*)$/,o=/^\|\|\|\|\|\|\| ?(.*)$/,s=/^=======$/,c=/^>>>>>>> ?(.*)$/,l=e=>e.replace(/\r?\n$/,``);function u(e){let t=e.split(/(?<=\n)/),n=[],r=[],i=null,u=`context`,d=()=>{r.length&&n.push({kind:`context`,lines:r}),r=[]};for(let e of t){let t=l(e),f=a.exec(t);if(f){if(u!==`context`)return null;d(),i={ours:[],base:null,theirs:[],oursLabel:f[1].trim(),theirsLabel:``},u=`ours`;continue}if(u===`context`){r.push(e);continue}if(o.exec(t)){if(u!==`ours`)return null;i.base=[],u=`base`;continue}if(s.test(t)){if(u!==`ours`&&u!==`base`)return null;u=`theirs`;continue}let p=c.exec(t);if(p){if(u!==`theirs`)return null;i.theirsLabel=p[1].trim(),n.push({kind:`conflict`,block:i}),i=null,u=`context`;continue}u===`ours`?i.ours.push(e):u===`base`?i.base.push(e):i.theirs.push(e)}return u===`context`?(d(),n.some(e=>e.kind===`conflict`)?n:null):null}function d(e,t){let n=[];return e.forEach((e,r)=>{if(e.kind===`context`){n.push(...e.lines);return}let i=t.get(r);if(!i)throw Error(`no pick for conflict at segment ${r}`);(i===`ours`||i===`both`)&&n.push(...e.block.ours),(i===`theirs`||i===`both`)&&n.push(...e.block.theirs)}),n.join(``)}var f=n(),p=[[`ours`,`Use ours`],[`theirs`,`Use theirs`],[`both`,`Use both`]];function m({note:e,busy:t,onPick:n,onMarkResolved:r}){return(0,f.jsxs)(`div`,{className:`cf-card`,children:[(0,f.jsx)(`div`,{className:`cf-card-note`,children:e}),(0,f.jsxs)(`div`,{className:`cf-card-actions`,children:[r&&(0,f.jsx)(`button`,{className:`primary`,disabled:t,onClick:r,children:`Mark resolved`}),(0,f.jsx)(`button`,{disabled:t,onClick:()=>n(`ours`),children:`Keep ours`}),(0,f.jsx)(`button`,{disabled:t,onClick:()=>n(`theirs`),children:`Keep theirs`}),(0,f.jsx)(`button`,{className:`danger`,disabled:t,onClick:()=>n(`delete`),children:`Delete file`})]})]})}function h({repo:e,file:n,onResolved:a}){let[o,s]=(0,i.useState)(null),[c,l]=(0,i.useState)(new Map),[h,g]=(0,i.useState)(``),[_,v]=(0,i.useState)(!1),y=`repo=${encodeURIComponent(e)}`;(0,i.useEffect)(()=>{s(null),l(new Map),g(``),r(`/api/conflict?${y}&file=${encodeURIComponent(n)}`).then(s).catch(e=>g(e.message))},[e,n]);let b=(0,i.useMemo)(()=>o?.content?u(o.content):null,[o]),x=(0,i.useMemo)(()=>b?.filter(e=>e.kind===`conflict`).length??0,[b]);(0,i.useEffect)(()=>{!b||!x||c.size<x||(v(!0),r(`/api/conflict?${y}`,t(`POST`,{action:`resolve`,file:n,content:d(b,c)})).then(a).catch(e=>{g(e.message),v(!1)}))},[c,b,x]);let S=e=>{v(!0),r(`/api/conflict?${y}`,t(`POST`,{action:e,file:n})).then(a).catch(e=>{g(e.message),v(!1)})},C=()=>{v(!0),r(`/api/conflict?${y}`,t(`POST`,{action:`resolve`,file:n,content:o?.content??``})).then(a).catch(e=>{g(e.message),v(!1)})},w=(e,t)=>l(n=>new Map(n).set(e,t)),T=e=>l(t=>{let n=new Map(t);return n.delete(e),n});return h?(0,f.jsx)(`div`,{className:`diffview error`,children:h}):o?o.tooLarge?(0,f.jsxs)(`div`,{className:`diffview empty`,children:[`File too large to resolve here (`,Math.round((o.size??0)/1024),` KB) — use the terminal`]}):o.binary?(0,f.jsx)(`div`,{className:`cf-view`,children:(0,f.jsx)(m,{note:`Binary file — there is nothing to merge line by line.`,busy:_,onPick:S})}):o.missing?(0,f.jsx)(`div`,{className:`cf-view`,children:(0,f.jsx)(m,{note:`Deleted on one side and modified on the other.`,busy:_,onPick:S})}):b?(0,f.jsxs)(`div`,{className:`cf-view`,children:[(0,f.jsxs)(`div`,{className:`cf-progress`,children:[c.size,` of `,x,` resolved`]}),b.map((e,t)=>{if(e.kind===`context`)return(0,f.jsx)(`pre`,{className:`cf-context`,children:e.lines.join(``)},t);let n=c.get(t);return(0,f.jsxs)(`div`,{className:`cf-block${n?` picked`:``}`,children:[(0,f.jsxs)(`div`,{className:`cf-bar`,children:[(0,f.jsx)(`span`,{className:`cf-side-name`,children:e.block.oursLabel||`ours`}),n?(0,f.jsxs)(f.Fragment,{children:[(0,f.jsxs)(`span`,{className:`cf-chosen`,children:[`took `,n]}),(0,f.jsx)(`button`,{disabled:_,onClick:()=>T(t),children:`Reset`})]}):p.map(([e,n])=>(0,f.jsx)(`button`,{disabled:_,onClick:()=>w(t,e),children:n},e))]}),(!n||n===`ours`||n===`both`)&&(0,f.jsx)(`pre`,{className:`cf-ours`,children:e.block.ours.join(``)}),!n&&(0,f.jsx)(`div`,{className:`cf-mid`,children:e.block.theirsLabel||`theirs`}),(!n||n===`theirs`||n===`both`)&&(0,f.jsx)(`pre`,{className:`cf-theirs`,children:e.block.theirs.join(``)})]},t)})]}):(0,f.jsx)(`div`,{className:`cf-view`,children:(0,f.jsx)(m,{note:`No conflict markers left in this file — it looks already resolved.`,busy:_,onPick:S,onMarkResolved:C})}):(0,f.jsx)(`div`,{className:`diffview empty`,children:`Loading…`})}export{h as default};
+import{a as e,i as t,n,r}from"./index-Ch9W5KCh.js";var i=e(),a=/^<<<<<<< ?(.*)$/,o=/^\|\|\|\|\|\|\| ?(.*)$/,s=/^=======$/,c=/^>>>>>>> ?(.*)$/,l=e=>e.replace(/\r?\n$/,``);function u(e){let t=e.split(/(?<=\n)/),n=[],r=[],i=null,u=`context`,d=()=>{r.length&&n.push({kind:`context`,lines:r}),r=[]};for(let e of t){let t=l(e),f=a.exec(t);if(f){if(u!==`context`)return null;d(),i={ours:[],base:null,theirs:[],oursLabel:f[1].trim(),theirsLabel:``},u=`ours`;continue}if(u===`context`){r.push(e);continue}if(o.exec(t)){if(u!==`ours`)return null;i.base=[],u=`base`;continue}if(s.test(t)){if(u!==`ours`&&u!==`base`)return null;u=`theirs`;continue}let p=c.exec(t);if(p){if(u!==`theirs`)return null;i.theirsLabel=p[1].trim(),n.push({kind:`conflict`,block:i}),i=null,u=`context`;continue}u===`ours`?i.ours.push(e):u===`base`?i.base.push(e):i.theirs.push(e)}return u===`context`?(d(),n.some(e=>e.kind===`conflict`)?n:null):null}function d(e,t){let n=[];return e.forEach((e,r)=>{if(e.kind===`context`){n.push(...e.lines);return}let i=t.get(r);if(!i)throw Error(`no pick for conflict at segment ${r}`);(i===`ours`||i===`both`)&&n.push(...e.block.ours),(i===`theirs`||i===`both`)&&n.push(...e.block.theirs)}),n.join(``)}var f=n(),p=[[`ours`,`Use ours`],[`theirs`,`Use theirs`],[`both`,`Use both`]];function m({note:e,busy:t,onPick:n,onMarkResolved:r}){return(0,f.jsxs)(`div`,{className:`cf-card`,children:[(0,f.jsx)(`div`,{className:`cf-card-note`,children:e}),(0,f.jsxs)(`div`,{className:`cf-card-actions`,children:[r&&(0,f.jsx)(`button`,{className:`primary`,disabled:t,onClick:r,children:`Mark resolved`}),(0,f.jsx)(`button`,{disabled:t,onClick:()=>n(`ours`),children:`Keep ours`}),(0,f.jsx)(`button`,{disabled:t,onClick:()=>n(`theirs`),children:`Keep theirs`}),(0,f.jsx)(`button`,{className:`danger`,disabled:t,onClick:()=>n(`delete`),children:`Delete file`})]})]})}function h({repo:e,file:n,onResolved:a}){let[o,s]=(0,i.useState)(null),[c,l]=(0,i.useState)(new Map),[h,g]=(0,i.useState)(``),[_,v]=(0,i.useState)(!1),y=`repo=${encodeURIComponent(e)}`;(0,i.useEffect)(()=>{s(null),l(new Map),g(``),r(`/api/conflict?${y}&file=${encodeURIComponent(n)}`).then(s).catch(e=>g(e.message))},[e,n]);let b=(0,i.useMemo)(()=>o?.content?u(o.content):null,[o]),x=(0,i.useMemo)(()=>b?.filter(e=>e.kind===`conflict`).length??0,[b]);(0,i.useEffect)(()=>{!b||!x||c.size<x||(v(!0),r(`/api/conflict?${y}`,t(`POST`,{action:`resolve`,file:n,content:d(b,c)})).then(a).catch(e=>{g(e.message),v(!1)}))},[c,b,x]);let S=e=>{v(!0),r(`/api/conflict?${y}`,t(`POST`,{action:e,file:n})).then(a).catch(e=>{g(e.message),v(!1)})},C=()=>{v(!0),r(`/api/conflict?${y}`,t(`POST`,{action:`resolve`,file:n,content:o?.content??``})).then(a).catch(e=>{g(e.message),v(!1)})},w=(e,t)=>l(n=>new Map(n).set(e,t)),T=e=>l(t=>{let n=new Map(t);return n.delete(e),n});return h?(0,f.jsx)(`div`,{className:`diffview error`,children:h}):o?o.tooLarge?(0,f.jsxs)(`div`,{className:`diffview empty`,children:[`File too large to resolve here (`,Math.round((o.size??0)/1024),` KB) — use the terminal`]}):o.binary?(0,f.jsx)(`div`,{className:`cf-view`,children:(0,f.jsx)(m,{note:`Binary file — there is nothing to merge line by line.`,busy:_,onPick:S})}):o.missing?(0,f.jsx)(`div`,{className:`cf-view`,children:(0,f.jsx)(m,{note:`Deleted on one side and modified on the other.`,busy:_,onPick:S})}):b?(0,f.jsxs)(`div`,{className:`cf-view`,children:[(0,f.jsxs)(`div`,{className:`cf-progress`,children:[c.size,` of `,x,` resolved`]}),b.map((e,t)=>{if(e.kind===`context`)return(0,f.jsx)(`pre`,{className:`cf-context`,children:e.lines.join(``)},t);let n=c.get(t);return(0,f.jsxs)(`div`,{className:`cf-block${n?` picked`:``}`,children:[(0,f.jsxs)(`div`,{className:`cf-bar`,children:[(0,f.jsx)(`span`,{className:`cf-side-name`,children:e.block.oursLabel||`ours`}),n?(0,f.jsxs)(f.Fragment,{children:[(0,f.jsxs)(`span`,{className:`cf-chosen`,children:[`took `,n]}),(0,f.jsx)(`button`,{disabled:_,onClick:()=>T(t),children:`Reset`})]}):p.map(([e,n])=>(0,f.jsx)(`button`,{disabled:_,onClick:()=>w(t,e),children:n},e))]}),(!n||n===`ours`||n===`both`)&&(0,f.jsx)(`pre`,{className:`cf-ours`,children:e.block.ours.join(``)}),!n&&(0,f.jsx)(`div`,{className:`cf-mid`,children:e.block.theirsLabel||`theirs`}),(!n||n===`theirs`||n===`both`)&&(0,f.jsx)(`pre`,{className:`cf-theirs`,children:e.block.theirs.join(``)})]},t)})]}):(0,f.jsx)(`div`,{className:`cf-view`,children:(0,f.jsx)(m,{note:`No conflict markers left in this file — it looks already resolved.`,busy:_,onPick:S,onMarkResolved:C})}):(0,f.jsx)(`div`,{className:`diffview empty`,children:`Loading…`})}export{h as default};