@doriandev/devcc 0.1.2 → 0.3.0

package/src/devcc/app/controlPlaneCommands.ts

@@ -0,0 +1,227 @@
+import type { AgentAdapter } from "../agents/agents.js"
+import type { CommandContext, CommandDefinition } from "../core/commands.js"
+import type { RemoteMachineConfig } from "../core/config.js"
+import { isActive } from "../processes/ManagedProcess.js"
+import { errorMessage } from "../utils/errors.js"
+
+export interface ControlPlaneCommandOptions {
+  agents: readonly AgentAdapter[]
+  machines: readonly RemoteMachineConfig[]
+}
+
+/** The directory commands act on: the selected worktree, else the project root. */
+function targetPath(context: CommandContext): string {
+  return context.selectedWorktree()?.path ?? context.store.getState().project.rootDir
+}
+
+/**
+ * Palette commands for worktrees, agents, verification, environment and remote
+ * machines. They resolve their target at run time (`selectedWorktree`), so
+ * "Launch Claude" from the Worktrees view acts on the highlighted worktree.
+ */
+export function createControlPlaneCommands(options: ControlPlaneCommandOptions): CommandDefinition[] {
+  const inRepository = (context: CommandContext) => context.store.getState().git.isRepository
+
+  const commands: CommandDefinition[] = [
+    // --- Worktrees ---------------------------------------------------------
+    {
+      id: "worktree.create",
+      title: "Worktree: create…",
+      category: "Worktree",
+      shortcut: "n",
+      keywords: ["new", "branch", "add", "git"],
+      when: inRepository,
+      execute: (context) => context.createWorktree(),
+    },
+    {
+      id: "worktree.remove",
+      title: "Worktree: remove the selected worktree",
+      category: "Worktree",
+      shortcut: "d",
+      keywords: ["delete", "git"],
+      when: (context) => {
+        const worktree = context.selectedWorktree()
+        return worktree !== undefined && !worktree.isMain && !worktree.isCurrent
+      },
+      execute: async (context) => {
+        const worktree = context.selectedWorktree()
+        if (worktree) await context.removeWorktree(worktree)
+      },
+    },
+    {
+      id: "worktree.openProject",
+      title: "Worktree: open in devcc",
+      category: "Worktree",
+      shortcut: "o",
+      keywords: ["switch", "project", "workspace"],
+      when: (context) => {
+        const worktree = context.selectedWorktree()
+        return worktree !== undefined && !worktree.isCurrent && !worktree.bare
+      },
+      execute: async (context) => {
+        const worktree = context.selectedWorktree()
+        if (worktree) await context.switchProject(worktree.path)
+      },
+    },
+    {
+      id: "worktree.openTerminal",
+      title: "Worktree: open terminal",
+      category: "Worktree",
+      shortcut: "t",
+      keywords: ["shell", "console"],
+      execute: (context) => context.openInTerminal(targetPath(context)),
+    },
+    {
+      id: "worktree.openEditor",
+      title: "Worktree: open in editor",
+      category: "Worktree",
+      shortcut: "e",
+      keywords: ["ide", "code", "zed", "cursor", "webstorm"],
+      execute: (context) => context.openInEditor(targetPath(context)),
+    },
+    {
+      id: "worktree.list",
+      title: "Worktree: show worktrees and agents",
+      category: "Worktree",
+      keywords: ["list", "agents"],
+      when: inRepository,
+      execute: async (context) => {
+        context.navigate("worktrees")
+        await context.git.refresh()
+      },
+    },
+
+    // --- AI agents ---------------------------------------------------------
+    ...options.agents.map((agent): CommandDefinition => ({
+      id: `agent.launch.${agent.id}`,
+      title: `AI: launch ${agent.name}`,
+      category: "AI",
+      shortcut: agent.id === "claude" ? "c" : agent.id === "codex" ? "x" : undefined,
+      keywords: ["agent", "ai", agent.id, agent.command],
+      execute: (context) => context.launchAgent(agent.id),
+    })),
+    {
+      id: "agent.stopAll",
+      title: "AI: stop all running agents",
+      category: "AI",
+      keywords: ["agent", "kill", "cancel"],
+      when: (context) => context.store.getState().agents.some((session) => isActive(session.status)),
+      confirm: { title: "Stop every running agent?", message: "Their work so far stays in the worktrees." },
+      execute: async (context) => {
+        const running = context.store.getState().agents.filter((session) => isActive(session.status))
+        await Promise.all(running.map((session) => context.agents.stop(session.id)))
+        context.notify("info", `Stopped ${running.length} agent(s)`)
+      },
+    },
+
+    // --- Verification ------------------------------------------------------
+    {
+      id: "verify.run",
+      title: "Project: verify (run every verification step)",
+      category: "Project",
+      shortcut: "V",
+      keywords: ["check", "ci", "test", "lint", "gate", "ship"],
+      execute: (context) => context.runVerify(),
+    },
+
+    // --- Environment -------------------------------------------------------
+    {
+      id: "environment.refresh",
+      title: "Environment: refresh tools, runtimes and direnv",
+      category: "Environment",
+      keywords: ["mise", "direnv", "versions", "doctor", "health"],
+      execute: async (context) => {
+        context.navigate("system")
+        const snapshot = await context.environment.refresh()
+        const problems = snapshot.tools.filter((tool) => tool.status === "error" || tool.status === "warning")
+        context.notify(
+          problems.length > 0 ? "warn" : "success",
+          problems.length > 0
+            ? `Environment: ${problems.map((tool) => tool.name).join(", ")} need attention`
+            : "Environment checked",
+        )
+      },
+    },
+    {
+      id: "environment.direnvAllow",
+      title: "Environment: direnv allow this project's .envrc",
+      category: "Environment",
+      keywords: ["direnv", "envrc", "approve", "trust"],
+      when: (context) => {
+        const { direnv } = context.store.getState().environment
+        return direnv.installed && direnv.rcPath !== undefined && direnv.approval !== "allowed"
+      },
+      execute: async (context) => {
+        const { rcPath } = context.store.getState().environment.direnv
+        const confirmed = await context.confirm(
+          "Allow this .envrc?",
+          `direnv will run ${rcPath ?? ".envrc"} whenever a shell enters the project. Only allow files you have read.`,
+        )
+        if (!confirmed) return
+        try {
+          await context.environment.allowDirenv()
+          context.notify("success", "direnv: .envrc allowed")
+        } catch (error) {
+          context.notify("error", errorMessage(error))
+        }
+      },
+    },
+  ]
+
+  // --- Project setup -------------------------------------------------------
+  const hasConfig = (context: CommandContext) => context.store.getState().project.configPath !== null
+  commands.push(
+    {
+      id: "config.starter",
+      title: "Project: set up .devcc.ts from detected scripts",
+      category: "Project",
+      keywords: ["init", "config", "setup", "starter", "generate"],
+      when: (context) => !hasConfig(context),
+      execute: (context) => context.setUpConfig("starter"),
+    },
+    ...options.agents
+      .filter((agent) => agent.separatesPrompt)
+      .map((agent): CommandDefinition => ({
+        id: `config.agent.${agent.id}`,
+        title: `Project: set up .devcc.ts with ${agent.name}`,
+        category: "Project",
+        keywords: ["init", "config", "setup", "improve", "agent", agent.id],
+        execute: (context) => context.setUpConfig(agent.id),
+      })),
+    {
+      id: "config.reload",
+      title: "Project: reload .devcc.ts",
+      category: "Project",
+      keywords: ["config", "refresh", "reread"],
+      when: hasConfig,
+      execute: (context) => context.reloadConfig(),
+    },
+  )
+
+  // --- Remote machines -----------------------------------------------------
+  for (const machine of options.machines) {
+    commands.push({
+      id: `remote.ssh.${machine.id}`,
+      title: `Remote: SSH to ${machine.name}`,
+      category: "Remote",
+      keywords: ["ssh", "remote", "connect", machine.host],
+      execute: (context) => context.sshTo(machine.id),
+    })
+  }
+  commands.push({
+    id: "remote.refresh",
+    title: "Remote: refresh machine and Tailscale status",
+    category: "Remote",
+    keywords: ["ssh", "tailscale", "ollama", "reachability"],
+    when: (context) =>
+      context.remoteMachines().length > 0 ||
+      context.store.getState().services.some((service) => service.category === "remote"),
+    execute: async (context) => {
+      context.navigate("services")
+      await context.services.refresh()
+      context.notify("info", "Remote status refreshed")
+    },
+  })
+
+  return commands
+}

package/src/devcc/app/keymap.ts

@@ -12,8 +12,10 @@ export const VIEW_SHORTCUTS: Readonly<Record<string, ViewId>> = {
   "7": "dependencies",
   "8": "system",
   "9": "settings",
+  "0": "worktrees",
   p: "processes",
   g: "git",
+  w: "worktrees",
   l: "logs",
   d: "dependencies",
 }
@@ -51,9 +53,10 @@ export const HELP_SECTIONS: HelpSection[] = [
       { keys: "Services", description: "things detected on this machine: Docker, databases, Ollama" },
       { keys: "Scripts", description: "package.json scripts, run through your package manager" },
       { keys: "Git", description: "branch, changes, commits; stage, commit, pull, push" },
+      { keys: "Worktrees", description: "git worktrees, and the AI agents (Claude, Codex) working in them" },
       { keys: "Logs", description: "output of everything devcc started, per source or merged" },
       { keys: "Dependencies", description: "outdated packages, checked only when you ask" },
-      { keys: "System", description: "host, toolchain versions, CPU, memory, disk" },
+      { keys: "System", description: "environment health (tools, mise, direnv), CPU, memory, disk, host" },
       { keys: "Settings", description: "detection results, config issues, diagnostics history" },
     ],
   },
@@ -61,6 +64,7 @@ export const HELP_SECTIONS: HelpSection[] = [
     title: "Getting started",
     entries: [
       { keys: ".devcc.ts", description: "declare processes devcc can control (see Config below)" },
+      { keys: "/ set up", description: "“Project: set up .devcc.ts” writes a starter or asks an agent" },
       { keys: "ctrl+p", description: "open another project; the current one keeps running" },
       { keys: "/", description: "the palette lists everything the app can do" },
       { keys: ".devcc/devcc.log", description: "internal diagnostics, if something looks wrong" },
@@ -74,8 +78,8 @@ export const HELP_SECTIONS: HelpSection[] = [
       { keys: "← / h", description: "previous section" },
       { keys: "→", description: "next section" },
       { keys: "tab / S-tab", description: "cycle sections" },
-      { keys: "1…9", description: "jump to a section" },
-      { keys: "p / g / l / d", description: "processes / git / logs / dependencies" },
+      { keys: "1…9, 0", description: "jump to a section (0 is Worktrees)" },
+      { keys: "p / g / w / l / d", description: "processes / git / worktrees / logs / dependencies" },
       { keys: "enter", description: "open or activate" },
       { keys: "esc", description: "close overlay / back" },
     ],
@@ -109,6 +113,18 @@ export const HELP_SECTIONS: HelpSection[] = [
       { keys: "r", description: "refresh status" },
     ],
   },
+  {
+    title: "Worktrees & agents",
+    entries: [
+      { keys: "n", description: "new worktree (branch, base, directory)" },
+      { keys: "d", description: "remove the worktree (confirmed, never forced)" },
+      { keys: "o / enter", description: "open the worktree in devcc; on an agent, its logs" },
+      { keys: "t / e", description: "open a terminal / the editor in the worktree" },
+      { keys: "c / x", description: "launch Claude Code / Codex with a task in the worktree" },
+      { keys: "s", description: "stop the selected agent" },
+      { keys: "r", description: "refresh the worktree list" },
+    ],
+  },
   {
     title: "Logs",
     entries: [
@@ -148,6 +164,7 @@ export const HELP_SECTIONS: HelpSection[] = [
       { keys: "ctrl+p / ctrl+o", description: "open / cycle projects" },
       { keys: "?", description: "this help" },
       { keys: "R", description: "refresh everything" },
+      { keys: "V", description: "verify the project (every verify step)" },
       { keys: "q / ctrl+c", description: "quit" },
     ],
   },
@@ -162,6 +179,11 @@ export const HELP_SECTIONS: HelpSection[] = [
       { keys: "services[]", description: "extra ports to watch: id, name, port, healthPath" },
       { keys: "projects[]", description: "extra paths offered by the project switcher" },
       { keys: "refresh", description: "{ system, services, git, clock } intervals in ms" },
+      { keys: "verify[]", description: "command ids, script names or { id, command }: devcc verify" },
+      { keys: "agents", description: "{ claude: { command, args }, codex: {...} } overrides" },
+      { keys: "editor / terminal", description: "{ command } or { application } for open actions" },
+      { keys: "remoteMachines[]", description: "id, name, host (an SSH alias works), services" },
+      { keys: "services[] ollama", description: '{ id, type: "ollama", baseUrl }: remote models' },
     ],
   },
 ]