@fapost/jig-ui 0.1.0-next.16 → 0.1.0-next.18

package/dist/main.js

@@ -6,7 +6,8 @@ import { DEFAULT_PORT, parseCliArgs } from './args.js';
 import { createApp, readPackageVersion } from './http/app.js';
 import { openBrowser } from './open-browser.js';
 import { configDir } from './registry/config-dir.js';
-import { probeInstance, readInstance, removeInstance, writeInstance } from './registry/instance.js';
+import { connectThrough, probeInstance, readInstance, removeInstance, writeInstance } from './registry/instance.js';
+import { mainCheckout } from './source/checkout.js';
 import { localSource } from './source/local.js';
 const HOST = '127.0.0.1';
 const HELP = `Usage: jig-ui [options]
@@ -21,12 +22,40 @@ function fail(message) {
     console.error(message);
     process.exit(1);
 }
-const link = ({ port, token }) => `http://${HOST}:${port}/?token=${token}`;
-async function show(info, open, dir) {
-    console.log(`Open it at ${link(info)}`);
-    if (open && !(await openBrowser(link(info), dir)))
+// The token swap redirects to `/` with no fragment, so the browser keeps this one: the board opens.
+const link = ({ port, token }, project) => `http://${HOST}:${port}/?token=${token}${project ? `#/projects/${project}` : ''}`;
+async function show(info, open, dir, project) {
+    console.log(`Open it at ${link(info, project)}`);
+    if (open && !(await openBrowser(link(info, project), dir)))
         console.log('Could not open a browser; open the link above.');
 }
+/** The folder this command runs in, as a checkout to connect: a worktree stands for its clone's main checkout. */
+async function here() {
+    const checkout = await mainCheckout(process.cwd());
+    if (checkout.kind === 'main')
+        return { path: checkout.root, worktree: false };
+    // A bare clone's worktree has no main checkout: nothing to connect, said as outside a project.
+    if (checkout.kind === 'worktree' && checkout.main)
+        return { path: checkout.main, worktree: true };
+    return undefined;
+}
+/**
+ * Connects the folder through the instance and returns the project's id. Outside a Jig project it says
+ * nothing: the command then only starts, as it always did.
+ */
+async function connectHere(info, place) {
+    if (!place)
+        return undefined;
+    const result = await connectThrough(info, place.path);
+    if ('id' in result) {
+        const what = place.worktree ? `the main checkout of this worktree, ${place.path}` : place.path;
+        console.log(result.created ? `Connected ${result.id}: ${what}.` : `${result.id} is connected: ${what}.`);
+        return result.id;
+    }
+    if (result.code !== 'not-a-repository' && result.code !== 'no-jig')
+        console.log(`Could not connect this folder: ${result.message}`);
+    return undefined;
+}
 /** The instance recorded in the config directory, if it still answers with its token. */
 async function runningInstance(dir) {
     const info = await readInstance(dir);
@@ -56,13 +85,14 @@ export async function main() {
     }
     const { port, open } = command;
     const dir = configDir(process.env, process.platform, homedir());
+    const place = await here();
     const running = await runningInstance(dir);
     if (running) {
         console.log(`Jig UI is already running on port ${running.port}.`);
         // ponytail: a --port equal to the default is indistinguishable from no flag; no note then.
         if (port !== running.port && port !== DEFAULT_PORT)
             console.log(`--port ${port} is ignored.`);
-        await show(running, open, dir);
+        await show(running, open, dir, await connectHere(running, place));
         return;
     }
     const version = readPackageVersion();
@@ -71,7 +101,7 @@ export async function main() {
         void (async () => {
             await writeInstance(dir, { port, token, pid: process.pid, version });
             console.log(`Jig UI ${version} is running at http://${HOST}:${port}/`);
-            await show({ port, token }, open, dir);
+            await show({ port, token }, open, dir, await connectHere({ port, token }, place));
             console.log('Press Ctrl+C to stop.');
         })().catch((error) => fail(`Could not start: ${error instanceof Error ? error.message : String(error)}`));
     });
@@ -83,7 +113,7 @@ export async function main() {
             if (!winner)
                 fail(`Port ${port} is already in use. Stop the other process or choose another port with --port.`);
             console.log(`Jig UI is already running on port ${winner.port}.`);
-            await show(winner, open, dir);
+            await show(winner, open, dir, await connectHere(winner, place));
             process.exit(0);
         });
     });

package/dist/registry/instance.js

@@ -48,3 +48,24 @@ export async function probeInstance(info, timeoutMs = 1000) {
         return false;
     }
 }
+/** Asks the instance to connect `path`, as the page does: the instance owns the registry, so no second process writes it. */
+export async function connectThrough(info, path, timeoutMs = 15_000) {
+    try {
+        const res = await fetch(`http://127.0.0.1:${info.port}/api/projects`, {
+            method: 'POST',
+            headers: { cookie: `${cookieName(info.port)}=${info.token}`, 'content-type': 'application/json' },
+            body: JSON.stringify({ path }),
+            signal: AbortSignal.timeout(timeoutMs),
+        });
+        // A failure the instance did not foresee answers in plain text.
+        const body = (await res.json().catch(() => ({})));
+        if (body.project)
+            return { id: body.project.id, created: res.status === 201 };
+        if (typeof body.error === 'object')
+            return body.error;
+        return { code: 'unexpected', message: `Jig UI answered ${res.status}.` };
+    }
+    catch (error) {
+        return { code: 'unreachable', message: error instanceof Error ? error.message : String(error) };
+    }
+}

package/dist/source/checkout.js

@@ -21,5 +21,23 @@ export async function mainCheckout(path) {
     const [top, own, common] = stdout.trim().split(/\r?\n/);
     if (!top || !own || !common)
         return { kind: 'not-a-repository' };
-    return (await realpath(own)) === (await realpath(common)) ? { kind: 'main', root: await realpath(top) } : { kind: 'worktree' };
+    if ((await realpath(own)) === (await realpath(common)))
+        return { kind: 'main', root: await realpath(top) };
+    return { kind: 'worktree', main: await mainWorktree(path) };
+}
+/**
+ * The main working tree, which `git worktree list` names first — not `dirname(--git-common-dir)`, which
+ * misses for a worktree of a submodule. A bare clone's first entry is the repository itself.
+ */
+async function mainWorktree(path) {
+    try {
+        const { stdout } = await run('git', ['worktree', 'list', '--porcelain'], { cwd: path, timeout: 10_000 });
+        const [first, second] = stdout.split(/\r?\n/);
+        if (!first?.startsWith('worktree ') || second === 'bare')
+            return null;
+        return await realpath(first.slice('worktree '.length));
+    }
+    catch {
+        return null;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fapost/jig-ui",
-  "version": "0.1.0-next.16",
+  "version": "0.1.0-next.18",
   "description": "A local web interface for Jig, the agent SDLC framework.",
   "license": "MIT",
   "type": "module",