@fourier-labs/harbour 0.1.8 → 0.1.9

package/dist/packages/harbour-cli/src/cli.js

@@ -4,8 +4,10 @@ import { productionise } from "./productionise.js";
 import { safeError, CliError } from "./output.js";
 import { CLI_VERSION } from "./version.js";
 import { login, logout, refreshStoredToken } from "./auth.js";
+import { connect, loadConfig, resolveConfig } from "./config.js";
 const args = process.argv.slice(2);
 const command = args[0];
+const connectUrl = args[1];
 const rootIndex = args.indexOf("--app-root");
 const root = rootIndex >= 0 ? args[rootIndex + 1] : undefined;
 const includePaths = [];
@@ -21,17 +23,15 @@ for (let index = 0; index < args.length; index += 1) {
         index += 1;
     }
 }
-const url = process.env.HARBOUR_MCP_URL;
 const explicitToken = process.env.HARBOUR_TOKEN?.trim() ?? "";
-const tenant = process.env.HARBOUR_TENANT ?? "";
-const usage = "Usage: harbour login | logout | productionise --app-root <path> [--include <relative-path>]... [--json]\nSet HARBOUR_MCP_URL and HARBOUR_TENANT. HARBOUR_TOKEN is a controlled non-production override.\n";
+const usage = "Usage: harbour connect <company-start-url> | login | logout | productionise --app-root <path> [--include <relative-path>]... [--json]\nRun `harbour connect <company-start-url>` once, then sign in when Harbour asks.\n";
 if (command === "--version" || command === "version") {
     process.stdout.write(`${CLI_VERSION}\n`);
 }
 else if (!command || command === "help" || command === "--help" || args.includes("-h")) {
     process.stdout.write(usage);
 }
-else if (!url || !tenant || !["login", "logout", "productionise"].includes(command) || (command === "productionise" && (optionError || !root || root.startsWith("--")))) {
+else if (!["connect", "login", "logout", "productionise"].includes(command) || (command === "connect" && (!connectUrl || connectUrl.startsWith("--"))) || (command === "productionise" && (optionError || !root || root.startsWith("--")))) {
     if (optionError)
         process.stderr.write(`${optionError}\n`);
     process.stderr.write(usage);
@@ -39,24 +39,36 @@ else if (!url || !tenant || !["login", "logout", "productionise"].includes(comma
 }
 else {
     try {
-        if (command === "login") {
-            await login(url, tenant, message => process.stderr.write(`${message}\n`));
-            process.stdout.write("Harbour sign-in complete.\n");
-            process.exitCode = 0;
-        }
-        else if (command === "logout") {
-            await logout(url, tenant);
-            process.stdout.write("Harbour sign-in removed from this device.\n");
+        if (command === "connect") {
+            const saved = await connect(connectUrl);
+            process.stdout.write(`Harbour is connected for ${saved.tenantId}.\n`);
             process.exitCode = 0;
         }
         else {
-            const token = explicitToken || await refreshStoredToken(url, tenant);
-            if (!token)
-                throw new CliError("AUTH_REQUIRED", "Sign in with `harbour login` before productionising an app.");
-            const client = new RemoteMcpClient(url, token, tenant);
-            const result = await productionise(root, client, message => { process.stderr.write(`${message}\n`); }, tenant, includePaths);
-            const envelope = { schema: "harbour.cli-result/1.0", cliVersion: CLI_VERSION, status: "SUCCEEDED", operationStarted: true, operationRef: result.operationRef, result: result.result };
-            process.stdout.write(`${JSON.stringify(envelope)}\n`);
+            const config = resolveConfig(process.env, await loadConfig());
+            if (!config)
+                throw new CliError("CONFIG_REQUIRED", "Connect Harbour first with `harbour connect <company-start-url>`.");
+            const url = config.mcpUrl;
+            const tenant = config.tenantId;
+            if (command === "login") {
+                await login(url, tenant, message => process.stderr.write(`${message}\n`));
+                process.stdout.write("Harbour sign-in complete.\n");
+                process.exitCode = 0;
+            }
+            else if (command === "logout") {
+                await logout(url, tenant);
+                process.stdout.write("Harbour sign-in removed from this device.\n");
+                process.exitCode = 0;
+            }
+            else {
+                const token = explicitToken || await refreshStoredToken(url, tenant);
+                if (!token)
+                    throw new CliError("AUTH_REQUIRED", "Please sign in to Harbour with `harbour login`.");
+                const client = new RemoteMcpClient(url, token, tenant);
+                const result = await productionise(root, client, message => { process.stderr.write(`${message}\n`); }, tenant, includePaths);
+                const envelope = { schema: "harbour.cli-result/1.0", cliVersion: CLI_VERSION, status: "SUCCEEDED", operationStarted: true, operationRef: result.operationRef, result: result.result };
+                process.stdout.write(`${JSON.stringify(envelope)}\n`);
+            }
         }
     }
     catch (error) {

package/dist/packages/harbour-cli/src/config.js

@@ -0,0 +1,69 @@
+import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { homedir } from "node:os";
+export function configPath(env = process.env) {
+    return join(env.XDG_CONFIG_HOME?.trim() || join(homedir(), ".config"), "harbour", "config.json");
+}
+export async function loadConfig(path = configPath()) {
+    try {
+        const parsed = JSON.parse(await readFile(path, "utf8"));
+        return validConfig(parsed) ? parsed : undefined;
+    }
+    catch (error) {
+        if (isMissing(error))
+            return undefined;
+        throw new Error("Harbour could not read its saved connection. Run `harbour connect <start-url>` again.");
+    }
+}
+export async function saveConfig(config, path = configPath()) {
+    if (!validConfig(config))
+        throw new Error("Harbour received an incomplete connection profile.");
+    await mkdir(dirname(path), { recursive: true, mode: 0o700 });
+    await chmod(dirname(path), 0o700);
+    await writeFile(path, JSON.stringify(config, null, 2), { mode: 0o600 });
+    await chmod(path, 0o600);
+}
+export async function connect(startUrl, path = configPath()) {
+    const url = new URL(startUrl);
+    if (!/^https?:$/.test(url.protocol))
+        throw new Error("Harbour connection URL must be an HTTPS URL.");
+    if (!url.pathname.endsWith(".json")) {
+        url.pathname = `${url.pathname.replace(/\/$/, "")}.json`;
+    }
+    const response = await fetch(url, { headers: { accept: "application/json" }, redirect: "error" });
+    if (!response.ok)
+        throw new Error("Harbour could not read this company connection profile.");
+    const body = await response.json();
+    if (!isRecord(body) || body.schema !== "harbour.tenant-start/1.0")
+        throw new Error("This is not a Harbour connection profile.");
+    const config = {
+        schema: "harbour.cli-config/1.0",
+        tenantId: String(body.tenantId ?? ""),
+        mcpUrl: String(body.mcpUrl ?? ""),
+        ...(typeof body.uploadUrl === "string" ? { uploadUrl: body.uploadUrl } : {})
+    };
+    await saveConfig(config, path);
+    return config;
+}
+export function resolveConfig(env, saved) {
+    const mcpUrl = env.HARBOUR_MCP_URL?.trim() || saved?.mcpUrl;
+    const tenantId = env.HARBOUR_TENANT?.trim() || saved?.tenantId;
+    if (!mcpUrl || !tenantId)
+        return undefined;
+    return { schema: "harbour.cli-config/1.0", tenantId, mcpUrl, ...(saved?.uploadUrl ? { uploadUrl: saved.uploadUrl } : {}) };
+}
+function validConfig(value) {
+    return Boolean(isRecord(value)
+        && value.schema === "harbour.cli-config/1.0"
+        && typeof value.tenantId === "string"
+        && value.tenantId.length > 0
+        && typeof value.mcpUrl === "string"
+        && /^https?:\/\//.test(value.mcpUrl)
+        && (value.uploadUrl === undefined || typeof value.uploadUrl === "string"));
+}
+function isRecord(value) {
+    return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function isMissing(error) {
+    return Boolean(error && typeof error === "object" && error.code === "ENOENT");
+}

package/dist/packages/harbour-cli/src/output.js

@@ -1,6 +1,7 @@
 export function safeError(error) {
     const code = error instanceof CliError ? error.code : "CLI_FAILED";
-    const raw = error instanceof CliError ? error.message : "Harbour could not complete the request.";
+    const original = error instanceof Error ? error.message : "";
+    const raw = error instanceof CliError ? error.message : friendlyMessage(original);
     return { code, message: raw.replace(/https?:\/\/\S+|Bearer\s+\S+|(?:x-harbour|authorization|content-type)[^\n]*/gi, "").replace(/\s+/g, " ").trim().slice(0, 240) || "Harbour could not complete the request." };
 }
 export class CliError extends Error {
@@ -12,3 +13,14 @@ export class CliError extends Error {
         this.operationRef = operationRef;
     }
 }
+function friendlyMessage(message) {
+    if (/connect|connection profile|tenant|company/i.test(message))
+        return "This company is not connected to Harbour yet.";
+    if (/sign-in|oauth|authorize|token|invalid_scope|redirect|callback|403|401/i.test(message))
+        return "Please sign in to Harbour. If sign-in still fails, your account may not be allowed for this company yet.";
+    if (/unsafe|secret|changed|digest|manifest|archive/i.test(message))
+        return "Harbour found unsafe or changed files and stopped safely.";
+    if (/source|save|worker|provider|github/i.test(message))
+        return "Saving to company code storage failed safely; nothing was deployed.";
+    return "Harbour could not complete the request.";
+}

package/dist/packages/harbour-cli/src/version.js

@@ -1 +1 @@
-export const CLI_VERSION = "0.1.8";
+export const CLI_VERSION = "0.1.9";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fourier-labs/harbour",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Harbour productionisation helper",
   "type": "module",
   "bin": { "harbour": "./dist/packages/harbour-cli/src/cli.js" },