@op1/threads 0.1.0 → 0.1.2

package/README.md

@@ -75,6 +75,10 @@ Plugin option `maxWorkers` defaults to 4 and accepts integers from 1 through 32.
 
 The terminal synchronizes workers before opening native tabs without changing focus. A TUI memory index survives plugin reloads and respects manually closed tabs. `/threads` explicitly reopens workers for open coordinator tabs. A new TUI recovers workers from durable storage. Closing the TUI does not interrupt workers.
 
+All open native root-session tabs are automatically grouped by OpenCode project ID, including sessions not managed by this plugin. Projects follow their first appearance in the current tab order. Worktrees with the same project ID stay together.
+
+Within each project, running sessions, the selected tab, and sessions waiting for input come before idle sessions. Tabs with the same priority keep their relative order. Finished runs remain visible below active work and rise again when resumed or selected. Idle is a display priority, not a completion verdict. Each tab with unloaded project metadata stays in its own group until that metadata becomes available. Reconciliation moves only out-of-order tabs, without changing focus or closing and reopening them. Native tabs do not support divider rows.
+
 The read-only RPC definition is `ThreadsRpc` in `src/rpc.ts`, with ID `threads` and method `snapshot`:
 
 ```ts
@@ -88,6 +92,8 @@ The input accepts at most 100 coordinator IDs. Raw HTTP RPC requests wrap the in
 
 Run `bun run typecheck`, `bun test`, and `bun run verify:live`. The live check requires OpenCode 2.0.3, Python, and `uv`. It starts a separate local server, a deterministic model endpoint, and a terminal process with isolated configuration and data. It verifies actual tool calls, durable messages, permission restrictions, worker limits, deleted-worker cleanup, restart behavior, and native tab visibility, busy state, and focus.
 
+Run `bun run verify:tabs` to verify project grouping across real git worktrees, activity-based ordering, permission prompts, completed and resumed workers, focus preservation, and TUI reopening.
+
 Pass an extracted package directory to test the release artifact: `bun run verify:live /absolute/path/to/package`.
 
 The native session and plugin index are separate writes. A crash after session creation but before indexing requires an explicit identical spawn retry. A crash after native report admission but before saving the report view requires an explicit report retry; the native coordinator notification remains canonical and is not duplicated. There is no custom outbox or startup task replay.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op1/threads",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Visible top-level worker sessions for OpenCode V2, with native tabs and durable reports.",
   "type": "module",
   "main": "./index.ts",
@@ -24,7 +24,8 @@
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "bun test",
-    "verify:live": "uv run --with pyte python scripts/verify-live.py"
+    "verify:live": "uv run --with pyte python scripts/verify-live.py",
+    "verify:tabs": "uv run --with pyte python scripts/verify-tab-groups.py"
   },
   "dependencies": {
     "@opencode/plugin": "2.0.3",

package/tui.ts

@@ -11,6 +11,38 @@ export default Plugin.define({
     let running = false;
     let reopenPending = false;
     let lastError: string | undefined;
+    function groupTabs() {
+      const tabs = ctx.ui.tabs.list().map((tab) => {
+        const projectID = ctx.data.session.get(tab.sessionID)?.projectID;
+        return {
+          sessionID: tab.sessionID,
+          priority: tab.busy || tab.active || tab.attention,
+          projectID:
+            typeof projectID === "string" && projectID.length > 0
+              ? projectID
+              : undefined,
+        };
+      });
+      const groups = new Map<string, typeof tabs>();
+      for (const tab of tabs) {
+        const key =
+          tab.projectID === undefined
+            ? `session:${tab.sessionID}`
+            : `project:${tab.projectID}`;
+        const group = groups.get(key);
+        if (group) group.push(tab);
+        else groups.set(key, [tab]);
+      }
+      const ordered = [...groups.values()].flatMap((group) =>
+        group
+          .sort((left, right) => Number(right.priority) - Number(left.priority))
+          .map((tab) => tab.sessionID),
+      );
+      for (const [index, sessionID] of ordered.entries()) {
+        if (ctx.ui.tabs.list()[index]?.sessionID === sessionID) continue;
+        if (!ctx.ui.tabs.move(sessionID, index)) break;
+      }
+    }
     async function reconcile(reopen = false) {
       if (stopped || !ctx.ui.tabs.enabled()) return;
       if (running) {
@@ -19,6 +51,7 @@ export default Plugin.define({
       }
       running = true;
       try {
+        groupTabs();
         const route = ctx.ui.router.current();
         const coordinatorIDs = [
           ...new Set([
@@ -45,6 +78,7 @@ export default Plugin.define({
             });
           }
         }
+        if (!stopped && ctx.ui.tabs.enabled()) groupTabs();
       } finally {
         running = false;
         if (reopenPending) {