@odla-ai/cli 0.11.2 → 0.13.0

package/dist/index.d.cts

@@ -2,6 +2,10 @@ import { SecurityReport, PlatformSecurityRun } from '@odla-ai/security';
 import { HostedSecurityJob, GitHubConnectionStatus, GitHubSecuritySource, HostedSecurityIntentResponse, HostedSecurityPlan, HostedSecurityReport, HostedSecurityJobStatus } from '@odla-ai/security/hosted';
 export { GitHubConnectionAttempt, GitHubConnectionStatus, GitHubSecuritySource, HostedSecurityCounts, HostedSecurityCoverage, HostedSecurityIntent, HostedSecurityIntentResponse, HostedSecurityJob, HostedSecurityJobStatus, HostedSecurityPlan, HostedSecurityPlanRoute, HostedSecurityReport, HostedSecurityReportFinding, HostedSecurityRoute } from '@odla-ai/security/hosted';
 
+/** Map a CLI failure to its process exit code: 75 (EX_TEMPFAIL) marks a
+ * handshake that is still awaiting human approval — the pending state is
+ * persisted and rerunning the same command resumes it — everything else is 1. */
+declare function exitCodeFor(err: unknown): number;
 /** Injectable side-effect boundaries used to run and test the command dispatcher. */
 interface CliDependencies {
     fetch?: typeof fetch;
@@ -95,8 +99,8 @@ declare function adminAi(options: AdminAiOptions): Promise<void>;
 /** Stable, machine-readable division of work between the CLI, coding agent,
  * human operator, and Studio. Printed by `odla-ai capabilities --json`. */
 declare const CAPABILITIES: {
-    readonly cli: readonly ["start an email-bound device request without accepting a password or user session token", "register the app and enable configured services per environment", "issue, persist, and explicitly rotate configured service credentials", "write local Worker values and push deployed Worker secrets through Wrangler stdin", "store tenant-vault secrets (including the Clerk webhook secret and reserved Clerk secret key) write-only from stdin or an env var", "push db schema/rules and configure platform AI, auth, and deployment links", "apply read-only Google calendar mirror and public booking-page config, then drive state-bound consent, status, discovery, resync, and disconnect flows", "validate config offline and smoke-test a provisioned db environment", "run app-attributed hosted security discovery and independent validation without provider keys", "connect/revoke source-read-only GitHub sources and drive commit-pinned hosted security jobs without PATs or provider keys", "let admins manage system AI policy and credentials, inspect attributed usage, and read immutable admin changes through separate short-lived capability-only approvals"];
-    readonly agent: readonly ["install and import the selected odla SDKs", "wrap the Worker with withObservability and choose useful telemetry", "make application-specific schema, rules, auth, UI, and migration decisions", "wire @odla-ai/calendar into trusted Worker code and keep the app admin key out of browsers"];
+    readonly cli: readonly ["start an email-bound device request without accepting a password or user session token", "register the app and enable configured services per environment", "issue, persist, and explicitly rotate configured service credentials", "write local Worker values and push deployed Worker secrets through Wrangler stdin", "store tenant-vault secrets (including the Clerk webhook secret and reserved Clerk secret key) write-only from stdin or an env var", "compose declared app-capability schema/rules, create guarded seeds when absent, and configure platform AI, auth, and deployment links", "apply Google Calendar booking config, then drive state-bound consent, status, discovery, and disconnect flows (bookings run live through the platform proxy)", "validate integration contracts offline and smoke-test a provisioned db environment plus anonymous capability routes", "run app-attributed hosted security discovery and independent validation without provider keys", "connect/revoke source-read-only GitHub sources and drive commit-pinned hosted security jobs without PATs or provider keys", "let admins manage system AI policy and credentials, inspect attributed usage, and read immutable admin changes through separate short-lived capability-only approvals"];
+    readonly agent: readonly ["install and import the selected odla SDKs", "wrap the Worker with withObservability and choose useful telemetry", "install capability packages, mount their runtime routes, and make application-specific schema, rules, auth, UI, and migration decisions", "wire @odla-ai/calendar into trusted Worker code and keep the app admin key out of browsers"];
     readonly human: readonly ["provide the existing odla account email, then sign in and explicitly review/approve the exact device code", "review mirrored calendar/attendee disclosure and complete the server-issued Google consent flow", "consent to production changes with --yes", "request destructive credential rotation explicitly", "review application semantics, security findings, releases, and merges", "approve redacted-source disclosure before hosted security reasoning", "approve GitHub App repository access separately from redacted-snippet disclosure"];
     readonly studio: readonly ["view telemetry and environment state", "let signed-in users inventory/revoke their own agent grants and admins audit/global-revoke them", "review calendar connection, granted read scope, selected calendars, and sync health without exposing provider tokens", "perform manual credential recovery when the CLI's local shown-once copy is unavailable", "configure system AI purposes and view app/environment/run-attributed usage", "connect/revoke GitHub security sources and inspect ref-to-SHA jobs, routes, retention, coverage, and normalized reports"];
 };
@@ -104,29 +108,28 @@ type Output = Pick<typeof console, "log">;
 /** Print the stable responsibility boundary for humans or agent tooling. */
 declare function printCapabilities(json?: boolean, out?: Output): void;
 
-declare const CALENDAR_STATES: readonly ["not_connected", "authorizing", "needs_sync", "initial_sync", "healthy", "degraded", "disconnected", "failed"];
-/** Connection lifecycle reported by the registry; mirrors the platform's calendar states. */
+declare const CALENDAR_STATES: readonly ["not_connected", "authorizing", "healthy", "degraded", "disconnected", "failed"];
+/** Connection lifecycle reported by the registry; mirrors the platform's
+ * calendar states. `degraded` means connected but re-consent is required. */
 type CalendarConnectionState = (typeof CALENDAR_STATES)[number];
-/** Owner-visible, secret-free calendar connection and sync health. */
+/** Owner-visible, secret-free calendar connection health. */
 interface CalendarStatus {
     env: string;
     enabled: boolean;
     /** True when the platform has provider credentials for this connection. */
     connected: boolean;
+    /** True when the grant covers booking writes; false means reconnect. */
+    writable: boolean;
     provider: "google" | null;
     status: CalendarConnectionState;
-    access?: "read";
+    access?: "book";
+    /** Calendar that receives created bookings. */
+    bookingCalendarId?: string;
+    /** Calendars consulted for FreeBusy availability. */
     calendars: string[];
-    attendeePolicy?: "full" | "hashed";
-    /** True once a booking projection may have established the DB privacy policy. */
-    attendeePolicyLocked?: boolean;
     bookingPageUrl?: string | null;
     grantedScopes: string[];
     attemptId?: string;
-    lastSuccessfulSyncAt?: number;
-    lastFullSyncAt?: number;
-    watchExpiresAt?: number;
-    bookingCount?: number;
     error?: {
         code?: string;
         message?: string;
@@ -142,9 +145,9 @@ interface AvailableGoogleCalendar {
 }
 
 /** Shared inputs for the calendar lifecycle commands (status, connect,
- * calendars, resync, disconnect): the project config path and env, plus
- * injectable token, output, browser, clock, and polling hooks so agents and
- * tests can drive the flow deterministically. */
+ * calendars, disconnect): the project config path and env, plus injectable
+ * token, output, browser, clock, and polling hooks so agents and tests can
+ * drive the flow deterministically. */
 interface CalendarLifecycleOptions {
     /** Path to the checked-in odla project config. */ configPath: string;
     /** Configured environment; defaults to dev when present. */ env?: string;
@@ -161,16 +164,17 @@ interface CalendarLifecycleOptions {
     now?: () => number;
     signal?: AbortSignal;
 }
-/** Read the owner-visible Google connection and mirror health for one env. */
+/** Read the owner-visible Google connection and booking health for one env. */
 declare function calendarStatus(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
 /** List calendars visible to the connected Google identity for config authoring. */
 declare function calendarCalendars(options: CalendarLifecycleOptions): Promise<AvailableGoogleCalendar[]>;
-/** Apply the public booking page setting, then complete Google consent + initial sync. */
+/** Apply the optional booking-page setting, then complete Google consent.
+ * A connection whose grant predates booking scopes (`degraded`) re-runs
+ * consent so the platform can create events and read FreeBusy. */
 declare function calendarConnect(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
-/** Ask the hosted connector for an immediate incremental/full recovery sync. */
-declare function calendarResync(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
-/** Stop watches and delete this connection's encrypted platform token/cursors
- * without purging the mirror or revoking the shared Google project grant. */
+/** Delete this connection's encrypted platform tokens. No calendar data is
+ * stored anywhere, so there is nothing else to clean up; the shared Google
+ * project grant is not revoked. */
 declare function calendarDisconnect(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
 
 interface RunResult {
@@ -191,47 +195,82 @@ type AppRules = Record<string, {
     update?: string;
     delete?: string;
 }>;
+/** One natural-key row the CLI creates only when an integration has not
+ * already been configured. Existing owner-edited rows are never overwritten. */
+interface IntegrationSeed {
+    /** Stable label used in dry-run output and the exactly-once mutation id. */
+    id: string;
+    /** Namespace containing the singleton/seed row. */
+    ns: string;
+    /** Declared-unique natural key used to detect an existing row and prevent
+     * a concurrent create from overwriting it. */
+    key: {
+        attr: string;
+        value: string;
+    };
+    /** Complete initial attributes; the key attribute may be omitted. */
+    attrs: Record<string, unknown>;
+}
+/** One unauthenticated deployed-app check performed by `odla-ai smoke`. */
+interface IntegrationProbe {
+    /** Absolute path beneath the configured environment link. */
+    path: string;
+    /** Expected unauthenticated HTTP status, normally 401. */
+    expectedStatus: number;
+}
+/** Structural, data-only capability descriptor consumed from
+ * `odla.config.mjs`. Capability packages do not depend on the CLI; their
+ * descriptors only need to conform to this shape. */
+interface OdlaIntegration {
+    /** Stable lowercase capability id, unique within one project. */
+    id: string;
+    /** Human-readable capability name for plans and diagnostics. */
+    title: string;
+    /** Package that supplies the capability. */
+    npm: string;
+    /** Serialized odla-db schema fragment merged by namespace. */
+    schema?: {
+        entities: Record<string, unknown>;
+        links?: Record<string, unknown>;
+    };
+    /** Rule fragment merged by namespace. */
+    rules?: AppRules;
+    /** Rows created after schema/rules provisioning only when absent. */
+    seeds?: IntegrationSeed[];
+    /** Read-only unauthenticated checks run against `links.<env>`. */
+    probes?: IntegrationProbe[];
+}
 interface ClerkAuthConfig {
     publishableKey?: string;
     audience?: string;
     mode?: "client" | "full";
 }
-/** Read-only event selection applied by the hosted Google calendar connector. */
-interface GoogleCalendarMatchConfig {
-    /** Mirror only events whose summary begins with this value. */
-    summaryPrefix?: string;
-    /** Require the connected identity to organize the event. Defaults to true. */
-    organizerSelf?: boolean;
-    /** Require at least one attendee. Defaults to true. */
-    requireAttendees?: boolean;
-}
-/** Google Calendar intent. OAuth credentials never belong in this config. */
+/** Google Calendar booking intent. OAuth credentials never belong in this
+ * config, and no calendar data is mirrored — Google is the source of truth. */
 interface GoogleCalendarConfig {
-    /** One through ten provider calendar ids to mirror in each odla environment. */
-    calendars: Record<OdlaEnvName, string[]>;
-    /** Public Google Appointment Schedule URL for static embed/link mode. */
+    /** One through ten calendars consulted for availability in each env. */
+    availabilityCalendars?: Record<OdlaEnvName, string[]>;
+    /** Retired read-mirror spelling of `availabilityCalendars` (still accepted). */
+    calendars?: Record<OdlaEnvName, string[]>;
+    /** Calendar that receives created bookings per env ("primary" or a concrete
+     * id). Defaults to the first availability calendar. */
+    bookingCalendar?: Record<OdlaEnvName, string>;
+    /** Optional public fallback link (retiring; first-party booking replaces it). */
     bookingPageUrl?: Record<OdlaEnvName, string | null>;
-    match?: GoogleCalendarMatchConfig;
-    /** Store normalized attendee addresses, or only SHA-256 match keys. */
-    attendeePolicy?: "full" | "hashed";
 }
-/** The `calendar` block of `odla.config.mjs` — the Google read-mirror
- * settings; valid only alongside the db service. */
+/** The `calendar` block of `odla.config.mjs` — the Google booking settings;
+ * valid only alongside the db service (booking rides the app's db key). */
 interface CalendarConfig {
     google: GoogleCalendarConfig;
 }
 /** Canonical, environment-specific config sent to the calendar controller. */
 interface CalendarServiceConfig extends Record<string, unknown> {
     provider: "google";
-    access: "read";
-    /** Deduplicated provider ids; the hosted connector accepts at most ten. */
-    calendars: string[];
-    match: {
-        organizerSelf: boolean;
-        requireAttendees: boolean;
-        summaryPrefix?: string;
-    };
-    attendeePolicy: "full" | "hashed";
+    access: "book";
+    /** Calendar that receives created bookings. */
+    bookingCalendarId: string;
+    /** Deduplicated provider ids; the booking proxy accepts at most ten. */
+    availabilityCalendars: string[];
 }
 /** Authored `odla.config.mjs` contract consumed by doctor and provision. */
 interface OdlaProjectConfig {
@@ -243,6 +282,9 @@ interface OdlaProjectConfig {
     };
     envs?: OdlaEnvName[];
     services?: string[];
+    /** App capabilities composed into schema/rules/seeds. Integrations are npm
+     * modules, not hosted platform services, so they do not belong in services. */
+    integrations?: OdlaIntegration[];
     db?: {
         /** Inline SerializedSchema, JSON file, or JS module path exporting default/schema. */
         schema?: unknown;
@@ -325,6 +367,11 @@ interface ProvisionOptions {
     /** true forces browser launch, false disables it, undefined auto-opens whenever
      * this machine can show a browser (skipped in CI, over SSH, or with no display). */
     open?: boolean;
+    /** Cap the handshake-approval wait, in seconds. When it elapses the command
+     * exits with the pending handshake persisted; rerunning resumes it. Defaults
+     * to the handshake's own expiry on an interactive terminal and 90 seconds
+     * everywhere else (agent tool shells kill long-running commands). */
+    wait?: number;
     /** Test/embedding override for opening the approval URL. Defaults to the OS browser opener. */
     openApprovalUrl?: (url: string) => Promise<void>;
     /** Test/embedding override for calendar connection polling. */
@@ -346,6 +393,8 @@ interface ProvisionPlan {
     dbEndpoint: string;
     envs: string[];
     services: string[];
+    /** Configured app-capability ids in provisioning order. */
+    integrations: string[];
     hasSchema: boolean;
     hasRules: boolean;
     aiProvider?: string;
@@ -364,8 +413,8 @@ interface SmokeOptions {
     stdout?: Pick<typeof console, "log" | "error">;
 }
 
-/** The only Google OAuth scope the platform ever requests: read-only calendar events. */
-declare const GOOGLE_CALENDAR_READ_SCOPE = "https://www.googleapis.com/auth/calendar.events.readonly";
+/** The Google OAuth scope that authorizes booking writes (events read/write). */
+declare const GOOGLE_CALENDAR_EVENTS_SCOPE = "https://www.googleapis.com/auth/calendar.events";
 /** Resolve the checked-in calendar block into one controller-safe env payload. */
 declare function calendarServiceConfig(cfg: LoadedProjectConfig, env: string): CalendarServiceConfig;
 /** Public Appointment Schedule URL to apply separately from connector config. */
@@ -378,13 +427,14 @@ interface DoctorOptions {
 /**
  * Validate and summarize an odla project config entirely offline — no network
  * calls and no file writes. Loads `configPath`, builds the provision plan, and
- * resolves the schema and rules (synthesizing deny-all rules from the schema
- * when `db.rules` is omitted and `db.defaultRules` isn't `false`), then prints a
- * summary line for the app, envs, services, schema entity count, rules namespace
- * count, and AI provider.
+ * resolves and collision-checks app plus integration schema/rules (synthesizing
+ * deny-all rules when `db.rules` is omitted and `db.defaultRules` isn't
+ * `false`), then prints the app, envs, services, integrations, schema entity
+ * count, rules namespace count, and AI provider.
  *
  * It then collects warnings for the mistakes provision can't fix silently: a
- * schema with no entities, a rules namespace with no matching entity, the `ai`
+ * schema with no entities, a rules namespace with no matching entity, an
+ * integration with incomplete rules or a seed targeting an unknown namespace, the `ai`
  * service enabled without an `ai.provider`, `auth.clerk` entries that reference
  * an unset env var (`$FOO`), an `ai.keyEnv` that isn't set (provider key upload
  * will be skipped), and — when `o11y` is enabled — any env whose local
@@ -442,8 +492,9 @@ declare function initProject(options: InitOptions): void;
  * developer token, creates the registry app when absent, enables each service
  * per env (AI also gets `setAi` with the configured provider/model), configures
  * Clerk auth and links, then per env mints or reuses credentials only for the
- * configured services, pushes the schema with the db key and the
- * rules with the developer token, and stores the provider key in the tenant
+ * configured services, collision-checks and merges integration schema/rules,
+ * pushes the composed schema with the db key and rules with the developer
+ * token, creates natural-key integration seeds only when absent, and stores the provider key in the tenant
  * vault when `ai.keyEnv` is set and present. Writes the credentials file
  * (mode 0600, gitignored) and, when requested, `.dev.vars`. Google Calendar
  * consent runs last, per env; when the platform connector itself is not yet
@@ -790,9 +841,10 @@ declare function installSkill(options?: SkillInstallOptions): SkillInstallResult
  *
  * It then makes real network calls: fetches the registry public-config (and, when
  * `ai.provider` is configured, asserts the live provider matches), fetches the
- * live db schema with the db key and asserts every entity from the local schema
- * is present, and runs a `count` aggregate against the first entity to confirm
- * the db answers queries. Progress lines are printed and it ends with `ok`.
+ * live db schema with the db key and asserts every entity from the composed app
+ * plus integration schema is present, runs a `count` aggregate against the
+ * first entity, and checks each integration's deployed route probe anonymously
+ * against `links.<env>`. Progress lines are printed and it ends with `ok`.
  * Read-only — it writes nothing and throws on the first mismatch or failed
  * request.
  *
@@ -803,4 +855,4 @@ declare function installSkill(options?: SkillInstallOptions): SkillInstallResult
  */
 declare function smoke(options: SmokeOptions): Promise<void>;
 
-export { AGENT_HARNESSES, type AdminAiOptions, type AgentHarness, type AgentHarnessSelector, type AvailableGoogleCalendar, CAPABILITIES, type CalendarConfig, type CalendarConnectionState, type CalendarLifecycleOptions, type CalendarServiceConfig, type CalendarStatus, type CliDependencies, type ConnectGitHubSecuritySourceOptions, type DisconnectGitHubSecuritySourceOptions, type FollowHostedSecurityJobOptions, GOOGLE_CALENDAR_READ_SCOPE, type GetHostedSecurityIntentOptions, type GetHostedSecurityJobOptions, type GoogleCalendarConfig, type GoogleCalendarMatchConfig, type HarnessInstallResult, type HostedSecurityProfile, type HostedSecurityResult, type HostedSecurityTokenRequest, type ListGitHubSecuritySourcesOptions, type ListHostedSecurityJobsOptions, type LoadedProjectConfig, type LocalCredentials, type OdlaProjectConfig, type ProvisionOptions, type ProvisionPlan, type RunHostedSecurityOptions, SYSTEM_AI_PURPOSES, type ScopedPlatformTokenOptions, type SecretsPushOptions, type SecretsSetOptions, type SkillInstallOptions, type SkillInstallResult, type SmokeOptions, type StartHostedSecurityJobOptions, type SystemAiPurpose, adminAi, calendarBookingPageUrl, calendarCalendars, calendarConnect, calendarDisconnect, calendarResync, calendarServiceConfig, calendarStatus, connectGitHubSecuritySource, disconnectGitHubSecuritySource, doctor, followHostedSecurityJob, getHostedSecurityIntent, getHostedSecurityJob, getHostedSecurityPlan, getHostedSecurityReport, getScopedPlatformToken, inferGitHubRepository, initProject, installSkill, isTerminalHostedSecurityStatus, listGitHubSecuritySources, listHostedSecurityJobs, printCapabilities, provision, redactSecrets, repositoryFromGitRemote, runCli, runHostedSecurity, secretsPush, secretsSet, secretsSetClerkKey, smoke, startHostedSecurityJob };
+export { AGENT_HARNESSES, type AdminAiOptions, type AgentHarness, type AgentHarnessSelector, type AvailableGoogleCalendar, CAPABILITIES, type CalendarConfig, type CalendarConnectionState, type CalendarLifecycleOptions, type CalendarServiceConfig, type CalendarStatus, type CliDependencies, type ConnectGitHubSecuritySourceOptions, type DisconnectGitHubSecuritySourceOptions, type FollowHostedSecurityJobOptions, GOOGLE_CALENDAR_EVENTS_SCOPE, type GetHostedSecurityIntentOptions, type GetHostedSecurityJobOptions, type GoogleCalendarConfig, type HarnessInstallResult, type HostedSecurityProfile, type HostedSecurityResult, type HostedSecurityTokenRequest, type IntegrationProbe, type IntegrationSeed, type ListGitHubSecuritySourcesOptions, type ListHostedSecurityJobsOptions, type LoadedProjectConfig, type LocalCredentials, type OdlaIntegration, type OdlaProjectConfig, type ProvisionOptions, type ProvisionPlan, type RunHostedSecurityOptions, SYSTEM_AI_PURPOSES, type ScopedPlatformTokenOptions, type SecretsPushOptions, type SecretsSetOptions, type SkillInstallOptions, type SkillInstallResult, type SmokeOptions, type StartHostedSecurityJobOptions, type SystemAiPurpose, adminAi, calendarBookingPageUrl, calendarCalendars, calendarConnect, calendarDisconnect, calendarServiceConfig, calendarStatus, connectGitHubSecuritySource, disconnectGitHubSecuritySource, doctor, exitCodeFor, followHostedSecurityJob, getHostedSecurityIntent, getHostedSecurityJob, getHostedSecurityPlan, getHostedSecurityReport, getScopedPlatformToken, inferGitHubRepository, initProject, installSkill, isTerminalHostedSecurityStatus, listGitHubSecuritySources, listHostedSecurityJobs, printCapabilities, provision, redactSecrets, repositoryFromGitRemote, runCli, runHostedSecurity, secretsPush, secretsSet, secretsSetClerkKey, smoke, startHostedSecurityJob };

package/dist/index.d.ts

@@ -2,6 +2,10 @@ import { SecurityReport, PlatformSecurityRun } from '@odla-ai/security';
 import { HostedSecurityJob, GitHubConnectionStatus, GitHubSecuritySource, HostedSecurityIntentResponse, HostedSecurityPlan, HostedSecurityReport, HostedSecurityJobStatus } from '@odla-ai/security/hosted';
 export { GitHubConnectionAttempt, GitHubConnectionStatus, GitHubSecuritySource, HostedSecurityCounts, HostedSecurityCoverage, HostedSecurityIntent, HostedSecurityIntentResponse, HostedSecurityJob, HostedSecurityJobStatus, HostedSecurityPlan, HostedSecurityPlanRoute, HostedSecurityReport, HostedSecurityReportFinding, HostedSecurityRoute } from '@odla-ai/security/hosted';
 
+/** Map a CLI failure to its process exit code: 75 (EX_TEMPFAIL) marks a
+ * handshake that is still awaiting human approval — the pending state is
+ * persisted and rerunning the same command resumes it — everything else is 1. */
+declare function exitCodeFor(err: unknown): number;
 /** Injectable side-effect boundaries used to run and test the command dispatcher. */
 interface CliDependencies {
     fetch?: typeof fetch;
@@ -95,8 +99,8 @@ declare function adminAi(options: AdminAiOptions): Promise<void>;
 /** Stable, machine-readable division of work between the CLI, coding agent,
  * human operator, and Studio. Printed by `odla-ai capabilities --json`. */
 declare const CAPABILITIES: {
-    readonly cli: readonly ["start an email-bound device request without accepting a password or user session token", "register the app and enable configured services per environment", "issue, persist, and explicitly rotate configured service credentials", "write local Worker values and push deployed Worker secrets through Wrangler stdin", "store tenant-vault secrets (including the Clerk webhook secret and reserved Clerk secret key) write-only from stdin or an env var", "push db schema/rules and configure platform AI, auth, and deployment links", "apply read-only Google calendar mirror and public booking-page config, then drive state-bound consent, status, discovery, resync, and disconnect flows", "validate config offline and smoke-test a provisioned db environment", "run app-attributed hosted security discovery and independent validation without provider keys", "connect/revoke source-read-only GitHub sources and drive commit-pinned hosted security jobs without PATs or provider keys", "let admins manage system AI policy and credentials, inspect attributed usage, and read immutable admin changes through separate short-lived capability-only approvals"];
-    readonly agent: readonly ["install and import the selected odla SDKs", "wrap the Worker with withObservability and choose useful telemetry", "make application-specific schema, rules, auth, UI, and migration decisions", "wire @odla-ai/calendar into trusted Worker code and keep the app admin key out of browsers"];
+    readonly cli: readonly ["start an email-bound device request without accepting a password or user session token", "register the app and enable configured services per environment", "issue, persist, and explicitly rotate configured service credentials", "write local Worker values and push deployed Worker secrets through Wrangler stdin", "store tenant-vault secrets (including the Clerk webhook secret and reserved Clerk secret key) write-only from stdin or an env var", "compose declared app-capability schema/rules, create guarded seeds when absent, and configure platform AI, auth, and deployment links", "apply Google Calendar booking config, then drive state-bound consent, status, discovery, and disconnect flows (bookings run live through the platform proxy)", "validate integration contracts offline and smoke-test a provisioned db environment plus anonymous capability routes", "run app-attributed hosted security discovery and independent validation without provider keys", "connect/revoke source-read-only GitHub sources and drive commit-pinned hosted security jobs without PATs or provider keys", "let admins manage system AI policy and credentials, inspect attributed usage, and read immutable admin changes through separate short-lived capability-only approvals"];
+    readonly agent: readonly ["install and import the selected odla SDKs", "wrap the Worker with withObservability and choose useful telemetry", "install capability packages, mount their runtime routes, and make application-specific schema, rules, auth, UI, and migration decisions", "wire @odla-ai/calendar into trusted Worker code and keep the app admin key out of browsers"];
     readonly human: readonly ["provide the existing odla account email, then sign in and explicitly review/approve the exact device code", "review mirrored calendar/attendee disclosure and complete the server-issued Google consent flow", "consent to production changes with --yes", "request destructive credential rotation explicitly", "review application semantics, security findings, releases, and merges", "approve redacted-source disclosure before hosted security reasoning", "approve GitHub App repository access separately from redacted-snippet disclosure"];
     readonly studio: readonly ["view telemetry and environment state", "let signed-in users inventory/revoke their own agent grants and admins audit/global-revoke them", "review calendar connection, granted read scope, selected calendars, and sync health without exposing provider tokens", "perform manual credential recovery when the CLI's local shown-once copy is unavailable", "configure system AI purposes and view app/environment/run-attributed usage", "connect/revoke GitHub security sources and inspect ref-to-SHA jobs, routes, retention, coverage, and normalized reports"];
 };
@@ -104,29 +108,28 @@ type Output = Pick<typeof console, "log">;
 /** Print the stable responsibility boundary for humans or agent tooling. */
 declare function printCapabilities(json?: boolean, out?: Output): void;
 
-declare const CALENDAR_STATES: readonly ["not_connected", "authorizing", "needs_sync", "initial_sync", "healthy", "degraded", "disconnected", "failed"];
-/** Connection lifecycle reported by the registry; mirrors the platform's calendar states. */
+declare const CALENDAR_STATES: readonly ["not_connected", "authorizing", "healthy", "degraded", "disconnected", "failed"];
+/** Connection lifecycle reported by the registry; mirrors the platform's
+ * calendar states. `degraded` means connected but re-consent is required. */
 type CalendarConnectionState = (typeof CALENDAR_STATES)[number];
-/** Owner-visible, secret-free calendar connection and sync health. */
+/** Owner-visible, secret-free calendar connection health. */
 interface CalendarStatus {
     env: string;
     enabled: boolean;
     /** True when the platform has provider credentials for this connection. */
     connected: boolean;
+    /** True when the grant covers booking writes; false means reconnect. */
+    writable: boolean;
     provider: "google" | null;
     status: CalendarConnectionState;
-    access?: "read";
+    access?: "book";
+    /** Calendar that receives created bookings. */
+    bookingCalendarId?: string;
+    /** Calendars consulted for FreeBusy availability. */
     calendars: string[];
-    attendeePolicy?: "full" | "hashed";
-    /** True once a booking projection may have established the DB privacy policy. */
-    attendeePolicyLocked?: boolean;
     bookingPageUrl?: string | null;
     grantedScopes: string[];
     attemptId?: string;
-    lastSuccessfulSyncAt?: number;
-    lastFullSyncAt?: number;
-    watchExpiresAt?: number;
-    bookingCount?: number;
     error?: {
         code?: string;
         message?: string;
@@ -142,9 +145,9 @@ interface AvailableGoogleCalendar {
 }
 
 /** Shared inputs for the calendar lifecycle commands (status, connect,
- * calendars, resync, disconnect): the project config path and env, plus
- * injectable token, output, browser, clock, and polling hooks so agents and
- * tests can drive the flow deterministically. */
+ * calendars, disconnect): the project config path and env, plus injectable
+ * token, output, browser, clock, and polling hooks so agents and tests can
+ * drive the flow deterministically. */
 interface CalendarLifecycleOptions {
     /** Path to the checked-in odla project config. */ configPath: string;
     /** Configured environment; defaults to dev when present. */ env?: string;
@@ -161,16 +164,17 @@ interface CalendarLifecycleOptions {
     now?: () => number;
     signal?: AbortSignal;
 }
-/** Read the owner-visible Google connection and mirror health for one env. */
+/** Read the owner-visible Google connection and booking health for one env. */
 declare function calendarStatus(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
 /** List calendars visible to the connected Google identity for config authoring. */
 declare function calendarCalendars(options: CalendarLifecycleOptions): Promise<AvailableGoogleCalendar[]>;
-/** Apply the public booking page setting, then complete Google consent + initial sync. */
+/** Apply the optional booking-page setting, then complete Google consent.
+ * A connection whose grant predates booking scopes (`degraded`) re-runs
+ * consent so the platform can create events and read FreeBusy. */
 declare function calendarConnect(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
-/** Ask the hosted connector for an immediate incremental/full recovery sync. */
-declare function calendarResync(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
-/** Stop watches and delete this connection's encrypted platform token/cursors
- * without purging the mirror or revoking the shared Google project grant. */
+/** Delete this connection's encrypted platform tokens. No calendar data is
+ * stored anywhere, so there is nothing else to clean up; the shared Google
+ * project grant is not revoked. */
 declare function calendarDisconnect(options: CalendarLifecycleOptions): Promise<CalendarStatus>;
 
 interface RunResult {
@@ -191,47 +195,82 @@ type AppRules = Record<string, {
     update?: string;
     delete?: string;
 }>;
+/** One natural-key row the CLI creates only when an integration has not
+ * already been configured. Existing owner-edited rows are never overwritten. */
+interface IntegrationSeed {
+    /** Stable label used in dry-run output and the exactly-once mutation id. */
+    id: string;
+    /** Namespace containing the singleton/seed row. */
+    ns: string;
+    /** Declared-unique natural key used to detect an existing row and prevent
+     * a concurrent create from overwriting it. */
+    key: {
+        attr: string;
+        value: string;
+    };
+    /** Complete initial attributes; the key attribute may be omitted. */
+    attrs: Record<string, unknown>;
+}
+/** One unauthenticated deployed-app check performed by `odla-ai smoke`. */
+interface IntegrationProbe {
+    /** Absolute path beneath the configured environment link. */
+    path: string;
+    /** Expected unauthenticated HTTP status, normally 401. */
+    expectedStatus: number;
+}
+/** Structural, data-only capability descriptor consumed from
+ * `odla.config.mjs`. Capability packages do not depend on the CLI; their
+ * descriptors only need to conform to this shape. */
+interface OdlaIntegration {
+    /** Stable lowercase capability id, unique within one project. */
+    id: string;
+    /** Human-readable capability name for plans and diagnostics. */
+    title: string;
+    /** Package that supplies the capability. */
+    npm: string;
+    /** Serialized odla-db schema fragment merged by namespace. */
+    schema?: {
+        entities: Record<string, unknown>;
+        links?: Record<string, unknown>;
+    };
+    /** Rule fragment merged by namespace. */
+    rules?: AppRules;
+    /** Rows created after schema/rules provisioning only when absent. */
+    seeds?: IntegrationSeed[];
+    /** Read-only unauthenticated checks run against `links.<env>`. */
+    probes?: IntegrationProbe[];
+}
 interface ClerkAuthConfig {
     publishableKey?: string;
     audience?: string;
     mode?: "client" | "full";
 }
-/** Read-only event selection applied by the hosted Google calendar connector. */
-interface GoogleCalendarMatchConfig {
-    /** Mirror only events whose summary begins with this value. */
-    summaryPrefix?: string;
-    /** Require the connected identity to organize the event. Defaults to true. */
-    organizerSelf?: boolean;
-    /** Require at least one attendee. Defaults to true. */
-    requireAttendees?: boolean;
-}
-/** Google Calendar intent. OAuth credentials never belong in this config. */
+/** Google Calendar booking intent. OAuth credentials never belong in this
+ * config, and no calendar data is mirrored — Google is the source of truth. */
 interface GoogleCalendarConfig {
-    /** One through ten provider calendar ids to mirror in each odla environment. */
-    calendars: Record<OdlaEnvName, string[]>;
-    /** Public Google Appointment Schedule URL for static embed/link mode. */
+    /** One through ten calendars consulted for availability in each env. */
+    availabilityCalendars?: Record<OdlaEnvName, string[]>;
+    /** Retired read-mirror spelling of `availabilityCalendars` (still accepted). */
+    calendars?: Record<OdlaEnvName, string[]>;
+    /** Calendar that receives created bookings per env ("primary" or a concrete
+     * id). Defaults to the first availability calendar. */
+    bookingCalendar?: Record<OdlaEnvName, string>;
+    /** Optional public fallback link (retiring; first-party booking replaces it). */
     bookingPageUrl?: Record<OdlaEnvName, string | null>;
-    match?: GoogleCalendarMatchConfig;
-    /** Store normalized attendee addresses, or only SHA-256 match keys. */
-    attendeePolicy?: "full" | "hashed";
 }
-/** The `calendar` block of `odla.config.mjs` — the Google read-mirror
- * settings; valid only alongside the db service. */
+/** The `calendar` block of `odla.config.mjs` — the Google booking settings;
+ * valid only alongside the db service (booking rides the app's db key). */
 interface CalendarConfig {
     google: GoogleCalendarConfig;
 }
 /** Canonical, environment-specific config sent to the calendar controller. */
 interface CalendarServiceConfig extends Record<string, unknown> {
     provider: "google";
-    access: "read";
-    /** Deduplicated provider ids; the hosted connector accepts at most ten. */
-    calendars: string[];
-    match: {
-        organizerSelf: boolean;
-        requireAttendees: boolean;
-        summaryPrefix?: string;
-    };
-    attendeePolicy: "full" | "hashed";
+    access: "book";
+    /** Calendar that receives created bookings. */
+    bookingCalendarId: string;
+    /** Deduplicated provider ids; the booking proxy accepts at most ten. */
+    availabilityCalendars: string[];
 }
 /** Authored `odla.config.mjs` contract consumed by doctor and provision. */
 interface OdlaProjectConfig {
@@ -243,6 +282,9 @@ interface OdlaProjectConfig {
     };
     envs?: OdlaEnvName[];
     services?: string[];
+    /** App capabilities composed into schema/rules/seeds. Integrations are npm
+     * modules, not hosted platform services, so they do not belong in services. */
+    integrations?: OdlaIntegration[];
     db?: {
         /** Inline SerializedSchema, JSON file, or JS module path exporting default/schema. */
         schema?: unknown;
@@ -325,6 +367,11 @@ interface ProvisionOptions {
     /** true forces browser launch, false disables it, undefined auto-opens whenever
      * this machine can show a browser (skipped in CI, over SSH, or with no display). */
     open?: boolean;
+    /** Cap the handshake-approval wait, in seconds. When it elapses the command
+     * exits with the pending handshake persisted; rerunning resumes it. Defaults
+     * to the handshake's own expiry on an interactive terminal and 90 seconds
+     * everywhere else (agent tool shells kill long-running commands). */
+    wait?: number;
     /** Test/embedding override for opening the approval URL. Defaults to the OS browser opener. */
     openApprovalUrl?: (url: string) => Promise<void>;
     /** Test/embedding override for calendar connection polling. */
@@ -346,6 +393,8 @@ interface ProvisionPlan {
     dbEndpoint: string;
     envs: string[];
     services: string[];
+    /** Configured app-capability ids in provisioning order. */
+    integrations: string[];
     hasSchema: boolean;
     hasRules: boolean;
     aiProvider?: string;
@@ -364,8 +413,8 @@ interface SmokeOptions {
     stdout?: Pick<typeof console, "log" | "error">;
 }
 
-/** The only Google OAuth scope the platform ever requests: read-only calendar events. */
-declare const GOOGLE_CALENDAR_READ_SCOPE = "https://www.googleapis.com/auth/calendar.events.readonly";
+/** The Google OAuth scope that authorizes booking writes (events read/write). */
+declare const GOOGLE_CALENDAR_EVENTS_SCOPE = "https://www.googleapis.com/auth/calendar.events";
 /** Resolve the checked-in calendar block into one controller-safe env payload. */
 declare function calendarServiceConfig(cfg: LoadedProjectConfig, env: string): CalendarServiceConfig;
 /** Public Appointment Schedule URL to apply separately from connector config. */
@@ -378,13 +427,14 @@ interface DoctorOptions {
 /**
  * Validate and summarize an odla project config entirely offline — no network
  * calls and no file writes. Loads `configPath`, builds the provision plan, and
- * resolves the schema and rules (synthesizing deny-all rules from the schema
- * when `db.rules` is omitted and `db.defaultRules` isn't `false`), then prints a
- * summary line for the app, envs, services, schema entity count, rules namespace
- * count, and AI provider.
+ * resolves and collision-checks app plus integration schema/rules (synthesizing
+ * deny-all rules when `db.rules` is omitted and `db.defaultRules` isn't
+ * `false`), then prints the app, envs, services, integrations, schema entity
+ * count, rules namespace count, and AI provider.
  *
  * It then collects warnings for the mistakes provision can't fix silently: a
- * schema with no entities, a rules namespace with no matching entity, the `ai`
+ * schema with no entities, a rules namespace with no matching entity, an
+ * integration with incomplete rules or a seed targeting an unknown namespace, the `ai`
  * service enabled without an `ai.provider`, `auth.clerk` entries that reference
  * an unset env var (`$FOO`), an `ai.keyEnv` that isn't set (provider key upload
  * will be skipped), and — when `o11y` is enabled — any env whose local
@@ -442,8 +492,9 @@ declare function initProject(options: InitOptions): void;
  * developer token, creates the registry app when absent, enables each service
  * per env (AI also gets `setAi` with the configured provider/model), configures
  * Clerk auth and links, then per env mints or reuses credentials only for the
- * configured services, pushes the schema with the db key and the
- * rules with the developer token, and stores the provider key in the tenant
+ * configured services, collision-checks and merges integration schema/rules,
+ * pushes the composed schema with the db key and rules with the developer
+ * token, creates natural-key integration seeds only when absent, and stores the provider key in the tenant
  * vault when `ai.keyEnv` is set and present. Writes the credentials file
  * (mode 0600, gitignored) and, when requested, `.dev.vars`. Google Calendar
  * consent runs last, per env; when the platform connector itself is not yet
@@ -790,9 +841,10 @@ declare function installSkill(options?: SkillInstallOptions): SkillInstallResult
  *
  * It then makes real network calls: fetches the registry public-config (and, when
  * `ai.provider` is configured, asserts the live provider matches), fetches the
- * live db schema with the db key and asserts every entity from the local schema
- * is present, and runs a `count` aggregate against the first entity to confirm
- * the db answers queries. Progress lines are printed and it ends with `ok`.
+ * live db schema with the db key and asserts every entity from the composed app
+ * plus integration schema is present, runs a `count` aggregate against the
+ * first entity, and checks each integration's deployed route probe anonymously
+ * against `links.<env>`. Progress lines are printed and it ends with `ok`.
  * Read-only — it writes nothing and throws on the first mismatch or failed
  * request.
  *
@@ -803,4 +855,4 @@ declare function installSkill(options?: SkillInstallOptions): SkillInstallResult
  */
 declare function smoke(options: SmokeOptions): Promise<void>;
 
-export { AGENT_HARNESSES, type AdminAiOptions, type AgentHarness, type AgentHarnessSelector, type AvailableGoogleCalendar, CAPABILITIES, type CalendarConfig, type CalendarConnectionState, type CalendarLifecycleOptions, type CalendarServiceConfig, type CalendarStatus, type CliDependencies, type ConnectGitHubSecuritySourceOptions, type DisconnectGitHubSecuritySourceOptions, type FollowHostedSecurityJobOptions, GOOGLE_CALENDAR_READ_SCOPE, type GetHostedSecurityIntentOptions, type GetHostedSecurityJobOptions, type GoogleCalendarConfig, type GoogleCalendarMatchConfig, type HarnessInstallResult, type HostedSecurityProfile, type HostedSecurityResult, type HostedSecurityTokenRequest, type ListGitHubSecuritySourcesOptions, type ListHostedSecurityJobsOptions, type LoadedProjectConfig, type LocalCredentials, type OdlaProjectConfig, type ProvisionOptions, type ProvisionPlan, type RunHostedSecurityOptions, SYSTEM_AI_PURPOSES, type ScopedPlatformTokenOptions, type SecretsPushOptions, type SecretsSetOptions, type SkillInstallOptions, type SkillInstallResult, type SmokeOptions, type StartHostedSecurityJobOptions, type SystemAiPurpose, adminAi, calendarBookingPageUrl, calendarCalendars, calendarConnect, calendarDisconnect, calendarResync, calendarServiceConfig, calendarStatus, connectGitHubSecuritySource, disconnectGitHubSecuritySource, doctor, followHostedSecurityJob, getHostedSecurityIntent, getHostedSecurityJob, getHostedSecurityPlan, getHostedSecurityReport, getScopedPlatformToken, inferGitHubRepository, initProject, installSkill, isTerminalHostedSecurityStatus, listGitHubSecuritySources, listHostedSecurityJobs, printCapabilities, provision, redactSecrets, repositoryFromGitRemote, runCli, runHostedSecurity, secretsPush, secretsSet, secretsSetClerkKey, smoke, startHostedSecurityJob };
+export { AGENT_HARNESSES, type AdminAiOptions, type AgentHarness, type AgentHarnessSelector, type AvailableGoogleCalendar, CAPABILITIES, type CalendarConfig, type CalendarConnectionState, type CalendarLifecycleOptions, type CalendarServiceConfig, type CalendarStatus, type CliDependencies, type ConnectGitHubSecuritySourceOptions, type DisconnectGitHubSecuritySourceOptions, type FollowHostedSecurityJobOptions, GOOGLE_CALENDAR_EVENTS_SCOPE, type GetHostedSecurityIntentOptions, type GetHostedSecurityJobOptions, type GoogleCalendarConfig, type HarnessInstallResult, type HostedSecurityProfile, type HostedSecurityResult, type HostedSecurityTokenRequest, type IntegrationProbe, type IntegrationSeed, type ListGitHubSecuritySourcesOptions, type ListHostedSecurityJobsOptions, type LoadedProjectConfig, type LocalCredentials, type OdlaIntegration, type OdlaProjectConfig, type ProvisionOptions, type ProvisionPlan, type RunHostedSecurityOptions, SYSTEM_AI_PURPOSES, type ScopedPlatformTokenOptions, type SecretsPushOptions, type SecretsSetOptions, type SkillInstallOptions, type SkillInstallResult, type SmokeOptions, type StartHostedSecurityJobOptions, type SystemAiPurpose, adminAi, calendarBookingPageUrl, calendarCalendars, calendarConnect, calendarDisconnect, calendarServiceConfig, calendarStatus, connectGitHubSecuritySource, disconnectGitHubSecuritySource, doctor, exitCodeFor, followHostedSecurityJob, getHostedSecurityIntent, getHostedSecurityJob, getHostedSecurityPlan, getHostedSecurityReport, getScopedPlatformToken, inferGitHubRepository, initProject, installSkill, isTerminalHostedSecurityStatus, listGitHubSecuritySources, listHostedSecurityJobs, printCapabilities, provision, redactSecrets, repositoryFromGitRemote, runCli, runHostedSecurity, secretsPush, secretsSet, secretsSetClerkKey, smoke, startHostedSecurityJob };