pluidr 0.7.0 → 0.7.2

package/bin/pluidr.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { run } from "../src/cli/index.js"
-
-run(process.argv)
+import { run } from "../src/cli/index.js"
+
+run(process.argv)

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "pluidr",
-  "version": "0.7.0",
-  "description": "Opinionated Engineering Workflow for OpenCode — Explore, Plan, Build, Debug, and Security-Audit.",
-  "keywords": [
-    "opencode",
-    "workflow",
-    "engineering",
-    "pipeline",
-    "ai-agents",
-    "code-review",
-    "debugging",
-    "security-audit",
-    "security",
-    "planner",
-    "builder",
-    "cli"
-  ],
-  "license": "MIT",
-  "type": "module",
-  "scripts": {
-    "test": "node --test"
-  },
-  "bin": {
-    "pluidr": "bin/pluidr.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/funara/pluidr.git"
-  },
-  "homepage": "https://github.com/funara/pluidr#readme",
-  "bugs": {
-    "url": "https://github.com/funara/pluidr/issues"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "files": [
-    "bin",
-    "src"
-  ],
-  "dependencies": {
-    "@clack/prompts": "^0.9"
-  }
-}
+{
+  "name": "pluidr",
+  "version": "0.7.2",
+  "description": "Opinionated Engineering Workflow for OpenCode — Explore, Plan, Build, Debug, and Security-Audit.",
+  "keywords": [
+    "opencode",
+    "workflow",
+    "engineering",
+    "pipeline",
+    "ai-agents",
+    "code-review",
+    "debugging",
+    "security-audit",
+    "security",
+    "planner",
+    "builder",
+    "cli"
+  ],
+  "license": "MIT",
+  "type": "module",
+  "scripts": {
+    "test": "node --test"
+  },
+  "bin": {
+    "pluidr": "bin/pluidr.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/funara/pluidr.git"
+  },
+  "homepage": "https://github.com/funara/pluidr#readme",
+  "bugs": {
+    "url": "https://github.com/funara/pluidr/issues"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "files": [
+    "bin",
+    "src"
+  ],
+  "dependencies": {
+    "@clack/prompts": "^0.9"
+  }
+}

package/src/cli/commands/doctor.js

@@ -1,101 +1,113 @@
-import { existsSync, readFileSync, readdirSync } from "node:fs"
-import { join } from "node:path"
-import { getConfigDir, getConfigPath, getPromptsDir } from "../../core/paths.js"
-import { findSqueezePath } from "../../core/squeezeInstaller.js"
-
-const EXPECTED_PROMPT_COUNT = 18
-const PLUGIN_FILES = ["pluidr-flow.js", "pluidr-squeeze.js"]
-
-export function collectChecks() {
-  const configDir = getConfigDir()
-  const configPath = getConfigPath()
-  const promptsDir = getPromptsDir()
-  const pluginsDir = join(configDir, "plugins")
-  const packageJsonPath = join(configDir, "package.json")
-  const binDir = join(configDir, "bin")
-
-  const checks = []
-
-  // 1. opencode.jsonc exists
-  const configExists = existsSync(configPath)
-  checks.push({ component: "opencode.jsonc", pass: configExists })
-
-  // 2. All 18 prompt files exist
-  let promptCount = 0
-  if (existsSync(promptsDir)) {
-    try {
-      const files = readdirSync(promptsDir).filter((f) => f.endsWith(".txt"))
-      promptCount = files.length
-    } catch {
-      promptCount = 0
-    }
-  }
-  checks.push({ component: "18 prompt files", pass: promptCount === EXPECTED_PROMPT_COUNT, detail: `${promptCount}/${EXPECTED_PROMPT_COUNT}` })
-
-  // 3. Both plugin files exist
-  let pluginsFound = 0
-  for (const f of PLUGIN_FILES) {
-    if (existsSync(join(pluginsDir, f))) pluginsFound++
-  }
-  checks.push({ component: "plugin files", pass: pluginsFound === PLUGIN_FILES.length, detail: `${pluginsFound}/${PLUGIN_FILES.length}` })
-
-  // 4. package.json with @opencode-ai/plugin dependency
-  let pkgValid = false
-  if (existsSync(packageJsonPath)) {
-    try {
-      const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"))
-      pkgValid = !!(pkg.dependencies && pkg.dependencies["@opencode-ai/plugin"])
-    } catch {
-      pkgValid = false
-    }
-  }
-  checks.push({ component: "package.json + plugin dep", pass: pkgValid })
-
-  // 5. Squeeze binary exists
-  let squeezeFound = false
-  const squeezeOnPath = findSqueezePath()
-  if (squeezeOnPath) {
-    squeezeFound = true
-  } else {
-    const binName = process.platform === "win32" ? "squeeze.exe" : "squeeze"
-    squeezeFound = existsSync(join(binDir, binName))
-  }
-  checks.push({ component: "squeeze binary tested", pass: squeezeFound })
-
-  // 6. Config is valid JSON/JSONC
-  let configValid = false
-  if (configExists) {
-    try {
-      const content = readFileSync(configPath, "utf-8")
-      const cleaned = content.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m, g) => g ? "" : m)
-      JSON.parse(cleaned)
-      configValid = true
-    } catch {
-      configValid = false
-    }
-  }
-  checks.push({ component: "config JSON validity", pass: configValid })
-
-  return checks
-}
-
-export async function runDoctor() {
-  const checks = collectChecks()
-  const allPass = checks.every((c) => c.pass)
-
-  console.log("\nPluidr Doctor — Installation Health Check\n")
-  for (const c of checks) {
-    const icon = c.pass ? "\u2713" : "\u2717"
-    const detail = c.detail ? ` (${c.detail})` : ""
-    console.log(`  ${icon} ${c.component}${detail}`)
-  }
-  console.log("")
-
-  if (allPass) {
-    console.log("All checks passed.")
-  } else {
-    console.log("Some checks failed. Re-run `pluidr init` to repair.")
-  }
-
-  process.exit(allPass ? 0 : 1)
-}
+import { existsSync, readFileSync, readdirSync } from "node:fs"
+import { join } from "node:path"
+import { getConfigDir, getConfigPath, getPromptsDir, getThemesDir } from "../../core/paths.js"
+import { findSqueezePath } from "../../core/squeezeInstaller.js"
+
+const EXPECTED_PROMPT_COUNT = 18
+const PLUGIN_FILES = ["pluidr-flow.js", "pluidr-squeeze.js"]
+
+export function cleanJsonc(content) {
+  return content.replace(
+    /\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)|(,\s*(?=[\]}]))/g,
+    (m, g1, g2) => g1 ? "" : g2 ? "" : m
+  )
+}
+
+export function collectChecks() {
+  const configDir = getConfigDir()
+  const configPath = getConfigPath()
+  const promptsDir = getPromptsDir()
+  const pluginsDir = join(configDir, "plugins")
+  const packageJsonPath = join(configDir, "package.json")
+  const binDir = join(configDir, "bin")
+  const themesDir = getThemesDir()
+
+  const checks = []
+
+  // 1. opencode.jsonc exists
+  const configExists = existsSync(configPath)
+  checks.push({ component: "opencode.jsonc", pass: configExists })
+
+  // 2. All 18 prompt files exist
+  let promptCount = 0
+  if (existsSync(promptsDir)) {
+    try {
+      const files = readdirSync(promptsDir).filter((f) => f.endsWith(".txt"))
+      promptCount = files.length
+    } catch {
+      promptCount = 0
+    }
+  }
+  checks.push({ component: "18 prompt files", pass: promptCount === EXPECTED_PROMPT_COUNT, detail: `${promptCount}/${EXPECTED_PROMPT_COUNT}` })
+
+  // 3. Both plugin files exist
+  let pluginsFound = 0
+  for (const f of PLUGIN_FILES) {
+    if (existsSync(join(pluginsDir, f))) pluginsFound++
+  }
+  checks.push({ component: "plugin files", pass: pluginsFound === PLUGIN_FILES.length, detail: `${pluginsFound}/${PLUGIN_FILES.length}` })
+
+  // 3b. Custom theme exists
+  const themeExists = existsSync(join(themesDir, "pluidr-contrast.json"))
+  checks.push({ component: "pluidr-contrast theme file", pass: themeExists })
+
+  // 4. package.json with @opencode-ai/plugin dependency
+  let pkgValid = false
+  if (existsSync(packageJsonPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"))
+      pkgValid = !!(pkg.dependencies && pkg.dependencies["@opencode-ai/plugin"])
+    } catch {
+      pkgValid = false
+    }
+  }
+  checks.push({ component: "package.json + plugin dep", pass: pkgValid })
+
+  // 5. Squeeze binary exists
+  let squeezeFound = false
+  const squeezeOnPath = findSqueezePath()
+  if (squeezeOnPath) {
+    squeezeFound = true
+  } else {
+    const binName = process.platform === "win32" ? "squeeze.exe" : "squeeze"
+    squeezeFound = existsSync(join(binDir, binName))
+  }
+  checks.push({ component: "squeeze binary tested", pass: squeezeFound })
+
+  // 6. Config is valid JSON/JSONC
+  let configValid = false
+  if (configExists) {
+    try {
+      const content = readFileSync(configPath, "utf-8")
+      const cleaned = cleanJsonc(content)
+      JSON.parse(cleaned)
+      configValid = true
+    } catch {
+      configValid = false
+    }
+  }
+  checks.push({ component: "config JSON validity", pass: configValid })
+
+  return checks
+}
+
+export async function runDoctor() {
+  const checks = collectChecks()
+  const allPass = checks.every((c) => c.pass)
+
+  console.log("\nPluidr Doctor — Installation Health Check\n")
+  for (const c of checks) {
+    const icon = c.pass ? "\u2713" : "\u2717"
+    const detail = c.detail ? ` (${c.detail})` : ""
+    console.log(`  ${icon} ${c.component}${detail}`)
+  }
+  console.log("")
+
+  if (allPass) {
+    console.log("All checks passed.")
+  } else {
+    console.log("Some checks failed. Re-run `pluidr init` to repair.")
+  }
+
+  process.exit(allPass ? 0 : 1)
+}

package/src/cli/commands/init.js

@@ -1,43 +1,47 @@
-import { readFileSync } from "node:fs"
-import { resolve, dirname } from "node:path"
-import { fileURLToPath } from "node:url"
-import { confirm, isCancel } from "@clack/prompts"
-import { selectModelTier } from "../wizard/selectModelTier.js"
-import { backupExistingConfig } from "../../core/backup.js"
-import { buildConfig } from "../../core/configBuilder.js"
-import { writeConfig } from "../../core/configWriter.js"
-import { writeAgentPrompts } from "../../core/agentPromptWriter.js"
-import { writePluginBundle, writePluginPackageJson } from "../../core/pluginWriter.js"
-import { installSqueeze } from "../../core/squeezeInstaller.js"
-import { getConfigPath } from "../../core/paths.js"
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const TEMPLATES_DIR = resolve(__dirname, "../../templates")
-
-export async function runInit() {
-  const defaultsPath = resolve(TEMPLATES_DIR, "model-defaults.json")
-  const modelDefaults = JSON.parse(readFileSync(defaultsPath, "utf-8"))
-
-  const tierChoices = await selectModelTier(modelDefaults)
-
-  const squeezeAnswer = await confirm({
-    message: "Install pluidr-squeeze plugin? Reduces bash output tokens by 60-90%.",
-    initialValue: true,
-  })
-
-  const installSqueezePlugin = isCancel(squeezeAnswer) ? false : squeezeAnswer
-
-  backupExistingConfig()
-
-  const configObject = buildConfig(tierChoices, TEMPLATES_DIR)
-  writeConfig(configObject)
-  writeAgentPrompts(TEMPLATES_DIR)
-  writePluginBundle()
-  writePluginPackageJson()
-  if (installSqueezePlugin) {
-    await installSqueeze()
-  }
-
-  const path = getConfigPath().replace(/\\/g, "/").replace(/^\//, "")
-  console.log(`Pluidr setup complete!\nYou can update your agent model settings later in \x1b]8;;file:///${path}\x1b\\opencode.jsonc\x1b]8;;\x1b\\`)
-}
+import { readFileSync, writeFileSync } from "node:fs"
+import { resolve, dirname } from "node:path"
+import { fileURLToPath } from "node:url"
+import { confirm, isCancel } from "@clack/prompts"
+import { selectModelTier } from "../wizard/selectModelTier.js"
+import { backupExistingConfig } from "../../core/backup.js"
+import { buildConfig } from "../../core/configBuilder.js"
+import { writeConfig } from "../../core/configWriter.js"
+import { writeAgentPrompts } from "../../core/agentPromptWriter.js"
+import { writePluginBundle, writePluginPackageJson } from "../../core/pluginWriter.js"
+import { writeThemes } from "../../core/themeWriter.js"
+import { writeTuiConfig } from "../../core/tuiConfigWriter.js"
+import { installSqueeze } from "../../core/squeezeInstaller.js"
+import { getConfigPath, getConfigDir } from "../../core/paths.js"
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const TEMPLATES_DIR = resolve(__dirname, "../../templates")
+
+export async function runInit() {
+  const defaultsPath = resolve(TEMPLATES_DIR, "model-defaults.json")
+  const modelDefaults = JSON.parse(readFileSync(defaultsPath, "utf-8"))
+
+  const tierChoices = await selectModelTier(modelDefaults)
+
+  const squeezeAnswer = await confirm({
+    message: "Install pluidr-squeeze plugin? Reduces bash output tokens by 60-90%.",
+    initialValue: true,
+  })
+
+  const installSqueezePlugin = isCancel(squeezeAnswer) ? false : squeezeAnswer
+
+  backupExistingConfig()
+
+  const configObject = buildConfig(tierChoices, TEMPLATES_DIR)
+  writeConfig(configObject)
+  writeAgentPrompts(TEMPLATES_DIR)
+  writeThemes(TEMPLATES_DIR)
+  writeTuiConfig("pluidr-contrast")
+  writePluginBundle()
+  writePluginPackageJson()
+  if (installSqueezePlugin) {
+    await installSqueeze()
+  }
+
+  const path = getConfigPath().replace(/\\/g, "/").replace(/^\//, "")
+  console.log(`Pluidr setup complete!\nYou can update your agent model settings later in \x1b]8;;file:///${path}\x1b\\opencode.jsonc\x1b]8;;\x1b\\`)
+}

package/src/cli/commands/launch.js

@@ -1,44 +1,46 @@
-import { spawn } from "node:child_process"
-import { confirm, isCancel } from "@clack/prompts"
-import { checkAndPromptUpdate } from "../../core/versionCheck.js"
-import { version } from "../../core/version.js"
-import { collectChecks } from "./doctor.js"
-import { runInit } from "./init.js"
-
-export async function runLaunch() {
-  // 1. Update check
-  await checkAndPromptUpdate(version)
-
-  // 2. Doctor check
-  process.stdout.write("Running doctor...         ")
-  const checks = collectChecks()
-  const allPass = checks.every((c) => c.pass)
-
-  if (allPass) {
-    console.log("✓ All checks passed")
-  } else {
-    const failed = checks.filter((c) => !c.pass)
-    console.log(`✗ ${failed.length} check${failed.length > 1 ? "s" : ""} failed`)
-    for (const c of failed) {
-      const detail = c.detail ? ` (${c.detail})` : ""
-      console.log(`  ✗ ${c.component}${detail}`)
-    }
-
-    const answer = await confirm({ message: "Repair with pluidr init?", initialValue: true })
-    if (!isCancel(answer) && answer) {
-      await runInit()
-    }
-  }
-
-  // 3. Launch opencode
-  console.log("Launching opencode...")
-  const child = spawn("opencode", [], { stdio: "inherit" })
-  child.on("error", (err) => {
-    if (err.code === "ENOENT") {
-      console.error("Error: opencode not found on PATH. Install it from https://opencode.ai")
-    } else {
-      console.error(`Error launching opencode: ${err.message}`)
-    }
-    process.exit(1)
-  })
-}
+import { spawn } from "node:child_process"
+import { confirm, isCancel } from "@clack/prompts"
+import { checkAndPromptUpdate } from "../../core/versionCheck.js"
+import { version } from "../../core/version.js"
+import { collectChecks } from "./doctor.js"
+import { runInit } from "./init.js"
+
+export async function runLaunch() {
+  // 1. Update check
+  await checkAndPromptUpdate(version)
+
+  // 2. Doctor check
+  process.stdout.write("Running doctor...         ")
+  const checks = collectChecks()
+  const allPass = checks.every((c) => c.pass)
+
+  if (allPass) {
+    console.log("✓ All checks passed")
+  } else {
+    const failed = checks.filter((c) => !c.pass)
+    console.log(`✗ ${failed.length} check${failed.length > 1 ? "s" : ""} failed`)
+    for (const c of failed) {
+      const detail = c.detail ? ` (${c.detail})` : ""
+      console.log(`  ✗ ${c.component}${detail}`)
+    }
+
+    const answer = await confirm({ message: "Repair with pluidr init?", initialValue: true })
+    if (!isCancel(answer) && answer) {
+      await runInit()
+    }
+  }
+
+  // 3. Launch opencode
+  console.log("Launching pluidr...")
+  const child = process.platform === "win32"
+    ? spawn("opencode", { stdio: "inherit", shell: true })
+    : spawn("opencode", [], { stdio: "inherit" })
+  child.on("error", (err) => {
+    if (err.code === "ENOENT") {
+      console.error("Error: opencode not found on PATH. Install it from https://opencode.ai")
+    } else {
+      console.error(`Error launching opencode: ${err.message}`)
+    }
+    process.exit(1)
+  })
+}