@islamihab/kds 0.11.0 → 0.12.0

package/index.js

@@ -14623,7 +14623,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "cli",
-  version: "0.11.0",
+  version: "0.12.0",
   private: true,
   type: "module",
   bin: {
@@ -15196,9 +15196,20 @@ var components = componentsGeneric();
 
 // ../../packages/backend/convex/constants.ts
 var KDS_DEVICE_AUTH_CLIENT_ID = "kds-cli";
-var PAGE_MODES = ["themed", "raw"];
+var PAGE_STYLES = {
+  basic: {
+    description: "a report in the house theme with a light/dark toggle and the credit line, where you write only what goes inside the page"
+  },
+  mockup: {
+    description: "an interactive prototype where the fragment is the screen of a phone, its own <style> and <script> tags do the rest, it fills the display on a real phone, and its manifest and apple-touch-icon install it under its own name and icon"
+  },
+  unthemed: {
+    description: "a blank document where the fragment is served as written with nothing added, so its own <style> and <script> tags decide everything"
+  }
+};
 var PAGE_VISIBILITIES = ["public", "private"];
 var MAX_PAGE_HTML_BYTES = 4000000;
+var MAX_PAGE_VERSIONS = 20;
 var ISSUE_STATUSES = [
   "backlog",
   "todo",
@@ -17346,6 +17357,7 @@ var localDateString = (timestamp) => {
   return `${date5.getFullYear()}-${month}-${day}`;
 };
 var localToday = () => localDateString(Date.now());
+var describeChoices = (choices, separator = "; ") => Object.entries(choices).map(([key, { description }]) => `${key}: ${description}`).join(separator);
 
 // src/lib/zod.ts
 var configSchema = exports_external.object({ sessionToken: exports_external.string().optional(), convexUrl: exports_external.url(), convexSiteUrl: exports_external.url() });
@@ -24120,6 +24132,10 @@ var issueActivityLine = (detail) => {
     case "attachment_added":
     case "attachment_removed":
       return `${label}: ${detail.name}`;
+    case "page_linked":
+    case "page_unlinked":
+    case "page_updated":
+      return `${label}: ${detail.title}`;
     case "child_added":
     case "child_removed":
       return `${label}: ${detail.identifier}`;
@@ -24413,15 +24429,6 @@ var repoProject = async (client3) => {
     throw new Error(`No project is connected to ${repo}. Connect one on the project in the dashboard.`);
   return project;
 };
-var resolveMilestone = async (client3, projectId, name) => {
-  const milestone = await client3.query(api2.milestones.find, { projectId, name });
-  if (!milestone) {
-    const milestones = await client3.query(api2.milestones.listByProject, { projectId, today: localToday() });
-    const names = milestones.map((candidate) => candidate.name).join(", ");
-    throw new Error(names ? `No milestone named "${name}". The project has: ${names}.` : "The project has no milestones.");
-  }
-  return milestone;
-};
 
 // src/commands/clients/charges/list.ts
 var monthName = (month) => new Date(Date.UTC(2000, month - 1)).toLocaleString("en-US", { month: "short", timeZone: "UTC" });
@@ -24691,9 +24698,10 @@ var create2 = command({
   name: "create",
   description: "Record a cost and print its id",
   longDescription: `One record per real-world bill, never one per project. A cost links to any number
-of projects, each carrying the full amount; no links at all is overhead. Billable
-costs pass through onto a client's invoices, so their projects must all belong to
-the same client.`,
+of projects, each carrying the full amount; until a client's project carries it, it
+is overhead. Billable
+costs pass through onto the invoices of whichever client their projects belong to,
+so the links cannot span two clients; with no links, billable waits for one.`,
   positionals: {
     name: exports_external.string().describe('What the bill is for, e.g. "Figma seats"')
   },
@@ -24750,9 +24758,10 @@ var costKindLabel = (cost) => {
   return cost.endDate === undefined ? cost.kind : `${cost.kind} \u2192 ${cost.endDate}`;
 };
 var costProjectsLabel = (cost) => {
-  if (cost.overhead)
-    return "overhead";
-  return cost.projects.length === 0 ? "(deleted project)" : cost.projects.map((project) => project.name).join(", ");
+  const names = cost.projects.map((project) => project.name).join(", ");
+  if (!cost.overhead)
+    return names;
+  return names === "" ? "overhead" : `overhead (${names})`;
 };
 
 // src/commands/costs/get.ts
@@ -24800,7 +24809,7 @@ after an edit. A yearly cost lands whole in its renewal month, never amortized.`
     month: exports_external.string().optional().describe("Derive one month's costs (YYYY-MM)").meta({ short: "m" }),
     kind: exports_external.enum(COST_KINDS).optional().describe("Only one_off, monthly, or yearly").meta({ short: "k" }),
     project: exports_external.string().optional().describe("Only costs linked to this project (id, URL, or repo)").meta({ short: "p" }),
-    overhead: exports_external.boolean().default(false).describe("Only costs with no project links"),
+    overhead: exports_external.boolean().default(false).describe("Only costs no client's project carries"),
     billable: exports_external.boolean().optional().describe("Only billable costs, or --no-billable").meta({ negatable: true }),
     limit: exports_external.coerce.number().int().positive().default(50).describe("Most costs to print"),
     json: exports_external.boolean().default(false).describe("Print as JSON")
@@ -24908,7 +24917,7 @@ var costs = group({
   description: "Manage costs",
   longDescription: `A cost is money the studio spends, recorded once per real-world bill. It links to any
 number of projects \u2014 each carrying the full amount, so per-project figures never sum
-to the studio total \u2014 and no links at all is overhead. Occurrences are always derived
+to the studio total. A cost no client's project carries is overhead. Occurrences are always derived
 from the record, so \`costs list --month\` answers for any month, past or future.`,
   commands: [create2, list3, get2, update3, end, remove2]
 });
@@ -25739,7 +25748,7 @@ var printTasks = (tasks) => {
 };
 
 // src/commands/issues/get.ts
-var printIssue = ({ relations, attachments, tasks, feed, milestone, ...issue3 }) => {
+var printIssue = ({ relations, attachments, pages, tasks, feed, milestone, ...issue3 }) => {
   const project = issue3.project;
   console.log(`${issue3.identifier} ${issue3.title}`);
   console.log(`Status: ${issue3.status} \xB7 Priority: ${issue3.priority} \xB7 Disposition: ${issue3.disposition}`);
@@ -25778,6 +25787,12 @@ var printIssue = ({ relations, attachments, tasks, feed, milestone, ...issue3 })
       console.log(`  ${attachment.name} \u2014 ${attachment.url ?? "unavailable"}`);
     }
   }
+  if (pages.length > 0) {
+    console.log("Pages:");
+    for (const page of pages) {
+      console.log(`  ${page.title} (${page.style}, ${page.visibility}) \u2014 ${page.url}`);
+    }
+  }
   printTasks(tasks);
   if (issue3.descriptionMarkdown)
     console.log(`
@@ -25819,10 +25834,11 @@ var get4 = command({
       throw new Error(`No issues match ${missing.join(", ")}.`);
     const details = found.flatMap((detail) => detail ? [detail] : []);
     if (json2) {
-      const objects = details.map(({ relations, attachments, tasks, feed, milestone: _, ...issue3 }) => ({
+      const objects = details.map(({ relations, attachments, pages, tasks, feed, milestone: _, ...issue3 }) => ({
         ...issue3,
         relations,
         attachments,
+        pages,
         tasks,
         feed
       }));
@@ -25911,7 +25927,50 @@ var labels = group({
   commands: [create5, list6, update5, remove4]
 });
 
+// src/commands/issues/link-pr.ts
+var linkPr = command({
+  name: "link-pr",
+  description: "Link a pull request to an issue by hand",
+  longDescription: `For a pull request the webhook cannot match on its own: work that started before
+its issue existed, so the branch never carried the identifier, or a second issue the
+same pull request lands. From here reviews and the merge move the issue as usual.
+--claim applies what opening the pull request would have: unstarted work moves to
+in_progress; any other status is kept.`,
+  positionals: {
+    id: exports_external.string().describe("Issue identifier, number, or URL"),
+    url: exports_external.string().describe("Pull request URL")
+  },
+  options: {
+    claim: exports_external.boolean().default(false).describe("Move backlog or todo work to in_progress along with the link")
+  },
+  run: async ({ positionals: { id, url: url2 }, options: { claim: claim2 } }) => {
+    const client3 = await backendClient();
+    const { identifier, linked, status: status3 } = await client3.mutation(api2.issues.linkPr, {
+      id: readIssueRef(id),
+      prUrl: url2,
+      ...claim2 ? { claim: claim2 } : {}
+    });
+    console.log(`${linked ? "Linked" : "Already linked"} ${url2} to ${identifier}: ${status3}`);
+  }
+});
+
 // src/commands/issues/list.ts
+var resolveScope = async (client3, { project, here, milestone }) => {
+  if (milestone) {
+    if (!project && !here)
+      throw new Error("A milestone filter needs --project or --here.");
+    const ref = project ? readProjectRef(project) : await currentRepoKey();
+    if (!ref)
+      throw new Error("No repository here: not a git checkout with an origin remote.");
+    const resolved = await client3.query(api2.milestones.resolve, { project: ref, name: milestone });
+    return { projectId: resolved.projectId, milestoneId: resolved._id };
+  }
+  if (project)
+    return { projectId: (await resolveProject(client3, project))._id };
+  if (here)
+    return { projectId: (await repoProject(client3))._id };
+  return;
+};
 var list7 = command({
   name: "list",
   description: "List open issues, most recently updated first",
@@ -25932,10 +25991,7 @@ var list7 = command({
     if (options.project && options.here)
       throw new Error("Pass --project or --here, not both.");
     const client3 = await backendClient();
-    const project = options.project ? await resolveProject(client3, options.project) : options.here ? await repoProject(client3) : undefined;
-    if (options.milestone && !project)
-      throw new Error("A milestone filter needs --project or --here.");
-    const milestone = project && options.milestone ? await resolveMilestone(client3, project._id, options.milestone) : undefined;
+    const scope = await resolveScope(client3, options);
     const result = await client3.query(api2.issueViews.query, {
       source: {
         type: "custom",
@@ -25949,8 +26005,8 @@ var list7 = command({
             statuses: options.status ? [options.status] : options.all ? undefined : ISSUE_STATUSES.filter(issueIsOpen),
             priorities: options.priority ? [options.priority] : undefined,
             dispositions: options.disposition ? [options.disposition] : undefined,
-            projectIds: project ? [project._id] : undefined,
-            milestoneIds: milestone ? [milestone._id] : undefined,
+            projectIds: scope ? [scope.projectId] : undefined,
+            milestoneIds: scope?.milestoneId ? [scope.milestoneId] : undefined,
             dueDate: options.due
           }
         }
@@ -26360,11 +26416,11 @@ todo, in_progress, ready_for_review, in_review, changes_requested, approved, don
 canceled), priority, and disposition (who acts next). The workflow commands \u2014 start,
 submit, start-review, submit-review \u2014 and the linked pull request move the status;
 each refuses an issue outside its own status, and \`set -s\` is for corrections.
-The repo link is never set by hand: work on a branch whose name contains the issue
-identifier and the branch, pull request, and status track automatically \u2014 a change
-request moves the issue to changes_requested, an approval to approved (one
-outstanding change request outweighs any number of approvals), and a merge lands
-it as done.`,
+Work on a branch whose name contains the issue identifier and the branch, pull
+request, and status track automatically \u2014 a change request moves the issue to
+changes_requested, an approval to approved (one outstanding change request outweighs
+any number of approvals), and a merge lands it as done. link-pr covers the pull
+request the branch name does not point at; from there the same tracking applies.`,
   commands: [
     create4,
     list7,
@@ -26378,6 +26434,7 @@ it as done.`,
     startReview,
     submitReview,
     markAddressed,
+    linkPr,
     tasks,
     relate,
     unrelate,
@@ -26386,6 +26443,9 @@ it as done.`,
   ]
 });
 
+// ../../packages/backend/convex/lib/object.ts
+var keys = (object2) => Object.keys(object2);
+
 // src/lib/group.ts
 import { basename as basename2 } from "path";
 var git = async (...args) => {
@@ -26413,20 +26473,21 @@ var create6 = command({
   options: {
     title: exports_external.string().describe("Page title").meta({ short: "t" }),
     group: exports_external.string().nullable().optional().describe("Group to list the page under (default: the current repo)").meta({ short: "g", negatable: true }),
-    raw: exports_external.boolean().default(false).describe("Serve a full document verbatim (may run JS)"),
-    private: exports_external.boolean().default(false).describe("Require the publishing account to view the page")
+    style: exports_external.enum(keys(PAGE_STYLES)).default("basic").describe(`Style to render in \u2014 ${describeChoices(PAGE_STYLES)}`),
+    private: exports_external.boolean().default(false).describe("Require the publishing account to view the page"),
+    issue: exports_external.string().optional().describe("Link the page to an issue (KAI-N, number, or URL)")
   },
-  run: async ({ positionals: { file: file2 }, options: { title, group: group2, raw, private: isPrivate } }) => {
+  run: async ({ positionals: { file: file2 }, options: { title, group: group2, style, private: isPrivate, issue: issue3 } }) => {
     const newGroup = await groupForCreate(group2);
     const html = await readBody(file2);
-    const mode = raw ? "raw" : "themed";
     const visibility = isPrivate ? "private" : "public";
     const { url: url2 } = await (await backendClient()).action(api2.pages.create, {
       title,
       group: newGroup,
       html,
-      mode,
-      visibility
+      style,
+      visibility,
+      issue: issue3 === undefined ? undefined : readIssueRef(issue3)
     });
     console.log(url2);
   }
@@ -26470,12 +26531,12 @@ var list8 = command({
     if (pages.length === 0)
       return console.log(group2 === undefined ? "No pages yet." : "No pages in that group.");
     printTable([
-      ["TITLE", "GROUP", "ACCESS", "MODE", "SIZE", "VERSIONS", "CREATED", "URL"],
+      ["TITLE", "GROUP", "ACCESS", "STYLE", "SIZE", "VERSIONS", "CREATED", "URL"],
       ...pages.map((page) => [
         page.title,
         page.group ?? "-",
         page.visibility,
-        page.mode,
+        page.style,
         formatBytes(page.size),
         page.versions === 0 ? "-" : String(page.versions),
         new Date(page.createdAt).toISOString().slice(0, 10),
@@ -26498,6 +26559,14 @@ var remove6 = command({
   }
 });
 
+// src/lib/pages.ts
+var warnPruned = (pruned) => {
+  if (pruned.length === 0)
+    return;
+  const versions2 = pruned.length === 1 ? `version ${pruned[0]}` : `versions ${pruned.join(", ")}`;
+  console.error(`Pruned ${versions2}; the history keeps the newest ${MAX_PAGE_VERSIONS}.`);
+};
+
 // src/commands/pages/revert.ts
 var revert = command({
   name: "revert",
@@ -26507,7 +26576,8 @@ var revert = command({
     version: exports_external.coerce.number().int().positive().describe("Version number from `kds pages versions`")
   },
   run: async ({ positionals: { id, version: version4 } }) => {
-    const { url: url2 } = await (await backendClient()).mutation(api2.pages.revert, { id: readPageId(id), version: version4 });
+    const { url: url2, pruned } = await (await backendClient()).mutation(api2.pages.revert, { id: readPageId(id), version: version4 });
+    warnPruned(pruned);
     console.log(url2);
   }
 });
@@ -26515,7 +26585,7 @@ var revert = command({
 // src/commands/pages/update.ts
 var update7 = command({
   name: "update",
-  description: "Replace a page's HTML, title, group, mode, or visibility",
+  description: "Replace a page's HTML, title, group, style, or visibility",
   positionals: {
     id: exports_external.string().describe("Page id or URL"),
     file: exports_external.string().optional().describe("HTML file, or - for stdin")
@@ -26523,21 +26593,24 @@ var update7 = command({
   options: {
     title: exports_external.string().optional().describe("New page title").meta({ short: "t" }),
     group: exports_external.string().nullable().optional().describe("Move the page to this group, or --no-group to remove it from one").meta({ short: "g", negatable: true }),
-    mode: exports_external.enum(PAGE_MODES).optional().describe("New serving mode"),
-    visibility: exports_external.enum(PAGE_VISIBILITIES).optional().describe("Who can view the page")
+    style: exports_external.enum(keys(PAGE_STYLES)).optional().describe(`New style \u2014 ${describeChoices(PAGE_STYLES)}`),
+    visibility: exports_external.enum(PAGE_VISIBILITIES).optional().describe("Who can view the page"),
+    issue: exports_external.string().nullable().optional().describe("Link the page to an issue (KAI-N, number, or URL), or --no-issue to unlink it").meta({ negatable: true })
   },
-  run: async ({ positionals: { id, file: file2 }, options: { title, group: group2, mode, visibility } }) => {
-    if (!file2 && title === undefined && group2 === undefined && mode === undefined && visibility === undefined)
-      throw new Error("Nothing to update. Pass a file, --title, --group, --no-group, --mode, or --visibility.");
+  run: async ({ positionals: { id, file: file2 }, options: { title, group: group2, style, visibility, issue: issue3 } }) => {
+    if (!file2 && title === undefined && group2 === undefined && style === undefined && visibility === undefined && issue3 === undefined)
+      throw new Error("Nothing to update. Pass a file, --title, --group, --no-group, --style, --visibility, --issue, or --no-issue.");
     const html = file2 ? await readBody(file2) : undefined;
-    const { url: url2 } = await (await backendClient()).action(api2.pages.update, {
+    const { url: url2, pruned } = await (await backendClient()).action(api2.pages.update, {
       id: readPageId(id),
       html,
       title,
       group: group2,
-      mode,
-      visibility
+      style,
+      visibility,
+      issue: typeof issue3 === "string" ? readIssueRef(issue3) : issue3
     });
+    warnPruned(pruned);
     console.log(url2);
   }
 });
@@ -26559,10 +26632,10 @@ var versions2 = command({
     if (archived.length === 0)
       return console.log("No previous versions.");
     printTable([
-      ["VERSION", "MODE", "SIZE", "ARCHIVED"],
+      ["VERSION", "STYLE", "SIZE", "ARCHIVED"],
       ...archived.map((version4) => [
         String(version4.version),
-        version4.mode,
+        version4.style,
         formatBytes(version4.size),
         new Date(version4.archivedAt).toISOString().slice(0, 10)
       ])
@@ -26574,10 +26647,10 @@ var versions2 = command({
 var pages = group({
   name: "pages",
   description: "Publish HTML documents to the web",
-  longDescription: `Themed pages (the default) render inside the site chrome under a strict CSP: only
-the site theme's styles apply \u2014 inline style attributes and author scripts are
-dropped. A self-contained document with its own CSS or JS needs raw mode, which
-serves it verbatim. A page keeps its URL across updates and reverts.`,
+  longDescription: `A page is an HTML fragment rendered in one of the site's styles:
+  ${describeChoices(PAGE_STYLES, `
+  `)}
+Basic is the default. A page keeps its URL across updates and reverts.`,
   commands: [create6, list8, get5, update7, versions2, revert, remove6]
 });
 
@@ -27198,6 +27271,7 @@ var rootCommand = group({
 
 // src/lib/errors.ts
 var errorMessage = (error51) => error51 instanceof ConvexError && typeof error51.data === "string" ? error51.data : error51.message;
+var isRedactedServerError = (error51) => error51 instanceof Error && !(error51 instanceof ConvexError) && /^\[Request ID: \w+\] Server Error$/.test(error51.message);
 
 // src/lib/update-check.ts
 var latestVersion = async () => {
@@ -27228,6 +27302,12 @@ var maybeNotifyUpdate = async () => {
   if (latest && Bun.semver.order(latest, CLI_VERSION) === 1)
     console.error(`kds v${latest} available (you have v${CLI_VERSION}) \u2014 run 'kds upgrade'`);
 };
+var staleCliHint = async (current = CLI_VERSION) => {
+  const latest = env.KDS_NO_UPDATE_CHECK ? undefined : await latestVersion().catch(() => {
+    return;
+  });
+  return latest && Bun.semver.order(latest, current) === 1 ? `kds v${current} is behind v${latest}, so the server likely refused a request this version still sends \u2014 run 'kds upgrade' and retry.` : "The server gave no details. If kds was installed a while ago, try 'kds upgrade'; otherwise report the request id.";
+};
 
 // src/index.ts
 var args = Bun.argv.slice(2);
@@ -27237,6 +27317,8 @@ try {
     await maybeNotifyUpdate();
 } catch (error51) {
   console.error(errorMessage(error51));
+  if (isRedactedServerError(error51))
+    console.error(await staleCliHint());
   process.exitCode = 1;
 } finally {
   closePrompts();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@islamihab/kds",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Command-line client for Kai Dev Studio",
   "license": "MIT",
   "publishConfig": {