@anaclumos/taal 1.1.8 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anaclumos/taal",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "CLI tool to sync MCP server configs and Agent Skills across AI coding assistants",
   "type": "module",
   "bin": {
@@ -39,6 +39,7 @@
     "@iarna/toml": "^2.2.5",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
+    "es-toolkit": "^1.44.0",
     "jsonc-parser": "^3.3.1",
     "yaml": "^2.3.4",
     "zod": "^3.22.4"

package/src/commands/collect.ts

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { isEqual, isPlainObject, isString, uniqWith } from "es-toolkit";
 import type { McpServer } from "../config/schema.js";
 import { initializeProviders, registry } from "../providers/index.js";
 import { copySkillsToProvider } from "../skills/copy.js";
@@ -95,10 +96,12 @@ export async function collect(baseDir?: string): Promise<CollectResult> {
   for (const [serverName, sources] of serverSources.entries()) {
     if (sources.length > 1) {
       // Check if configs are actually different
-      const configStrings = sources.map((s) => JSON.stringify(s.config));
-      const uniqueConfigs = new Set(configStrings);
+      const uniqueConfigs = uniqWith(
+        sources.map((s) => s.config),
+        isEqual
+      );
 
-      if (uniqueConfigs.size > 1) {
+      if (uniqueConfigs.length > 1) {
         conflicts.push({
           serverName,
           providers: sources.map((s) => s.provider),
@@ -159,14 +162,14 @@ export async function collect(baseDir?: string): Promise<CollectResult> {
  * Convert provider-specific server config to TAAL format
  */
 function convertToTaalFormat(config: unknown): McpServer | null {
-  if (!config || typeof config !== "object") {
+  if (!isPlainObject(config)) {
     return null;
   }
 
   const obj = config as Record<string, unknown>;
 
   // HTTP server
-  if (obj.url && typeof obj.url === "string") {
+  if (obj.url && isString(obj.url)) {
     return {
       url: obj.url,
       headers:
@@ -176,7 +179,7 @@ function convertToTaalFormat(config: unknown): McpServer | null {
   }
 
   // Stdio server
-  if (obj.command && typeof obj.command === "string") {
+  if (obj.command && isString(obj.command)) {
     const server: McpServer = {
       command: obj.command,
     };
@@ -185,9 +188,9 @@ function convertToTaalFormat(config: unknown): McpServer | null {
       server.args = obj.args as string[];
     }
 
-    if (obj.env && typeof obj.env === "object") {
+    if (obj.env && isPlainObject(obj.env)) {
       server.env = obj.env as Record<string, string>;
-    } else if (obj.environment && typeof obj.environment === "object") {
+    } else if (obj.environment && isPlainObject(obj.environment)) {
       server.env = obj.environment as Record<string, string>;
     }
 
@@ -202,7 +205,7 @@ function convertToTaalFormat(config: unknown): McpServer | null {
       args,
     };
 
-    if (obj.environment && typeof obj.environment === "object") {
+    if (obj.environment && isPlainObject(obj.environment)) {
       server.env = obj.environment as Record<string, string>;
     }
 

package/src/commands/diff.ts

@@ -1,21 +1,9 @@
 import { homedir } from "node:os";
+import { isEqual } from "es-toolkit";
+import { isError } from "es-toolkit/predicate";
 import { loadTaalConfig } from "../config/loader.js";
 import { initializeProviders, registry } from "../providers/index.js";
 
-function sortObjectKeys(obj: unknown): unknown {
-  if (obj === null || typeof obj !== "object") {
-    return obj;
-  }
-  if (Array.isArray(obj)) {
-    return obj.map(sortObjectKeys);
-  }
-  const sorted: Record<string, unknown> = {};
-  for (const key of Object.keys(obj).sort()) {
-    sorted[key] = sortObjectKeys((obj as Record<string, unknown>)[key]);
-  }
-  return sorted;
-}
-
 export interface DiffChange {
   type: "add" | "remove" | "modify";
   serverName: string;
@@ -87,16 +75,12 @@ export async function diff(
 
         for (const key of taalKeys) {
           if (currentKeys.has(key)) {
-            const currentValue = JSON.stringify(
-              sortObjectKeys(currentServers[key])
-            );
-            const newValue = JSON.stringify(
-              sortObjectKeys(
-                (transformedServers as Record<string, unknown>)[key]
-              )
-            );
-
-            if (currentValue !== newValue) {
+            const currentValue = currentServers[key];
+            const newValue = (transformedServers as Record<string, unknown>)[
+              key
+            ];
+
+            if (!isEqual(currentValue, newValue)) {
               changes.push({
                 type: "modify",
                 serverName: key,
@@ -139,7 +123,7 @@ export async function diff(
     return {
       hasChanges: false,
       changes: [],
-      error: error instanceof Error ? error.message : String(error),
+      error: isError(error) ? error.message : String(error),
     };
   }
 }

package/src/commands/list.ts

@@ -1,4 +1,6 @@
 import { homedir } from "node:os";
+import { compact } from "es-toolkit/array";
+import { isError } from "es-toolkit/predicate";
 import { loadTaalConfig } from "../config/loader.js";
 import { discoverSkills } from "../skills/discovery.js";
 
@@ -37,22 +39,17 @@ export async function list(baseDir?: string): Promise<ListResult> {
   const config = result.config;
 
   try {
-    const servers: ServerInfo[] = [];
-    for (const [name, server] of Object.entries(config.mcp || {})) {
-      if (server.url) {
-        servers.push({
-          name,
-          type: "http",
-          url: server.url,
-        });
-      } else if (server.command) {
-        servers.push({
-          name,
-          type: "stdio",
-          command: server.command,
-        });
-      }
-    }
+    const servers = compact(
+      Object.entries(config.mcp || {}).map(([name, server]) => {
+        if (server.url) {
+          return { name, type: "http" as const, url: server.url };
+        }
+        if (server.command) {
+          return { name, type: "stdio" as const, command: server.command };
+        }
+        return undefined;
+      })
+    );
 
     const skillPaths = config.skills?.paths || [];
     const discoveredSkills = await discoverSkills(skillPaths, home);
@@ -74,7 +71,7 @@ export async function list(baseDir?: string): Promise<ListResult> {
       servers: [],
       skills: [],
       enabledProviders: [],
-      error: error instanceof Error ? error.message : String(error),
+      error: isError(error) ? error.message : String(error),
     };
   }
 }

package/src/commands/sync.ts

@@ -1,4 +1,5 @@
 import { homedir } from "node:os";
+import { isError } from "es-toolkit/predicate";
 import { loadTaalConfig } from "../config/loader.js";
 import { initializeProviders, registry } from "../providers/index.js";
 import { copySkillsToProvider } from "../skills/copy.js";
@@ -90,7 +91,7 @@ export async function sync(
       } catch (error) {
         failed.push({
           provider: provider.name,
-          error: error instanceof Error ? error.message : String(error),
+          error: isError(error) ? error.message : String(error),
         });
       }
     }
@@ -105,7 +106,7 @@ export async function sync(
       success: false,
       synced: [],
       failed: [],
-      error: error instanceof Error ? error.message : String(error),
+      error: isError(error) ? error.message : String(error),
     };
   }
 }

package/src/config/env.ts

@@ -1,7 +1,9 @@
+import { isPlainObject, isString } from "es-toolkit";
+
 export function findEnvVarReferences(value: unknown): string[] {
   const refs = new Set<string>();
 
-  if (typeof value === "string") {
+  if (isString(value)) {
     const matches = value.matchAll(/\$\{([^}]+)\}/g);
     for (const match of matches) {
       refs.add(match[1]);
@@ -12,7 +14,7 @@ export function findEnvVarReferences(value: unknown): string[] {
         refs.add(ref);
       }
     }
-  } else if (value && typeof value === "object") {
+  } else if (isPlainObject(value)) {
     for (const v of Object.values(value)) {
       for (const ref of findEnvVarReferences(v)) {
         refs.add(ref);
@@ -24,7 +26,7 @@ export function findEnvVarReferences(value: unknown): string[] {
 }
 
 export function substituteEnvVars(value: unknown): unknown {
-  if (typeof value === "string") {
+  if (isString(value)) {
     return value.replace(/\$\{([^}]+)\}/g, (match, varName) => {
       const envValue = process.env[varName];
       if (envValue === undefined) {
@@ -39,7 +41,7 @@ export function substituteEnvVars(value: unknown): unknown {
     return value.map(substituteEnvVars);
   }
 
-  if (value && typeof value === "object") {
+  if (isPlainObject(value)) {
     return Object.fromEntries(
       Object.entries(value).map(([k, v]) => [k, substituteEnvVars(v)])
     );

package/src/config/loader.ts

@@ -1,6 +1,7 @@
 import { exists, readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { isError } from "es-toolkit/predicate";
 import { parse } from "yaml";
 import { findEnvVarReferences, substituteEnvVars } from "./env.js";
 import { type TaalConfig, TaalConfigSchema } from "./schema.js";
@@ -35,7 +36,7 @@ export async function loadTaalConfig(
     return {
       config: null,
       errors: [
-        `Failed to read config: ${error instanceof Error ? error.message : error}`,
+        `Failed to read config: ${isError(error) ? error.message : String(error)}`,
       ],
       warnings: [],
     };
@@ -48,7 +49,7 @@ export async function loadTaalConfig(
     return {
       config: null,
       errors: [
-        `Failed to parse YAML: ${error instanceof Error ? error.message : error}`,
+        `Failed to parse YAML: ${isError(error) ? error.message : String(error)}`,
       ],
       warnings,
     };

package/src/config/parser.ts

@@ -1,4 +1,5 @@
 import { readFileSync } from "node:fs";
+import { isError } from "es-toolkit/predicate";
 import { parse } from "yaml";
 import { substituteEnvVars } from "./env.js";
 import { type TaalConfig, TaalConfigSchema } from "./schema.js";
@@ -16,7 +17,9 @@ export function loadConfig(path: string): TaalConfig {
   try {
     fileContent = readFileSync(path, "utf-8");
   } catch (error) {
-    throw new Error(`Failed to read config file at ${path}: ${error}`);
+    throw new Error(
+      `Failed to read config file at ${path}: ${isError(error) ? error.message : String(error)}`
+    );
   }
 
   // 2. Parse YAML
@@ -24,7 +27,9 @@ export function loadConfig(path: string): TaalConfig {
   try {
     rawConfig = parse(fileContent);
   } catch (error) {
-    throw new Error(`Failed to parse YAML in ${path}: ${error}`);
+    throw new Error(
+      `Failed to parse YAML in ${path}: ${isError(error) ? error.message : String(error)}`
+    );
   }
 
   // 3. Substitute environment variables

package/src/errors/index.ts

@@ -1,3 +1,5 @@
+import { isError } from "es-toolkit/predicate";
+
 export class TaalError extends Error {
   readonly code: string;
 
@@ -36,7 +38,7 @@ export class ValidationError extends TaalError {
 }
 
 export function formatError(error: unknown): string {
-  if (error instanceof Error) {
+  if (isError(error)) {
     return error.message;
   }
   return String(error);

package/src/index.ts

@@ -4,6 +4,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import chalk from "chalk";
 import { Command } from "commander";
+import { isError } from "es-toolkit/predicate";
 import YAML from "yaml";
 import { collect } from "./commands/collect";
 import { diff } from "./commands/diff";
@@ -46,7 +47,7 @@ program
         );
       }
     } catch (error) {
-      console.error("Error:", error instanceof Error ? error.message : error);
+      console.error("Error:", isError(error) ? error.message : error);
       process.exit(1);
     }
   });
@@ -101,7 +102,7 @@ program
       await writeFile(configPath, YAML.stringify(existingConfig), "utf-8");
       console.log(`\n✓ Updated config: ${configPath}`);
     } catch (error) {
-      console.error("Error:", error instanceof Error ? error.message : error);
+      console.error("Error:", isError(error) ? error.message : error);
       process.exit(1);
     }
   });
@@ -132,7 +133,7 @@ program
         process.exit(1);
       }
     } catch (error) {
-      console.error("Error:", error instanceof Error ? error.message : error);
+      console.error("Error:", isError(error) ? error.message : error);
       process.exit(1);
     }
   });
@@ -180,7 +181,7 @@ program
 
       process.exit(1);
     } catch (error) {
-      console.error("Error:", error instanceof Error ? error.message : error);
+      console.error("Error:", isError(error) ? error.message : error);
       process.exit(1);
     }
   });
@@ -218,7 +219,7 @@ program
 
       process.exit(result.success ? 0 : 1);
     } catch (error) {
-      console.error("Error:", error instanceof Error ? error.message : error);
+      console.error("Error:", isError(error) ? error.message : error);
       process.exit(1);
     }
   });
@@ -271,7 +272,7 @@ program
 
       console.log();
     } catch (error) {
-      console.error("Error:", error instanceof Error ? error.message : error);
+      console.error("Error:", isError(error) ? error.message : error);
       process.exit(1);
     }
   });
@@ -310,7 +311,7 @@ program
 
       console.log();
     } catch (error) {
-      console.error("Error:", error instanceof Error ? error.message : error);
+      console.error("Error:", isError(error) ? error.message : error);
       process.exit(1);
     }
   });

package/src/providers/continue.ts

@@ -1,5 +1,6 @@
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { mapValues } from "es-toolkit/object";
 import { stringify as stringifyYaml } from "yaml";
 import type { McpServer } from "../config/schema.js";
 import { atomicWrite } from "../utils/atomic-write.js";
@@ -53,10 +54,8 @@ export class ContinueProvider extends BaseProvider {
   private transformEnvVars(
     obj: Record<string, string>
   ): Record<string, string> {
-    const transformed: Record<string, string> = {};
-    for (const [key, value] of Object.entries(obj)) {
-      transformed[key] = value.replace(/\$\{([^}]+)\}/g, "${{ secrets.$1 }}");
-    }
-    return transformed;
+    return mapValues(obj, (value) =>
+      value.replace(/\$\{([^}]+)\}/g, "${{ secrets.$1 }}")
+    );
   }
 }

package/src/skills/validator.ts

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { isPlainObject, isString } from "es-toolkit";
 import { parse as parseYaml } from "yaml";
 
 interface SkillFrontmatter {
@@ -72,7 +73,7 @@ export function validateSkill(skillPath: string): ValidationResult {
     };
   }
 
-  if (!parsed || typeof parsed !== "object") {
+  if (!isPlainObject(parsed)) {
     return {
       valid: false,
       error: "Frontmatter must be a YAML object",
@@ -81,7 +82,7 @@ export function validateSkill(skillPath: string): ValidationResult {
 
   const frontmatter = parsed as SkillFrontmatter;
 
-  if (!frontmatter.name || typeof frontmatter.name !== "string") {
+  if (!(frontmatter.name && isString(frontmatter.name))) {
     return {
       valid: false,
       error: 'Frontmatter must contain a "name" field (string)',