@hasna/brains 0.0.19 → 0.0.21

package/dist/cli/commands/collections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/collections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgCzC,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA2DlE"}
+{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/collections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgCzC,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA6DlE"}

package/dist/cli/commands/data.d.ts

@@ -1,3 +1,5 @@
 import type { Command } from "commander";
 export declare function registerDataCommands(program: Command): void;
+declare function getMergeOutputDirectory(outputPath: string): string;
+export { getMergeOutputDirectory };
 //# sourceMappingURL=data.d.ts.map

package/dist/cli/commands/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmM3D"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmM3D;AAED,iBAAS,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/cli/commands/models.d.ts

@@ -1,3 +1,20 @@
 import type { Command } from "commander";
+import { fineTunedModels } from "../../db/index.js";
+type ModelRow = typeof fineTunedModels.$inferSelect;
+type Provider = ModelRow["provider"];
+type ModelStatus = ModelRow["status"];
+interface ListModelsOptions {
+    json?: boolean;
+    provider?: string;
+    status?: string;
+    limit?: string;
+}
+declare function parseListLimit(rawLimit: string | undefined): number | undefined;
+declare function parseListFilters(opts: ListModelsOptions): {
+    provider?: Provider;
+    status?: ModelStatus;
+    limit?: number;
+};
 export declare function registerModelsCommands(program: Command): void;
+export { parseListFilters, parseListLimit };
 //# sourceMappingURL=models.d.ts.map

package/dist/cli/commands/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQzC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAwO7D"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,EAAS,eAAe,EAAgB,MAAM,mBAAmB,CAAC;AAKzE,KAAK,QAAQ,GAAG,OAAO,eAAe,CAAC,YAAY,CAAC;AACpD,KAAK,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;AACrC,KAAK,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAUtC,UAAU,iBAAiB;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,iBAAS,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAOxE;AAED,iBAAS,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAiBhH;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmQ7D;AAED,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}

package/dist/cli/index.js

@@ -23207,12 +23207,58 @@ class ThinkerLabsProvider {
 }
 
 // src/cli/commands/models.ts
+var VALID_STATUSES = new Set([
+  "pending",
+  "running",
+  "succeeded",
+  "failed",
+  "cancelled"
+]);
+function parseListLimit(rawLimit) {
+  if (!rawLimit)
+    return;
+  const parsed = Number(rawLimit);
+  if (!Number.isInteger(parsed) || parsed <= 0) {
+    throw new Error(`Invalid --limit value: ${rawLimit}. Use a positive integer.`);
+  }
+  return parsed;
+}
+function parseListFilters(opts) {
+  const providerRaw = opts.provider?.trim();
+  const statusRaw = opts.status?.trim();
+  if (providerRaw && providerRaw !== "openai" && providerRaw !== "thinker-labs") {
+    throw new Error(`Invalid --provider value: ${providerRaw}. Use openai or thinker-labs.`);
+  }
+  if (statusRaw && !VALID_STATUSES.has(statusRaw)) {
+    throw new Error(`Invalid --status value: ${statusRaw}. Use one of: ${Array.from(VALID_STATUSES).join(", ")}.`);
+  }
+  const limit2 = parseListLimit(opts.limit);
+  const provider = providerRaw;
+  const status = statusRaw;
+  return { provider, status, limit: limit2 };
+}
 function registerModelsCommands(program2) {
   const modelsCmd = program2.command("models").description("Manage tracked fine-tuned models");
-  modelsCmd.command("list").description("List all tracked fine-tuned models").option("--json", "Output as JSON").action(async (opts) => {
+  const ensureModelExists = async (id) => {
+    const db = getDb();
+    const [model] = await db.select({ id: fineTunedModels.id }).from(fineTunedModels).where(eq(fineTunedModels.id, id));
+    if (!model) {
+      printError(`Model not found: ${id}`);
+      process.exit(1);
+    }
+    return db;
+  };
+  modelsCmd.command("list").description("List all tracked fine-tuned models").option("--provider <provider>", "Filter by provider (openai|thinker-labs)").option("--status <status>", "Filter by status (pending|running|succeeded|failed|cancelled)").option("--limit <n>", "Maximum number of results").option("--json", "Output as JSON").action(async (opts) => {
     try {
       const db = getDb();
-      const models = await db.select().from(fineTunedModels);
+      const filters = parseListFilters(opts);
+      const whereClause = filters.provider && filters.status ? and(eq(fineTunedModels.provider, filters.provider), eq(fineTunedModels.status, filters.status)) : filters.provider ? eq(fineTunedModels.provider, filters.provider) : filters.status ? eq(fineTunedModels.status, filters.status) : undefined;
+      const query = db.select().from(fineTunedModels).$dynamic();
+      if (whereClause)
+        query.where(whereClause);
+      if (filters.limit)
+        query.limit(filters.limit);
+      const models = await query;
       if (opts.json) {
         printJson(models);
         return;
@@ -23272,7 +23318,7 @@ function registerModelsCommands(program2) {
   });
   modelsCmd.command("rename <id> <displayName>").description("Set the display name of a model").action(async (id, displayName) => {
     try {
-      const db = getDb();
+      const db = await ensureModelExists(id);
       await db.update(fineTunedModels).set({ displayName, updatedAt: Date.now() }).where(eq(fineTunedModels.id, id));
       printSuccess(`Display name set to "${displayName}"`);
     } catch (err) {
@@ -23282,9 +23328,9 @@ function registerModelsCommands(program2) {
   });
   modelsCmd.command("describe <id> <description>").description("Set the description of a model").action(async (id, description) => {
     try {
-      const db = getDb();
+      const db = await ensureModelExists(id);
       await db.update(fineTunedModels).set({ description, updatedAt: Date.now() }).where(eq(fineTunedModels.id, id));
-      printSuccess(`Description updated.`);
+      printSuccess("Description updated.");
     } catch (err) {
       printError(err instanceof Error ? err.message : String(err));
       process.exit(1);
@@ -23328,7 +23374,7 @@ function registerModelsCommands(program2) {
   });
   modelsCmd.command("collection <id> <collectionName>").description("Set the collection of a model").action(async (id, collectionName) => {
     try {
-      const db = getDb();
+      const db = await ensureModelExists(id);
       await db.update(fineTunedModels).set({ collection: collectionName, updatedAt: Date.now() }).where(eq(fineTunedModels.id, id));
       printSuccess(`Collection set to "${collectionName}"`);
     } catch (err) {
@@ -23371,7 +23417,7 @@ function registerModelsCommands(program2) {
         status: result.status,
         startedAt: now
       });
-      printSuccess(`Model imported successfully.`);
+      printSuccess("Model imported successfully.");
       console.log();
       console.log(`  Local ID:  ${modelId}`);
       console.log(`  Job ID:    ${jobId}`);
@@ -23584,7 +23630,7 @@ function registerFinetuneCommands(program2) {
 // src/cli/commands/data.ts
 import { randomUUID as randomUUID3 } from "crypto";
 import { readFileSync as readFileSync6, existsSync as existsSync11, mkdirSync as mkdirSync6, writeFileSync as writeFileSync5 } from "fs";
-import { join as join13 } from "path";
+import { dirname as dirname3, join as join13 } from "path";
 import { homedir as homedir12 } from "os";
 var DEFAULT_DATASETS_DIR = join13(homedir12(), ".hasna", "brains", "datasets");
 function registerDataCommands(program2) {
@@ -23696,7 +23742,7 @@ function registerDataCommands(program2) {
           process.exit(1);
         }
       }
-      mkdirSync6(join13(opts.output, "..").replace(/\/\.\.$/, "") || DEFAULT_DATASETS_DIR, { recursive: true });
+      mkdirSync6(getMergeOutputDirectory(opts.output), { recursive: true });
       const allExamples = [];
       for (const f of files) {
         const lines = readFileSync6(f, "utf8").split(`
@@ -23762,6 +23808,11 @@ function registerDataCommands(program2) {
     }
   });
 }
+function getMergeOutputDirectory(outputPath) {
+  if (!outputPath)
+    return DEFAULT_DATASETS_DIR;
+  return dirname3(outputPath);
+}
 
 // src/cli/commands/collections.ts
 async function listCollections(json = false) {
@@ -23777,7 +23828,7 @@ async function listCollections(json = false) {
       return;
     }
     if (rows.length === 0) {
-      printInfo("No collections found. Set a collection with 'brains models set-collection'.");
+      printInfo("No collections found. Set a collection with 'brains models collection <model-id> <name>'.");
       return;
     }
     printTable(["Collection", "Model Count", "Models"], rows.map((r) => [r.collection ?? "(none)", String(r.count), r.names ?? ""]));
@@ -23794,14 +23845,22 @@ function registerCollectionsCommands(program2) {
   collectionsCmd.command("list").description("List all collections with model counts").option("--json", "Output as JSON").action(async (opts) => {
     await listCollections(opts.json);
   });
-  collectionsCmd.command("show <name>").description("List all models in a collection").action(async (name) => {
+  collectionsCmd.command("show <name>").description("List all models in a collection").option("--json", "Output as JSON").action(async (name, opts) => {
     try {
       const db = getDb();
       const models = await db.select().from(fineTunedModels).where(eq(fineTunedModels.collection, name));
       if (models.length === 0) {
+        if (opts.json) {
+          printJson([]);
+          return;
+        }
         printInfo(`No models found in collection '${name}'.`);
         return;
       }
+      if (opts.json) {
+        printJson(models);
+        return;
+      }
       printTable(["ID", "Name", "Provider", "Status", "Base Model"], models.map((m) => [m.id, m.name, m.provider, printStatus(m.status), m.baseModel]));
     } catch (err) {
       printError(err instanceof Error ? err.message : String(err));
@@ -23993,12 +24052,12 @@ function registerCloudCommands2(program2) {
 
 // src/lib/package-metadata.ts
 import { existsSync as existsSync12, readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname3, resolve as resolve2 } from "path";
+import { dirname as dirname4, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 var DEFAULT_VERSION = "0.0.0";
 var cachedVersion;
 function getPackageJsonPath() {
-  return resolve2(dirname3(fileURLToPath(import.meta.url)), "../../package.json");
+  return resolve2(dirname4(fileURLToPath(import.meta.url)), "../../package.json");
 }
 function getPackageVersion() {
   if (cachedVersion) {
@@ -24018,6 +24077,17 @@ function getPackageVersion() {
   return cachedVersion;
 }
 
+// src/cli/remove.ts
+function parseRemoveType(rawType) {
+  if (!rawType)
+    return;
+  const normalized = rawType.trim().toLowerCase();
+  if (normalized === "model" || normalized === "job") {
+    return normalized;
+  }
+  throw new Error(`Invalid --type value: ${rawType}. Use model or job.`);
+}
+
 // src/cli/index.ts
 var program2 = new Command;
 program2.name("brains").description("Fine-tuned model tracker and trainer").version(getPackageVersion());
@@ -24025,34 +24095,63 @@ registerModelsCommands(program2);
 registerFinetuneCommands(program2);
 registerDataCommands(program2);
 registerCollectionsCommands(program2);
-program2.command("remove <id>").alias("rm").alias("uninstall").description("Remove a fine-tuned model or training job by ID").option("--type <type>", "Type: model | job (default: auto-detect)").action(async (id, opts) => {
+program2.command("remove <id>").alias("rm").alias("uninstall").description("Remove a fine-tuned model or training job by ID").option("--type <type>", "Type: model | job (default: auto-detect)").option("--json", "Output as JSON").action(async (id, opts) => {
   const db = getDb();
   try {
-    const type = opts.type?.toLowerCase();
-    if (type === "job" || !type && !type) {
+    const type = parseRemoveType(opts.type);
+    if (!type || type === "job") {
       const job = db.select().from(trainingJobs).where(eq(trainingJobs.id, id)).get();
-      if (job || type === "job") {
-        if (!job) {
-          printError(`Job not found: ${id}`);
-          process.exit(1);
-        }
+      if (job) {
         db.delete(trainingJobs).where(eq(trainingJobs.id, id)).run();
+        if (opts.json) {
+          printJson({ deleted: "job", id });
+          return;
+        }
         printSuccess(`Training job ${id} removed`);
         return;
       }
+      if (type === "job") {
+        if (opts.json) {
+          printJson({ error: `Job not found: ${id}` });
+        } else {
+          printError(`Job not found: ${id}`);
+        }
+        process.exit(1);
+      }
     }
-    if (type === "model" || !type) {
+    if (!type || type === "model") {
       const model = db.select().from(fineTunedModels).where(eq(fineTunedModels.id, id)).get();
       if (model) {
         db.delete(fineTunedModels).where(eq(fineTunedModels.id, id)).run();
+        if (opts.json) {
+          printJson({ deleted: "model", id });
+          return;
+        }
         printSuccess(`Model ${id} removed`);
         return;
       }
+      if (type === "model") {
+        if (opts.json) {
+          printJson({ error: `Model not found: ${id}` });
+        } else {
+          printError(`Model not found: ${id}`);
+        }
+        process.exit(1);
+      }
+    }
+    const message = `Not found: ${id}. Use --type model|job to target a specific entity.`;
+    if (opts.json) {
+      printJson({ error: message });
+    } else {
+      printError(message);
     }
-    printError(`Not found: ${id}. Use --type model|job`);
     process.exit(1);
   } catch (err) {
-    printError(err instanceof Error ? err.message : String(err));
+    if (opts.json) {
+      printJson({ error: err instanceof Error ? err.message : String(err) });
+    } else {
+      printError(err instanceof Error ? err.message : String(err));
+    }
     process.exit(1);
   }
 });

package/dist/cli/remove.d.ts

@@ -0,0 +1,3 @@
+export type RemoveEntityType = "model" | "job";
+export declare function parseRemoveType(rawType?: string): RemoveEntityType | undefined;
+//# sourceMappingURL=remove.d.ts.map

package/dist/cli/remove.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../src/cli/remove.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,KAAK,CAAC;AAE/C,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAO9E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/brains",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Fine-tuned model tracker and trainer — wraps OpenAI + Thinker Labs, gathers training data from todos/mementos/conversations/sessions",
   "type": "module",
   "main": "./dist/index.js",