@open-cr-agent/cli 0.3.0 → 0.5.0

package/dist/review/settings-sources.js

@@ -0,0 +1,58 @@
+import { ACCOUNT_SCALARS } from "./cloud-settings.js";
+import { forTerminal } from "./terminal.js";
+const TIERS = ["top", "standard", "light"];
+/** file: the configuration before the account's settings; effective: after; filled: what they filled. */
+export function effectiveSettings(file, effective, filled) {
+    const settings = [];
+    const add = (key, value, fromFile) => {
+        const fromAccount = filled.includes(key);
+        const source = fromFile && fromAccount
+            ? "file+account"
+            : fromAccount
+                ? "account"
+                : fromFile
+                    ? "file"
+                    : "default";
+        settings.push(source === "default" ? { key, source } : { key, value, source });
+    };
+    add("runtime", effective.runtime, file.runtimeSet);
+    for (const tier of TIERS) {
+        add(`models.${tier}`, effective.models[tier], file.models[tier] !== undefined);
+    }
+    for (const tier of TIERS) {
+        add(`effort.${tier}`, effective.effort[tier], file.effort[tier] !== undefined);
+    }
+    for (const [id, entry] of Object.entries(effective.reviewers)) {
+        add(`reviewers.${id}`, entry, file.reviewers[id] !== undefined);
+    }
+    for (const [role, entry] of Object.entries(effective.roles)) {
+        add(`roles.${role}`, entry, file.roles[role] !== undefined);
+    }
+    for (const key of ACCOUNT_SCALARS)
+        add(key, effective[key], file[key] !== undefined);
+    add("include", effective.include, file.include.length > 0);
+    add("exclude", effective.exclude, file.exclude.length > 0);
+    add("rules", effective.rules.map(({ path, source }) => ({ path, source })), file.rules.length > 0);
+    // A flag rather than a key: listed only when the account turned it on.
+    if (filled.includes("ultra"))
+        settings.push({ key: "ultra", value: true, source: "account" });
+    return settings;
+}
+export function renderSettings(settings, account) {
+    const lines = [
+        "",
+        account
+            ? `Settings (under your ocra Cloud settings, version ${account.version ?? "none"}):`
+            : "Settings:",
+    ];
+    const set = settings.filter((s) => s.source !== "default");
+    const width = Math.max(0, ...set.map((s) => s.key.length));
+    for (const s of set) {
+        lines.push(`  ${s.key.padEnd(width)}  ${JSON.stringify(s.value)}  (${s.source})`);
+    }
+    const defaults = settings.filter((s) => s.source === "default").map((s) => s.key);
+    if (defaults.length > 0)
+        lines.push(`  default: ${defaults.join(", ")}`);
+    return forTerminal(`${lines.join("\n")}\n`);
+}
+//# sourceMappingURL=settings-sources.js.map

package/dist/review/target.d.ts

@@ -4,6 +4,7 @@ import { type CliConfig } from "./config.js";
 export interface ReviewTarget {
     config: CliConfig;
     plugins: OcraPlugin[];
+    accountPlugins: boolean;
     createVcs(registry: PluginRegistry): VcsAdapter;
     readTrusted?: (path: string) => Promise<string | undefined>;
     publish: boolean;

package/dist/review/target.js

@@ -16,6 +16,7 @@ export async function localTarget(args, cwd, root, env, warn, fetchImpl) {
         config,
         // Plugins named by the user's own file are resolved from where it is.
         plugins: await loadExternalPlugins(config.plugins, args.configFile ? dirname(args.configFile) : root),
+        accountPlugins: !args.ignoreRepoConfig,
         createVcs: (registry) => registry.createVcs("local", { cwd, target: args.target }),
         ...(args.ignoreRepoConfig ? { readTrusted: untrustedTreeReader(args, cwd) } : {}),
         publish: false,
@@ -62,6 +63,7 @@ export async function pullRequestTarget(pr, cwd, root, env, warn, fetchImpl, ign
     return {
         config,
         plugins: [],
+        accountPlugins: false,
         createVcs: (registry) => registry.createVcs("github", {
             owner,
             repo,
@@ -90,7 +92,7 @@ const GITLAB_API = "https://gitlab.com/api/v4";
 export async function mergeRequestTarget(mr, cwd, root, env, warn, fetchImpl, ignoreRepoConfig = false, configFile) {
     const token = env.GITLAB_TOKEN;
     if (!token) {
-        throw new OcraError("CONFIG_CREDENTIALS_MISSING", "--mr needs a GitLab token in GITLAB_TOKEN: a project access token with the api scope and the Developer role (CI_JOB_TOKEN cannot post comments)");
+        throw new OcraError("CONFIG_CREDENTIALS_MISSING", "--mr needs a GitLab token in GITLAB_TOKEN with the api scope and the Developer role: a project access token, or on GitLab.com Free a personal access token of a dedicated account (CI_JOB_TOKEN cannot post comments)");
     }
     const origin = await originUrl(root);
     const project = mr.project ?? env.CI_PROJECT_ID ?? gitlabProject(origin);
@@ -125,6 +127,7 @@ export async function mergeRequestTarget(mr, cwd, root, env, warn, fetchImpl, ig
     return {
         config,
         plugins: [],
+        accountPlugins: false,
         createVcs: (registry) => registry.createVcs("gitlab", {
             project: /^\d+$/.test(project) ? Number(project) : project,
             iid: mr.iid,

package/dist/run.js

@@ -2,8 +2,11 @@ import { writeFile } from "node:fs/promises";
 import { parseArgs } from "node:util";
 import { isOcraError } from "@open-cr-agent/core";
 import { errorMessage } from "@open-cr-agent/core/internal";
+import { cloudCommand, defaultCloudDeps, LOGIN_USAGE } from "./cloud.js";
 import { memoryCommand } from "./memory.js";
 import { metricsCommand } from "./metrics.js";
+import { pluginsDir } from "./plugin-store.js";
+import { defaultNpm, PLUGINS_USAGE, pluginsCommand } from "./plugins-command.js";
 import { parseReviewArgs, REVIEW_USAGE, UsageError } from "./review/args.js";
 import { BUILTIN_PLUGINS, EXIT, reviewCommand } from "./review/command.js";
 import { BUILTIN_RUNTIMES } from "./review/runtimes.js";
@@ -15,6 +18,10 @@ Commands:
   review      Review code changes (run "ocra review --help" for options)
   memory      Remember findings the team accepts (run "ocra memory --help")
   metrics     Counts over past reviews: runs, cost, findings, per reviewer (run "ocra metrics --help")
+  plugins     Allow plugins your ocra Cloud settings name on this machine (run "ocra plugins --help")
+  login       Sign in to ocra Cloud (in development; run "ocra login --help")
+  logout      Sign out of ocra Cloud
+  whoami      Show the ocra Cloud account
 
 Options:
   -h, --help     Show help
@@ -27,6 +34,7 @@ export function defaultDeps() {
         builtinPlugins: BUILTIN_PLUGINS,
         runtimes: BUILTIN_RUNTIMES,
         writeFile: (path, content) => writeFile(path, content, "utf8"),
+        cloud: defaultCloudDeps(process.env),
         now: Date.now,
         heartbeatMs: 30_000,
         onInterrupt(handler) {
@@ -61,6 +69,34 @@ export async function run(argv, out, err, deps = defaultDeps()) {
             return EXIT.error;
         }
     }
+    if (command === "plugins") {
+        try {
+            return await pluginsCommand(rest, out, {
+                dir: pluginsDir(deps.env),
+                npm: deps.npm ?? defaultNpm(),
+            });
+        }
+        catch (error) {
+            if (error instanceof UsageError) {
+                err.write(`${error.message ? `${error.message}\n\n` : ""}${PLUGINS_USAGE}`);
+            }
+            else
+                err.write(failure(error));
+            return EXIT.error;
+        }
+    }
+    if (command === "login" || command === "logout" || command === "whoami") {
+        try {
+            return await cloudCommand(command, rest, out, err, defaultCloudDeps(deps.env));
+        }
+        catch (error) {
+            if (error instanceof UsageError)
+                err.write(`${error.message}\n\n${LOGIN_USAGE}`);
+            else
+                err.write(failure(error));
+            return EXIT.error;
+        }
+    }
     if (command !== undefined && !command.startsWith("-")) {
         err.write(`Unknown command: ${command}\n\n${USAGE}`);
         return EXIT.error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-cr-agent/cli",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "ocra: open-source multi-agent code review for local changes and GitHub pull requests",
   "keywords": [
     "code-review",
@@ -10,7 +10,7 @@
     "github-action"
   ],
   "license": "Apache-2.0",
-  "homepage": "https://ocra.majincheng.com",
+  "homepage": "https://ocracloud.com",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/jma49/Open-CR-Agent.git",
@@ -37,15 +37,15 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@open-cr-agent/core": "0.3.0",
-    "@open-cr-agent/runtime-direct": "0.3.0",
-    "@open-cr-agent/vcs-github": "0.3.0",
-    "@open-cr-agent/vcs-gitlab": "0.3.0",
-    "@open-cr-agent/vcs-local": "0.3.0",
+    "@open-cr-agent/core": "0.5.0",
+    "@open-cr-agent/runtime-direct": "0.5.0",
+    "@open-cr-agent/vcs-github": "0.5.0",
+    "@open-cr-agent/vcs-gitlab": "0.5.0",
+    "@open-cr-agent/vcs-local": "0.5.0",
     "zod": "^4.6.5"
   },
   "optionalDependencies": {
-    "@open-cr-agent/runtime-opencode": "0.3.0"
+    "@open-cr-agent/runtime-opencode": "0.5.0"
   },
   "publishConfig": {
     "access": "public"