@workjournal/cli 0.8.0 → 0.17.0

package/dist/help/tags-new.json

@@ -0,0 +1,35 @@
+{
+    "command": "tags new",
+    "description": "Create a new tag in a workspace (workspace-scope) or in a specific journal (journal-scope via --journal). Workspace-scope tags require a description; journal-scope tags allow an optional description. Plus+ tier; Free returns FEATURE_NOT_IN_TIER.",
+    "args": [
+        {
+            "name": "workspaceSlug",
+            "required": true,
+            "description": "Slug from `workspaces list`."
+        },
+        {
+            "name": "name",
+            "required": true,
+            "description": "Tag name. Must be lowercase, hyphenated, alphanumeric (kebab-case). Max 50 chars."
+        }
+    ],
+    "flags": [
+        {
+            "short": "-d",
+            "long": "--description",
+            "value": "<text>",
+            "description": "Description (max 200 chars). Required at workspace scope; optional at journal scope."
+        },
+        {
+            "long": "--journal",
+            "value": "<journalSlug>",
+            "description": "Create as journal-scope. Omit for workspace-scope."
+        }
+    ],
+    "annotations": { "destructive": false, "idempotent": false },
+    "examples": [
+        "workjournal tags new acme decision -d \"Records a decision that future agents should know about\"",
+        "workjournal tags new acme planning -d \"Sprint planning notes\" --journal engineering"
+    ],
+    "when_to_use": "Adding a new tag to the workspace vocabulary or journal-local set before referencing it from `entries write --tags`."
+}

package/dist/help/tags-update.json

@@ -0,0 +1,41 @@
+{
+    "command": "tags update",
+    "description": "Rename a tag or replace its description. Renaming a workspace-scope tag cascades to every entry across the workspace; renaming a journal-scope tag cascades to entries in that journal. Not tier-gated — downgraded workspaces can still tidy up.",
+    "args": [
+        {
+            "name": "workspaceSlug",
+            "required": true,
+            "description": "Slug from `workspaces list`."
+        },
+        {
+            "name": "tagName",
+            "required": true,
+            "description": "Current tag name."
+        }
+    ],
+    "flags": [
+        {
+            "short": "-n",
+            "long": "--name",
+            "value": "<newName>",
+            "description": "New name (kebab-case, max 50 chars). Cascades the rename to every entry in scope."
+        },
+        {
+            "short": "-d",
+            "long": "--description",
+            "value": "<text>",
+            "description": "New description (max 200 chars). Pass an empty value to clear (journal-scope only — workspace-scope requires a non-empty description)."
+        },
+        {
+            "long": "--journal",
+            "value": "<journalSlug>",
+            "description": "Target the journal-scope row of this name."
+        }
+    ],
+    "annotations": { "destructive": false, "idempotent": true },
+    "examples": [
+        "workjournal tags update acme decision -d \"Architecturally load-bearing decisions only\"",
+        "workjournal tags update acme bug -n incident"
+    ],
+    "when_to_use": "Renaming a tag whose meaning shifted, or refining the description to better steer future tagging."
+}

package/dist/index.js

@@ -1,19 +1,29 @@
 #!/usr/bin/env node
-import { API_PATHS, apiGet, requireAuth } from './api-client.js';
-import { loginFinish, loginInteractive, loginStart } from './auth.js';
-import { createEntry, deleteEntry, getEntry, lastEntries, listEntries, searchEntries, } from './commands/entries.js';
+import packageJson from '../package.json' with { type: 'json' };
+import { API_PATHS, AuthRequiredError, apiGet } from './api-client.js';
+import { loginFinish, loginInteractive, loginStart, revokeDeviceSession } from './auth.js';
+import { parseGlobalFlags } from './cli-args.js';
+import { createEntry, deleteEntry, getEntry, lastEntries, listEntries, searchEntries, updateEntry, } from './commands/entries.js';
 import { exportJournal } from './commands/export.js';
 import { deleteInvite, listInvites, newInvite } from './commands/invites.js';
 import { createJournal, deleteJournal, getJournal, listJournals, renameJournal, selectJournal, setJournalSlug, } from './commands/journals.js';
+import { assignJournalPrompt, createPrompt, deletePrompt, getPrompt, listPrompts, unassignJournalPrompt, updatePrompt, } from './commands/prompts.js';
 import { deleteShare, listShares } from './commands/shares.js';
+import { createTag, deleteTag, getTag, listTags, updateTag } from './commands/tags.js';
 import { getWorkspace, listWorkspaces, selectWorkspace } from './commands/workspaces.js';
 import { readConfig } from './config.js';
 import { CONFIG_DIR, clearCredentials, clearLoginState, readCredentials } from './credentials.js';
+import { printTopLevelHelp, tryHandleHelp } from './help/_dispatch.js';
+import { FEEDBACK_FOOTER } from './help/_renderer.js';
 import { findProjectConfig, getProjectConfigPath, rewriteProjectConfigAt, } from './project-config.js';
+const FEEDBACK_URL = 'https://github.com/workjournal-pro/feedback/issues';
 // ── Arg parsing ─────────────────────────────────────────────────────────────
 const rawArgs = process.argv.slice(2);
-const jsonOutput = rawArgs.includes('--json');
-const args = rawArgs.filter((a) => a !== '--json');
+// `parseGlobalFlags` strips `--json` / `--verbose`, preserves boolean flags
+// (`--help` / `-h` / `--version` / `-V`) for the route handlers to see, and
+// keeps `<flag> <value>` pairs intact so a literal `--json` body doesn't get
+// silently swallowed. See `cli-args.ts` for the parser + its tests.
+const { args, jsonOutput, verbose } = parseGlobalFlags(rawArgs);
 /** Parse args into flags (single-dash short or double-dash long) and positional args. */
 function parseFlags(argv) {
     const flags = {};
@@ -33,6 +43,23 @@ function parseFlags(argv) {
     }
     return { flags, positional };
 }
+/**
+ * Parse the `--tags a,b,c` flag value into a deduplicated string array.
+ * Returns `undefined` when the flag was not provided (so the caller can
+ * distinguish "omit tags from PATCH" from "replace with empty set").
+ * An explicit empty value (`--tags ""`) clears the tag set on PATCH.
+ */
+function parseTagsFlag(raw) {
+    if (raw === undefined)
+        return undefined;
+    const seen = new Set();
+    for (const part of raw.split(',')) {
+        const trimmed = part.trim();
+        if (trimmed.length > 0)
+            seen.add(trimmed);
+    }
+    return Array.from(seen);
+}
 /**
  * Migrate a legacy `{ journal_id }` project config by walking workspaces and
  * journals to find the entry whose `id` matches. Rewrites the file in place
@@ -40,10 +67,9 @@ function parseFlags(argv) {
  * not authenticated).
  */
 async function migrateLegacyProjectConfig(journalId, configPath) {
-    const token = await requireAuth();
     let workspaces;
     try {
-        const result = await apiGet(API_PATHS.workspaces, token);
+        const result = await apiGet(API_PATHS.workspaces);
         workspaces = result.data;
     }
     catch {
@@ -51,7 +77,7 @@ async function migrateLegacyProjectConfig(journalId, configPath) {
     }
     for (const ws of workspaces) {
         try {
-            const journals = await apiGet(API_PATHS.journals(ws.slug), token);
+            const journals = await apiGet(API_PATHS.journals(ws.slug));
             const match = journals.data.find((j) => j.id === journalId);
             if (match) {
                 rewriteProjectConfigAt(configPath, ws.slug, match.slug);
@@ -97,6 +123,9 @@ async function resolveActiveSelection() {
 // ── Routing ─────────────────────────────────────────────────────────────────
 async function routeAuth(argv) {
     const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'auth' : `auth ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
     switch (sub) {
         case 'login': {
             const loginSub = argv[1];
@@ -120,11 +149,16 @@ async function routeAuth(argv) {
             }
             break;
         }
-        case 'logout':
+        case 'logout': {
+            const existing = readCredentials();
+            if (existing?.refresh_token) {
+                await revokeDeviceSession(existing.refresh_token);
+            }
             clearCredentials();
             clearLoginState();
             process.stdout.write('Logged out. Credentials removed.\n');
             break;
+        }
         case 'whoami': {
             const creds = readCredentials();
             if (!creds) {
@@ -156,6 +190,9 @@ async function routeAuth(argv) {
 }
 async function routeWorkspaces(argv) {
     const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'workspaces' : `workspaces ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
     switch (sub) {
         case undefined:
         case 'list':
@@ -187,10 +224,13 @@ async function routeWorkspaces(argv) {
 }
 async function routeJournals(argv) {
     const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'journals' : `journals ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
     if (sub === undefined) {
         // Shortcut: workjournal journals → show selected journal details
         const sel = await resolveActiveSelection();
-        await getJournal(sel.workspaceSlug, sel.journalSlug, jsonOutput);
+        await getJournal(sel.workspaceSlug, sel.journalSlug, jsonOutput, verbose);
         return;
     }
     switch (sub) {
@@ -212,7 +252,7 @@ async function routeJournals(argv) {
                 process.stderr.write('Usage: workjournal journals get <workspaceSlug> <journalSlug>\n');
                 process.exit(1);
             }
-            await getJournal(ws, j, jsonOutput);
+            await getJournal(ws, j, jsonOutput, verbose);
             return;
         }
         case 'new':
@@ -260,6 +300,27 @@ async function routeJournals(argv) {
             await setJournalSlug(ws, j, newSlug, jsonOutput);
             return;
         }
+        case 'assign-prompt': {
+            const ws = argv[1];
+            const j = argv[2];
+            const promptSlug = argv[3];
+            if (!ws || !j || !promptSlug) {
+                process.stderr.write('Usage: workjournal journals assign-prompt <workspaceSlug> <journalSlug> <promptSlug>\n');
+                process.exit(1);
+            }
+            await assignJournalPrompt(ws, j, promptSlug, jsonOutput);
+            return;
+        }
+        case 'unassign-prompt': {
+            const ws = argv[1];
+            const j = argv[2];
+            if (!ws || !j) {
+                process.stderr.write('Usage: workjournal journals unassign-prompt <workspaceSlug> <journalSlug>\n');
+                process.exit(1);
+            }
+            await unassignJournalPrompt(ws, j, jsonOutput);
+            return;
+        }
         case 'select': {
             const ws = argv[1];
             const j = argv[2];
@@ -272,12 +333,15 @@ async function routeJournals(argv) {
         }
         default:
             process.stderr.write(`Unknown journals subcommand: ${sub}\n` +
-                'Usage: workjournal journals <list|get|new|delete|rename|set-slug|select>\n');
+                'Usage: workjournal journals <list|get|new|delete|rename|set-slug|assign-prompt|unassign-prompt|select>\n');
             process.exit(1);
     }
 }
 async function routeEntries(argv) {
     const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'entries' : `entries ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
     switch (sub) {
         case undefined:
         case 'list': {
@@ -294,7 +358,7 @@ async function routeEntries(argv) {
             const ws = argv[1];
             const j = argv[2];
             if (!ws || !j) {
-                process.stderr.write('Usage: workjournal entries write <workspaceSlug> <journalSlug> -t <title> -s <summary> -b <body>\n');
+                process.stderr.write('Usage: workjournal entries write <workspaceSlug> <journalSlug> -t <title> -s <summary> -b <body> [--tags <a,b,c>]\n');
                 process.exit(1);
             }
             const { flags } = parseFlags(argv.slice(3));
@@ -302,10 +366,12 @@ async function routeEntries(argv) {
             const summary = flags['-s'] ?? flags['--summary'];
             const body = flags['-b'] ?? flags['--body'];
             if (!title || !summary || !body) {
-                process.stderr.write('Usage: workjournal entries write <workspaceSlug> <journalSlug> -t <title> -s <summary> -b <body>\n');
+                process.stderr.write('Usage: workjournal entries write <workspaceSlug> <journalSlug> -t <title> -s <summary> -b <body> [--tags <a,b,c>]\n');
                 process.exit(1);
             }
-            await createEntry(ws, j, title, summary, body, jsonOutput);
+            const tagsRaw = flags['--tags'];
+            const tags = parseTagsFlag(tagsRaw);
+            await createEntry(ws, j, title, summary, body, tags, jsonOutput);
             return;
         }
         case 'last': {
@@ -334,6 +400,28 @@ async function routeEntries(argv) {
             await getEntry(ws, j, index, jsonOutput);
             return;
         }
+        case 'update': {
+            const ws = argv[1];
+            const j = argv[2];
+            const index = argv[3];
+            if (!ws || !j || !index) {
+                process.stderr.write('Usage: workjournal entries update <workspaceSlug> <journalSlug> <index> [-t <title>] [-s <summary>] [-b <file>|-] [--tags <a,b,c>]\n');
+                process.exit(1);
+            }
+            const { flags } = parseFlags(argv.slice(4));
+            const title = flags['-t'] ?? flags['--title'];
+            const summary = flags['-s'] ?? flags['--summary'];
+            const bodySource = flags['-b'] ?? flags['--body'];
+            const tagsRaw = flags['--tags'];
+            const tags = parseTagsFlag(tagsRaw);
+            await updateEntry(ws, j, index, {
+                ...(title !== undefined ? { title } : {}),
+                ...(summary !== undefined ? { summary } : {}),
+                ...(bodySource !== undefined ? { bodySource } : {}),
+                ...(tags !== undefined ? { tags } : {}),
+            }, jsonOutput);
+            return;
+        }
         case 'delete': {
             const ws = argv[1];
             const j = argv[2];
@@ -358,12 +446,180 @@ async function routeEntries(argv) {
         }
         default:
             process.stderr.write(`Unknown entries subcommand: ${sub}\n` +
-                'Usage: workjournal entries <list|write|last|get|delete|search>\n');
+                'Usage: workjournal entries <list|write|last|get|update|delete|search>\n');
+            process.exit(1);
+    }
+}
+async function routePrompts(argv) {
+    const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'prompts' : `prompts ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
+    switch (sub) {
+        case undefined:
+        case 'list': {
+            const ws = argv[1] ?? readConfig().workspaceSlug;
+            if (!ws) {
+                process.stderr.write('Usage: workjournal prompts list <workspaceSlug>\n' +
+                    '(or run `workjournal workspaces select <slug>` first)\n');
+                process.exit(1);
+            }
+            await listPrompts(ws, jsonOutput);
+            return;
+        }
+        case 'new':
+        case 'create': {
+            const { flags, positional } = parseFlags(argv.slice(1));
+            const ws = positional[0];
+            const name = positional[1];
+            if (!ws || !name) {
+                process.stderr.write('Usage: workjournal prompts new <workspaceSlug> <name> [-b <body>] [--slug <slug>]\n');
+                process.exit(1);
+            }
+            const body = flags['-b'] ?? flags['--body'] ?? '';
+            const slug = flags['--slug'];
+            await createPrompt(ws, name, body, slug, jsonOutput);
+            return;
+        }
+        case 'get': {
+            const ws = argv[1];
+            const slug = argv[2];
+            if (!ws || !slug) {
+                process.stderr.write('Usage: workjournal prompts get <workspaceSlug> <promptSlug>\n');
+                process.exit(1);
+            }
+            await getPrompt(ws, slug, jsonOutput);
+            return;
+        }
+        case 'update': {
+            const { flags, positional } = parseFlags(argv.slice(1));
+            const ws = positional[0];
+            const slug = positional[1];
+            if (!ws || !slug) {
+                process.stderr.write('Usage: workjournal prompts update <workspaceSlug> <promptSlug> [-n <name>] [-b <body>]\n');
+                process.exit(1);
+            }
+            const updates = {};
+            const name = flags['-n'] ?? flags['--name'];
+            const body = flags['-b'] ?? flags['--body'];
+            if (name !== undefined)
+                updates.name = name;
+            if (body !== undefined)
+                updates.body = body;
+            if (Object.keys(updates).length === 0) {
+                process.stderr.write('At least one of -n/--name or -b/--body is required.\n');
+                process.exit(1);
+            }
+            await updatePrompt(ws, slug, updates, jsonOutput);
+            return;
+        }
+        case 'delete': {
+            const ws = argv[1];
+            const slug = argv[2];
+            if (!ws || !slug) {
+                process.stderr.write('Usage: workjournal prompts delete <workspaceSlug> <promptSlug>\n');
+                process.exit(1);
+            }
+            await deletePrompt(ws, slug, jsonOutput);
+            return;
+        }
+        default:
+            process.stderr.write(`Unknown prompts subcommand: ${sub}\n` +
+                'Usage: workjournal prompts <list|new|get|update|delete>\n');
+            process.exit(1);
+    }
+}
+async function routeTags(argv) {
+    const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'tags' : `tags ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
+    switch (sub) {
+        case undefined:
+        case 'list': {
+            const { flags, positional } = parseFlags(argv.slice(1));
+            const ws = positional[0] ?? readConfig().workspaceSlug;
+            if (!ws) {
+                process.stderr.write('Usage: workjournal tags list <workspaceSlug> [--journal <journalSlug>]\n' +
+                    '(or run `workjournal workspaces select <slug>` first)\n');
+                process.exit(1);
+            }
+            const journalSlug = flags['--journal'] ?? flags['-j'];
+            await listTags(ws, journalSlug, jsonOutput);
+            return;
+        }
+        case 'new':
+        case 'create': {
+            const { flags, positional } = parseFlags(argv.slice(1));
+            const ws = positional[0];
+            const name = positional[1];
+            if (!ws || !name) {
+                process.stderr.write('Usage: workjournal tags new <workspaceSlug> <name> [-d <description>] [--journal <journalSlug>]\n');
+                process.exit(1);
+            }
+            const description = flags['-d'] ?? flags['--description'];
+            const journalSlug = flags['--journal'] ?? flags['-j'];
+            await createTag(ws, name, description, journalSlug, jsonOutput);
+            return;
+        }
+        case 'get': {
+            const { flags, positional } = parseFlags(argv.slice(1));
+            const ws = positional[0];
+            const name = positional[1];
+            if (!ws || !name) {
+                process.stderr.write('Usage: workjournal tags get <workspaceSlug> <tagName> [--journal <journalSlug>]\n');
+                process.exit(1);
+            }
+            const journalSlug = flags['--journal'] ?? flags['-j'];
+            await getTag(ws, name, journalSlug, jsonOutput);
+            return;
+        }
+        case 'update': {
+            const { flags, positional } = parseFlags(argv.slice(1));
+            const ws = positional[0];
+            const name = positional[1];
+            if (!ws || !name) {
+                process.stderr.write('Usage: workjournal tags update <workspaceSlug> <tagName> [-n <newName>] [-d <description>] [--journal <journalSlug>]\n');
+                process.exit(1);
+            }
+            const updates = {};
+            const newName = flags['-n'] ?? flags['--name'];
+            const description = flags['-d'] ?? flags['--description'];
+            if (newName !== undefined)
+                updates.name = newName;
+            if (description !== undefined)
+                updates.description = description;
+            if (Object.keys(updates).length === 0) {
+                process.stderr.write('At least one of -n/--name or -d/--description is required.\n');
+                process.exit(1);
+            }
+            const journalSlug = flags['--journal'] ?? flags['-j'];
+            await updateTag(ws, name, updates, journalSlug, jsonOutput);
+            return;
+        }
+        case 'delete': {
+            const { flags, positional } = parseFlags(argv.slice(1));
+            const ws = positional[0];
+            const name = positional[1];
+            if (!ws || !name) {
+                process.stderr.write('Usage: workjournal tags delete <workspaceSlug> <tagName> [--journal <journalSlug>]\n');
+                process.exit(1);
+            }
+            const journalSlug = flags['--journal'] ?? flags['-j'];
+            await deleteTag(ws, name, journalSlug, jsonOutput);
+            return;
+        }
+        default:
+            process.stderr.write(`Unknown tags subcommand: ${sub}\n` +
+                'Usage: workjournal tags <list|new|get|update|delete>\n');
             process.exit(1);
     }
 }
 async function routeShares(argv) {
     const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'shares' : `shares ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
     switch (sub) {
         case undefined:
         case 'list': {
@@ -394,6 +650,9 @@ async function routeShares(argv) {
 }
 async function routeInvites(argv) {
     const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'invites' : `invites ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
     switch (sub) {
         case undefined:
         case 'list': {
@@ -435,10 +694,13 @@ async function routeInvites(argv) {
     }
 }
 async function routeExport(argv) {
+    if (tryHandleHelp('export', argv, jsonOutput))
+        return;
     const ws = argv[0];
     const j = argv[1];
     if (!ws || !j) {
-        process.stderr.write('Usage: workjournal export <workspaceSlug> <journalSlug> [-f json|md|csv] [-p <path>]\n');
+        process.stderr.write('Usage: workjournal export <workspaceSlug> <journalSlug> [-f json|md|csv] [-p <path>]\n' +
+            'Run `workjournal export --help` for details.\n');
         process.exit(1);
     }
     const { flags } = parseFlags(argv.slice(2));
@@ -452,6 +714,9 @@ async function routeExport(argv) {
 }
 async function routeConfig(argv) {
     const sub = argv[0];
+    const helpKey = !sub || sub === '--help' || sub === '-h' ? 'config show' : `config ${sub}`;
+    if (tryHandleHelp(helpKey, argv, jsonOutput))
+        return;
     if (sub === 'show') {
         const projectPath = getProjectConfigPath();
         const stored = findProjectConfig();
@@ -490,71 +755,20 @@ async function routeConfig(argv) {
     }
 }
 // ── Help ────────────────────────────────────────────────────────────────────
-function printHelp() {
-    process.stdout.write(`workjournal — CLI for Workjournal (https://workjournal.pro)
-
-Usage:
-  workjournal                                           List entries in selected journal
-
-Workspaces:
-  workjournal workspaces list                            List your workspaces
-  workjournal workspaces get <ws>                        Show workspace details
-  workjournal workspaces select <ws>                     Set active workspace
-
-Journals:
-  workjournal journals list [<ws>]                       List journals in workspace
-  workjournal journals list shared-with-me               List journals shared with you
-  workjournal journals get <ws> <j>                      Show journal details
-  workjournal journals new <ws> <name> [--slug <slug>]   Create a new journal
-  workjournal journals delete <ws> <j>                   Delete a journal
-  workjournal journals rename <ws> <j> <newName>         Rename a journal
-  workjournal journals set-slug <ws> <j> <newSlug>       Change a journal's slug
-  workjournal journals select <ws> <j>                   Set active journal
-  workjournal journals                                   Show selected journal details
-
-Entries:
-  workjournal entries list <ws> <j>                      List entries
-  workjournal entries write <ws> <j> -t <title> -s <summary> -b <body>
-                                                         Create a new entry
-  workjournal entries last <ws> <j> [count]              Show most recent entries (full body)
-  workjournal entries get <ws> <j> <index>               Show a single entry by index
-  workjournal entries delete <ws> <j> <index>            Delete an entry by index
-  workjournal entries search <ws> <j> <query>            Search entries
-
-Shares (members):
-  workjournal shares list <ws> <j>                       List members
-  workjournal shares delete <ws> <j> <email>             Remove a member
-
-Invites:
-  workjournal invites list <ws> <j>                      List invitations
-  workjournal invites new <ws> <j> <email>               Invite a collaborator
-  workjournal invites delete <ws> <j> <invitationId>     Revoke an invitation
-
-Export:
-  workjournal export <ws> <j> [-f json|md|csv] [-p <path>]
-                                                         Export journal data
-
-Auth:
-  workjournal auth login                                 Interactive login
-  workjournal auth login start                           Print authorize URL (headless)
-  workjournal auth login finish <CODE>                   Exchange code for credentials
-  workjournal auth logout                                Remove stored credentials
-  workjournal auth whoami                                Show current auth status
-  workjournal auth status                                Show detailed auth status
-
-Config:
-  workjournal config show                                Show resolved config
-
-Flags:
-  --json                                                 Output raw JSON instead of tables
-`);
+function printVersion() {
+    process.stdout.write(`@workjournal/cli ${packageJson.version}\n`);
+    process.stdout.write(`${FEEDBACK_FOOTER}\n`);
 }
 // ── Main ────────────────────────────────────────────────────────────────────
 async function run() {
     try {
         const command = args[0];
-        if (command === 'help' || command === '--help') {
-            printHelp();
+        if (command === 'help' || command === '--help' || command === '-h') {
+            printTopLevelHelp(jsonOutput);
+            return;
+        }
+        if (command === '--version' || command === '-V') {
+            printVersion();
             return;
         }
         if (command === undefined) {
@@ -572,6 +786,8 @@ async function run() {
                 break;
             case 'journal': {
                 // Shortcut: show selected journal details (matches docs/cli-commands.md)
+                if (tryHandleHelp('journal', args.slice(1), jsonOutput))
+                    break;
                 const sel = await resolveActiveSelection();
                 if (args.length > 1) {
                     process.stderr.write('`workjournal journal` shows the selected journal. Use `workjournal entries`, ' +
@@ -579,7 +795,7 @@ async function run() {
                         'resource verbs.\n');
                     process.exit(1);
                 }
-                await getJournal(sel.workspaceSlug, sel.journalSlug, jsonOutput);
+                await getJournal(sel.workspaceSlug, sel.journalSlug, jsonOutput, verbose);
                 break;
             }
             case 'journals':
@@ -588,6 +804,12 @@ async function run() {
             case 'entries':
                 await routeEntries(args.slice(1));
                 break;
+            case 'prompts':
+                await routePrompts(args.slice(1));
+                break;
+            case 'tags':
+                await routeTags(args.slice(1));
+                break;
             case 'shares':
                 await routeShares(args.slice(1));
                 break;
@@ -601,12 +823,22 @@ async function run() {
                 await routeConfig(args.slice(1));
                 break;
             default:
-                printHelp();
+                printTopLevelHelp(jsonOutput);
                 process.stderr.write(`\nUnknown command: ${command}\n`);
+                process.stderr.write(`If this is a bug, please report it: ${FEEDBACK_URL}\n`);
                 process.exit(1);
         }
     }
     catch (err) {
+        if (err instanceof AuthRequiredError) {
+            if (err.reason === 'not-logged-in') {
+                process.stderr.write('Not logged in. Run `workjournal auth login` to authenticate.\n');
+            }
+            else {
+                process.stderr.write('Authentication expired. Run `workjournal auth login` to re-authenticate.\n');
+            }
+            process.exit(1);
+        }
         const message = err instanceof Error ? err.message : String(err);
         if (message.includes('fetch') ||
             message.includes('ECONNREFUSED') ||
@@ -616,6 +848,7 @@ async function run() {
         else {
             process.stderr.write(`Error: ${message}\n`);
         }
+        process.stderr.write(`If this looks like a bug, please report it: ${FEEDBACK_URL}\n`);
         process.exit(1);
     }
 }