@taskmark/ui 0.2.5 → 0.2.6

package/lib/taskmark/autoconfig.ts

@@ -7,8 +7,13 @@ import {
   discoverTaskmarkProjects,
 } from "@/lib/taskmark/discover"
 import type { DiscoveredProject } from "@/lib/taskmark/types"
+import { isWorkspaceMode } from "@/lib/taskmark/workspace-mode"
 
-export type AutoconfigSource = "env_board" | "env_master" | "cwd"
+export type AutoconfigSource =
+  | "env_board"
+  | "env_master"
+  | "cwd"
+  | "sibling"
 
 export type AutoconfigWorkspace = {
   source: AutoconfigSource
@@ -84,13 +89,54 @@ export function cwdCandidates(): string[] {
   return out
 }
 
+/**
+ * Multi-git: product repo beside `<parentBasename>-taskmark` (or unique sibling).
+ */
+export function resolveSiblingDedicatedBoard(fromDir: string): string | null {
+  const resolved = path.resolve(fromDir)
+  const parent = path.dirname(resolved)
+  const parentName = path.basename(parent)
+  const preferred = path.join(parent, `${parentName}-taskmark`)
+  const preferredBoard = resolveBoardAtPath(preferred)
+  if (preferredBoard) return preferredBoard
+
+  let entries: fs.Dirent[]
+  try {
+    entries = fs.readdirSync(parent, { withFileTypes: true })
+  } catch {
+    return null
+  }
+
+  const boards: string[] = []
+  for (const entry of entries) {
+    if (!entry.isDirectory() || !entry.name.endsWith("-taskmark")) continue
+    const board = resolveBoardAtPath(path.join(parent, entry.name))
+    if (board) boards.push(board)
+  }
+  if (boards.length === 0) return null
+  if (boards.length === 1) return boards[0]
+
+  const cwdBase = path.basename(resolved)
+  const parts = cwdBase.split("-").filter(Boolean)
+  for (let i = parts.length - 1; i >= 1; i--) {
+    const prefix = parts.slice(0, i).join("-")
+    const hit = boards.find((b) => path.basename(b) === `${prefix}-taskmark`)
+    if (hit) return hit
+  }
+
+  return null
+}
+
 /**
  * Resolve a zero-config workspace without cookies.
  *
- * Precedence: TASKMARK_BOARD → TASKMARK_MASTER → cwd layouts.
- * Returns null when nothing valid is found (caller should use cookie setup).
+ * Precedence: TASKMARK_BOARD → TASKMARK_MASTER → cwd layouts → sibling *-taskmark.
+ * Returns null when nothing valid is found (caller should use cookie setup),
+ * or when workspace mode asked for the multi-project picker instead of a bind.
  */
 export function resolveAutoconfigWorkspace(): AutoconfigWorkspace | null {
+  if (isWorkspaceMode()) return null
+
   const boardEnv = readEnvPath("TASKMARK_BOARD")
   if (boardEnv) {
     const board = resolveBoardAtPath(boardEnv)
@@ -114,5 +160,10 @@ export function resolveAutoconfigWorkspace(): AutoconfigWorkspace | null {
     if (board) return workspaceFromBoard(board, "cwd")
   }
 
+  for (const candidate of cwdCandidates()) {
+    const sibling = resolveSiblingDedicatedBoard(candidate)
+    if (sibling) return workspaceFromBoard(sibling, "sibling")
+  }
+
   return null
 }

package/lib/taskmark/discover.ts

@@ -129,7 +129,8 @@ export function discoverTaskmarkProjects(
     for (const entry of entries) {
       if (!entry.isDirectory()) continue
       if (shouldSkipDir(entry.name)) continue
-      if (entry.name === "taskmark") continue
+      // A real `<dir>/taskmark` board already returned above, so a folder named
+      // "taskmark" here is an ordinary directory (e.g. a workspace root).
       visit(path.join(dir, entry.name), depth + 1)
     }
   }

package/lib/taskmark/workspace-mode.ts

@@ -0,0 +1,24 @@
+import path from "node:path"
+
+/**
+ * Workspace (multi-project) mode — `taskmark` / `taskmark open` / `--workspace`.
+ *
+ * Board-bound commands (`serve`, `dev`) auto-config a single board from env or
+ * cwd. Workspace mode turns that off so the cookie-based master folders and the
+ * app bar project picker drive which board is shown.
+ */
+export function isWorkspaceMode(): boolean {
+  const raw = process.env.TASKMARK_WORKSPACE?.trim().toLowerCase()
+  return raw === "1" || raw === "true"
+}
+
+/** Directory `taskmark` was invoked from; seeds the setup wizard input. */
+export function workspaceStartPath(): string {
+  for (const raw of [
+    process.env.TASKMARK_WORKSPACE_ROOT,
+    process.env.INIT_CWD,
+  ]) {
+    if (raw && raw.trim()) return path.resolve(raw.trim())
+  }
+  return ""
+}

package/lib/taskmark/workspace.ts

@@ -1,4 +1,7 @@
-import { resolveAutoconfigWorkspace } from "@/lib/taskmark/autoconfig"
+import {
+  resolveAutoconfigWorkspace,
+  type AutoconfigSource,
+} from "@/lib/taskmark/autoconfig"
 import { discoverTaskmarkProjectsFromMasters } from "@/lib/taskmark/discover"
 import { validateMasterFolder } from "@/lib/taskmark/validate"
 import type { DiscoveredProject } from "@/lib/taskmark/types"
@@ -7,7 +10,7 @@ export type ConfiguredWorkspace = {
   masters: string[]
   projects: DiscoveredProject[]
   /** How the workspace was resolved; null means cookie/manual masters. */
-  source: "env_board" | "env_master" | "cwd" | "cookies" | null
+  source: AutoconfigSource | "cookies" | null
   /** When true, UI is locked to the auto-bound board(s) (skip setup). */
   autoconfig: boolean
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@taskmark/ui",
-  "version": "0.2.5",
-  "description": "Local Taskmark board UI — install in a board folder and run `npx taskmark serve`, `npx taskmark dev`, or `npx taskmark build`",
+  "version": "0.2.6",
+  "description": "Taskmark board UI — run globally for setup/project picker, or install in a board folder to open that board with `npx taskmark`",
   "private": false,
   "type": "module",
   "bin": {
@@ -33,6 +33,8 @@
   },
   "scripts": {
     "dev": "node ./bin/taskmark.js dev",
+    "dev:workspace": "node ./bin/taskmark.js dev --workspace",
+    "open": "node ./bin/taskmark.js open",
     "build": "next build --webpack && node scripts/prepare-standalone.mjs",
     "build:static": "node scripts/build-static.mjs",
     "start": "next start",