@catafal/notion-cli 5.9.1 → 5.9.2

package/dist/notion.js

@@ -6,6 +6,16 @@ const cache_1 = require("./cache");
 const retry_1 = require("./retry");
 const deduplication_1 = require("./deduplication");
 const http_agent_1 = require("./http-agent");
+const shell_config_1 = require("./utils/shell-config");
+// Resolve token: env var takes priority, fall back to ~/.notion-cli/config.json.
+// This ensures the CLI works in non-interactive environments (AI agents, cron, etc.)
+// where shell profile files (~/.zshrc, ~/.zshenv) are not sourced.
+if (!process.env.NOTION_TOKEN) {
+    const configToken = (0, shell_config_1.readTokenFromConfig)();
+    if (configToken) {
+        process.env.NOTION_TOKEN = configToken;
+    }
+}
 /**
  * Custom fetch function that uses our configured HTTPS agent and compression
  */

package/dist/utils/shell-config.d.ts

@@ -1,11 +1,14 @@
 /**
- * Shell Configuration Utility
+ * Shell Configuration & Token Persistence
  *
- * Detects the user's shell and persists environment variables (e.g., NOTION_TOKEN)
- * to the appropriate rc file (.zshrc, .bashrc, etc.).
+ * Handles token storage across three layers:
+ * 1. Shell rc files (.zshrc, .bashrc) — for interactive terminal sessions
+ * 2. ~/.zshenv — for non-interactive zsh subprocesses
+ * 3. ~/.notion-cli/config.json — for environments with no shell at all
+ *    (AI agent runtimes like OpenClaw, cron jobs, CI pipelines)
  *
- * Used by both `config set-token` and `init` commands to avoid duplicating
- * shell detection and rc file writing logic.
+ * Token resolution order (in notion.ts):
+ *   process.env.NOTION_TOKEN > ~/.notion-cli/config.json
  */
 /**
  * Detect the current shell from the SHELL environment variable.
@@ -17,12 +20,18 @@ export declare function detectShell(): string;
  */
 export declare function getRcFilePath(shell: string): string;
 /**
- * Persist a Notion token to the user's shell rc file.
- *
- * Reads the rc file, checks if NOTION_TOKEN already exists (replaces it if so),
- * otherwise appends a new export line. Creates the file if it doesn't exist.
+ * Read the Notion token from ~/.notion-cli/config.json.
+ * Synchronous because it runs at module load time (before Notion client init).
+ * Returns null if file doesn't exist, is malformed, or has no token.
+ */
+export declare function readTokenFromConfig(): string | null;
+/**
+ * Persist a Notion token to all storage layers:
+ * 1. Shell rc file (.zshrc / .bashrc / etc.) — interactive sessions
+ * 2. ~/.zshenv (zsh only) — non-interactive subprocesses
+ * 3. ~/.notion-cli/config.json — shell-free environments (AI agents, cron)
  *
- * Returns the shell name and rc file path so callers can inform the user.
+ * Returns the shell name and primary rc file path so callers can inform the user.
  */
 export declare function persistToken(token: string): Promise<{
     rcFile: string;

package/dist/utils/shell-config.js

@@ -1,20 +1,28 @@
 "use strict";
 /**
- * Shell Configuration Utility
+ * Shell Configuration & Token Persistence
  *
- * Detects the user's shell and persists environment variables (e.g., NOTION_TOKEN)
- * to the appropriate rc file (.zshrc, .bashrc, etc.).
+ * Handles token storage across three layers:
+ * 1. Shell rc files (.zshrc, .bashrc) — for interactive terminal sessions
+ * 2. ~/.zshenv — for non-interactive zsh subprocesses
+ * 3. ~/.notion-cli/config.json — for environments with no shell at all
+ *    (AI agent runtimes like OpenClaw, cron jobs, CI pipelines)
  *
- * Used by both `config set-token` and `init` commands to avoid duplicating
- * shell detection and rc file writing logic.
+ * Token resolution order (in notion.ts):
+ *   process.env.NOTION_TOKEN > ~/.notion-cli/config.json
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectShell = detectShell;
 exports.getRcFilePath = getRcFilePath;
+exports.readTokenFromConfig = readTokenFromConfig;
 exports.persistToken = persistToken;
 const fs = require("fs/promises");
+const fsSync = require("fs");
 const path = require("path");
 const os = require("os");
+// Config file path: ~/.notion-cli/config.json (same dir used for caches)
+const CONFIG_DIR = path.join(os.homedir(), '.notion-cli');
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 /**
  * Detect the current shell from the SHELL environment variable.
  * Falls back to bash on Unix, powershell on Windows.
@@ -48,37 +56,70 @@ function getRcFilePath(shell) {
     }
 }
 /**
- * Persist a Notion token to the user's shell rc file.
- *
- * Reads the rc file, checks if NOTION_TOKEN already exists (replaces it if so),
- * otherwise appends a new export line. Creates the file if it doesn't exist.
- *
- * Returns the shell name and rc file path so callers can inform the user.
+ * Read the Notion token from ~/.notion-cli/config.json.
+ * Synchronous because it runs at module load time (before Notion client init).
+ * Returns null if file doesn't exist, is malformed, or has no token.
  */
-async function persistToken(token) {
-    const shell = detectShell();
-    const rcFile = getRcFilePath(shell);
-    // Read existing rc file (create if missing)
-    let rcContent = '';
+function readTokenFromConfig() {
+    try {
+        const raw = fsSync.readFileSync(CONFIG_FILE, 'utf-8');
+        const config = JSON.parse(raw);
+        return typeof config.token === 'string' ? config.token : null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Upsert a NOTION_TOKEN export line in a single shell file.
+ * Replaces existing line if found, otherwise appends a new one.
+ */
+async function upsertTokenInFile(filePath, token) {
+    let content = '';
     try {
-        rcContent = await fs.readFile(rcFile, 'utf-8');
+        content = await fs.readFile(filePath, 'utf-8');
     }
     catch (error) {
         if (error && typeof error === 'object' && 'code' in error && error.code !== 'ENOENT') {
             throw error;
         }
-        // File doesn't exist — will be created on write
     }
-    // Upsert the NOTION_TOKEN export line
     const tokenLineRegex = /^export\s+NOTION_TOKEN=.*/gm;
     const newTokenLine = `export NOTION_TOKEN="${token}"`;
-    let updatedContent;
-    if (tokenLineRegex.test(rcContent)) {
-        updatedContent = rcContent.replace(tokenLineRegex, newTokenLine);
+    let updated;
+    if (tokenLineRegex.test(content)) {
+        updated = content.replace(tokenLineRegex, newTokenLine);
     }
     else {
-        updatedContent = rcContent.trim() + '\n\n# Notion CLI Token\n' + newTokenLine + '\n';
+        updated = content.trim() + '\n\n# Notion CLI Token\n' + newTokenLine + '\n';
+    }
+    await fs.writeFile(filePath, updated, 'utf-8');
+}
+/**
+ * Persist a Notion token to all storage layers:
+ * 1. Shell rc file (.zshrc / .bashrc / etc.) — interactive sessions
+ * 2. ~/.zshenv (zsh only) — non-interactive subprocesses
+ * 3. ~/.notion-cli/config.json — shell-free environments (AI agents, cron)
+ *
+ * Returns the shell name and primary rc file path so callers can inform the user.
+ */
+async function persistToken(token) {
+    const shell = detectShell();
+    const rcFile = getRcFilePath(shell);
+    // 1. Write to shell rc file (interactive sessions)
+    await upsertTokenInFile(rcFile, token);
+    // 2. For zsh: also write to ~/.zshenv (non-interactive subprocesses)
+    if (shell === 'zsh') {
+        await upsertTokenInFile(path.join(os.homedir(), '.zshenv'), token);
+    }
+    // 3. Write to ~/.notion-cli/config.json (shell-free environments)
+    await fs.mkdir(CONFIG_DIR, { recursive: true });
+    let config = {};
+    try {
+        config = JSON.parse(await fs.readFile(CONFIG_FILE, 'utf-8'));
     }
-    await fs.writeFile(rcFile, updatedContent, 'utf-8');
+    catch { /* file doesn't exist yet — start fresh */ }
+    config.token = token;
+    await fs.writeFile(CONFIG_FILE, JSON.stringify(config, null, 2) + '\n', 'utf-8');
     return { rcFile, shell };
 }