@apso/cli 0.37.1 → 0.39.0

package/README.md

@@ -57,6 +57,17 @@ Add to your MCP configuration:
 | `start_dev_server` | Start local dev environment via Docker Compose |
 | `deploy_api` | Deploy to the Apso platform |
 
+**Schema edit tools** (from `@apso/schema-tools`) change the project's `.apsorc` one step at a time. Each write is linted with the rules `apso generate` enforces; a change that would add a lint error is rejected and the file is left as it was.
+
+| Tool | Description |
+|------|-------------|
+| `get_schema`, `describe_entity` | Read the schema outline, or one entity and its relationships |
+| `add_entity`, `rename_entity`, `remove_entity` | Entities (relationships and foreign key indexes follow renames and removals) |
+| `add_field`, `update_field`, `rename_field`, `remove_field` | Fields (indexes and uniques follow renames and removals) |
+| `add_relationship`, `remove_relationship` | Relationships |
+| `add_index` | Index or unique index |
+| `lint_schema` | Lint report |
+
 **Available resources:**
 
 | Resource | URI | Description |

package/dist/commands/mcp/serve.js

@@ -16,6 +16,7 @@ const lib_1 = require("../../lib");
 const runner_1 = require("../../lib/doctor/runner");
 const file_system_1 = require("../../lib/utils/file-system");
 const schema_convert_1 = require("../../lib/utils/schema-convert");
+const mcp_schema_tools_1 = require("../../lib/mcp-schema-tools");
 const perf_hooks_1 = require("perf_hooks");
 class McpServe extends base_command_1.default {
     async run() {
@@ -69,6 +70,10 @@ class McpServe extends base_command_1.default {
         };
     }
     registerTools(server) {
+        // ── granular schema edits (@apso/schema-tools) ─────────────────
+        // get_schema, describe_entity, add_entity, add_field, rename_field, ...
+        // on the project's .apsorc, each linted before it is written.
+        (0, mcp_schema_tools_1.registerSchemaTools)(server);
         // ── design_schema ──────────────────────────────────────────────
         server.tool("design_schema", "Design a database schema from application requirements. Takes a description of entities, relationships, and business rules. Returns a validated .apsorc schema definition ready for code generation.", {
             requirements: zod_1.z

package/dist/commands/schema/lint.d.ts

@@ -0,0 +1,18 @@
+import { LintIssue, LintResult } from "@apso/schema-tools";
+import BaseCommand from "../../lib/base-command";
+import { ApsorcType } from "../../lib/apsorc-parser";
+/** Lints (and with `fix`, repairs and saves) an .apsorc file. */
+export declare function lintApsorc(configPath: string, apsorc: ApsorcType, fix: boolean): {
+    result: LintResult;
+    fixed: LintIssue[];
+    backupPath?: string;
+};
+export default class SchemaLint extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        fix: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/schema/lint.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.lintApsorc = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const fs = tslib_1.__importStar(require("fs"));
+const path = tslib_1.__importStar(require("path"));
+const schema_tools_1 = require("@apso/schema-tools");
+const base_command_1 = tslib_1.__importDefault(require("../../lib/base-command"));
+const config_1 = require("../../lib/config");
+const apsorc_parser_1 = require("../../lib/apsorc-parser");
+/** Lints (and with `fix`, repairs and saves) an .apsorc file. */
+function lintApsorc(configPath, apsorc, fix) {
+    if (!fix)
+        return { result: (0, schema_tools_1.lintSchema)(apsorc), fixed: [] };
+    const { schema, applied } = (0, schema_tools_1.fixSchema)(apsorc);
+    let backupPath;
+    if (applied.length > 0) {
+        backupPath = (0, config_1.createBackup)(configPath, path.dirname(configPath));
+        fs.writeFileSync(configPath, `${JSON.stringify(schema, null, 2)}\n`, "utf-8");
+    }
+    return { result: (0, schema_tools_1.lintSchema)(schema), fixed: applied, backupPath };
+}
+exports.lintApsorc = lintApsorc;
+class SchemaLint extends base_command_1.default {
+    async run() {
+        const { flags } = await this.parse(SchemaLint);
+        let file;
+        try {
+            file = (0, apsorc_parser_1.readApsorcFile)();
+        }
+        catch (error) {
+            this.error(`Failed to read .apsorc: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        if (file.apsorc.version !== 2) {
+            this.error("apso schema lint supports version 2 .apsorc files only.");
+        }
+        const { result, fixed, backupPath } = lintApsorc(file.configPath, file.apsorc, flags.fix);
+        if (flags.json) {
+            this.log(JSON.stringify({ ...result, fixed }, null, 2));
+        }
+        else {
+            if (fixed.length > 0) {
+                this.log(`Fixed ${fixed.length} issue(s) in ${file.configPath} (backup: ${backupPath}):`);
+                for (const issue of fixed)
+                    this.log(`  - ${issue.rule}: ${issue.message}`);
+                this.log("");
+            }
+            this.log((0, schema_tools_1.formatLintReport)(result));
+            if (!flags.fix && result.issues.some((issue) => issue.fixable)) {
+                this.log('\nRun "apso schema lint --fix" to apply the auto-fixable changes.');
+            }
+        }
+        if (result.errorCount > 0)
+            this.exit(1);
+    }
+}
+SchemaLint.description = "Check the local .apsorc for names and settings that would break the generated code";
+SchemaLint.examples = [
+    "$ apso schema lint",
+    "$ apso schema lint --fix",
+    "$ apso schema lint --json",
+];
+SchemaLint.flags = {
+    fix: core_1.Flags.boolean({
+        description: "Apply the safe automatic fixes and save .apsorc (a backup is kept)",
+        default: false,
+    }),
+    json: core_1.Flags.boolean({
+        description: "Print the result as JSON",
+        default: false,
+    }),
+};
+exports.default = SchemaLint;

package/dist/commands/schema/validate.js

@@ -5,12 +5,32 @@ const core_1 = require("@oclif/core");
 const base_command_1 = tslib_1.__importDefault(require("../../lib/base-command"));
 const config_1 = require("../../lib/config");
 const services_1 = require("../../lib/api/services");
+const schema_tools_1 = require("@apso/schema-tools");
 const apsorc_parser_1 = require("../../lib/apsorc-parser");
 const schema_convert_1 = require("../../lib/utils/schema-convert");
 class SchemaValidate extends base_command_1.default {
     async run() {
         var _a;
         const { flags } = await this.parse(SchemaValidate);
+        // Lint first so every issue is listed, not just the first one parseApsorc throws on
+        let file;
+        try {
+            file = (0, apsorc_parser_1.readApsorcFile)();
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            this.error(`Failed to read .apsorc: ${msg}`);
+        }
+        if (file.apsorc.version === 2) {
+            const lint = (0, schema_tools_1.lintSchema)(file.apsorc);
+            if (lint.issues.length > 0) {
+                this.log((0, schema_tools_1.formatLintReport)(lint));
+                this.log("");
+            }
+            if (lint.errorCount > 0) {
+                this.error(`Validation failed with ${lint.errorCount} lint error(s). Run "apso schema lint --fix" to apply the safe fixes.`);
+            }
+        }
         // Parse .apsorc
         let parsed;
         try {

package/dist/lib/apsorc-parser.d.ts

@@ -51,6 +51,24 @@ type ParsedApsorc = {
     coAuthor?: boolean;
 };
 export declare const parseApsorcV1: (apsorc: ApsorcType) => ParsedApsorcData;
+/**
+ * A schema problem that would make `apso generate` emit code that does not
+ * compile. `code` is the @apso/schema-tools rule id (FIELD_RELATIONSHIP_COLLISION,
+ * DUPLICATE_FIELD_NAME, ...), the same codes the apso-client-v2 validator used.
+ */
+export declare class ApsorcNamingError extends Error {
+    code: string;
+    entity: string;
+    field?: string | undefined;
+    constructor(message: string, code: string, entity: string, field?: string | undefined);
+}
+/**
+ * Throws an ApsorcNamingError for the first @apso/schema-tools error, e.g. a
+ * text field `notes` on Contact plus Note ManyToOne Contact, whose inverse
+ * side is `notes: Note[]` on Contact (TS2300 Duplicate identifier). The client
+ * schema builder runs the same rules, so a schema that passes there passes here.
+ */
+export declare const assertCodegenSafeNames: (apsorc: Pick<ApsorcType, "entities" | "relationships">) => void;
 export declare const parseApsorcV2: (apsorc: ApsorcType) => ParsedApsorcData;
 export declare const parseApsorc: () => ParsedApsorc;
 /**
@@ -58,5 +76,10 @@ export declare const parseApsorc: () => ParsedApsorc;
  * Searches upwards from the current working directory.
  * @returns The absolute path to the .apsorc file, or null if not found.
  */
+/** Reads the .apsorc file itself (not rc-merged), for commands that rewrite it. */
+export declare const readApsorcFile: () => {
+    configPath: string;
+    apsorc: ApsorcType;
+};
 export declare const findConfigPath: () => string | null;
 export {};

package/dist/lib/apsorc-parser.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfigPath = exports.parseApsorc = exports.parseApsorcV2 = exports.parseApsorcV1 = exports.ApiType = void 0;
+exports.findConfigPath = exports.readApsorcFile = exports.parseApsorc = exports.parseApsorcV2 = exports.assertCodegenSafeNames = exports.ApsorcNamingError = exports.parseApsorcV1 = exports.ApiType = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
 const rc_1 = tslib_1.__importDefault(require("rc"));
 const relationships_1 = require("./utils/relationships");
 const perf_hooks_1 = require("perf_hooks");
+// @apso/schema-tools is published on npm (apsoai/apso-packages).
+const schema_tools_1 = require("@apso/schema-tools");
 var ApiType;
 (function (ApiType) {
     ApiType["Graphql"] = "graphql";
@@ -21,8 +23,39 @@ const parseApsorcV1 = (apsorc) => {
     return { entities, relationshipMap };
 };
 exports.parseApsorcV1 = parseApsorcV1;
+/**
+ * A schema problem that would make `apso generate` emit code that does not
+ * compile. `code` is the @apso/schema-tools rule id (FIELD_RELATIONSHIP_COLLISION,
+ * DUPLICATE_FIELD_NAME, ...), the same codes the apso-client-v2 validator used.
+ */
+class ApsorcNamingError extends Error {
+    constructor(message, code, entity, field) {
+        super(message);
+        this.code = code;
+        this.entity = entity;
+        this.field = field;
+        this.name = "ApsorcNamingError";
+    }
+}
+exports.ApsorcNamingError = ApsorcNamingError;
+/**
+ * Throws an ApsorcNamingError for the first @apso/schema-tools error, e.g. a
+ * text field `notes` on Contact plus Note ManyToOne Contact, whose inverse
+ * side is `notes: Note[]` on Contact (TS2300 Duplicate identifier). The client
+ * schema builder runs the same rules, so a schema that passes there passes here.
+ */
+const assertCodegenSafeNames = (apsorc) => {
+    const { issues } = (0, schema_tools_1.lintSchema)(apsorc);
+    const error = issues.find((issue) => issue.severity === "error");
+    if (!error)
+        return;
+    const more = issues.filter((issue) => issue.severity === "error").length - 1;
+    throw new ApsorcNamingError(`${error.message}${more > 0 ? ` (${more} more error${more === 1 ? "" : "s"})` : ""} Run "apso schema lint" to see every issue, or "apso schema lint --fix" to apply the safe fixes.`, error.rule, error.entity || "", error.field);
+};
+exports.assertCodegenSafeNames = assertCodegenSafeNames;
 const parseApsorcV2 = (apsorc) => {
     const { entities, relationships: apsoRelationships } = apsorc;
+    (0, exports.assertCodegenSafeNames)(apsorc);
     const relationshipMap = (0, relationships_1.parseRelationships)(apsoRelationships);
     return { entities, relationshipMap };
 };
@@ -115,6 +148,15 @@ exports.parseApsorc = parseApsorc;
  * Searches upwards from the current working directory.
  * @returns The absolute path to the .apsorc file, or null if not found.
  */
+/** Reads the .apsorc file itself (not rc-merged), for commands that rewrite it. */
+const readApsorcFile = () => {
+    const configPath = (0, exports.findConfigPath)();
+    if (!configPath) {
+        throw new Error("No .apsorc found in this directory or any parent.");
+    }
+    return { configPath, apsorc: JSON.parse(fs.readFileSync(configPath).toString()) };
+};
+exports.readApsorcFile = readApsorcFile;
 const findConfigPath = () => {
     let currentDir = process.cwd();
     while (currentDir !== path.parse(currentDir).root) {

package/dist/lib/base-command.d.ts

@@ -1,4 +1,6 @@
 import { Command } from "@oclif/core";
+/** True for errors oclif raised deliberately (this.error, this.exit, parse errors). */
+export declare function isUserError(err: unknown): boolean;
 export default abstract class BaseCommand extends Command {
     /**
      * Report failures to Sentry + PostHog before oclif exits. The postrun hook
@@ -7,6 +9,9 @@ export default abstract class BaseCommand extends Command {
     catch(err: Error & {
         exitCode?: number;
         code?: string;
+        oclif?: {
+            exit?: number;
+        };
     }): Promise<any>;
     runCommand(command: string, args: string[], silent?: boolean): Promise<void>;
     runNpmCommand(args: string[], silent?: boolean): Promise<void>;

package/dist/lib/base-command.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUserError = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const child_process_1 = require("child_process");
 const os_1 = tslib_1.__importDefault(require("os"));
 const telemetry_1 = require("./telemetry/telemetry");
+/** True for errors oclif raised deliberately (this.error, this.exit, parse errors). */
+function isUserError(err) {
+    return Boolean(err && typeof err === "object" && "oclif" in err);
+}
+exports.isUserError = isUserError;
 class BaseCommand extends core_1.Command {
     /**
      * Report failures to Sentry + PostHog before oclif exits. The postrun hook
@@ -12,12 +18,20 @@ class BaseCommand extends core_1.Command {
      */
     async catch(err) {
         try {
-            (0, telemetry_1.captureException)(err, { command: this.id });
+            // oclif marks errors it raised on purpose (this.error, this.exit, flag
+            // and arg parse failures) with an `oclif` property. Those are messages
+            // we chose to show the user, e.g. "No entity named X", not crashes, so
+            // they go to PostHog only. Everything else is a real bug for Sentry.
+            const userError = isUserError(err);
+            if (!userError) {
+                (0, telemetry_1.captureException)(err, { command: this.id });
+            }
             (0, telemetry_1.track)("cli_command_failed", {
                 command: this.id,
                 duration_ms: (0, telemetry_1.elapsedMs)(),
                 error: err === null || err === void 0 ? void 0 : err.message,
                 error_code: err === null || err === void 0 ? void 0 : err.code,
+                user_error: userError,
             });
             await (0, telemetry_1.shutdownTelemetry)();
         }

package/dist/lib/config/types.d.ts

@@ -133,6 +133,10 @@ export interface GlobalConfigFile {
      * Whether the first-run telemetry transparency notice has been shown.
      */
     telemetryNoticeShown: boolean;
+    /**
+     * User id this install's anonymous telemetry id was last aliased to.
+     */
+    telemetryAliasedUserId?: string;
 }
 /**
  * Project link stored in .apso/link.json

package/dist/lib/mcp-schema-tools.d.ts

@@ -0,0 +1,31 @@
+export interface SchemaToolFileResult {
+    ok: boolean;
+    message: string;
+    data?: unknown;
+    configPath: string;
+    /** True when the operation changed the schema and .apsorc was rewritten. */
+    saved: boolean;
+    lint: {
+        errorCount: number;
+        warningCount: number;
+        report: string;
+    };
+}
+/**
+ * Run one @apso/schema-tools operation on an .apsorc file: read it, apply the
+ * operation, write it back when the operation changed the schema, and return
+ * the lint result. An operation that would add a lint error is rejected by
+ * the tool and the file is left untouched.
+ */
+export declare function applySchemaToolToFile(configPath: string, name: string, input: unknown): SchemaToolFileResult;
+type ToolServer = {
+    tool: (...args: any[]) => unknown;
+};
+/**
+ * Register every @apso/schema-tools operation as a granular MCP tool on the
+ * project's .apsorc (found from the current directory up), next to the coarse
+ * design/validate/scaffold tools. The JSON Schema inputs from the package are
+ * converted to zod for the MCP SDK.
+ */
+export declare function registerSchemaTools(server: ToolServer): void;
+export {};

package/dist/lib/mcp-schema-tools.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerSchemaTools = exports.applySchemaToolToFile = void 0;
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs"));
+const zod_1 = require("zod");
+const schema_tools_1 = require("@apso/schema-tools");
+const apsorc_parser_1 = require("./apsorc-parser");
+/**
+ * Run one @apso/schema-tools operation on an .apsorc file: read it, apply the
+ * operation, write it back when the operation changed the schema, and return
+ * the lint result. An operation that would add a lint error is rejected by
+ * the tool and the file is left untouched.
+ */
+function applySchemaToolToFile(configPath, name, input) {
+    // eslint-disable-next-line unicorn/prefer-json-parse-buffer -- JSON.parse's TS type requires a string
+    const apsorc = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    if (apsorc.version !== 2) {
+        throw new Error("The schema tools support version 2 .apsorc files only.");
+    }
+    const result = (0, schema_tools_1.runSchemaTool)(apsorc, name, input);
+    const saved = result.ok && result.schema !== apsorc;
+    if (saved)
+        fs.writeFileSync(configPath, `${JSON.stringify(result.schema, null, 2)}\n`, "utf-8");
+    const lint = (0, schema_tools_1.lintSchema)(result.schema);
+    return {
+        ok: result.ok,
+        message: result.message,
+        ...(result.data === undefined ? {} : { data: result.data }),
+        configPath,
+        saved,
+        lint: { errorCount: lint.errorCount, warningCount: lint.warningCount, report: (0, schema_tools_1.formatLintReport)(lint) },
+    };
+}
+exports.applySchemaToolToFile = applySchemaToolToFile;
+/**
+ * Register every @apso/schema-tools operation as a granular MCP tool on the
+ * project's .apsorc (found from the current directory up), next to the coarse
+ * design/validate/scaffold tools. The JSON Schema inputs from the package are
+ * converted to zod for the MCP SDK.
+ */
+function registerSchemaTools(server) {
+    for (const t of schema_tools_1.schemaTools) {
+        const shape = zod_1.z.fromJSONSchema(t.inputSchema).shape;
+        server.tool(t.name, `${t.description} Operates on the .apsorc in the current project.${t.readOnly ? "" : " Writes the file only when the change lints clean of new errors."}`, shape, { readOnlyHint: t.readOnly }, async (input) => {
+            const configPath = (0, apsorc_parser_1.findConfigPath)();
+            if (!configPath) {
+                return {
+                    content: [{ type: "text", text: "No .apsorc found in this directory or its parents. Run `apso init` first." }],
+                    isError: true,
+                };
+            }
+            try {
+                const result = applySchemaToolToFile(configPath, t.name, input);
+                return {
+                    content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
+                    isError: !result.ok,
+                };
+            }
+            catch (error) {
+                return {
+                    content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }],
+                    isError: true,
+                };
+            }
+        });
+    }
+}
+exports.registerSchemaTools = registerSchemaTools;

package/dist/lib/telemetry/telemetry.js

@@ -45,6 +45,9 @@ let enabled = false;
 let sentryOn = false;
 let authenticatedUser = false;
 let distinctId = "cli-anonymous";
+let workspaceId;
+let workspaceSlug;
+let serviceId;
 let environment = "production";
 let startedAt = Date.now();
 let noticePending = false;
@@ -85,7 +88,7 @@ function getOrCreateInstallId(currentInstallId) {
  * when disabled — it just no-ops everything downstream.
  */
 function initTelemetry() {
-    var _a, _b, _c, _d;
+    var _a, _b;
     try {
         startedAt = Date.now();
         const cfg = config_1.globalConfig.read();
@@ -101,14 +104,33 @@ function initTelemetry() {
         noticePending = !cfg.telemetryNoticeShown;
         const creds = config_1.credentials.read();
         authenticatedUser = Boolean((_a = creds === null || creds === void 0 ? void 0 : creds.user) === null || _a === void 0 ? void 0 : _a.id);
-        distinctId = ((_b = creds === null || creds === void 0 ? void 0 : creds.user) === null || _b === void 0 ? void 0 : _b.id) || getOrCreateInstallId(cfg.installId);
+        const installId = getOrCreateInstallId(cfg.installId);
+        // Logged in: the Apso user id (the same distinct id the web app uses), so
+        // CLI and app activity land on one person. No email or name is sent.
+        distinctId = ((_b = creds === null || creds === void 0 ? void 0 : creds.user) === null || _b === void 0 ? void 0 : _b.id) ? String(creds.user.id) : installId;
+        // Workspace context: the linked project (.apso/link.json) wins, else the
+        // workspace chosen with `apso use`.
+        let link = null;
+        try {
+            link = config_1.projectLink.read();
+        }
+        catch {
+            link = null;
+        }
+        workspaceId = (link === null || link === void 0 ? void 0 : link.workspaceId) || cfg.activeWorkspaceId || undefined;
+        workspaceSlug = (link === null || link === void 0 ? void 0 : link.workspaceSlug) || cfg.activeWorkspaceSlug || undefined;
+        serviceId = (link === null || link === void 0 ? void 0 : link.serviceId) || undefined;
         posthog = new posthog_node_1.PostHog(environment === "staging" ? POSTHOG_KEY_STAGING : POSTHOG_KEY_PROD, { host: POSTHOG_HOST, flushAt: 1, flushInterval: 0 });
-        if ((_c = creds === null || creds === void 0 ? void 0 : creds.user) === null || _c === void 0 ? void 0 : _c.email) {
-            // Attach identity so CLI events attribute to the same person as the app.
-            posthog.identify({
-                distinctId,
-                properties: { email: creds.user.email, name: creds.user.name },
-            });
+        // First run after login: merge this install's earlier anonymous events
+        // into the user, once per user.
+        if (authenticatedUser && installId !== distinctId && cfg.telemetryAliasedUserId !== distinctId) {
+            posthog.alias({ distinctId, alias: installId });
+            try {
+                config_1.globalConfig.write({ telemetryAliasedUserId: distinctId });
+            }
+            catch {
+                // ignore — worst case we alias again next run
+            }
         }
         const dsn = process.env.APSO_CLI_SENTRY_DSN || SENTRY_DSN_DEFAULT;
         if (dsn) {
@@ -118,8 +140,12 @@ function initTelemetry() {
                 release: `apso-cli@${cliVersion}`,
                 tracesSampleRate: 0,
             });
-            Sentry.setUser({ id: distinctId, email: (_d = creds === null || creds === void 0 ? void 0 : creds.user) === null || _d === void 0 ? void 0 : _d.email });
+            Sentry.setUser({ id: distinctId });
             Sentry.setTag("cli_version", cliVersion);
+            if (workspaceId)
+                Sentry.setTag("workspace_id", workspaceId);
+            if (serviceId)
+                Sentry.setTag("service_id", serviceId);
             sentryOn = true;
         }
     }
@@ -136,14 +162,18 @@ function commonProps() {
         arch: os_1.default.arch(),
         node_version: process.version,
         authenticated: authenticatedUser,
+        ...(workspaceId ? { workspace_id: workspaceId } : {}),
+        ...(workspaceSlug ? { workspace_slug: workspaceSlug } : {}),
+        ...(serviceId ? { service_id: serviceId } : {}),
     };
 }
 /**
  * The one-time transparency notice text (issue #96). Printed to stderr by the
  * init hook so it never pollutes stdout / piped output.
  */
-exports.FIRST_RUN_NOTICE = "Apso collects anonymous usage data (command name, CLI version, OS) to improve the tool.\n" +
-    "No code, schema, file contents, or personal data is collected.\n" +
+exports.FIRST_RUN_NOTICE = "Apso collects usage data (command name, CLI version, OS) to improve the tool. When you're\n" +
+    "logged in, it's tied to your Apso account id and workspace id. No email, code, schema, or\n" +
+    "file contents are collected.\n" +
     "Opt out any time: apso config set telemetry off  (or APSO_TELEMETRY=0, or DO_NOT_TRACK=1)";
 /**
  * True once per install: telemetry is enabled and the notice hasn't been shown
@@ -173,6 +203,8 @@ function track(event, properties = {}) {
             distinctId,
             event,
             properties: { ...commonProps(), ...properties },
+            // PostHog group analytics: roll activity up per workspace.
+            ...(workspaceId ? { groups: { workspace: workspaceId } } : {}),
         });
     }
     catch {

package/npm-shrinkwrap.json

@@ -1,14 +1,15 @@
 {
   "name": "@apso/cli",
-  "version": "0.37.1",
+  "version": "0.39.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.37.1",
+      "version": "0.39.0",
       "license": "Apache-2.0",
       "dependencies": {
+        "@apso/schema-tools": "^0.1.0",
         "@biomejs/biome": "^1.9.4",
         "@electric-sql/pglite": "^0.2.17",
         "@modelcontextprotocol/sdk": "^1.29.0",
@@ -147,6 +148,15 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
+    "node_modules/@apso/schema-tools": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@apso/schema-tools/-/schema-tools-0.1.0.tgz",
+      "integrity": "sha512-c/vvsyo+ZMxq4DK4V1UlP3N/De9ijTfcAM/9VrZHmLxeA6JiXx3J+baSBAseffBBTUeNYDp4D/c4iLz8CcCePw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "pluralize": "^8.0.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.21.4",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.37.1",
+  "version": "0.39.0",
   "commands": {
     "config": {
       "id": "config",
@@ -784,6 +784,36 @@
       "flags": {},
       "args": {}
     },
+    "schema:lint": {
+      "id": "schema:lint",
+      "description": "Check the local .apsorc for names and settings that would break the generated code",
+      "strict": true,
+      "pluginName": "@apso/cli",
+      "pluginAlias": "@apso/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [],
+      "examples": [
+        "$ apso schema lint",
+        "$ apso schema lint --fix",
+        "$ apso schema lint --json"
+      ],
+      "flags": {
+        "fix": {
+          "name": "fix",
+          "type": "boolean",
+          "description": "Apply the safe automatic fixes and save .apsorc (a backup is kept)",
+          "allowNo": false
+        },
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Print the result as JSON",
+          "allowNo": false
+        }
+      },
+      "args": {}
+    },
     "schema:pull": {
       "id": "schema:pull",
       "description": "Pull remote schema to local .apsorc",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.37.1",
+  "version": "0.39.0",
   "mcpName": "io.github.apsoai/apso",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",
@@ -24,6 +24,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
+    "@apso/schema-tools": "^0.1.0",
     "@biomejs/biome": "^1.9.4",
     "@electric-sql/pglite": "^0.2.17",
     "@modelcontextprotocol/sdk": "^1.29.0",