orbitmap 0.3.0 → 0.4.1

package/dist/index.js

@@ -2,7 +2,7 @@
 import { Command } from 'commander';
 import { initCommand } from './commands/init.js';
 import { contextCommand } from './commands/context.js';
-import { projectsCommand } from './commands/projects.js';
+import { areasCommand } from './commands/areas.js';
 import { membersCommand } from './commands/agents.js';
 import { overviewCommand } from './commands/overview.js';
 import { tasksCommand } from './commands/tasks.js';
@@ -28,27 +28,66 @@ import { logoutCommand } from './commands/logout.js';
 import { issueRegisterCommand, issueListCommand, issueShowCommand, issueResolveCommand, issueStatusCommand, } from './commands/issues.js';
 import { vibeLogCommand, vibeListCommand, vibeShowCommand, vibeUpdateCommand, } from './commands/vibes.js';
 import { ideaListCommand, ideaShowCommand, ideaAddCommand, ideaStatusCommand, } from './commands/ideas.js';
-import { orbitItemsCommand, orbitAttachCommand, orbitDetachCommand, } from './commands/orbit.js';
+import { orbitListCommand, orbitShowCommand, orbitCreateCommand, orbitUpdateCommand, orbitItemsCommand, orbitAttachCommand, orbitDetachCommand, orbitAreaLinkCommand, orbitAreaUnlinkCommand, orbitDepAddCommand, } from './commands/orbit.js';
+import { intentListCommand, intentShowCommand, intentCreateCommand, intentUpdateCommand, intentLinkCommand, intentUnlinkCommand, intentOrbitCommand, } from './commands/intent.js';
+import { missionListCommand, missionShowCommand, missionCreateCommand, missionUpdateCommand, missionStatusCommand, missionLinkCommand, missionUnlinkCommand, } from './commands/mission.js';
 import { depAddCommand, depRemoveCommand } from './commands/dep.js';
 import { getCommand } from './commands/get.js';
-import { createProjectCommand } from './commands/create-project.js';
+import { createRequire } from 'node:module';
+import { createAreaCommand } from './commands/create-area.js';
+import { setWorkspaceFlag } from './workspace-resolve.js';
 const program = new Command();
+/**
+ * `--version` reads the real package version instead of a hardcoded literal, which had gone
+ * stale (it still said 0.3.0 two releases later, so `orbitmap --version` lied about what was
+ * installed). `../package.json` resolves to the repo root from both `src/` and `dist/`, and npm
+ * always ships package.json in the tarball regardless of the `files` allow-list.
+ */
+const { version } = createRequire(import.meta.url)('../package.json');
 program
     .name('orbitmap')
     .description('CLI tool for OrbitMap Agent API')
-    .version('0.3.0')
+    .version(version)
     .option('--json', 'Output in JSON format', false)
-    .option('--project <id>', 'Project ID or slug to use');
+    .option('--area <id>', 'Area ID or slug to use')
+    .option('--workspace <path>', 'Local workspace directory to use (local mode)');
+// The workspace flag is program-level and consumed by the resolver, not by the
+// command modules, so capture it once before any action runs.
+program.hook('preAction', (thisCommand) => {
+    setWorkspaceFlag(thisCommand.opts()['workspace']);
+});
 program
     .command('init')
-    .description('Configure API credentials and generate MCP config')
+    .description('Set up OrbitMap (cloud account or local files) and install the agent skills')
     .option('--key <api-key>', 'Agent API key (enables non-interactive mode)')
     .option('--token <api-key>', 'Alias for --key')
-    .option('--project <id>', 'Default project ID')
+    .option('--area <id>', 'Default area ID (cloud) or first area name (local)')
     .option('--profile <profile>', 'MCP profile: full, lite, manager (default: full)')
     .option('--advanced', 'Show advanced options (e.g. custom API URL)')
-    .action(async (opts) => {
-    await initCommand({ advanced: opts.advanced, key: opts.key, token: opts.token, project: opts.project, profile: opts.profile });
+    .option('--local', 'Set up local-files mode without the interactive question')
+    .option('--workspace <path>', 'Local workspace directory (default: ./.orbitmap)')
+    .option('--workspace-name <name>', 'Local workspace name (default: current directory name)')
+    .option('--no-skills', 'Skip installing the OrbitMap agent skills')
+    .option('--agent <type>', 'Coding agent to install the skills for: claude, gemini, codex, cursor, windsurf, generic ' +
+    '(default: detected from this directory, or asked)')
+    .option('--global', 'Cloud: write to ~/.orbitmap/config.json instead of ./.orbitmap/config.json')
+    .action(async (opts, command) => {
+    // `--workspace` also exists as a program-level flag, and Commander binds it there;
+    // `optsWithGlobals()` picks it up whichever position it was given in.
+    const all = command.optsWithGlobals();
+    await initCommand({
+        advanced: opts.advanced,
+        key: opts.key,
+        token: opts.token,
+        area: opts.area ?? all['area'],
+        profile: opts.profile,
+        local: opts.local,
+        workspace: opts.workspace ?? all['workspace'],
+        workspaceName: opts.workspaceName,
+        skills: opts.skills,
+        agent: opts.agent,
+        global: opts.global,
+    });
 });
 program
     .command('login')
@@ -65,45 +104,47 @@ program
 });
 program
     .command('context')
-    .description('Show agent identity and current project info')
+    .description('Show agent identity and current area info')
     .action(async (_opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await contextCommand({ json: globalOpts.json, project: globalOpts.project });
+    await contextCommand({ json: globalOpts.json, area: globalOpts.area });
 });
 program
-    .command('projects')
-    .description('List all projects assigned to this agent')
+    .command('areas')
+    .description('List all areas assigned to this agent')
     .action(async (_opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await projectsCommand({ json: globalOpts.json });
+    await areasCommand({ json: globalOpts.json });
 });
 program
-    .command('create-project <name>')
-    .description('Create a new project')
-    .option('--desc <description>', 'Project description')
-    .option('--slug <slug>', 'Project slug (auto-generated from name if omitted)')
+    .command('create-area <name>')
+    .description('Create a new area')
+    .option('--desc <description>', 'Area description')
+    .option('--slug <slug>', 'Area slug (auto-generated from name if omitted)')
+    .option('--workspace-id <uuid>', 'Workspace to create the area in')
     .action(async (name, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await createProjectCommand(name, {
+    await createAreaCommand(name, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         desc: opts.desc,
         slug: opts.slug,
+        workspaceId: opts.workspaceId,
     });
 });
 program
-    .command('members <project-id>')
-    .description('List all members (agents and users) in a project')
-    .action(async (projectId, _opts, cmd) => {
+    .command('members <area-id>')
+    .description('List all members (agents and users) in an area')
+    .action(async (areaId, _opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await membersCommand(projectId, { json: globalOpts.json });
+    await membersCommand(areaId, { json: globalOpts.json });
 });
 program
-    .command('overview [project-id]')
-    .description('Show project overview with task statistics')
-    .action(async (projectId, _opts, cmd) => {
+    .command('overview [area-id]')
+    .description('Show area overview with task statistics')
+    .action(async (areaId, _opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await overviewCommand(projectId, { json: globalOpts.json, project: globalOpts.project });
+    await overviewCommand(areaId, { json: globalOpts.json, area: globalOpts.area });
 });
 program
     .command('tasks')
@@ -115,7 +156,7 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await tasksCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         status: opts.status,
         priority: opts.priority,
         orbit: opts.orbit,
@@ -123,20 +164,20 @@ program
 });
 program
     .command('get <prefixed-id>')
-    .description('Show any object by prefixed ID (TS-xxx, IS-xxx, ID-xxx, VB-xxx)')
+    .description('Show any object by prefixed ID (TS-xxx, IS-xxx, ID-xxx, VB-xxx, IN-xxx, MS-xxx)')
     .action(async (prefixedId, _opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await getCommand(prefixedId, { json: globalOpts.json, project: globalOpts.project });
+    await getCommand(prefixedId, { json: globalOpts.json, area: globalOpts.area });
 });
 program
-    .command('task <id>')
-    .description('Show full task details (UUID or task number)')
+    .command('task <id-or-number>')
+    .description('Show full task details (UUID, TS-prefixed ID, or task number)')
     .action(async (id, _opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await taskCommand(id, { json: globalOpts.json, project: globalOpts.project });
+    await taskCommand(id, { json: globalOpts.json, area: globalOpts.area });
 });
 program
-    .command('task-edit-content <task-id>')
+    .command('task-edit-content <id-or-number>')
     .description('Edit task content (title, description, agent instructions)')
     .option('--title <title>', 'New title')
     .option('--description <text>', 'New description')
@@ -145,29 +186,31 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await taskEditContentCommand(taskId, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         title: opts.title,
         description: opts.description,
         agentInstructions: opts.agentInstructions,
     });
 });
 program
-    .command('start [task-id]')
+    .command('start [id-or-number]')
     .description('Start working on a task (auto-pick if no ID given)')
     .action(async (taskId, _opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await startCommand(taskId, { json: globalOpts.json, project: globalOpts.project });
+    await startCommand(taskId, { json: globalOpts.json, area: globalOpts.area });
 });
 program
-    .command('status <task-id> <status>')
+    .command('status <id-or-number> <status>')
     .description('Update task status (backlog, todo, in_progress, in_review, review_changes, done, blocked)')
     .option('--delivery <status>', 'Delivery status: on_branch, merged, released')
+    .option('--force', 'Allow done even with unfinished subtasks')
     .action(async (taskId, status, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await statusCommand(taskId, status, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         delivery: opts.delivery,
+        force: opts.force,
     });
 });
 program
@@ -181,11 +224,13 @@ program
     .option('--branch <name>', 'Git branch name')
     .option('--instructions <text>', 'Agent instructions')
     .option('--from-issue <id-or-number>', 'Link task to an existing issue (UUID, number, or IS-prefixed)')
+    .option('--intent <id>', 'Link task to an intent')
+    .option('--orbit <id>', 'Attach task to an orbit (omit to inherit the intent orbit)')
     .action(async (title, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await createCommand(title, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         desc: opts.desc,
         priority: opts.priority,
         status: opts.status,
@@ -194,10 +239,12 @@ program
         branch: opts.branch,
         instructions: opts.instructions,
         fromIssue: opts.fromIssue,
+        intent: opts.intent,
+        orbit: opts.orbit,
     });
 });
 program
-    .command('subtask <parent-id> <title>')
+    .command('subtask <parent-id-or-number> <title>')
     .description('Create a subtask under a parent task')
     .option('--desc <description>', 'Subtask description')
     .option('--priority <priority>', 'Priority (critical, high, medium, low)')
@@ -206,26 +253,28 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await subtaskCommand(parentId, title, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         desc: opts.desc,
         priority: opts.priority,
         effort: opts.effort,
     });
 });
 program
-    .command('assign <task-id> [agent-id]')
-    .description('Assign a task to an agent or user')
+    .command('assign <id-or-number> [agent-id]')
+    .description('Assign a task, issue, idea, or intent to an agent or user')
     .option('--user-id <id>', 'Assign to a user (by user ID) instead of an agent')
-    .action(async (taskId, agentId, opts, cmd) => {
+    .option('--type <type>', 'Object type: task, issue, idea, intent (auto-detected from prefixed IDs; default task)')
+    .action(async (objectId, agentId, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await assignCommand(taskId, agentId, {
+    await assignCommand(objectId, agentId, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         userId: opts.userId,
+        type: opts.type,
     });
 });
 program
-    .command('log <task-id> <message>')
+    .command('log <id-or-number> <message>')
     .description('Log work on a task')
     .option('--type <type>', 'Log type: note, code_change, decision, blocker, discovery, exploration, fix', 'note')
     .option('--meta <json>', 'JSON metadata (e.g. \'{"files":["..."]}\')')
@@ -233,21 +282,21 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await logCommand(taskId, message, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         meta: opts.meta,
     });
 });
 const docs = program
     .command('docs')
-    .description('List project documents (with sections count and context)')
+    .description('List area documents (with sections count and context)')
     .option('--type <type>', 'Filter by type (spec, architecture, api, guide, decision, changelog, other)')
     .option('--search <query>', 'Search by title')
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await docsCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         search: opts.search,
     });
@@ -257,7 +306,7 @@ docs
     .description('Download document(s) to local cache (.orbitmap/docs/)')
     .action(async (slug, _opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await docsPullCommand(slug, { json: globalOpts.json, project: globalOpts.project });
+    await docsPullCommand(slug, { json: globalOpts.json, area: globalOpts.area });
 });
 docs
     .command('list-cache')
@@ -271,7 +320,7 @@ docs
     .description('Remove stale cached documents (>7 days, not in available docs)')
     .action(async (_opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await docsCleanCommand({ json: globalOpts.json, project: globalOpts.project });
+    await docsCleanCommand({ json: globalOpts.json, area: globalOpts.area });
 });
 program
     .command('doc <id-or-slug>')
@@ -282,24 +331,24 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await docCommand(idOrSlug, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         full: opts.full,
         section: opts.section,
     });
 });
 program
     .command('doc-import <title>')
-    .description('Import a markdown file as a document (project or workspace level)')
+    .description('Import a markdown file as a document (area or workspace level)')
     .requiredOption('--type <type>', 'Document type: spec, architecture, api, guide, decision, changelog, other')
     .requiredOption('--file <path>', 'Path to markdown file')
     .option('--source-path <path>', 'Original source path for reference')
     .option('--context <text>', 'Short description of when this document is relevant')
-    .option('--workspace-id <uuid>', 'Create as workspace-level document (cross-project knowledge)')
+    .option('--workspace-id <uuid>', 'Create as workspace-level document (cross-area knowledge)')
     .action(async (title, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await docImportCommand(title, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         file: opts.file,
         sourcePath: opts.sourcePath,
@@ -316,7 +365,7 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await docUpdateCommand(idOrSlug, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         file: opts.file,
         changelog: opts.changelog,
     });
@@ -337,7 +386,7 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await docPatchCommand(idOrSlug, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         operations: opts.operations,
         baseVersion: opts.baseVersion,
         changelog: opts.changelog,
@@ -350,42 +399,43 @@ program
     });
 });
 program
-    .command('doc-share <document-id> <project-id>')
-    .description('Share a document with another project')
+    .command('doc-share <document-id> <area-id>')
+    .description('Share a document with another area')
     .option('--agents <ids>', 'Comma-separated agent IDs to restrict visibility')
-    .action(async (documentId, projectId, opts, cmd) => {
+    .action(async (documentId, areaId, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await docShareCommand(documentId, projectId, {
+    await docShareCommand(documentId, areaId, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         agents: opts.agents,
     });
 });
 program
-    .command('doc-unshare <document-id> <project-id>')
-    .description('Remove document sharing from a project')
-    .action(async (documentId, projectId, _opts, cmd) => {
+    .command('doc-unshare <document-id> <area-id>')
+    .description('Remove document sharing from an area')
+    .action(async (documentId, areaId, _opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await docUnshareCommand(documentId, projectId, {
+    await docUnshareCommand(documentId, areaId, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
     });
 });
 program
-    .command('doc-visibility <document-id> <target-project-id>')
+    .command('doc-visibility <document-id> <target-area-id>')
     .description('Update document visibility (restrict to specific agents or allow all)')
     .option('--agents <ids>', 'Comma-separated agent IDs to restrict visibility (omit to allow all)')
-    .action(async (documentId, targetProjectId, opts, cmd) => {
+    .action(async (documentId, targetAreaId, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    await docVisibilityCommand(documentId, targetProjectId, {
+    await docVisibilityCommand(documentId, targetAreaId, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         agents: opts.agents,
     });
 });
 program
     .command('setup-agent')
-    .description('Add OrbitMap instructions to your agent config file')
+    .description('Refresh the OrbitMap agent instructions/skills, or add another agent type ' +
+    '(`init` already installs them once)')
     .option('--agent <type>', 'Agent type: claude, gemini, codex, cursor, windsurf, generic')
     .action(async (opts) => {
     await setupAgentCommand({ agent: opts.agent });
@@ -395,14 +445,14 @@ program
     .description('Install OrbitMap MCP entry into .mcp.json in the current directory (no API calls)')
     .option('--token <api-key>', 'Agent API key (Bearer auth)')
     .option('--oauth', 'Use OAuth (no Authorization header; auth happens on first MCP use)')
-    .option('--project <slug>', 'Project slug or UUID (required for --token, optional for --oauth)')
+    .option('--area <slug>', 'Area slug or UUID (required for --token, optional for --oauth)')
     .option('--profile <profile>', 'MCP profile: full, lite, manager (default: full)')
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await setupMcpCommand({
         token: opts.token,
         oauth: opts.oauth,
-        project: opts.project || globalOpts.project,
+        area: opts.area || globalOpts.area,
         profile: opts.profile,
     });
 });
@@ -417,7 +467,7 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await issueListCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         status: opts.status,
         severity: opts.severity,
         limit: opts.limit,
@@ -433,7 +483,7 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await vibeListCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         since: opts.since,
         limit: opts.limit,
@@ -449,12 +499,40 @@ program
     const globalOpts = cmd.optsWithGlobals();
     await ideaListCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         status: opts.status,
         priority: opts.priority,
         limit: opts.limit,
     });
 });
+program
+    .command('intents')
+    .description('List intents (shortcut for intent list)')
+    .option('--status <statuses>', 'Filter by status (comma-separated; default new,design,plan,build)')
+    .option('--limit <n>', 'Limit results')
+    .action(async (opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentListCommand({
+        json: globalOpts.json,
+        area: globalOpts.area,
+        status: opts.status,
+        limit: opts.limit,
+    });
+});
+program
+    .command('missions')
+    .description('List missions (shortcut for mission list)')
+    .option('--status <statuses>', 'Filter by status (comma-separated; default new,active)')
+    .option('--limit <n>', 'Limit results')
+    .action(async (opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionListCommand({
+        json: globalOpts.json,
+        area: globalOpts.area,
+        status: opts.status,
+        limit: opts.limit,
+    });
+});
 // ── Issue commands ──
 const issue = program
     .command('issue')
@@ -466,15 +544,17 @@ issue
     .requiredOption('--description <text>', 'Issue description')
     .option('--severity <level>', 'Severity: critical, high, medium, low')
     .option('--related-task <id>', 'Related task UUID')
+    .option('--intent <id>', 'Link issue to an intent')
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await issueRegisterCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         title: opts.title,
         description: opts.description,
         severity: opts.severity,
         relatedTask: opts.relatedTask,
+        intent: opts.intent,
     });
 });
 issue
@@ -487,7 +567,7 @@ issue
     const globalOpts = cmd.optsWithGlobals();
     await issueListCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         status: opts.status,
         severity: opts.severity,
         limit: opts.limit,
@@ -500,7 +580,7 @@ issue
     const globalOpts = cmd.optsWithGlobals();
     await issueShowCommand(idOrNumber, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
     });
 });
 issue
@@ -513,7 +593,7 @@ issue
     const globalOpts = cmd.optsWithGlobals();
     await issueResolveCommand(idOrNumber, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         status: opts.status,
         resolution: opts.resolution,
         resolvedTask: opts.resolvedTask,
@@ -528,7 +608,7 @@ issue
     const globalOpts = cmd.optsWithGlobals();
     await issueStatusCommand(idOrNumber, status, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         resolution: opts.resolution,
         resolvedTask: opts.resolvedTask,
     });
@@ -548,7 +628,7 @@ vibe
     const globalOpts = cmd.optsWithGlobals();
     await vibeLogCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         content: opts.content,
         type: opts.type,
         title: opts.title,
@@ -565,7 +645,7 @@ vibe
     const globalOpts = cmd.optsWithGlobals();
     await vibeListCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         since: opts.since,
         limit: opts.limit,
@@ -578,7 +658,7 @@ vibe
     const globalOpts = cmd.optsWithGlobals();
     await vibeShowCommand(id, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
     });
 });
 vibe
@@ -592,7 +672,7 @@ vibe
     const globalOpts = cmd.optsWithGlobals();
     await vibeUpdateCommand(id, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         title: opts.title,
         content: opts.content,
@@ -613,7 +693,7 @@ idea
     const globalOpts = cmd.optsWithGlobals();
     await ideaListCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         status: opts.status,
         priority: opts.priority,
         limit: opts.limit,
@@ -626,7 +706,7 @@ idea
     const globalOpts = cmd.optsWithGlobals();
     await ideaShowCommand(idOrNumber, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
     });
 });
 idea
@@ -639,7 +719,7 @@ idea
     const globalOpts = cmd.optsWithGlobals();
     await ideaAddCommand({
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         content: opts.content,
         title: opts.title,
         priority: opts.priority,
@@ -653,37 +733,93 @@ idea
     const globalOpts = cmd.optsWithGlobals();
     await ideaStatusCommand(idOrNumber, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         status: opts.status,
     });
 });
 // ── Orbit commands ──
 const orbit = program
     .command('orbit')
-    .description('Manage orbit items');
+    .description('Manage orbits and orbit items');
+orbit
+    .command('list')
+    .description('List orbits (workspace-scoped from the area context)')
+    .option('--workspace <id>', 'Filter by workspace UUID')
+    .action(async (opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await orbitListCommand({
+        json: globalOpts.json,
+        area: globalOpts.area,
+        workspace: opts.workspace,
+    });
+});
+orbit
+    .command('show <orbit-id-or-slug>')
+    .description('Show orbit details (areas, task counts, resources)')
+    .action(async (orbitIdOrSlug, _opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await orbitShowCommand(orbitIdOrSlug, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+    });
+});
+orbit
+    .command('create <name>')
+    .description('Create a new orbit (no delete exists — archive via orbit update)')
+    .option('--desc <description>', 'Orbit description')
+    .option('--color <hex>', 'Color (#rgb or #rrggbb, e.g. #5B8DEF)')
+    .option('--areas <ids>', 'Comma-separated area UUIDs to link')
+    .action(async (name, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await orbitCreateCommand(name, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        desc: opts.desc,
+        color: opts.color,
+        areas: opts.areas,
+    });
+});
+orbit
+    .command('update <orbit-id-or-slug>')
+    .description('Update an orbit (name, description, status, color)')
+    .option('--name <name>', 'New name')
+    .option('--desc <description>', 'New description')
+    .option('--status <status>', 'Status: active, completed, archived')
+    .option('--color <hex>', 'Color (#rgb or #rrggbb)')
+    .action(async (orbitIdOrSlug, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await orbitUpdateCommand(orbitIdOrSlug, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        name: opts.name,
+        desc: opts.desc,
+        status: opts.status,
+        color: opts.color,
+    });
+});
 orbit
     .command('items <orbit-id-or-slug>')
     .description('List all items in an orbit')
-    .option('--type <type>', 'Filter by type: task, issue, vibe, document')
+    .option('--type <type>', 'Filter by type: task, issue, vibe, idea, document')
     .action(async (orbitIdOrSlug, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await orbitItemsCommand(orbitIdOrSlug, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
     });
 });
 orbit
     .command('attach <orbit-id-or-slug>')
     .description('Attach an object to an orbit')
-    .requiredOption('--type <type>', 'Object type: task, issue, vibe, document')
+    .requiredOption('--type <type>', 'Object type: task, issue, vibe, idea, document')
     .requiredOption('--id <uuid>', 'Object UUID')
     .option('--note <text>', 'Optional note for the attachment')
     .action(async (orbitIdOrSlug, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await orbitAttachCommand(orbitIdOrSlug, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         id: opts.id,
         note: opts.note,
@@ -692,13 +828,250 @@ orbit
 orbit
     .command('detach <orbit-id-or-slug>')
     .description('Detach an object from an orbit')
-    .requiredOption('--type <type>', 'Object type: task, issue, vibe, document')
+    .requiredOption('--type <type>', 'Object type: task, issue, vibe, idea, document')
     .requiredOption('--id <uuid>', 'Object UUID')
     .action(async (orbitIdOrSlug, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await orbitDetachCommand(orbitIdOrSlug, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
+        type: opts.type,
+        id: opts.id,
+    });
+});
+const orbitArea = orbit
+    .command('area')
+    .description('Manage orbit-area links');
+orbitArea
+    .command('link <orbit-id-or-slug> <area-id>')
+    .description('Link an area to an orbit')
+    .action(async (orbitIdOrSlug, areaId, _opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await orbitAreaLinkCommand(orbitIdOrSlug, areaId, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+    });
+});
+orbitArea
+    .command('unlink <orbit-id-or-slug> <area-id>')
+    .description('Unlink an area from an orbit')
+    .action(async (orbitIdOrSlug, areaId, _opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await orbitAreaUnlinkCommand(orbitIdOrSlug, areaId, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+    });
+});
+orbit
+    .command('dep <orbit-id-or-slug> <target-orbit-id>')
+    .description('Add an orbit-to-orbit dependency (no remove exists in the API)')
+    .option('--note <text>', 'Optional note for the dependency')
+    .action(async (orbitIdOrSlug, targetOrbitId, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await orbitDepAddCommand(orbitIdOrSlug, targetOrbitId, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        note: opts.note,
+    });
+});
+// ── Intent commands ──
+const intent = program
+    .command('intent')
+    .description('Manage intents (workspace-level desired outcomes)');
+intent
+    .command('list')
+    .description('List intents')
+    .option('--status <statuses>', 'Filter by status (comma-separated; default new,design,plan,build)')
+    .option('--limit <n>', 'Limit results')
+    .action(async (opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentListCommand({
+        json: globalOpts.json,
+        area: globalOpts.area,
+        status: opts.status,
+        limit: opts.limit,
+    });
+});
+intent
+    .command('show <id-or-number>')
+    .description('Show full intent details (UUID or IN-prefixed number)')
+    .action(async (idOrNumber, _opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentShowCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+    });
+});
+intent
+    .command('create <title>')
+    .description('Create a new intent')
+    .option('--outcome <text>', 'Desired outcome')
+    .option('--status <status>', 'Initial status: new, design, plan, build, done, cancelled (default new)')
+    .option('--orbit <id>', 'Attach the intent to an orbit after creation')
+    .action(async (title, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentCreateCommand(title, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        outcome: opts.outcome,
+        status: opts.status,
+        orbit: opts.orbit,
+    });
+});
+intent
+    .command('update <id-or-number>')
+    .description('Update an intent (title, outcome, status)')
+    .option('--title <title>', 'New title')
+    .option('--outcome <text>', 'New outcome')
+    .option('--status <status>', 'Status: new, design, plan, build, done, cancelled')
+    .action(async (idOrNumber, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentUpdateCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        title: opts.title,
+        outcome: opts.outcome,
+        status: opts.status,
+    });
+});
+intent
+    .command('link <id-or-number>')
+    .description('Link a task or issue to an intent')
+    .requiredOption('--type <type>', 'Object type: task, issue')
+    .requiredOption('--id <uuid>', 'Object UUID')
+    .action(async (idOrNumber, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentLinkCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        type: opts.type,
+        id: opts.id,
+    });
+});
+intent
+    .command('unlink <id-or-number>')
+    .description('Unlink a task or issue from an intent')
+    .requiredOption('--type <type>', 'Object type: task, issue')
+    .requiredOption('--id <uuid>', 'Object UUID')
+    .action(async (idOrNumber, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentUnlinkCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        type: opts.type,
+        id: opts.id,
+    });
+});
+intent
+    .command('orbit <id-or-number> [orbit-id]')
+    .description('Set or clear the orbit of an intent')
+    .option('--clear', 'Clear the orbit instead of setting one')
+    .action(async (idOrNumber, orbitId, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await intentOrbitCommand(idOrNumber, orbitId, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        clear: opts.clear,
+    });
+});
+// ── Mission commands ──
+const mission = program
+    .command('mission')
+    .description('Manage missions (time-boxed workspace focus)');
+mission
+    .command('list')
+    .description('List missions')
+    .option('--status <statuses>', 'Filter by status (comma-separated; default new,active)')
+    .option('--limit <n>', 'Limit results')
+    .action(async (opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionListCommand({
+        json: globalOpts.json,
+        area: globalOpts.area,
+        status: opts.status,
+        limit: opts.limit,
+    });
+});
+mission
+    .command('show <id-or-number>')
+    .description('Show full mission details (UUID or MS-prefixed number)')
+    .action(async (idOrNumber, _opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionShowCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+    });
+});
+mission
+    .command('create <title>')
+    .description('Create a new mission (always starts as "new")')
+    .option('--desc <description>', 'Mission description')
+    .option('--outcome <text>', 'Desired outcome (max 500 chars)')
+    .option('--end-date <date>', 'Target end date (YYYY-MM-DD)')
+    .action(async (title, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionCreateCommand(title, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        desc: opts.desc,
+        outcome: opts.outcome,
+        endDate: opts.endDate,
+    });
+});
+mission
+    .command('update <id-or-number>')
+    .description('Update a mission (title, description, outcome, end date)')
+    .option('--title <title>', 'New title')
+    .option('--desc <description>', 'New description')
+    .option('--outcome <text>', 'New outcome')
+    .option('--end-date <date>', 'New end date (YYYY-MM-DD)')
+    .action(async (idOrNumber, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionUpdateCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        title: opts.title,
+        desc: opts.desc,
+        outcome: opts.outcome,
+        endDate: opts.endDate,
+    });
+});
+mission
+    .command('status <id-or-number> <status>')
+    .description('Set mission lifecycle status (active, completed, cancelled; only one mission can be active)')
+    .option('--move-to <mission-id>', 'Mission to move unfinished work to when completing/cancelling')
+    .action(async (idOrNumber, status, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionStatusCommand(idOrNumber, status, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        moveTo: opts.moveTo,
+    });
+});
+mission
+    .command('link <id-or-number>')
+    .description('Link a task, issue, idea, or intent to a mission (clears intent_id on tasks/issues)')
+    .requiredOption('--type <type>', 'Object type: task, issue, idea, intent')
+    .requiredOption('--id <uuid>', 'Object UUID')
+    .action(async (idOrNumber, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionLinkCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
+        type: opts.type,
+        id: opts.id,
+    });
+});
+mission
+    .command('unlink <id-or-number>')
+    .description('Unlink a directly-linked item from a mission')
+    .requiredOption('--type <type>', 'Object type: task, issue, idea, intent')
+    .requiredOption('--id <uuid>', 'Object UUID')
+    .action(async (idOrNumber, opts, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    await missionUnlinkCommand(idOrNumber, {
+        json: globalOpts.json,
+        area: globalOpts.area,
         type: opts.type,
         id: opts.id,
     });
@@ -708,7 +1081,7 @@ const dep = program
     .command('dep')
     .description('Manage task dependencies');
 dep
-    .command('add <task-id> <target-task-id>')
+    .command('add <id-or-number> <target-id-or-number>')
     .description('Add a dependency between tasks')
     .option('--type <type>', 'Dependency type: depends_on, related', 'depends_on')
     .option('--note <text>', 'Optional note for the dependency')
@@ -716,20 +1089,20 @@ dep
     const globalOpts = cmd.optsWithGlobals();
     await depAddCommand(taskId, targetTaskId, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
         note: opts.note,
     });
 });
 dep
-    .command('remove <task-id> <target-task-id>')
+    .command('remove <id-or-number> <target-id-or-number>')
     .description('Remove a dependency between tasks')
     .option('--type <type>', 'Dependency type to remove: depends_on, related')
     .action(async (taskId, targetTaskId, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await depRemoveCommand(taskId, targetTaskId, {
         json: globalOpts.json,
-        project: globalOpts.project,
+        area: globalOpts.area,
         type: opts.type,
     });
 });