@flydocs/cli 0.6.0-alpha.7 → 0.6.0-alpha.8

package/dist/cli.js

@@ -15,7 +15,7 @@ var CLI_VERSION, CLI_NAME, PACKAGE_NAME, POSTHOG_API_KEY;
 var init_constants = __esm({
   "src/lib/constants.ts"() {
     "use strict";
-    CLI_VERSION = "0.6.0-alpha.7";
+    CLI_VERSION = "0.6.0-alpha.8";
     CLI_NAME = "flydocs";
     PACKAGE_NAME = "@flydocs/cli";
     POSTHOG_API_KEY = "phc_v1MSJTQDFkMS90CBh3mxIz3v8bYCCnKU6v1ir6bz0Xn";
@@ -293,10 +293,9 @@ function extractPreservedValues(config) {
   return {
     tier: config.tier,
     setupComplete: config.setupComplete ?? false,
-    providerTeamId: config.provider?.teamId ?? null,
+    workspaceId: config.workspaceId ?? null,
     workspace: config.workspace ?? {},
     issueLabels: config.issueLabels ?? {},
-    statusMapping: config.statusMapping ?? {},
     detectedStack: config.detectedStack ?? {},
     skills: config.skills ?? {},
     designSystem: config.designSystem ?? null,
@@ -312,21 +311,13 @@ async function mergeConfig(templateDir, version, tierFlag, preserved) {
   config.version = version;
   config.tier = tierFlag ?? preserved.tier;
   config.setupComplete = preserved.setupComplete;
-  if (preserved.providerTeamId !== null) {
-    if (!config.provider) {
-      config.provider = { type: "linear", teamId: null };
-    }
-    config.provider.teamId = preserved.providerTeamId;
-  }
+  config.workspaceId = preserved.workspaceId;
   if (Object.keys(preserved.workspace).length > 0) {
     config.workspace = preserved.workspace;
   }
   if (Object.keys(preserved.issueLabels).length > 0) {
     config.issueLabels = preserved.issueLabels;
   }
-  if (Object.keys(preserved.statusMapping).length > 0) {
-    config.statusMapping = preserved.statusMapping;
-  }
   if (Object.keys(preserved.detectedStack).length > 0) {
     config.detectedStack = preserved.detectedStack;
   }
@@ -1888,6 +1879,21 @@ async function validateRelayKey(apiKey) {
   if (!data.valid) return { valid: false };
   return { valid: true, org: data.org ?? "your organization" };
 }
+async function fetchWorkspaces(apiKey) {
+  const baseUrl = process.env.FLYDOCS_RELAY_URL?.replace(/\/$/, "") ?? "https://app.flydocs.ai/api/relay";
+  const response = await fetch(`${baseUrl}/auth/workspaces`, {
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${apiKey}`
+    },
+    signal: AbortSignal.timeout(15e3)
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch workspaces: ${response.status}`);
+  }
+  const data = await response.json();
+  return data;
+}
 async function validateLinearKey(apiKey) {
   const response = await fetch("https://api.linear.app/graphql", {
     method: "POST",
@@ -2074,6 +2080,8 @@ var init_install = __esm({
         }
         printInfo(`Tier: ${tier}`);
         await capture("install_tier_selected", { tier });
+        let selectedWorkspaceId = null;
+        let selectedWorkspaceName = null;
         if (tier === "cloud") {
           console.log();
           console.log(`  ${pc6.bold("Connect to FlyDocs Cloud")}`);
@@ -2115,6 +2123,46 @@ var init_install = __esm({
           }
           const envFile = await storeEnvKey(targetDir, "FLYDOCS_API_KEY", apiKey);
           printStatus(`API key stored in ${pc6.dim(envFile)}`);
+          console.log();
+          printInfo("Fetching workspaces...");
+          try {
+            const workspaces = await fetchWorkspaces(apiKey);
+            if (workspaces.length === 0) {
+              printError(
+                "No workspaces found. Create a workspace in the FlyDocs dashboard first, then re-run install."
+              );
+              process.exit(1);
+            }
+            if (workspaces.length === 1) {
+              selectedWorkspaceId = workspaces[0].id;
+              selectedWorkspaceName = workspaces[0].name;
+              printStatus(
+                `Workspace: ${pc6.bold(selectedWorkspaceName)} (auto-selected)`
+              );
+            } else {
+              const workspaceChoice = await select({
+                message: "Select a workspace",
+                options: workspaces.map((ws) => ({
+                  value: ws.id,
+                  label: `${ws.name} (${ws.provider.type})`,
+                  hint: ws.team.name
+                }))
+              });
+              if (isCancel3(workspaceChoice)) {
+                cancel2("Installation cancelled.");
+                process.exit(0);
+              }
+              selectedWorkspaceId = workspaceChoice;
+              const chosen = workspaces.find((ws) => ws.id === selectedWorkspaceId);
+              selectedWorkspaceName = chosen?.name ?? "Unknown";
+              printStatus(`Workspace: ${pc6.bold(selectedWorkspaceName)}`);
+            }
+          } catch {
+            printError(
+              "Could not fetch workspaces. Check your network and try again."
+            );
+            process.exit(1);
+          }
         }
         let skipConfigOverwrite = false;
         if (!await pathExists(join15(targetDir, ".git"))) {
@@ -2196,6 +2244,9 @@ var init_install = __esm({
         const configPath = join15(targetDir, ".flydocs", "config.json");
         if (!await pathExists(configPath)) {
           const config = await createFreshConfig(templateDir, version, tier);
+          if (selectedWorkspaceId) {
+            config.workspaceId = selectedWorkspaceId;
+          }
           await writeConfig(targetDir, config);
           printStatus(`.flydocs/config.json (new, tier: ${tier})`);
         } else if (args.tier) {
@@ -2203,15 +2254,34 @@ var init_install = __esm({
             const existing = await readConfig(targetDir);
             existing.version = version;
             existing.tier = tier;
+            if (selectedWorkspaceId) {
+              existing.workspaceId = selectedWorkspaceId;
+            }
             await writeConfig(targetDir, existing);
             printStatus(`.flydocs/config.json (tier updated: ${tier})`);
           } catch {
             const config = await createFreshConfig(templateDir, version, tier);
+            if (selectedWorkspaceId) {
+              config.workspaceId = selectedWorkspaceId;
+            }
             await writeConfig(targetDir, config);
             printStatus(`.flydocs/config.json (recreated, tier: ${tier})`);
           }
         } else {
-          printWarning(".flydocs/config.json exists, preserving");
+          if (selectedWorkspaceId) {
+            try {
+              const existing = await readConfig(targetDir);
+              existing.workspaceId = selectedWorkspaceId;
+              await writeConfig(targetDir, existing);
+              printWarning(
+                ".flydocs/config.json exists, preserving (workspace updated)"
+              );
+            } catch {
+              printWarning(".flydocs/config.json exists, preserving");
+            }
+          } else {
+            printWarning(".flydocs/config.json exists, preserving");
+          }
         }
         console.log();
         console.log(`Installing skills (tier: ${tier})...`);
@@ -2810,10 +2880,9 @@ var init_update = __esm({
         let preserved = {
           tier: "cloud",
           setupComplete: false,
-          providerTeamId: null,
+          workspaceId: null,
           workspace: {},
           issueLabels: {},
-          statusMapping: {},
           detectedStack: {},
           skills: {},
           designSystem: null,
@@ -2837,6 +2906,7 @@ var init_update = __esm({
         } else {
           effectiveTier = preserved.tier;
         }
+        await ensureDirectories(targetDir, effectiveTier);
         console.log("Replacing framework directories...");
         await replaceDirectory(
           join16(templateDir, ".flydocs", "templates"),
@@ -3672,7 +3742,9 @@ var init_connect = __esm({
         }
         const wasLocal = config.tier === "local";
         config.tier = "cloud";
-        config.provider = config.provider ?? { type: null, teamId: null };
+        const configRecord = config;
+        delete configRecord.statusMapping;
+        delete configRecord.provider;
         await writeConfig(targetDir, config);
         printStatus("Config updated to cloud tier");
         if (wasLocal) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flydocs/cli",
-  "version": "0.6.0-alpha.7",
+  "version": "0.6.0-alpha.8",
   "type": "module",
   "description": "FlyDocs AI CLI — install, setup, and manage FlyDocs projects",
   "bin": {

package/template/.claude/skills/flydocs-cloud/SKILL.md

@@ -74,6 +74,7 @@ All scripts: `python3 .claude/skills/flydocs-cloud/scripts/<script>`
 | `set_preferences.py`    | `[--workspace ID] [--assignee self\|ID] [--display JSON]`             | `{success, preferences}` — no flags = GET current; with flags = POST update                     |
 | `get_estimate_scale.py` | (no args)                                                             | `{scale, type}` — provider's valid estimate values (fixed or freeform)                          |
 | `refresh_labels.py`     | `[--fix]`                                                             | `{valid, stale, details}` — validates config label IDs against relay; `--fix` updates stale IDs |
+| `validate_setup.py`     | (no args)                                                             | `{valid, checks, missing[]}` — validates workspace config, caches result, sets setupComplete    |
 
 ### Script Notes
 

package/template/.claude/skills/flydocs-cloud/scripts/flydocs_api.py

@@ -37,6 +37,12 @@ class FlyDocsClient:
             print("Set in environment or .env/.env.local file", file=sys.stderr)
             sys.exit(1)
 
+        self.workspace_id = self.config.get("workspaceId")
+        if not self.workspace_id:
+            print("ERROR: workspaceId not found in .flydocs/config.json", file=sys.stderr)
+            print("Run 'flydocs setup' to configure your workspace", file=sys.stderr)
+            sys.exit(1)
+
         self.base_url = self._resolve_base_url()
 
     def _load_config(self) -> dict:
@@ -93,6 +99,7 @@ class FlyDocsClient:
 
         headers = {
             "Authorization": f"Bearer {self.api_key}",
+            "X-Workspace": self.workspace_id,
             "Content-Type": "application/json",
             "Accept": "application/json",
         }

package/template/.claude/skills/flydocs-cloud/scripts/validate_setup.py

@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+"""Validate workspace setup via the FlyDocs Relay API.
+
+Read-only validation that checks provider, team, status mapping, label config,
+and user identity. Writes result to .flydocs/validation-cache.json and sets
+setupComplete: true in config when all required checks pass.
+"""
+
+import json
+import sys
+from datetime import datetime, timezone
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).parent))
+from flydocs_api import get_client, output_json, fail
+
+
+# Required checks — failure blocks setup completion
+REQUIRED_CHECKS = {
+    "provider": {
+        "test": lambda cfg: cfg.get("provider", {}).get("connected") is True,
+        "message": "No provider connected — configure in FlyDocs dashboard",
+    },
+    "team": {
+        "test": lambda cfg: bool(cfg.get("team", {}).get("id")),
+        "message": "No team selected — configure in FlyDocs dashboard",
+    },
+    "statusMapping": {
+        "test": lambda cfg: cfg.get("statusMapping", {}).get("configured") is True,
+        "message": "Status mapping not configured — configure in FlyDocs dashboard",
+    },
+    "labelConfig": {
+        "test": lambda cfg: cfg.get("labelConfig", {}).get("configured") is True,
+        "message": "Label config not configured — configure in FlyDocs dashboard",
+    },
+}
+
+# Optional checks — warn but don't block
+OPTIONAL_CHECKS = {
+    "userIdentity": {
+        "test": lambda cfg: cfg.get("userIdentity", {}).get("linked") is True,
+        "message": (
+            "Provider identity not linked — run: "
+            "python3 .claude/skills/flydocs-cloud/scripts/set_identity.py <provider> <id>"
+        ),
+    },
+}
+
+
+def main() -> None:
+    client = get_client()
+
+    # Fetch workspace config from relay
+    config_response = client.get("/auth/config")
+
+    # Run checks
+    checks: dict[str, bool] = {}
+    valid: list[str] = []
+    missing: list[dict[str, str]] = []
+    warnings: list[dict[str, str]] = []
+
+    for name, check in REQUIRED_CHECKS.items():
+        passed = check["test"](config_response)
+        checks[name] = passed
+        if passed:
+            valid.append(name)
+        else:
+            missing.append({"check": name, "action": check["message"]})
+
+    for name, check in OPTIONAL_CHECKS.items():
+        passed = check["test"](config_response)
+        checks[name] = passed
+        if passed:
+            valid.append(name)
+        else:
+            warnings.append({"check": name, "action": check["message"]})
+
+    all_required_pass = len(missing) == 0
+
+    # Build workspace info from response
+    workspace = config_response.get("workspace", {})
+    provider_type = config_response.get("provider", {}).get("type", "unknown")
+
+    # Write validation cache
+    cache = {
+        "timestamp": datetime.now(timezone.utc).isoformat().replace("+00:00", "Z"),
+        "valid": all_required_pass,
+        "workspace": {
+            "id": workspace.get("id", ""),
+            "name": workspace.get("name", ""),
+        },
+        "provider": provider_type,
+        "checks": checks,
+        "missing": [m["check"] for m in missing],
+    }
+
+    cache_path = client.project_root / ".flydocs" / "validation-cache.json"
+    cache_path.parent.mkdir(parents=True, exist_ok=True)
+    with open(cache_path, "w") as f:
+        json.dump(cache, f, indent=2)
+        f.write("\n")
+
+    # If all required checks pass, set setupComplete in config
+    if all_required_pass:
+        config_path = client.config_path
+        if config_path.exists():
+            with open(config_path, "r") as f:
+                local_config = json.load(f)
+        else:
+            local_config = {}
+
+        local_config["setupComplete"] = True
+        with open(config_path, "w") as f:
+            json.dump(local_config, f, indent=2)
+            f.write("\n")
+
+    # Output structured report
+    report: dict = {
+        "valid": all_required_pass,
+        "checks": checks,
+        "passed": valid,
+    }
+    if missing:
+        report["missing"] = missing
+    if warnings:
+        report["warnings"] = warnings
+    if all_required_pass:
+        report["setupComplete"] = True
+
+    output_json(report)
+
+
+if __name__ == "__main__":
+    main()

package/template/.flydocs/config.json

@@ -1,18 +1,16 @@
 {
-  "version": "0.6.0-alpha.7",
+  "version": "0.6.0-alpha.8",
   "sourceRepo": "github.com/plastrlab/flydocs-core",
   "tier": "local",
   "setupComplete": false,
+  "workspaceId": null,
   "paths": {
     "content": "flydocs"
   },
-  "provider": {
-    "type": null,
-    "teamId": null
-  },
   "workspace": {
     "activeProjects": [],
     "defaultMilestoneId": null,
+    "repoSlug": null,
     "product": {
       "name": null,
       "labelIds": [],
@@ -21,7 +19,7 @@
     }
   },
   "issueLabels": {
-    "_note": "Run /flydocs-setup to populate these from your provider",
+    "_note": "Run /flydocs-setup to populate these from your workspace",
     "category": {
       "feature": null,
       "bug": null,
@@ -50,18 +48,6 @@
     "installed": [],
     "custom": []
   },
-  "statusMapping": {
-    "BACKLOG": "Backlog",
-    "READY": "Todo",
-    "IMPLEMENTING": "In Progress",
-    "BLOCKED": "Blocked",
-    "REVIEW": "In Review",
-    "TESTING": "QA",
-    "COMPLETE": "Done",
-    "ARCHIVED": "Archived",
-    "CANCELED": "Canceled",
-    "DUPLICATE": "Duplicate"
-  },
   "designSystem": null,
   "aiLabor": {
     "enabled": false,

package/template/.flydocs/hooks/prompt-submit.py

@@ -168,15 +168,32 @@ def get_flydocs_version() -> str | None:
 
 
 def get_setup_nudge() -> str | None:
-    """Check if setup has been completed, return nudge if not."""
+    """Check if setup has been completed, return nudge if not.
+
+    Reads validation cache (written by validate_setup.py) for specific
+    missing items. Falls back to generic nudge if cache is absent.
+    """
     config_file = Path('.flydocs/config.json')
     if not config_file.exists():
         return None
     try:
         config = json.loads(config_file.read_text())
-        # Only nudge if field is explicitly set to false (not missing)
-        if 'setupComplete' in config and config['setupComplete'] is False:
-            return '[Setup incomplete — run /flydocs-setup to configure your project]'
+        if config.get('setupComplete') is not False:
+            return None
+
+        # Check validation cache for specific missing items
+        cache_file = Path('.flydocs/validation-cache.json')
+        if cache_file.exists():
+            try:
+                cache = json.loads(cache_file.read_text())
+                missing = cache.get('missing', [])
+                if missing:
+                    items = ', '.join(missing)
+                    return f'[Setup incomplete — missing: {items}. Run /flydocs-setup or fix in dashboard]'
+            except (json.JSONDecodeError, OSError, IOError):
+                pass
+
+        return '[Setup incomplete — run /flydocs-setup to configure your project]'
     except (json.JSONDecodeError, OSError, IOError):
         pass
     return None

package/template/.flydocs/version

@@ -1 +1 @@
-0.6.0-alpha.7
+0.6.0-alpha.8

package/template/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.0-alpha.7",
+  "version": "0.6.0-alpha.8",
   "description": "FlyDocs Core - Manifest of all managed files",
   "repository": "github.com/plastrlab/flydocs-core",