offwatch 0.5.12 → 0.5.14

package/src/commands/client/approval.ts

@@ -1,259 +0,0 @@
-import { Command } from "commander";
-import {
-  createApprovalSchema,
-  requestApprovalRevisionSchema,
-  resolveApprovalSchema,
-  resubmitApprovalSchema,
-  type Approval,
-  type ApprovalComment,
-} from "@paperclipai/shared";
-import {
-  addCommonClientOptions,
-  formatInlineRecord,
-  handleCommandError,
-  printOutput,
-  resolveCommandContext,
-  type BaseClientOptions,
-} from "./common.js";
-
-interface ApprovalListOptions extends BaseClientOptions {
-  companyId?: string;
-  status?: string;
-}
-
-interface ApprovalDecisionOptions extends BaseClientOptions {
-  decisionNote?: string;
-  decidedByUserId?: string;
-}
-
-interface ApprovalCreateOptions extends BaseClientOptions {
-  companyId?: string;
-  type: string;
-  requestedByAgentId?: string;
-  payload: string;
-  issueIds?: string;
-}
-
-interface ApprovalResubmitOptions extends BaseClientOptions {
-  payload?: string;
-}
-
-interface ApprovalCommentOptions extends BaseClientOptions {
-  body: string;
-}
-
-export function registerApprovalCommands(program: Command): void {
-  const approval = program.command("approval").description("Approval operations");
-
-  addCommonClientOptions(
-    approval
-      .command("list")
-      .description("List approvals for a company")
-      .requiredOption("-C, --company-id <id>", "Company ID")
-      .option("--status <status>", "Status filter")
-      .action(async (opts: ApprovalListOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts, { requireCompany: true });
-          const params = new URLSearchParams();
-          if (opts.status) params.set("status", opts.status);
-          const query = params.toString();
-          const rows =
-            (await ctx.api.get<Approval[]>(
-              `/api/companies/${ctx.companyId}/approvals${query ? `?${query}` : ""}`,
-            )) ?? [];
-
-          if (ctx.json) {
-            printOutput(rows, { json: true });
-            return;
-          }
-
-          if (rows.length === 0) {
-            printOutput([], { json: false });
-            return;
-          }
-
-          for (const row of rows) {
-            console.log(
-              formatInlineRecord({
-                id: row.id,
-                type: row.type,
-                status: row.status,
-                requestedByAgentId: row.requestedByAgentId,
-                requestedByUserId: row.requestedByUserId,
-              }),
-            );
-          }
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-    { includeCompany: false },
-  );
-
-  addCommonClientOptions(
-    approval
-      .command("get")
-      .description("Get one approval")
-      .argument("<approvalId>", "Approval ID")
-      .action(async (approvalId: string, opts: BaseClientOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const row = await ctx.api.get<Approval>(`/api/approvals/${approvalId}`);
-          printOutput(row, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-
-  addCommonClientOptions(
-    approval
-      .command("create")
-      .description("Create an approval request")
-      .requiredOption("-C, --company-id <id>", "Company ID")
-      .requiredOption("--type <type>", "Approval type (hire_agent|approve_ceo_strategy)")
-      .requiredOption("--payload <json>", "Approval payload as JSON object")
-      .option("--requested-by-agent-id <id>", "Requesting agent ID")
-      .option("--issue-ids <csv>", "Comma-separated linked issue IDs")
-      .action(async (opts: ApprovalCreateOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts, { requireCompany: true });
-          const payloadJson = parseJsonObject(opts.payload, "payload");
-          const payload = createApprovalSchema.parse({
-            type: opts.type,
-            payload: payloadJson,
-            requestedByAgentId: opts.requestedByAgentId,
-            issueIds: parseCsv(opts.issueIds),
-          });
-          const created = await ctx.api.post<Approval>(`/api/companies/${ctx.companyId}/approvals`, payload);
-          printOutput(created, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-    { includeCompany: false },
-  );
-
-  addCommonClientOptions(
-    approval
-      .command("approve")
-      .description("Approve an approval request")
-      .argument("<approvalId>", "Approval ID")
-      .option("--decision-note <text>", "Decision note")
-      .option("--decided-by-user-id <id>", "Decision actor user ID")
-      .action(async (approvalId: string, opts: ApprovalDecisionOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const payload = resolveApprovalSchema.parse({
-            decisionNote: opts.decisionNote,
-            decidedByUserId: opts.decidedByUserId,
-          });
-          const updated = await ctx.api.post<Approval>(`/api/approvals/${approvalId}/approve`, payload);
-          printOutput(updated, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-
-  addCommonClientOptions(
-    approval
-      .command("reject")
-      .description("Reject an approval request")
-      .argument("<approvalId>", "Approval ID")
-      .option("--decision-note <text>", "Decision note")
-      .option("--decided-by-user-id <id>", "Decision actor user ID")
-      .action(async (approvalId: string, opts: ApprovalDecisionOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const payload = resolveApprovalSchema.parse({
-            decisionNote: opts.decisionNote,
-            decidedByUserId: opts.decidedByUserId,
-          });
-          const updated = await ctx.api.post<Approval>(`/api/approvals/${approvalId}/reject`, payload);
-          printOutput(updated, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-
-  addCommonClientOptions(
-    approval
-      .command("request-revision")
-      .description("Request revision for an approval")
-      .argument("<approvalId>", "Approval ID")
-      .option("--decision-note <text>", "Decision note")
-      .option("--decided-by-user-id <id>", "Decision actor user ID")
-      .action(async (approvalId: string, opts: ApprovalDecisionOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const payload = requestApprovalRevisionSchema.parse({
-            decisionNote: opts.decisionNote,
-            decidedByUserId: opts.decidedByUserId,
-          });
-          const updated = await ctx.api.post<Approval>(`/api/approvals/${approvalId}/request-revision`, payload);
-          printOutput(updated, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-
-  addCommonClientOptions(
-    approval
-      .command("resubmit")
-      .description("Resubmit an approval (optionally with new payload)")
-      .argument("<approvalId>", "Approval ID")
-      .option("--payload <json>", "Payload JSON object")
-      .action(async (approvalId: string, opts: ApprovalResubmitOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const payload = resubmitApprovalSchema.parse({
-            payload: opts.payload ? parseJsonObject(opts.payload, "payload") : undefined,
-          });
-          const updated = await ctx.api.post<Approval>(`/api/approvals/${approvalId}/resubmit`, payload);
-          printOutput(updated, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-
-  addCommonClientOptions(
-    approval
-      .command("comment")
-      .description("Add comment to an approval")
-      .argument("<approvalId>", "Approval ID")
-      .requiredOption("--body <text>", "Comment body")
-      .action(async (approvalId: string, opts: ApprovalCommentOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const created = await ctx.api.post<ApprovalComment>(`/api/approvals/${approvalId}/comments`, {
-            body: opts.body,
-          });
-          printOutput(created, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-}
-
-function parseCsv(value: string | undefined): string[] | undefined {
-  if (!value) return undefined;
-  const rows = value.split(",").map((v) => v.trim()).filter(Boolean);
-  return rows.length > 0 ? rows : undefined;
-}
-
-function parseJsonObject(value: string, name: string): Record<string, unknown> {
-  try {
-    const parsed = JSON.parse(value) as unknown;
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      throw new Error(`${name} must be a JSON object`);
-    }
-    return parsed as Record<string, unknown>;
-  } catch (err) {
-    throw new Error(`Invalid ${name} JSON: ${err instanceof Error ? err.message : String(err)}`);
-  }
-}

package/src/commands/client/auth.ts

@@ -1,113 +0,0 @@
-import type { Command } from "commander";
-import {
-  getStoredBoardCredential,
-  loginBoardCli,
-  removeStoredBoardCredential,
-  revokeStoredBoardCredential,
-} from "../../client/board-auth.js";
-import {
-  addCommonClientOptions,
-  handleCommandError,
-  printOutput,
-  resolveCommandContext,
-  type BaseClientOptions,
-} from "./common.js";
-
-interface AuthLoginOptions extends BaseClientOptions {
-  instanceAdmin?: boolean;
-}
-
-interface AuthLogoutOptions extends BaseClientOptions {}
-interface AuthWhoamiOptions extends BaseClientOptions {}
-
-export function registerClientAuthCommands(auth: Command): void {
-  addCommonClientOptions(
-    auth
-      .command("login")
-      .description("Authenticate the CLI for board-user access")
-      .option("--instance-admin", "Request instance-admin approval instead of plain board access", false)
-      .action(async (opts: AuthLoginOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const login = await loginBoardCli({
-            apiBase: ctx.api.apiBase,
-            requestedAccess: opts.instanceAdmin ? "instance_admin_required" : "board",
-            requestedCompanyId: ctx.companyId ?? null,
-            command: "paperclipai auth login",
-          });
-          printOutput(
-            {
-              ok: true,
-              apiBase: ctx.api.apiBase,
-              userId: login.userId ?? null,
-              approvalUrl: login.approvalUrl,
-            },
-            { json: ctx.json },
-          );
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-    { includeCompany: true },
-  );
-
-  addCommonClientOptions(
-    auth
-      .command("logout")
-      .description("Remove the stored board-user credential for this API base")
-      .action(async (opts: AuthLogoutOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const credential = getStoredBoardCredential(ctx.api.apiBase);
-          if (!credential) {
-            printOutput({ ok: true, apiBase: ctx.api.apiBase, revoked: false, removedLocalCredential: false }, { json: ctx.json });
-            return;
-          }
-          let revoked = false;
-          try {
-            await revokeStoredBoardCredential({
-              apiBase: ctx.api.apiBase,
-              token: credential.token,
-            });
-            revoked = true;
-          } catch {
-            // Remove the local credential even if the server-side revoke fails.
-          }
-          const removedLocalCredential = removeStoredBoardCredential(ctx.api.apiBase);
-          printOutput(
-            {
-              ok: true,
-              apiBase: ctx.api.apiBase,
-              revoked,
-              removedLocalCredential,
-            },
-            { json: ctx.json },
-          );
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-
-  addCommonClientOptions(
-    auth
-      .command("whoami")
-      .description("Show the current board-user identity for this API base")
-      .action(async (opts: AuthWhoamiOptions) => {
-        try {
-          const ctx = resolveCommandContext(opts);
-          const me = await ctx.api.get<{
-            user: { id: string; name: string; email: string } | null;
-            userId: string;
-            isInstanceAdmin: boolean;
-            companyIds: string[];
-            source: string;
-            keyId: string | null;
-          }>("/api/cli-auth/me");
-          printOutput(me, { json: ctx.json });
-        } catch (err) {
-          handleCommandError(err);
-        }
-      }),
-  );
-}

package/src/commands/client/common.ts

@@ -1,221 +0,0 @@
-import pc from "picocolors";
-import type { Command } from "commander";
-import { getStoredBoardCredential, loginBoardCli } from "../../client/board-auth.js";
-import { buildCliCommandLabel } from "../../client/command-label.js";
-import { readConfig } from "../../config/store.js";
-import { readContext, resolveProfile, type ClientContextProfile } from "../../client/context.js";
-import { ApiRequestError, PaperclipApiClient } from "../../client/http.js";
-
-export interface BaseClientOptions {
-  config?: string;
-  dataDir?: string;
-  context?: string;
-  profile?: string;
-  apiBase?: string;
-  apiKey?: string;
-  companyId?: string;
-  json?: boolean;
-}
-
-export interface ResolvedClientContext {
-  api: PaperclipApiClient;
-  companyId?: string;
-  profileName: string;
-  profile: ClientContextProfile;
-  json: boolean;
-}
-
-export function addCommonClientOptions(command: Command, opts?: { includeCompany?: boolean }): Command {
-  command
-    .option("-c, --config <path>", "Path to Paperclip config file")
-    .option("-d, --data-dir <path>", "Paperclip data directory root (isolates state from ~/.paperclip)")
-    .option("--context <path>", "Path to CLI context file")
-    .option("--profile <name>", "CLI context profile name")
-    .option("--api-base <url>", "Base URL for the Paperclip API")
-    .option("--api-key <token>", "Bearer token for agent-authenticated calls")
-    .option("--json", "Output raw JSON");
-
-  if (opts?.includeCompany) {
-    command.option("-C, --company-id <id>", "Company ID (overrides context default)");
-  }
-
-  return command;
-}
-
-export function resolveCommandContext(
-  options: BaseClientOptions,
-  opts?: { requireCompany?: boolean },
-): ResolvedClientContext {
-  const context = readContext(options.context);
-  const { name: profileName, profile } = resolveProfile(context, options.profile);
-
-  const apiBase =
-    options.apiBase?.trim() ||
-    process.env.PAPERCLIP_API_URL?.trim() ||
-    profile.apiBase ||
-    inferApiBaseFromConfig(options.config);
-
-  const explicitApiKey =
-    options.apiKey?.trim() ||
-    process.env.PAPERCLIP_API_KEY?.trim() ||
-    readKeyFromProfileEnv(profile);
-  const storedBoardCredential = explicitApiKey ? null : getStoredBoardCredential(apiBase);
-  const apiKey = explicitApiKey || storedBoardCredential?.token;
-
-  const companyId =
-    options.companyId?.trim() ||
-    process.env.PAPERCLIP_COMPANY_ID?.trim() ||
-    profile.companyId;
-
-  if (opts?.requireCompany && !companyId) {
-    throw new Error(
-      "Company ID is required. Pass --company-id, set PAPERCLIP_COMPANY_ID, or set context profile companyId via `paperclipai context set`.",
-    );
-  }
-
-  const api = new PaperclipApiClient({
-    apiBase,
-    apiKey,
-    recoverAuth: explicitApiKey || !canAttemptInteractiveBoardAuth()
-      ? undefined
-      : async ({ error }) => {
-          const requestedAccess = error.message.includes("Instance admin required")
-            ? "instance_admin_required"
-            : "board";
-          if (!shouldRecoverBoardAuth(error)) {
-            return null;
-          }
-          const login = await loginBoardCli({
-            apiBase,
-            requestedAccess,
-            requestedCompanyId: companyId ?? null,
-            command: buildCliCommandLabel(),
-          });
-          return login.token;
-        },
-  });
-  return {
-    api,
-    companyId,
-    profileName,
-    profile,
-    json: Boolean(options.json),
-  };
-}
-
-function shouldRecoverBoardAuth(error: ApiRequestError): boolean {
-  if (error.status === 401) return true;
-  if (error.status !== 403) return false;
-  return error.message.includes("Board access required") || error.message.includes("Instance admin required");
-}
-
-function canAttemptInteractiveBoardAuth(): boolean {
-  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
-
-export function printOutput(data: unknown, opts: { json?: boolean; label?: string } = {}): void {
-  if (opts.json) {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
-
-  if (opts.label) {
-    console.log(pc.bold(opts.label));
-  }
-
-  if (Array.isArray(data)) {
-    if (data.length === 0) {
-      console.log(pc.dim("(empty)"));
-      return;
-    }
-    for (const item of data) {
-      if (typeof item === "object" && item !== null) {
-        console.log(formatInlineRecord(item as Record<string, unknown>));
-      } else {
-        console.log(String(item));
-      }
-    }
-    return;
-  }
-
-  if (typeof data === "object" && data !== null) {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
-
-  if (data === undefined || data === null) {
-    console.log(pc.dim("(null)"));
-    return;
-  }
-
-  console.log(String(data));
-}
-
-export function formatInlineRecord(record: Record<string, unknown>): string {
-  const keyOrder = ["identifier", "id", "name", "status", "priority", "title", "action"];
-  const seen = new Set<string>();
-  const parts: string[] = [];
-
-  for (const key of keyOrder) {
-    if (!(key in record)) continue;
-    parts.push(`${key}=${renderValue(record[key])}`);
-    seen.add(key);
-  }
-
-  for (const [key, value] of Object.entries(record)) {
-    if (seen.has(key)) continue;
-    if (typeof value === "object") continue;
-    parts.push(`${key}=${renderValue(value)}`);
-  }
-
-  return parts.join(" ");
-}
-
-function renderValue(value: unknown): string {
-  if (value === null || value === undefined) return "-";
-  if (typeof value === "string") {
-    const compact = value.replace(/\s+/g, " ").trim();
-    return compact.length > 90 ? `${compact.slice(0, 87)}...` : compact;
-  }
-  if (typeof value === "number" || typeof value === "boolean") {
-    return String(value);
-  }
-  return "[object]";
-}
-
-function inferApiBaseFromConfig(configPath?: string): string {
-  const envHost = process.env.PAPERCLIP_SERVER_HOST?.trim() || "localhost";
-  let port = Number(process.env.PAPERCLIP_SERVER_PORT || "");
-
-  if (!Number.isFinite(port) || port <= 0) {
-    try {
-      const config = readConfig(configPath);
-      port = Number(config?.server?.port ?? 3100);
-    } catch {
-      port = 3100;
-    }
-  }
-
-  if (!Number.isFinite(port) || port <= 0) {
-    port = 3100;
-  }
-
-  return `http://${envHost}:${port}`;
-}
-
-function readKeyFromProfileEnv(profile: ClientContextProfile): string | undefined {
-  if (!profile.apiKeyEnvVarName) return undefined;
-  return process.env[profile.apiKeyEnvVarName]?.trim() || undefined;
-}
-
-export function handleCommandError(error: unknown): never {
-  if (error instanceof ApiRequestError) {
-    const detailSuffix = error.details !== undefined ? ` details=${JSON.stringify(error.details)}` : "";
-    console.error(pc.red(`API error ${error.status}: ${error.message}${detailSuffix}`));
-    process.exit(1);
-  }
-
-  const message = error instanceof Error ? error.message : String(error);
-  console.error(pc.red(message));
-  process.exit(1);
-}