copyhub-cli 1.0.3 → 1.0.4

package/.env.example

@@ -1,4 +1,5 @@
-# Copy to .env and fill in values. CopyHub reads .env when you run the CLI from the current directory.
+# Copy to `.env` (project folder), `~/.copyhub/.env`, or both. CopyHub merges these without relying on cwd alone:
+# package dir `.env` → ~/.copyhub/.env → current working directory `.env` (later wins). Shell-exported vars always win.
 #
 # Google Cloud Console → APIs: enable "Google Sheets API" on the SAME project as your OAuth client ID
 # (if sync fails with project=..., open the Enable link in the log or Library → Google Sheets API → Enable).

package/README.md

@@ -120,7 +120,7 @@ copyhub start
 
    - **Recommended for first setup:** run **`copyhub login`** with no secrets configured — your browser opens a **localhost wizard** where you paste **Client ID** and **Client secret** (the same values as `COPYHUB_GOOGLE_CLIENT_ID` / `COPYHUB_GOOGLE_CLIENT_SECRET`); they are stored in `~/.copyhub/config.json`.
 
-   - Copy `.env.example` to `.env` and set `COPYHUB_GOOGLE_CLIENT_ID`, `COPYHUB_GOOGLE_CLIENT_SECRET`, and optionally `COPYHUB_OAUTH_REDIRECT_PORT` (default **19999**).
+   - Copy `.env.example` to **`~/.copyhub/.env`** and/or a `.env` in your project folder and set `COPYHUB_GOOGLE_CLIENT_ID`, `COPYHUB_GOOGLE_CLIENT_SECRET`, and optionally `COPYHUB_OAUTH_REDIRECT_PORT` (default **19999**). This works even with **`npm install -g`** when your shell is not in the repo directory.
 
    - Or run **`copyhub config`**:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copyhub-cli",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "CopyHub — clipboard, local history, Google Sheets sync (OAuth). Windows, macOS, Linux.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import 'dotenv/config';
+import { loadCopyhubEnv } from './load-env.js';
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { program } from 'commander';
@@ -33,6 +33,8 @@ import { ensureDir } from './storage.js';
 import { runCopyhubDaemon } from './start-daemon-logic.js';
 import { wipeCopyhubDirectory } from './wipe-data.js';
 
+loadCopyhubEnv();
+
 const CLI_JS = fileURLToPath(new URL('./cli.js', import.meta.url));
 
 program.name('copyhub').description(

package/src/load-env.js

@@ -0,0 +1,39 @@
+import dotenv from 'dotenv';
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { DIR } from './paths.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
+ * Merge `.env` files into `process.env` without overwriting shell-exported vars.
+ * Order (later wins among files only): package directory → ~/.copyhub/.env → cwd.
+ * Fixes global `copyhub login` when cwd has no `.env` (dotenv/config default looks only at cwd).
+ */
+export function loadCopyhubEnv() {
+  const pkgRoot = join(__dirname, '..');
+  const paths = [
+    join(pkgRoot, '.env'),
+    join(DIR, '.env'),
+    join(process.cwd(), '.env'),
+  ];
+
+  /** @type {Record<string, string>} */
+  const merged = {};
+  for (const p of paths) {
+    if (!existsSync(p)) continue;
+    try {
+      const raw = readFileSync(p, 'utf8');
+      Object.assign(merged, dotenv.parse(raw));
+    } catch {
+      /* ignore unreadable or malformed .env */
+    }
+  }
+
+  for (const [key, value] of Object.entries(merged)) {
+    if (process.env[key] === undefined) {
+      process.env[key] = value;
+    }
+  }
+}

package/ui/main.mjs

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import {
@@ -12,6 +11,7 @@ import {
   Menu,
   nativeImage,
 } from 'electron';
+import { loadCopyhubEnv } from '../src/load-env.js';
 import { readRecentHistorySync } from '../src/storage.js';
 import {
   loadOverlayAcceleratorFromConfigSync,
@@ -20,6 +20,8 @@ import {
 import { loadTokens } from '../src/tokens.js';
 import { fetchOverlayDailyTabRows } from '../src/sheet-overlay-history.js';
 
+loadCopyhubEnv();
+
 const gotLock = app.requestSingleInstanceLock();
 if (!gotLock) {
   app.quit();