@dobby.ai/dobby 0.1.0 → 0.1.1

package/src/cli/program.ts

@@ -1,12 +1,12 @@
+import { existsSync, readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
 import { Command } from "commander";
 import {
-  runConfigEditCommand,
   runConfigListCommand,
   runConfigSchemaListCommand,
   runConfigSchemaShowCommand,
   runConfigShowCommand,
 } from "./commands/config.js";
-import { runConfigureCommand } from "./commands/configure.js";
 import {
   runCronAddCommand,
   runCronListCommand,
@@ -25,16 +25,18 @@ import {
 } from "./commands/extension.js";
 import { runInitCommand } from "./commands/init.js";
 import { runStartCommand } from "./commands/start.js";
-import {
-  runBindingListCommand,
-  runBindingRemoveCommand,
-  runBindingSetCommand,
-  runBotListCommand,
-  runBotSetCommand,
-  runRouteListCommand,
-  runRouteRemoveCommand,
-  runRouteSetCommand,
-} from "./commands/topology.js";
+
+function loadCliVersion(): string {
+  const candidates = [
+    fileURLToPath(new URL("../../package.json", import.meta.url)),
+    fileURLToPath(new URL("../../../package.json", import.meta.url)),
+  ];
+  const fallbackCandidate = fileURLToPath(new URL("../../package.json", import.meta.url));
+  const packageJsonPath = candidates.find((candidate) => existsSync(candidate)) ?? fallbackCandidate;
+  return JSON.parse(readFileSync(packageJsonPath, "utf-8")).version as string;
+}
+
+const CLI_VERSION = loadCliVersion();
 
 /**
  * Builds the top-level dobby CLI program and registers all subcommands.
@@ -43,6 +45,7 @@ export function buildProgram(): Command {
   const program = new Command();
   program
     .name("dobby")
+    .version(CLI_VERSION)
     .description("Discord-first local agent gateway")
     .showHelpAfterError()
     .action(async () => {
@@ -63,146 +66,7 @@ export function buildProgram(): Command {
       await runInitCommand();
     });
 
-  program
-    .command("configure")
-    .description("Interactive configuration wizard")
-    .option(
-      "--section <section>",
-      "Config section (repeatable): provider|connector|route|binding|sandbox|data",
-      (value: string, previous: string[]) => [...previous, value],
-      [] as string[],
-    )
-    .action(async (opts) => {
-      await runConfigureCommand({
-        sections: opts.section as string[],
-      });
-    });
-
-  const botCommand = program.command("bot").description("Manage bot connector settings");
-
-  botCommand
-    .command("list")
-    .description("List configured bot connectors")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runBotListCommand({
-        json: Boolean(opts.json),
-      });
-    });
-
-  botCommand
-    .command("set")
-    .description("Update one bot connector")
-    .argument("<connectorId>", "Connector instance ID")
-    .option("--name <name>", "Discord botName")
-    .option("--token <token>", "Discord botToken")
-    .action(async (connectorId: string, opts) => {
-      await runBotSetCommand({
-        connectorId,
-        ...(typeof opts.name === "string" ? { name: opts.name as string } : {}),
-        ...(typeof opts.token === "string" ? { token: opts.token as string } : {}),
-      });
-    });
-
-  const bindingCommand = program.command("binding").description("Manage connector source-route bindings");
-
-  bindingCommand
-    .command("list")
-    .description("List bindings")
-    .option("--connector <id>", "Filter by connector instance ID")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runBindingListCommand({
-        ...(typeof opts.connector === "string" ? { connectorId: opts.connector as string } : {}),
-        json: Boolean(opts.json),
-      });
-    });
-
-  bindingCommand
-    .command("set")
-    .description("Create or update one binding")
-    .argument("<bindingId>", "Binding ID")
-    .requiredOption("--connector <id>", "Connector instance ID")
-    .requiredOption("--source-type <type>", "Source type: channel|chat")
-    .requiredOption("--source-id <id>", "Source ID")
-    .requiredOption("--route <id>", "Route ID")
-    .action(async (bindingId: string, opts) => {
-      if (opts.sourceType !== "channel" && opts.sourceType !== "chat") {
-        throw new Error("--source-type must be channel or chat");
-      }
-
-      await runBindingSetCommand({
-        bindingId,
-        connectorId: opts.connector as string,
-        sourceType: opts.sourceType as "channel" | "chat",
-        sourceId: opts.sourceId as string,
-        routeId: opts.route as string,
-      });
-    });
-
-  bindingCommand
-    .command("remove")
-    .description("Remove one binding")
-    .argument("<bindingId>", "Binding ID")
-    .action(async (bindingId: string) => {
-      await runBindingRemoveCommand({
-        bindingId,
-      });
-    });
-
-  const routeCommand = program.command("route").description("Manage route profiles");
-
-  routeCommand
-    .command("list")
-    .description("List route profiles")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runRouteListCommand({
-        json: Boolean(opts.json),
-      });
-    });
-
-  routeCommand
-    .command("set")
-    .description("Create or update one route")
-    .argument("<routeId>", "Route ID")
-    .option("--project-root <path>", "Route project root")
-    .option("--tools <profile>", "Route tools profile: full|readonly")
-    .option("--provider <id>", "Provider instance ID")
-    .option("--sandbox <id>", "Sandbox instance ID")
-    .option("--mentions <policy>", "Mention policy: required|optional")
-    .action(async (routeId: string, opts) => {
-      if (
-        typeof opts.mentions === "string"
-        && opts.mentions !== "required"
-        && opts.mentions !== "optional"
-      ) {
-        throw new Error("--mentions must be required or optional");
-      }
-
-      await runRouteSetCommand({
-        routeId,
-        ...(typeof opts.projectRoot === "string" ? { projectRoot: opts.projectRoot as string } : {}),
-        ...(typeof opts.tools === "string" ? { tools: opts.tools as string } : {}),
-        ...(typeof opts.provider === "string" ? { providerId: opts.provider as string } : {}),
-        ...(typeof opts.sandbox === "string" ? { sandboxId: opts.sandbox as string } : {}),
-        ...(typeof opts.mentions === "string" ? { mentions: opts.mentions as "required" | "optional" } : {}),
-      });
-    });
-
-  routeCommand
-    .command("remove")
-    .description("Remove one route")
-    .argument("<routeId>", "Route ID")
-    .option("--cascade-bindings", "Remove bindings that reference this route", false)
-    .action(async (routeId: string, opts) => {
-      await runRouteRemoveCommand({
-        routeId,
-        cascadeBindings: Boolean(opts.cascadeBindings),
-      });
-    });
-
-  const configCommand = program.command("config").description("Inspect and edit config");
+  const configCommand = program.command("config").description("Inspect config");
 
   configCommand
     .command("show")
@@ -228,21 +92,6 @@ export function buildProgram(): Command {
       });
     });
 
-  configCommand
-    .command("edit")
-    .description("Interactive edit for high-frequency sections")
-    .option(
-      "--section <section>",
-      "Edit section (repeatable): provider|connector|route|binding",
-      (value: string, previous: string[]) => [...previous, value],
-      [] as string[],
-    )
-    .action(async (opts) => {
-      await runConfigEditCommand({
-        sections: opts.section as string[],
-      });
-    });
-
   const configSchemaCommand = configCommand.command("schema").description("Inspect extension config schemas");
 
   configSchemaCommand

package/src/cli/shared/config-io.ts

@@ -1,8 +1,8 @@
-import { existsSync, readFileSync } from "node:fs";
 import { access, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, resolve } from "node:path";
 import { homedir } from "node:os";
 import { loadGatewayConfig } from "../../core/routing.js";
+import { findDobbyRepoRoot, isDobbyRepoRoot } from "../../shared/dobby-repo.js";
 import type { RawGatewayConfig } from "./config-types.js";
 
 /**
@@ -37,27 +37,6 @@ interface ResolvedConfigPathInfo {
   source: ConfigPathSource;
 }
 
-/**
- * Returns true when a directory looks like the dobby repository root.
- */
-function isDobbyRepoRoot(candidateDir: string): boolean {
-  const packageJsonPath = resolve(candidateDir, "package.json");
-  const repoConfigPath = resolve(candidateDir, "config", "gateway.json");
-  const localExtensionsScriptPath = resolve(candidateDir, "scripts", "local-extensions.mjs");
-
-  if (!existsSync(packageJsonPath) || !existsSync(repoConfigPath) || !existsSync(localExtensionsScriptPath)) {
-    return false;
-  }
-
-  try {
-    const packageJsonRaw = readFileSync(packageJsonPath, "utf-8");
-    const parsed = JSON.parse(packageJsonRaw) as { name?: unknown };
-    return parsed.name === "dobby";
-  } catch {
-    return false;
-  }
-}
-
 function resolveConfigBaseDir(configPath: string): string {
   const absoluteConfigPath = resolve(configPath);
   const configDir = dirname(absoluteConfigPath);
@@ -74,19 +53,8 @@ function resolveConfigBaseDir(configPath: string): string {
  * Scans current directory and ancestors to find a local dobby repo config path.
  */
 function findDobbyRepoConfigPath(startDir: string): string | null {
-  let currentDir = resolve(startDir);
-
-  while (true) {
-    if (isDobbyRepoRoot(currentDir)) {
-      return resolve(currentDir, "config", "gateway.json");
-    }
-
-    const parentDir = dirname(currentDir);
-    if (parentDir === currentDir) {
-      return null;
-    }
-    currentDir = parentDir;
-  }
+  const repoRoot = findDobbyRepoRoot(startDir);
+  return repoRoot ? resolve(repoRoot, "config", "gateway.json") : null;
 }
 
 /**

package/src/cli/shared/config-mutators.ts

@@ -4,6 +4,7 @@ import type {
   ContributionTemplatesByKind,
   NormalizedGatewayConfig,
   RawBindingConfig,
+  RawDefaultBindingConfig,
   RawExtensionItemConfig,
   RawGatewayConfig,
   RawRouteDefaults,
@@ -65,6 +66,7 @@ function asRouteDefaults(value: unknown): RawRouteDefaults {
   }
 
   return {
+    ...(typeof value.projectRoot === "string" && value.projectRoot.trim().length > 0 ? { projectRoot: value.projectRoot } : {}),
     ...(typeof value.provider === "string" && value.provider.trim().length > 0 ? { provider: value.provider } : {}),
     ...(typeof value.sandbox === "string" && value.sandbox.trim().length > 0 ? { sandbox: value.sandbox } : {}),
     tools: value.tools === "readonly" ? "readonly" : "full",
@@ -79,13 +81,13 @@ function asRoutes(value: unknown): Record<string, RawRouteProfile> {
 
   const normalized: Record<string, RawRouteProfile> = {};
   for (const [routeId, route] of Object.entries(value)) {
-    if (!isRecord(route) || typeof route.projectRoot !== "string" || route.projectRoot.trim().length === 0) {
+    if (!isRecord(route)) {
       continue;
     }
 
     normalized[routeId] = {
       ...route,
-      projectRoot: route.projectRoot,
+      ...(typeof route.projectRoot === "string" && route.projectRoot.trim().length > 0 ? { projectRoot: route.projectRoot } : {}),
       ...(route.tools === "readonly" ? { tools: "readonly" as const } : {}),
       ...(route.mentions === "optional" ? { mentions: "optional" as const } : {}),
       ...(typeof route.provider === "string" && route.provider.trim().length > 0 ? { provider: route.provider } : {}),
@@ -97,6 +99,17 @@ function asRoutes(value: unknown): Record<string, RawRouteProfile> {
   return normalized;
 }
 
+function asDefaultBinding(value: unknown): RawDefaultBindingConfig | undefined {
+  if (!isRecord(value) || typeof value.route !== "string" || value.route.trim().length === 0) {
+    return undefined;
+  }
+
+  return {
+    ...value,
+    route: value.route,
+  };
+}
+
 function asBindings(value: unknown): Record<string, RawBindingConfig> {
   if (!isRecord(value)) {
     return {};
@@ -147,7 +160,7 @@ export function ensureGatewayConfigShape(config: RawGatewayConfig): NormalizedGa
       ? config.sandboxes.default
       : "host.builtin";
 
-  const routeDefaults = asRouteDefaults(config.routes?.defaults);
+  const routeDefaults = asRouteDefaults(config.routes?.default);
   if (!routeDefaults.provider && normalizedProvidersDefault) {
     routeDefaults.provider = normalizedProvidersDefault;
   }
@@ -155,6 +168,8 @@ export function ensureGatewayConfigShape(config: RawGatewayConfig): NormalizedGa
     routeDefaults.sandbox = normalizedSandboxesDefault;
   }
 
+  const defaultBinding = asDefaultBinding(config.bindings?.default);
+
   return {
     ...config,
     extensions: {
@@ -177,11 +192,12 @@ export function ensureGatewayConfigShape(config: RawGatewayConfig): NormalizedGa
     },
     routes: {
       ...((isRecord(config.routes) ? config.routes : {}) as Record<string, unknown>),
-      defaults: routeDefaults,
+      default: routeDefaults,
       items: asRoutes(config.routes?.items),
     },
     bindings: {
       ...((isRecord(config.bindings) ? config.bindings : {}) as Record<string, unknown>),
+      ...(defaultBinding ? { default: defaultBinding } : {}),
       items: asBindings(config.bindings?.items),
     },
     data: {
@@ -368,11 +384,11 @@ export function setDefaultProviderIfMissingOrInvalid(config: RawGatewayConfig):
 
   if (defaultProvider && items[defaultProvider]) {
     config.providers = next.providers;
-    if (!next.routes.defaults.provider) {
+    if (!next.routes.default.provider) {
       config.routes = {
         ...next.routes,
         defaults: {
-          ...next.routes.defaults,
+          ...next.routes.default,
           provider: defaultProvider,
         },
       };
@@ -393,8 +409,8 @@ export function setDefaultProviderIfMissingOrInvalid(config: RawGatewayConfig):
   };
   config.routes = {
     ...next.routes,
-    defaults: {
-      ...next.routes.defaults,
+    default: {
+      ...next.routes.default,
       provider: candidates[0]!,
     },
   };
@@ -403,7 +419,7 @@ export function setDefaultProviderIfMissingOrInvalid(config: RawGatewayConfig):
 export function upsertRoute(config: RawGatewayConfig, routeId: string, profile: RawRouteProfile): void {
   const next = ensureGatewayConfigShape(config);
   next.routes.items[routeId] = {
-    projectRoot: profile.projectRoot,
+    ...(typeof profile.projectRoot === "string" && profile.projectRoot.trim().length > 0 ? { projectRoot: profile.projectRoot } : {}),
     ...(profile.tools ? { tools: profile.tools } : {}),
     ...(profile.mentions ? { mentions: profile.mentions } : {}),
     ...(profile.provider ? { provider: profile.provider } : {}),
@@ -425,6 +441,20 @@ export function upsertBinding(config: RawGatewayConfig, bindingId: string, bindi
   };
 }
 
+export function setDefaultBinding(config: RawGatewayConfig, binding: RawDefaultBindingConfig | undefined): void {
+  const next = ensureGatewayConfigShape(config);
+  const normalizedBinding = binding ? structuredClone(binding) : undefined;
+  config.bindings = {
+    ...next.bindings,
+    ...(normalizedBinding ? { default: normalizedBinding } : {}),
+    items: next.bindings.items,
+  };
+
+  if (!normalizedBinding) {
+    delete config.bindings.default;
+  }
+}
+
 export function listContributionIds(config: RawGatewayConfig): {
   providers: string[];
   connectors: string[];

package/src/cli/shared/config-types.ts

@@ -9,6 +9,7 @@ export interface RawExtensionItemConfig {
 }
 
 export interface RawRouteDefaults {
+  projectRoot?: string;
   provider?: string;
   sandbox?: string;
   tools?: "full" | "readonly";
@@ -17,7 +18,7 @@ export interface RawRouteDefaults {
 }
 
 export interface RawRouteProfile {
-  projectRoot: string;
+  projectRoot?: string;
   tools?: "full" | "readonly";
   systemPromptFile?: string;
   mentions?: "required" | "optional";
@@ -26,6 +27,11 @@ export interface RawRouteProfile {
   [key: string]: unknown;
 }
 
+export interface RawDefaultBindingConfig {
+  route: string;
+  [key: string]: unknown;
+}
+
 export interface RawBindingConfig {
   connector: string;
   source: {
@@ -62,6 +68,7 @@ export interface RawGatewayConfig {
     [key: string]: unknown;
   };
   bindings?: {
+    default?: RawDefaultBindingConfig;
     items?: Record<string, RawBindingConfig>;
     [key: string]: unknown;
   };
@@ -93,11 +100,12 @@ export interface NormalizedGatewayConfig extends RawGatewayConfig {
     [key: string]: unknown;
   };
   routes: {
-    defaults: RawRouteDefaults;
+    default: RawRouteDefaults;
     items: Record<string, RawRouteProfile>;
     [key: string]: unknown;
   };
   bindings: {
+    default?: RawDefaultBindingConfig;
     items: Record<string, RawBindingConfig>;
     [key: string]: unknown;
   };

package/src/cli/shared/configure-sections.ts

@@ -10,6 +10,7 @@ import {
 import JSON5 from "json5";
 import {
   ensureGatewayConfigShape,
+  setDefaultBinding,
   setDefaultProviderIfMissingOrInvalid,
   upsertBinding,
   upsertConnectorInstance,
@@ -220,7 +221,7 @@ async function configureProviderSection(config: RawGatewayConfig, context?: Conf
       throw new Error("Configure cancelled.");
     }
     next.providers.default = String(defaultProvider);
-    next.routes.defaults.provider = String(defaultProvider);
+    next.routes.default.provider = String(defaultProvider);
   }
 
   Object.assign(config, next);
@@ -321,11 +322,32 @@ async function configureRouteSection(config: RawGatewayConfig): Promise<void> {
   const routeId = String(targetRoute) === "__new" ? await requiredText("New route ID", "main") : String(targetRoute);
   const existing = routeItems[routeId];
 
-  const projectRoot = await requiredText("projectRoot", existing?.projectRoot ?? process.cwd());
+  const defaultProjectRoot = next.routes.default.projectRoot;
+  let projectRoot = existing?.projectRoot;
+  if (defaultProjectRoot) {
+    const projectRootMode = await select({
+      message: "projectRoot",
+      options: [
+        { value: "__default", label: `Use route default (${defaultProjectRoot})` },
+        { value: "__custom", label: "Set explicit projectRoot" },
+      ],
+      initialValue: existing?.projectRoot ? "__custom" : "__default",
+    });
+    if (isCancel(projectRootMode)) {
+      cancel("Configure cancelled.");
+      throw new Error("Configure cancelled.");
+    }
+
+    projectRoot = projectRootMode === "__custom"
+      ? await requiredText("projectRoot", existing?.projectRoot ?? defaultProjectRoot)
+      : undefined;
+  } else {
+    projectRoot = await requiredText("projectRoot", existing?.projectRoot ?? process.cwd());
+  }
   const tools = await select({
     message: "tools",
     options: [
-      { value: "__default", label: `Use route default (${next.routes.defaults.tools ?? "full"})` },
+      { value: "__default", label: `Use route default (${next.routes.default.tools ?? "full"})` },
       { value: "full", label: "full" },
       { value: "readonly", label: "readonly" },
     ],
@@ -339,7 +361,7 @@ async function configureRouteSection(config: RawGatewayConfig): Promise<void> {
   const mentions = await select({
     message: "mentions",
     options: [
-      { value: "__default", label: `Use route default (${next.routes.defaults.mentions ?? "required"})` },
+      { value: "__default", label: `Use route default (${next.routes.default.mentions ?? "required"})` },
       { value: "required", label: "required" },
       { value: "optional", label: "optional" },
     ],
@@ -355,7 +377,7 @@ async function configureRouteSection(config: RawGatewayConfig): Promise<void> {
     ? await select({
       message: "provider",
       options: [
-        { value: "__default", label: `Use route default (${(next.routes.defaults.provider ?? next.providers.default) || "(unset)"})` },
+        { value: "__default", label: `Use route default (${(next.routes.default.provider ?? next.providers.default) || "(unset)"})` },
         ...providerIds.map((id) => ({ value: id, label: id })),
       ],
       initialValue: existing?.provider ?? "__default",
@@ -370,7 +392,7 @@ async function configureRouteSection(config: RawGatewayConfig): Promise<void> {
   const sandboxValue = await select({
     message: "sandbox",
     options: [
-      { value: "__default", label: `Use route default (${next.routes.defaults.sandbox ?? next.sandboxes.default})` },
+      { value: "__default", label: `Use route default (${next.routes.default.sandbox ?? next.sandboxes.default})` },
       ...sandboxIds.map((id) => ({ value: id, label: id })),
     ],
     initialValue: existing?.sandbox ?? "__default",
@@ -383,7 +405,7 @@ async function configureRouteSection(config: RawGatewayConfig): Promise<void> {
   const systemPromptFile = await optionalText("systemPromptFile (optional)", existing?.systemPromptFile ?? "");
 
   upsertRoute(next, routeId, {
-    projectRoot,
+    ...(projectRoot ? { projectRoot } : {}),
     ...(tools !== "__default" ? { tools: String(tools) as "full" | "readonly" } : {}),
     ...(mentions !== "__default" ? { mentions: String(mentions) as "required" | "optional" } : {}),
     ...(providerValue !== "__default" ? { provider: String(providerValue) } : {}),
@@ -407,20 +429,43 @@ async function configureBindingSection(config: RawGatewayConfig): Promise<void>
   }
 
   const targetBinding = bindingChoices.length === 0
-    ? "__new"
+    ? (next.bindings.default ? "__default" : "__new")
     : await select({
       message: "Select binding",
       options: [
+        { value: "__default", label: next.bindings.default ? "Edit default direct-message binding" : "Create default direct-message binding" },
         ...bindingChoices.map((id) => ({ value: id, label: id })),
         { value: "__new", label: "Create new binding" },
       ],
-      initialValue: bindingChoices[0],
+      initialValue: next.bindings.default ? "__default" : bindingChoices[0],
     });
   if (isCancel(targetBinding)) {
     cancel("Configure cancelled.");
     throw new Error("Configure cancelled.");
   }
 
+  const routeIds = Object.keys(next.routes.items).sort((a, b) => a.localeCompare(b));
+  if (String(targetBinding) === "__default") {
+    const defaultRouteId = await select({
+      message: "Default direct-message route",
+      options: routeIds.map((id) => ({ value: id, label: id })),
+      initialValue:
+        next.bindings.default?.route && routeIds.includes(next.bindings.default.route)
+          ? next.bindings.default.route
+          : routeIds[0],
+    });
+    if (isCancel(defaultRouteId)) {
+      cancel("Configure cancelled.");
+      throw new Error("Configure cancelled.");
+    }
+
+    setDefaultBinding(next, {
+      route: String(defaultRouteId),
+    });
+    Object.assign(config, next);
+    return;
+  }
+
   const bindingId = String(targetBinding) === "__new"
     ? await requiredText("New binding ID", "discord.main.main")
     : String(targetBinding);
@@ -451,7 +496,6 @@ async function configureBindingSection(config: RawGatewayConfig): Promise<void>
   }
 
   const sourceId = await requiredText("source.id", existing?.source.id);
-  const routeIds = Object.keys(next.routes.items).sort((a, b) => a.localeCompare(b));
   const routeId = await select({
     message: "route",
     options: routeIds.map((id) => ({ value: id, label: id })),
@@ -501,7 +545,7 @@ async function configureSandboxSection(config: RawGatewayConfig): Promise<void>
   }
 
   next.sandboxes.default = String(defaultSandbox);
-  next.routes.defaults.sandbox = String(defaultSandbox);
+  next.routes.default.sandbox = String(defaultSandbox);
   Object.assign(config, next);
 }