@notis_ai/cli 0.2.2 → 0.2.3

package/dist/scaffolds.json

@@ -2,12 +2,35 @@
   "source": "apps/*/notis.config.ts",
   "scaffolds": [
     {
-      "slug": "notes",
+      "slug": "notis-database",
+      "name": "Databases",
+      "description": "Read-only catalog and schema explorer for every database in your Notis workspace.",
+      "icon": "phosphor:database",
+      "categories": [
+        "Product & Engineering",
+        "Operations"
+      ],
+      "tagline": "Explore every database and schema in your Notis workspace."
+    },
+    {
+      "slug": "notis-notes",
       "name": "Notis Notes",
       "description": "Browse notes by documents, table, or calendar with folders in the sidebar.",
-      "icon": "lucide:notebook-pen",
-      "categories": [],
-      "tagline": "Browse notes by documents, table, or calendar with folders in the sidebar."
+      "icon": "phosphor:note-pencil",
+      "categories": [
+        "Productivity"
+      ],
+      "tagline": "Folder-based notes with gallery, table, and calendar views."
+    },
+    {
+      "slug": "notis-random",
+      "name": "Random Number Generator",
+      "description": "Generate random numbers with configurable bounds, and keep a history of everything you rolled.",
+      "icon": "phosphor:dice-five",
+      "categories": [
+        "Personal"
+      ],
+      "tagline": "Roll dice, keep history."
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notis_ai/cli",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Agent-first Notis CLI for apps and generic tool execution",
   "type": "module",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "files": [
     "bin/",
+    "config/",
     "dist/",
     "src/",
     "skills/",

package/skills/notis-apps/SKILL.md

@@ -138,7 +138,7 @@ export default defineNotisApp({
       default: true,
     },
   ],
-  tools: ['notis-default-query', 'notis-default-upsert_tasks'],
+  tools: ['LOCAL_NOTIS_DATABASE_QUERY', 'LOCAL_NOTIS_DATABASE_UPSERT_TASKS'],
 });
 ```
 
@@ -149,7 +149,7 @@ Use SDK hooks for data and tool access:
 ```tsx
 import { useTool } from '@notis/sdk';
 
-const query = useTool('notis-default-query');
+const query = useTool('LOCAL_NOTIS_DATABASE_QUERY');
 ```
 
 Do not fetch Notis backend endpoints directly from app code unless the SDK explicitly requires it. The Portal provides authentication, runtime context, and route rendering.

package/skills/notis-cli/SKILL.md

@@ -130,7 +130,7 @@ This is the main escape hatch for:
    - `npx --package @notis_ai/cli@latest -- notis tools toolkits`
 2. Search for the capability you need using natural language:
    - `npx --package @notis_ai/cli@latest -- notis tools search "<query>"`
-   - optionally narrow with `--toolkits <csv-or-json>`
+   - optionally add known field hints with `--known-fields "<key:value>"`
 3. If needed, inspect the exact tool and parameter schema:
    - `npx --package @notis_ai/cli@latest -- notis tools describe <tool-name>`
    - `npx --package @notis_ai/cli@latest -- notis tools exec <tool-name> --get-schema`
@@ -155,7 +155,7 @@ This is the main escape hatch for:
 
 Typical toolkit namespaces include:
 
-- `notis-default` for native Notis tools
+- `notis` for native Notis tools
 - `composio-*` for Composio-backed integrations
 - `mcp-*` for MCP-backed tools
 
@@ -178,22 +178,22 @@ npx --package @notis_ai/cli@latest -- notis tools search "list today's calendar
 Inspect a tool before execution:
 
 ```bash
-npx --package @notis_ai/cli@latest -- notis tools describe composio-googlecalendar-default-list_events
-npx --package @notis_ai/cli@latest -- notis tools exec composio-googlecalendar-default-list_events --get-schema
+npx --package @notis_ai/cli@latest -- notis tools describe composio-googlecalendar-list_events
+npx --package @notis_ai/cli@latest -- notis tools exec composio-googlecalendar-list_events --get-schema
 ```
 
 Dry-run a tool call:
 
 ```bash
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-query --dry-run --arguments '{"database_slug":"tasks","query":{"page_size":10}}'
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-get_database --dry-run --arguments '{"database_slug":"tasks"}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_GET_DATABASE --dry-run --arguments '{"database_slug":"tasks"}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_QUERY --dry-run --arguments '{"database_id":"tasks-db-id","query":{"page_size":10}}'
 ```
 
 Execute a tool call:
 
 ```bash
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-query --arguments '{"database_slug":"tasks","query":{"page_size":10}}'
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-get_database --arguments '{"database_slug":"tasks"}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_GET_DATABASE --arguments '{"database_slug":"tasks"}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_QUERY --arguments '{"database_id":"tasks-db-id","query":{"page_size":10}}'
 ```
 
 Connect a missing toolkit:
@@ -206,21 +206,23 @@ npx --package @notis_ai/cli@latest -- notis tools link github
 
 Native Notis databases are accessed through the generic tool workflow, not a first-class database command group. Use these canonical tool names:
 
-- `notis-default-list_databases` -- list databases accessible to the current profile
-- `notis-default-get_database` -- inspect read-only metadata and schema detail
-- `notis-default-query` -- query documents from a database
-- `notis-default-upsert_database` -- create or update a database schema
+- `LOCAL_NOTIS_DATABASE_LIST_DATABASES` -- list databases accessible to the current profile
+- `LOCAL_NOTIS_DATABASE_GET_DATABASE` -- inspect read-only metadata and schema detail
+- `LOCAL_NOTIS_DATABASE_QUERY` -- query documents from a database
+- `LOCAL_NOTIS_DATABASE_UPSERT_DATABASE` -- create or update a database schema
 
 Example workflow before building an app:
 
 ```bash
 npx --package @notis_ai/cli@latest -- notis tools search "list Notis databases"
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-list_databases --arguments '{}'
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-get_database --get-schema
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-get_database --arguments '{"database_slug":"social_media_calendar"}'
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-query --arguments '{"database_slug":"social_media_calendar","query":{"page_size":1}}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_LIST_DATABASES --arguments '{}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_GET_DATABASE --get-schema
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_GET_DATABASE --arguments '{"database_slug":"social_media_calendar"}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_QUERY --arguments '{"database_id":"social-media-calendar-db-id","query":{"page_size":1}}'
 ```
 
+When `LOCAL_NOTIS_DATABASE_LIST_DATABASES` or `LOCAL_NOTIS_DATABASE_GET_DATABASE` returns a database ID, prefer `database_id` for `LOCAL_NOTIS_DATABASE_QUERY`; `database_slug` remains supported as a fallback.
+
 ## Supporting commands
 
 - `npx --package @notis_ai/cli@latest -- notis doctor` — verify CLI config, auth, and API reachability before relying on the CLI

package/skills/notis-query/cli.md

@@ -10,20 +10,20 @@ For CI, hosted agents, or internal scripts, pass a non-persisted token with `NOT
 
 ## Canonical database tools
 
-- `notis-default-list_databases` — list native databases.
-- `notis-default-get_database` — inspect one database schema.
-- `notis-default-query` — query native database documents.
-- `notis-default-upsert_database` — create or update database schema.
+- `LOCAL_NOTIS_DATABASE_LIST_DATABASES` — list native databases.
+- `LOCAL_NOTIS_DATABASE_GET_DATABASE` — inspect one database schema.
+- `LOCAL_NOTIS_DATABASE_QUERY` — query native database documents.
+- `LOCAL_NOTIS_DATABASE_UPSERT_DATABASE` — create or update database schema.
 
 ## Workflow
 
 ```bash
 npx --package @notis_ai/cli@latest -- notis tools search "list Notis databases"
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-list_databases --arguments '{}'
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-get_database --get-schema
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-get_database --arguments '{"database_slug":"tasks"}'
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-query --dry-run --arguments '{"database_slug":"tasks","query":{"page_size":10}}'
-npx --package @notis_ai/cli@latest -- notis tools exec notis-default-query --arguments '{"database_slug":"tasks","query":{"page_size":10}}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_LIST_DATABASES --arguments '{}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_GET_DATABASE --get-schema
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_GET_DATABASE --arguments '{"database_slug":"tasks"}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_QUERY --dry-run --arguments '{"database_slug":"tasks","query":{"page_size":10}}'
+npx --package @notis_ai/cli@latest -- notis tools exec LOCAL_NOTIS_DATABASE_QUERY --arguments '{"database_slug":"tasks","query":{"page_size":10}}'
 ```
 
 ## Supporting command
@@ -37,4 +37,3 @@ When to use: Use this before relying on the CLI in automation or after changing
 Examples:
 - `npx --package @notis_ai/cli@latest -- notis doctor`
 - `npx --package @notis_ai/cli@latest -- notis doctor --json`
-

package/src/cli.js

@@ -1,10 +1,29 @@
+import { readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { Command } from 'commander';
 import { COMMAND_SPECS, GROUP_SUMMARIES } from './command-specs/index.js';
 import { OutputManager } from './runtime/output.js';
 import { asCliError } from './runtime/errors.js';
 import { resolveRuntimeProfile, workspacePath } from './runtime/profiles.js';
 
-const CLI_VERSION = '0.2.0';
+// Read the version from package.json: the publish pipeline bumps the manifest
+// (scripts/release-utils.js applyVersion), so a hardcoded string here goes
+// stale on every release.
+function readCliVersion() {
+  try {
+    const manifestPath = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
+    const version = JSON.parse(readFileSync(manifestPath, 'utf-8')).version;
+    if (typeof version === 'string' && version.trim()) {
+      return version.trim();
+    }
+  } catch {
+    // Fall through to the placeholder below.
+  }
+  return '0.0.0';
+}
+
+const CLI_VERSION = readCliVersion();
 
 function buildHelpFooter(spec) {
   const lines = [
@@ -64,7 +83,16 @@ function attachSpec(program, parentMap, spec, specs) {
   }
 
   for (const option of spec.args_schema?.options || []) {
-    command.option(option.flags, option.description);
+    if (option.collect) {
+      command.option(
+        option.flags,
+        option.description,
+        (value, previous) => [...(previous || []), value],
+        [],
+      );
+    } else {
+      command.option(option.flags, option.description);
+    }
   }
 
   command.action(async (...raw) => {

package/src/command-specs/apps.js

@@ -46,6 +46,7 @@ import {
 import { getAvailablePort } from '../runtime/ports.js';
 import { getCliMode } from '../runtime/cli-mode.js';
 import {
+  localNotisToolSlug,
   nextIdempotencyKey,
   runToolCommand,
   toolConflictToError,
@@ -54,8 +55,11 @@ import {
 const DEFAULT_DEV_PORT = 5173;
 const DEV_HEARTBEAT_INTERVAL_MS = 10_000;
 const CONFIG_FILENAMES = ['notis.config.ts', 'notis.config.js', 'notis.config.mjs'];
-const ENSURE_DEV_APP_INSTALLATION_TOOL = 'notis-default-ensure_dev_app_installation';
-const GET_APP_TOOL = 'notis-default-get_app';
+const ENSURE_DEV_APP_INSTALLATION_TOOL = 'LOCAL_NOTIS_ENSURE_DEV_APP_INSTALLATION';
+const GET_APP_TOOL = 'LOCAL_NOTIS_GET_APP';
+const LIST_APPS_TOOL = 'LOCAL_NOTIS_LIST_APPS';
+const CREATE_APP_TOOL = 'LOCAL_NOTIS_CREATE_APP';
+const SAVE_APP_FILES_TOOL = 'LOCAL_NOTIS_SAVE_APP_FILES';
 
 // ---------------------------------------------------------------------------
 // Formatters
@@ -192,9 +196,29 @@ function pickDefaultRouteSlug(manifest) {
   return firstWithSlug ? firstWithSlug.slug : null;
 }
 
-export function buildDevelopmentDesktopUrl(appHref = null) {
+const DESKTOP_DEEP_LINK_SCHEME_PATTERN = /^[a-z][a-z0-9-]*$/;
+
+export function resolveDevelopmentDesktopScheme(env = process.env) {
+  // Mirror the desktop app's own scheme resolution (electron main + forge config):
+  // local dev launches register `notis-dev`, while installed prod/beta builds claim
+  // `notis`. Hardcoding `notis` here is what made `apps dev` open the installed
+  // prod/beta app instead of the local dev app.
+  const scheme = (env.NOTIS_DESKTOP_DEEP_LINK_SCHEME || '').trim();
+  return DESKTOP_DEEP_LINK_SCHEME_PATTERN.test(scheme) ? scheme : 'notis';
+}
+
+export function buildDevelopmentDesktopUrl(appHref = null, scheme = 'notis') {
   const route = String(appHref || '/store').replace(/^\/+/, '');
-  return `notis://${route || 'store'}`;
+  const normalizedScheme = DESKTOP_DEEP_LINK_SCHEME_PATTERN.test(scheme) ? scheme : 'notis';
+  return `${normalizedScheme}://${route || 'store'}`;
+}
+
+export function shouldOpenDevelopmentTab(options = {}) {
+  // Commander stores the negatable `--no-open` flag as `options.open === false`;
+  // it never sets `options.noOpen`. Reading the non-existent `noOpen` key meant
+  // `--no-open` was silently ignored and `apps dev` always ran `open notis://…`,
+  // which macOS routes to the installed prod/beta desktop app.
+  return options.open !== false;
 }
 
 function buildAppHref({ appSlug, appId, manifest }) {
@@ -311,14 +335,14 @@ function assertHarnessResult(result, route, databaseSlugs) {
     const seen = (result.runtimeCalls || []).some(
       (call) =>
         call?.op === 'callTool' &&
-        call?.args?.name === 'notis-default-query' &&
+        localNotisToolSlug(call?.args?.name) === 'LOCAL_NOTIS_DATABASE_QUERY' &&
         call?.args?.arguments?.database_slug === databaseSlug,
     );
     if (!seen) {
       assertions.push({
         ok: false,
         code: 'missing_database_query',
-        message: `Route "${route.slug}" did not call notis-default-query for "${databaseSlug}".`,
+        message: `Route "${route.slug}" did not call LOCAL_NOTIS_DATABASE_QUERY for "${databaseSlug}".`,
         details: { databaseSlug },
       });
     }
@@ -447,7 +471,7 @@ function databaseMaterializationWarnings(apps) {
 async function assertDirectDeployAccess(runtime, appId) {
   const result = await runToolCommand({
     runtime,
-    toolName: 'notis_list_apps',
+    toolName: LIST_APPS_TOOL,
   });
   const apps = result.payload.apps || [];
   const hasAccess = apps.some((app) => (app.app_id || app.id) === appId);
@@ -463,7 +487,7 @@ async function assertDirectDeployAccess(runtime, appId) {
 async function appsListHandler(ctx) {
   const result = await runToolCommand({
     runtime: ctx.runtime,
-    toolName: 'notis_list_apps',
+    toolName: LIST_APPS_TOOL,
   });
   const apps = result.payload.apps || [];
   return ctx.output.emitSuccess({
@@ -511,7 +535,7 @@ async function appsCreateHandler(ctx) {
   const idempotencyKey = nextIdempotencyKey(ctx.globalOptions);
   const result = await runToolCommand({
     runtime: ctx.runtime,
-    toolName: 'notis_create_app',
+    toolName: CREATE_APP_TOOL,
     arguments_: {
       name: ctx.args.name,
       description: appConfig?.description || undefined,
@@ -634,7 +658,10 @@ async function appsDevHandler(ctx) {
       }),
     };
   });
-  const developmentTabUrl = buildDevelopmentDesktopUrl(apps[0]?.appHref);
+  const developmentTabUrl = buildDevelopmentDesktopUrl(
+    apps[0]?.appHref,
+    resolveDevelopmentDesktopScheme(),
+  );
   const warnings = databaseMaterializationWarnings(apps);
 
   const devServer = await startAppDevServer({
@@ -710,7 +737,7 @@ async function appsDevHandler(ctx) {
     ].join('\n'),
   });
 
-  if (!ctx.options.noOpen) {
+  if (shouldOpenDevelopmentTab(ctx.options)) {
     openInBrowser(developmentTabUrl);
   }
 
@@ -1073,7 +1100,7 @@ async function appsDeployHandler(ctx) {
   try {
     result = await runToolCommand({
       runtime: ctx.runtime,
-      toolName: 'notis_save_app_files',
+      toolName: SAVE_APP_FILES_TOOL,
       arguments_: {
         app_id: appId,
         files,
@@ -1185,7 +1212,7 @@ export const appsCommandSpecs = [
     examples: ['notis apps list', 'notis apps list --json'],
     mutates: false,
     idempotent: true,
-    backend_call: { type: 'tool', name: 'notis_list_apps' },
+    backend_call: { type: 'tool', name: LIST_APPS_TOOL },
     handler: appsListHandler,
   },
   {
@@ -1242,7 +1269,7 @@ export const appsCommandSpecs = [
     ],
     mutates: true,
     idempotent: false,
-    backend_call: { type: 'tool', name: 'notis_create_app' },
+    backend_call: { type: 'tool', name: CREATE_APP_TOOL },
     handler: appsCreateHandler,
   },
   {
@@ -1376,7 +1403,7 @@ export const appsCommandSpecs = [
     examples: ['notis apps deploy', 'notis apps deploy --skip-build', 'notis apps deploy --app-id abc123', 'notis apps deploy --direct'],
     mutates: true,
     idempotent: true,
-    backend_call: { type: 'tool', name: 'notis_save_app_files' },
+    backend_call: { type: 'tool', name: SAVE_APP_FILES_TOOL },
     handler: appsDeployHandler,
   },
   {

package/src/command-specs/helpers.js

@@ -2,6 +2,34 @@ import { randomUUID } from 'node:crypto';
 import { CliError, EXIT_CODES, usageError } from '../runtime/errors.js';
 import { callTool, httpRequest } from '../runtime/transport.js';
 
+export const COMPOSIO_SEARCH_TOOLS = 'COMPOSIO_SEARCH_TOOLS';
+export const COMPOSIO_GET_TOOL_SCHEMAS = 'COMPOSIO_GET_TOOL_SCHEMAS';
+export const COMPOSIO_MULTI_EXECUTE_TOOL = 'COMPOSIO_MULTI_EXECUTE_TOOL';
+
+const NOTIS_DATABASE_CORE_NAMES = new Set([
+  'query',
+  'get_database',
+  'get_document',
+  'list_databases',
+  'upsert_database',
+]);
+
+function isNotisDatabaseCoreName(coreName) {
+  // Mirrors server is_database_tool_name: canonical database ops plus generated
+  // upsert_<db> tools. Database tools live in the NOTIS_DATABASE toolkit so their
+  // public slug carries the DATABASE segment.
+  return NOTIS_DATABASE_CORE_NAMES.has(coreName) || coreName.startsWith('upsert_');
+}
+
+export function localNotisToolSlug(toolName) {
+  if (typeof toolName !== 'string' || !toolName.startsWith('notis-')) {
+    return toolName;
+  }
+  const coreName = toolName.slice('notis-'.length);
+  const prefix = isNotisDatabaseCoreName(coreName) ? 'LOCAL_NOTIS_DATABASE_' : 'LOCAL_NOTIS_';
+  return `${prefix}${coreName.replace(/-/g, '_').toUpperCase()}`;
+}
+
 export function parseJson(value, label) {
   try {
     return JSON.parse(value);
@@ -17,23 +45,6 @@ export function parseMaybeJson(value, label) {
   return parseJson(value, label);
 }
 
-export function normalizeToolkits(value) {
-  if (!value) {
-    return [];
-  }
-  if (value.startsWith('[')) {
-    const parsed = parseJson(value, 'toolkits');
-    if (!Array.isArray(parsed)) {
-      throw usageError('toolkits JSON must be an array of toolkit strings');
-    }
-    return parsed;
-  }
-  return value
-    .split(',')
-    .map((entry) => entry.trim())
-    .filter(Boolean);
-}
-
 export function nextIdempotencyKey(globalOptions) {
   return globalOptions.idempotencyKey || randomUUID();
 }
@@ -44,39 +55,32 @@ export async function runToolCommand({
   arguments_ = {},
   mutating = false,
   idempotencyKey,
+  fileBindings = [],
 }) {
   const result = await callTool({
     runtime: { ...runtime, mutating },
     toolName,
     arguments_,
     idempotencyKey: mutating ? idempotencyKey : null,
+    fileBindings,
   });
   return result;
 }
 
 export async function fetchToolkits(runtime) {
-  const result = await runToolCommand({
-    runtime,
-    toolName: 'notis_find_toolkits',
-  });
-  return result.payload.toolkits || [];
-}
-
-export async function resolveSearchToolkits(runtime, rawToolkits) {
-  const toolkits = normalizeToolkits(rawToolkits);
-  if (toolkits.length) {
-    return toolkits;
-  }
-  const availableToolkits = await fetchToolkits(runtime);
-  return availableToolkits.map((entry) => entry.id);
+  const payload = await fetchToolDiscovery(runtime, 'List available toolkit namespaces and connection statuses');
+  return (payload.toolkit_connection_statuses || []).map((entry) => ({
+    id: entry.toolkit,
+    provider: typeof entry.toolkit === 'string' ? entry.toolkit.split('-', 1)[0] : undefined,
+    description: entry.description || entry.status_message || entry.toolkit,
+    has_active_connection: Boolean(entry.has_active_connection),
+    status_message: entry.status_message || '',
+    connection_details: entry.connection_details || {},
+  }));
 }
 
 export async function probeAuth(runtime) {
-  const result = await runToolCommand({
-    runtime,
-    toolName: 'notis_find_toolkits',
-  });
-  return result.payload;
+  return fetchToolDiscovery(runtime, 'List available toolkit namespaces and connection statuses');
 }
 
 export async function healthCheck(runtime) {
@@ -88,22 +92,46 @@ export async function healthCheck(runtime) {
   });
 }
 
-export async function fetchToolSchema(runtime, toolName, rawToolkits) {
-  const toolkits = normalizeToolkits(rawToolkits);
+export async function fetchToolSchema(runtime, toolName) {
   const result = await runToolCommand({
     runtime,
-    toolName: 'notis_find_tools',
+    toolName: COMPOSIO_GET_TOOL_SCHEMAS,
     arguments_: {
-      query: toolName,
-      ...(toolkits.length ? { toolkits } : {}),
+      tool_slugs: [toolName],
     },
   });
-  const tools = result.payload.tools || [];
-  const match = tools.find((t) => t.name === toolName);
-  if (!match) {
+  const payload = result.payload || {};
+  const schema = (
+    payload.tool_schemas?.[toolName] ||
+    payload.schemas?.[toolName] ||
+    payload.tools?.find?.((tool) => tool?.tool_slug === toolName || tool?.name === toolName)
+  );
+  if (!schema) {
     throw usageError(`Tool "${toolName}" not found.`);
   }
-  return match;
+  return {
+    name: toolName,
+    toolkit_id: schema.toolkit,
+    description: schema.description || '',
+    parameters: schema.input_schema || { type: 'object', properties: {} },
+    output_schema: schema.output_schema || {},
+    schema_available: Boolean(schema.hasFullSchema),
+  };
+}
+
+export async function fetchToolDiscovery(runtime, useCase, knownFields = '') {
+  const query = { use_case: useCase };
+  if (knownFields) {
+    query.known_fields = knownFields;
+  }
+  const result = await runToolCommand({
+    runtime,
+    toolName: COMPOSIO_SEARCH_TOOLS,
+    arguments_: {
+      queries: [query],
+    },
+  });
+  return result.payload || {};
 }
 
 export function validateArguments(schema, args) {

package/src/command-specs/meta.js

@@ -1,4 +1,4 @@
-import { healthCheck, probeAuth } from './helpers.js';
+import { COMPOSIO_SEARCH_TOOLS, healthCheck, probeAuth } from './helpers.js';
 import { findCommandSpec, formatDescribe } from '../runtime/help.js';
 
 async function doctorHandler(ctx) {
@@ -21,7 +21,7 @@ async function doctorHandler(ctx) {
   if (ctx.runtime.jwt) {
     try {
       const payload = await probeAuth(ctx.runtime);
-      checks.tool_roundtrip = Array.isArray(payload.toolkits) ? 'ok' : 'error';
+      checks.tool_roundtrip = Array.isArray(payload.toolkit_connection_statuses) ? 'ok' : 'error';
     } catch {
       checks.tool_roundtrip = 'error';
     }
@@ -68,7 +68,7 @@ function decodeJwtUserId(jwt) {
 
 async function whoamiHandler(ctx) {
   const payload = await probeAuth(ctx.runtime);
-  const toolkits = payload.toolkits || [];
+  const toolkits = payload.toolkit_connection_statuses || [];
   const userId = decodeJwtUserId(ctx.runtime.jwt);
 
   return ctx.output.emitSuccess({
@@ -78,7 +78,7 @@ async function whoamiHandler(ctx) {
       api_base: ctx.runtime.apiBase,
       user_id: userId,
       toolkit_count: toolkits.length,
-      toolkits: toolkits.map((t) => t.id),
+      toolkits: toolkits.map((t) => t.toolkit),
       cli_version: ctx.runtime.cliVersion,
     },
     humanSummary: `Logged in as ${userId || 'unknown'} via profile "${ctx.runtime.profileName}"`,
@@ -91,7 +91,7 @@ async function whoamiHandler(ctx) {
         `Version:   ${ctx.runtime.cliVersion}`,
       ].join('\n'),
     hints: [
-      { command: 'notis tools toolkits', reason: 'List available toolkit namespaces' },
+      { command: 'notis tools toolkits', reason: 'List available toolkit namespaces and connection statuses' },
       { command: 'notis doctor', reason: 'Run a full health check' },
     ],
   });
@@ -110,7 +110,7 @@ async function describeHandler(ctx) {
 export const metaCommandSpecs = [
   {
     command_path: ['whoami'],
-    summary: 'Display the active profile, user, and available toolkits.',
+    summary: 'Display the active profile, user, and available toolkit connection statuses.',
     when_to_use: 'Use this to quickly confirm which account and environment a command will target.',
     args_schema: { arguments: [], options: [] },
     examples: ['notis whoami', 'notis whoami --json'],
@@ -118,7 +118,7 @@ export const metaCommandSpecs = [
     mutates: false,
     idempotent: true,
     related_commands: ['notis doctor'],
-    backend_call: { type: 'tool', name: 'notis_find_toolkits' },
+    backend_call: { type: 'tool', name: COMPOSIO_SEARCH_TOOLS },
     handler: whoamiHandler,
   },
   {