orbitmap 0.4.4 → 0.5.0

package/dist/errors.d.ts

@@ -33,10 +33,22 @@ export declare const AREA_CONTEXT_REQUIRED = "AREA_CONTEXT_REQUIRED";
  */
 export declare const WORKSPACE_CONTEXT_REQUIRED = "WORKSPACE_CONTEXT_REQUIRED";
 /**
- * `X-Orbitmap-Workspace` and `X-Orbitmap-Area` named different workspaces (422). Raised
- * server-side only.
+ * `X-Orbitmap-Workspace` and `X-Orbitmap-Area` named different workspaces (422).
+ *
+ * @deprecated UNREACHABLE since Agent API 9.0.0: the workspace ceiling refuses a foreign
+ * `X-Orbitmap-Workspace` with 403 `ACCESS_DENIED` before the area and the workspace are ever
+ * compared, so the server can no longer emit this. Nothing in the CLI dispatches on it any
+ * more; the constant survives only because the vendored contract fixtures are still pinned
+ * to 8.5.0 and one of them is this error body. Delete it with the 9.0.0 re-vendor.
  */
 export declare const AREA_WORKSPACE_MISMATCH = "AREA_WORKSPACE_MISMATCH";
+/**
+ * 409 from `POST /tasks/start`: the next task exists but belongs to another agent, so
+ * auto-pick refuses to take it. The error carries `task_id`, `task_number`, `task_title`,
+ * `current_owner` and a `suggestion`; the CLI puts the question to the user and only then
+ * retries with `confirm_reassign=true` (see `src/commands/start.ts`).
+ */
+export declare const REASSIGN_CONFIRMATION_REQUIRED = "REASSIGN_CONFIRMATION_REQUIRED";
 /** The caller's agent has no access to the area (same code the API uses). */
 export declare const NO_AREA_ACCESS = "NO_AREA_ACCESS";
 /** The caller's role in the area is too low for the operation (same code the API uses). */
@@ -85,6 +97,15 @@ export declare class OrbitMapAPIError extends Error {
     readonly status: number;
     readonly details?: Record<string, unknown>;
     constructor(message: string, code: string, status: number, details?: Record<string, unknown>);
+    /**
+     * Build the error from the standard `{error: {code, message, status, details?}}` envelope.
+     *
+     * Anything ELSE the `error` object carries is folded into `details` rather than dropped:
+     * the rich errors put their payload at the top level of `error` — the 403s' `required_role`
+     * / `current_role` / `suggestion`, and the 409 `REASSIGN_CONFIRMATION_REQUIRED`'s
+     * `task_id` / `task_number` / `task_title` / `current_owner`. Dropping those left the CLI
+     * unable to ask the very question the server asked it to ask.
+     */
     static fromResponse(body: ApiErrorBody): OrbitMapAPIError;
     static fromFlatResponse(body: FlatApiErrorBody, httpStatus: number): OrbitMapAPIError;
     static workspaceNotFound(message?: string): OrbitMapAPIError;

package/dist/errors.js

@@ -16,10 +16,22 @@ export const AREA_CONTEXT_REQUIRED = 'AREA_CONTEXT_REQUIRED';
  */
 export const WORKSPACE_CONTEXT_REQUIRED = 'WORKSPACE_CONTEXT_REQUIRED';
 /**
- * `X-Orbitmap-Workspace` and `X-Orbitmap-Area` named different workspaces (422). Raised
- * server-side only.
+ * `X-Orbitmap-Workspace` and `X-Orbitmap-Area` named different workspaces (422).
+ *
+ * @deprecated UNREACHABLE since Agent API 9.0.0: the workspace ceiling refuses a foreign
+ * `X-Orbitmap-Workspace` with 403 `ACCESS_DENIED` before the area and the workspace are ever
+ * compared, so the server can no longer emit this. Nothing in the CLI dispatches on it any
+ * more; the constant survives only because the vendored contract fixtures are still pinned
+ * to 8.5.0 and one of them is this error body. Delete it with the 9.0.0 re-vendor.
  */
 export const AREA_WORKSPACE_MISMATCH = 'AREA_WORKSPACE_MISMATCH';
+/**
+ * 409 from `POST /tasks/start`: the next task exists but belongs to another agent, so
+ * auto-pick refuses to take it. The error carries `task_id`, `task_number`, `task_title`,
+ * `current_owner` and a `suggestion`; the CLI puts the question to the user and only then
+ * retries with `confirm_reassign=true` (see `src/commands/start.ts`).
+ */
+export const REASSIGN_CONFIRMATION_REQUIRED = 'REASSIGN_CONFIRMATION_REQUIRED';
 /** The caller's agent has no access to the area (same code the API uses). */
 export const NO_AREA_ACCESS = 'NO_AREA_ACCESS';
 /** The caller's role in the area is too low for the operation (same code the API uses). */
@@ -91,9 +103,25 @@ export class OrbitMapAPIError extends Error {
         this.status = status;
         this.details = details;
     }
+    /**
+     * Build the error from the standard `{error: {code, message, status, details?}}` envelope.
+     *
+     * Anything ELSE the `error` object carries is folded into `details` rather than dropped:
+     * the rich errors put their payload at the top level of `error` — the 403s' `required_role`
+     * / `current_role` / `suggestion`, and the 409 `REASSIGN_CONFIRMATION_REQUIRED`'s
+     * `task_id` / `task_number` / `task_title` / `current_owner`. Dropping those left the CLI
+     * unable to ask the very question the server asked it to ask.
+     */
     static fromResponse(body) {
         const { code, message, status, details } = body.error;
-        return new OrbitMapAPIError(message, code, status, details);
+        const extras = {};
+        for (const [key, value] of Object.entries(body.error)) {
+            if (key === 'code' || key === 'message' || key === 'status' || key === 'details')
+                continue;
+            extras[key] = value;
+        }
+        const merged = Object.keys(extras).length > 0 ? { ...(details ?? {}), ...extras } : details;
+        return new OrbitMapAPIError(message, code, status, merged);
     }
     static fromFlatResponse(body, httpStatus) {
         const message = body.message || body.error;

package/dist/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -21,7 +21,7 @@ import { docUpdateCommand } from './commands/doc-update.js';
 import { docPatchCommand } from './commands/doc-patch.js';
 import { docShareCommand, docUnshareCommand, docVisibilityCommand } from './commands/doc-share.js';
 import { docsPullCommand, docsListCacheCommand, docsCleanCommand } from './commands/docs-cache.js';
-import { setupAgentCommand } from './commands/setup-agent.js';
+import { setupAgentCommand, warnIfInstructionsDrift } from './commands/setup-agent.js';
 import { setupMcpCommand } from './commands/setup-mcp.js';
 import { loginCommand } from './commands/login.js';
 import { logoutCommand } from './commands/logout.js';
@@ -36,6 +36,8 @@ import { getCommand } from './commands/get.js';
 import { createRequire } from 'node:module';
 import { createAreaCommand } from './commands/create-area.js';
 import { setWorkspaceFlag, setWorkspaceIdFlag } from './workspace-resolve.js';
+import { printValidationError } from './output.js';
+import { ALL_HELP, commandPath, DOCS_DESCRIPTION, IDEA_STATUS_HELP, IDEAS_DESCRIPTION, INTENT_STATUS_HELP, INTENTS_DESCRIPTION, ISSUE_STATUS_HELP, ISSUES_DESCRIPTION, LIMIT_HELP, MISSION_STATUS_HELP, MISSIONS_DESCRIPTION, multiAreaRejection, TASKS_DESCRIPTION, TASK_STATUS_HELP, VIBES_DESCRIPTION, } from './list-options.js';
 const program = new Command();
 /**
  * `--version` reads the real package version instead of a hardcoded literal, which had gone
@@ -63,7 +65,9 @@ program
     .description('CLI tool for OrbitMap Agent API')
     .version(version)
     .option('--json', 'Output in JSON format', false)
-    .option('--area <id>', 'Area ID or slug to use')
+    .option('--area <ids>', 'Narrow to one area or several, comma-separated (`--area web,api`). Slugs or UUIDs. ' +
+    'Lists span every area you can reach unless you pass this; `--area all` spans them ' +
+    'again from inside an area-mapped directory. For writes it names the target area')
     .option('--workspace <path>', 'Local workspace directory to use (local mode)')
     .option('--workspace-id <slug-or-uuid>', 'Workspace to use (slug or UUID)')
     // Satisfies the write-target confirmation non-interactively (see src/write-target.ts).
@@ -79,6 +83,15 @@ program
 // but never sent `X-Orbitmap-Workspace` — the same flag reached the header ladder or not
 // purely depending on where the user typed it.
 program.hook('preAction', (thisCommand, actionCommand) => {
+    const path = commandPath(actionCommand.name(), actionCommand.parent?.name());
+    const area = actionCommand.opts()['area'] ??
+        thisCommand.opts()['area'];
+    const rejected = multiAreaRejection(path, area);
+    if (rejected) {
+        printValidationError(rejected, Boolean(thisCommand.opts()['json']));
+        // `printValidationError` sets the exit code; stop before the command writes anything.
+        process.exit(1);
+    }
     setWorkspaceFlag(thisCommand.opts()['workspace']);
     const subcommandWorkspaceId = actionCommand.opts()['workspaceId'];
     setWorkspaceIdFlag(subcommandWorkspaceId ?? thisCommand.opts()['workspaceId']);
@@ -104,6 +117,8 @@ program
     'directory) or project (this directory only)')
     .option('--global', 'Cloud: write to ~/.orbitmap/config.json instead of ./.orbitmap/config.json')
     .action(async (opts, command) => {
+    // Stale-instructions check (IS-bej5d8): one stderr line, only here and on `context`.
+    warnIfInstructionsDrift();
     // `--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();
@@ -143,6 +158,9 @@ program
     .command('context')
     .description('Show agent identity and current area info')
     .action(async (_opts, cmd) => {
+    // Stale-instructions check (IS-bej5d8): one stderr line, only here and on `init`.
+    // stderr keeps `--json` stdout parseable.
+    warnIfInstructionsDrift();
     const globalOpts = cmd.optsWithGlobals();
     await contextCommand({ json: globalOpts.json, area: globalOpts.area });
 });
@@ -187,11 +205,16 @@ program
 });
 program
     .command('tasks')
-    .description('List tasks in the current area — or, when the context is workspace-scoped, every ' +
-    'area in the workspace grouped by area')
-    .option('--status <statuses>', 'Filter by status (comma-separated)', 'todo,in_progress')
+    .description(TASKS_DESCRIPTION)
+    .option('--status <statuses>', TASK_STATUS_HELP, 'todo,in_progress')
     .option('--priority <priority>', 'Filter by priority')
     .option('--orbit <id-or-slug>', 'Filter by orbit (UUID or slug)')
+    .option('--intent <id-or-number>', 'Only tasks of this intent (IN-xxxxxx, code or UUID)')
+    .option('--mission <id-or-number>', 'Only tasks of this mission (MS-xxxxxx, code or UUID)')
+    .option('--agent <me-or-slug-or-id>', "Only this agent's tasks (`me`, a slug or a UUID)")
+    .option('--unassigned', 'Only tasks nobody holds — the free backlog', false)
+    .option('--limit <n>', 'Rows per page (default 30, max 100)')
+    .option('--all', 'Follow every page to the end and print every row', false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await tasksCommand({
@@ -200,6 +223,12 @@ program
         status: opts.status,
         priority: opts.priority,
         orbit: opts.orbit,
+        intent: opts.intent,
+        mission: opts.mission,
+        agent: opts.agent,
+        unassigned: opts.unassigned,
+        limit: opts.limit,
+        all: opts.all,
     });
 });
 program
@@ -337,9 +366,11 @@ program
 });
 const docs = program
     .command('docs')
-    .description('List area documents (with sections count and context)')
+    .description(DOCS_DESCRIPTION)
     .option('--type <type>', 'Filter by type (spec, architecture, api, guide, decision, changelog, other)')
     .option('--search <query>', 'Search by title')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await docsCommand({
@@ -347,6 +378,8 @@ const docs = program
         area: globalOpts.area,
         type: opts.type,
         search: opts.search,
+        limit: opts.limit,
+        all: opts.all,
     });
 });
 docs
@@ -522,10 +555,12 @@ program
 // ── Shortcut aliases ──
 program
     .command('issues')
-    .description('List issues (shortcut for issue list)')
-    .option('--status <statuses>', 'Filter by status (comma-separated)', 'open,investigating')
+    .description(ISSUES_DESCRIPTION + ' (shortcut for issue list)')
+    .option('--status <statuses>', ISSUE_STATUS_HELP, 'open,investigating')
     .option('--severity <level>', 'Filter by severity')
-    .option('--limit <n>', 'Limit results')
+    .option('--intent <id-or-number>', 'Only issues of this intent (IN-xxxxxx, code or UUID)')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await issueListCommand({
@@ -533,15 +568,18 @@ program
         area: globalOpts.area,
         status: opts.status,
         severity: opts.severity,
+        intent: opts.intent,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 program
     .command('vibes')
-    .description('List vibes (shortcut for vibe list)')
+    .description(VIBES_DESCRIPTION + ' (shortcut for vibe list)')
     .option('--type <type>', 'Filter by type')
     .option('--since <date>', 'Filter since date (ISO or "today"/"this_week")')
-    .option('--limit <n>', 'Limit results')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await vibeListCommand({
@@ -550,14 +588,16 @@ program
         type: opts.type,
         since: opts.since,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 program
     .command('ideas')
-    .description('List ideas (shortcut for idea list)')
-    .option('--status <statuses>', 'Filter by status (comma-separated)', 'pending,accepted')
+    .description(IDEAS_DESCRIPTION + ' (shortcut for idea list)')
+    .option('--status <statuses>', IDEA_STATUS_HELP, 'pending,accepted')
     .option('--priority <priority>', 'Filter by priority (critical, high, medium, low)')
-    .option('--limit <n>', 'Limit results')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await ideaListCommand({
@@ -566,27 +606,33 @@ program
         status: opts.status,
         priority: opts.priority,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 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')
+    .description(INTENTS_DESCRIPTION + ' (shortcut for intent list)')
+    .option('--status <statuses>', INTENT_STATUS_HELP)
+    .option('--mission <id-or-number>', 'Only intents of this mission (MS-xxxxxx, code or UUID)')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await intentListCommand({
         json: globalOpts.json,
         area: globalOpts.area,
         status: opts.status,
+        mission: opts.mission,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 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')
+    .description(MISSIONS_DESCRIPTION + ' (shortcut for mission list)')
+    .option('--status <statuses>', MISSION_STATUS_HELP)
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await missionListCommand({
@@ -594,6 +640,7 @@ program
         area: globalOpts.area,
         status: opts.status,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 // ── Issue commands ──
@@ -629,10 +676,12 @@ issue
 });
 issue
     .command('list')
-    .description('List issues')
-    .option('--status <statuses>', 'Filter by status (comma-separated)', 'open,investigating')
+    .description(ISSUES_DESCRIPTION)
+    .option('--status <statuses>', ISSUE_STATUS_HELP, 'open,investigating')
     .option('--severity <level>', 'Filter by severity')
-    .option('--limit <n>', 'Limit results')
+    .option('--intent <id-or-number>', 'Only issues of this intent (IN-xxxxxx, code or UUID)')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await issueListCommand({
@@ -640,7 +689,9 @@ issue
         area: globalOpts.area,
         status: opts.status,
         severity: opts.severity,
+        intent: opts.intent,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 issue
@@ -714,10 +765,11 @@ vibe
 });
 vibe
     .command('list')
-    .description('List vibes')
+    .description(VIBES_DESCRIPTION)
     .option('--type <type>', 'Filter by type')
     .option('--since <date>', 'Filter since date (ISO or "today"/"this_week")')
-    .option('--limit <n>', 'Limit results')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await vibeListCommand({
@@ -726,6 +778,7 @@ vibe
         type: opts.type,
         since: opts.since,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 vibe
@@ -762,10 +815,11 @@ const idea = program
     .description('Manage ideas');
 idea
     .command('list')
-    .description('List ideas')
-    .option('--status <statuses>', 'Filter by status (comma-separated)', 'pending,accepted')
+    .description(IDEAS_DESCRIPTION)
+    .option('--status <statuses>', IDEA_STATUS_HELP, 'pending,accepted')
     .option('--priority <priority>', 'Filter by priority (critical, high, medium, low)')
-    .option('--limit <n>', 'Limit results')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await ideaListCommand({
@@ -774,6 +828,7 @@ idea
         status: opts.status,
         priority: opts.priority,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 idea
@@ -973,26 +1028,39 @@ const intent = program
     .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')
+    .description(INTENTS_DESCRIPTION)
+    .option('--status <statuses>', INTENT_STATUS_HELP)
+    .option('--mission <id-or-number>', 'Only intents of this mission (MS-xxxxxx, code or UUID)')
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await intentListCommand({
         json: globalOpts.json,
         area: globalOpts.area,
         status: opts.status,
+        mission: opts.mission,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 intent
     .command('show <id-or-number>')
     .description('Show full intent details (UUID or IN-prefixed number)')
-    .action(async (idOrNumber, _opts, cmd) => {
+    // Commander turns `--no-logs` into `opts.logs === false` (default true).
+    .option('--no-logs', 'Skip the embedded work-log tail (`?logs=0`) — a smaller payload')
+    // Same Commander negation pattern: `--no-bundle` → `opts.bundle === false`.
+    .option('--no-bundle', 'Skip the embedded context bundle (`?bundle=0`) — docs, mission, siblings, items')
+    .option('--slim', 'Freshness probe (`?slim=1`): handle, TL;DRs, task counts and the ' +
+    'updated_at/last_log_id pair instead of the full body (wins over the other flags)')
+    .action(async (idOrNumber, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await intentShowCommand(idOrNumber, {
         json: globalOpts.json,
         area: globalOpts.area,
+        logs: opts.logs,
+        bundle: opts.bundle,
+        slim: opts.slim,
     });
 });
 intent
@@ -1019,12 +1087,13 @@ intent
 });
 intent
     .command('update <id-or-number>')
-    .description('Update an intent (title, outcome, design, plan, status)')
+    .description('Update an intent (title, outcome, design, plan, status, declared areas)')
     .option('--title <title>', 'New title')
     .option('--outcome <text>', 'New outcome')
     .option('--design <text>', 'New design notes (markdown)')
     .option('--plan <text>', 'New plan notes (markdown)')
     .option('--status <status>', 'Status: new, design, plan, build, done, cancelled')
+    .option('--areas <slugs>', "Declare the intent's areas: comma-separated slugs or UUIDs (replaces the declared set)")
     .option('--log <type:content>', LOG_FLAG_HELP, collect, [])
     .action(async (idOrNumber, opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
@@ -1036,6 +1105,7 @@ intent
         design: opts.design,
         plan: opts.plan,
         status: opts.status,
+        areas: opts.areas,
         log: opts.log,
     });
 });
@@ -1085,9 +1155,10 @@ const mission = program
     .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')
+    .description(MISSIONS_DESCRIPTION)
+    .option('--status <statuses>', MISSION_STATUS_HELP)
+    .option('--limit <n>', LIMIT_HELP)
+    .option('--all', ALL_HELP, false)
     .action(async (opts, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     await missionListCommand({
@@ -1095,6 +1166,7 @@ mission
         area: globalOpts.area,
         status: opts.status,
         limit: opts.limit,
+        all: opts.all,
     });
 });
 mission