@illuminis/comprism 0.1.5 → 0.1.6

package/out/agent/command.js

@@ -56,11 +56,11 @@ exports.runAgent = runAgent;
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
 const connection_1 = require("../lib/connection");
-const project_1 = require("../lib/project");
+const project_1 = require("../machine/folder/project");
 const session_1 = require("./session");
 const ui = __importStar(require("./render"));
 const output_1 = require("../lib/output");
-const self_1 = require("../lib/self");
+const self_1 = require("../machine/runtime/self");
 /** The WebSocket the session needs is a global from Node 22.
  *
  *  Checked here with a message somebody can act on. Without it the failure is
@@ -219,7 +219,7 @@ async function runAgent(args) {
     // `--sandbox` never runs without one (manual 4.12): refused before anything
     // runs or is charged.
     if (args.sandbox) {
-        const { availability } = await Promise.resolve().then(() => __importStar(require("../executor/sandbox")));
+        const { availability } = await Promise.resolve().then(() => __importStar(require("../machine/executor/sandbox")));
         const found = availability();
         if (!found.system) {
             process.stderr.write(ui.red(`  --sandbox cannot start: ${found.why}.`)
@@ -414,7 +414,7 @@ ${ui.bold("comprism work")} — a coding agent in your terminal
   comprism work "add a test for the parser and make it pass"
 
 ${ui.bold("What it does")}
-  Reads your project, changes files, runs commands and runs your tests. It
+  Reads your workspace, changes files, runs commands and runs your tests. It
   shows you every change as it makes it, asks before deleting a file or
   running a command, and can undo the whole job. Each step is routed to whichever
   model finishes the work for least, and the receipt at the end says what it

package/out/agent/session.d.ts

@@ -1,4 +1,4 @@
-import { type ProjectFacts } from "../lib/project";
+import { type ProjectFacts } from "../machine/folder/project";
 import * as ui from "./render";
 export interface SessionOptions {
     /** Where the workspace lives, and the URL of the server that owns it. */
@@ -106,7 +106,12 @@ export interface SessionOptions {
     /** `--output stream`: handed the service's stream lines as they arrive. */
     onStream?: (items: Array<Record<string, unknown>>) => void;
 }
+/** How many next steps the last job offered (web manual 13.4), so a bare number
+ *  typed next is sent to the service to run one rather than to the agent. */
+export declare let waitingNextSteps: number;
 export interface JobResult {
+    /** The service's lines for the next steps it offered, printed as sent. */
+    nextSteps?: string[];
     outcome: string;
     detail?: string | null;
     jobId?: string;

package/out/agent/session.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminalSession = void 0;
+exports.TerminalSession = exports.waitingNextSteps = void 0;
 /**
  * A coding job, run from a terminal.
  *
@@ -63,12 +63,15 @@ const gateway_1 = require("../lib/gateway");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const readline = __importStar(require("readline"));
-const executor_1 = require("../executor");
-const project_1 = require("../lib/project");
+const executor_1 = require("../machine/executor");
+const project_1 = require("../machine/folder/project");
 const ui = __importStar(require("./render"));
 const jobs_1 = require("../commands/jobs");
 /** The actions that change a file, whose change is shown as it is made. */
 const CHANGES = new Set(["edit_file", "multi_edit", "write_file"]);
+/** How many next steps the last job offered (web manual 13.4), so a bare number
+ *  typed next is sent to the service to run one rather than to the agent. */
+exports.waitingNextSteps = 0;
 /** Files with changes in Git as the job starts: the person's, not the agent's. */
 function dirtyFiles(root) {
     try {
@@ -158,7 +161,7 @@ class TerminalSession {
             // A real refusal, in the service's own words: a plan that does not
             // include coding and an allowance that has been spent have different
             // fixes, and a caller told only "refused" looks in the wrong place.
-            this.refusal = reply.message || "your workspace could not be reached";
+            this.refusal = reply.message || "your organization could not be reached";
             // The reason word, for the exit number (Appendix B): the service's own
             // when it answered, else what the missing answer means.
             this.refusalReason = reply.reason
@@ -313,7 +316,7 @@ class TerminalSession {
                     // long pause for a feature they did not ask for, to save money on a
                     // job they have not started. So the job runs now, reading files the
                     // ordinary way, and the second job in this project has the map.
-                    this.out(ui.dim("  reading a map of this project in the background;"
+                    this.out(ui.dim("  reading a map of this workspace in the background;"
                         + " your next job here will use it\n"));
                     void refresh(this.opts.root, this.project()).catch(() => undefined);
                 }
@@ -568,7 +571,7 @@ class TerminalSession {
                     if (frame.type === "event" && frame.kind === "sandbox") {
                         // The service turned the sandbox on for this job: every command from
                         // here runs inside it, with its allowed addresses (manual 4.12).
-                        const { Sandbox } = await Promise.resolve().then(() => __importStar(require("../executor/sandbox")));
+                        const { Sandbox } = await Promise.resolve().then(() => __importStar(require("../machine/executor/sandbox")));
                         const system = this.sandboxSystem();
                         if (system) {
                             const box = new Sandbox(system, this.opts.root, this.opts.project?.added ?? []);
@@ -639,6 +642,9 @@ class TerminalSession {
                         // cost and saving comes from here.
                         result.receipt = String(frame.receipt ?? "");
                         result.card = frame.card ?? null;
+                        result.nextSteps = Array.isArray(frame.next_steps_lines)
+                            ? frame.next_steps_lines.map(String) : [];
+                        exports.waitingNextSteps = Array.isArray(frame.next_steps) ? frame.next_steps.length : 0;
                         result.reusedPct = ui.reusePct(0, frame.cached_tokens, Math.max(0, Number(frame.context_tokens ?? 0) - Number(frame.cached_tokens ?? 0)));
                         result.text = String(frame.text ?? "");
                         result.why = this.lastWhy;
@@ -696,7 +702,7 @@ class TerminalSession {
                     // is the live connection that carries the work, and the wording names
                     // that instead.
                     if (!ready && first) {
-                        reject(new Error("The live connection to your workspace could not be opened. "
+                        reject(new Error("The live connection to your organization could not be opened. "
                             + "You are signed in; the work stream is what failed."));
                     }
                 };
@@ -871,7 +877,7 @@ class TerminalSession {
     sandboxSystem() {
         if (this.sandboxChecked === undefined) {
             // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const { availability } = require("../executor/sandbox");
+            const { availability } = require("../machine/executor/sandbox");
             this.sandboxChecked = availability().system;
         }
         return (this.sandboxChecked ?? null);
@@ -1204,6 +1210,9 @@ class TerminalSession {
                 this.out(ui.dim(`  ${line}\n`));
             this.out(ui.receipt(r.receipt, r.models, r.ending ? undefined : r.testsPassed, r.card));
         }
+        // What would finish the request, worded by the service (web manual 13.4).
+        for (const line of r.nextSteps ?? [])
+            this.out(`${line}\n`);
         if (r.jobId) {
             // The job's own reference, so a person can quote it. The link to the
             // account sits in the receipt above, where the server put it.

package/out/commands/agents.js

@@ -41,8 +41,8 @@ exports.cmdAgents = cmdAgents;
  * wins a clash and what each line says; this reads the files it names, inside
  * the project and through the executor's own checks, and prints its lines.
  */
-const files_1 = require("../executor/files");
-const project_1 = require("../lib/project");
+const files_1 = require("../machine/executor/files");
+const project_1 = require("../machine/folder/project");
 const gateway_1 = require("../lib/gateway");
 const ui = __importStar(require("../lib/ui"));
 const ROUNDS = 6;
@@ -54,7 +54,7 @@ async function helperLines(folder) {
         const reply = await (0, gateway_1.ask)({ intent: "agents", prompt: "", agentsPayload: { round, files, listings, project: root } });
         const body = reply.agents;
         if (!reply.ok || reply.served === false || !body) {
-            return [ui.fail(reply.message || "The helper list could not be read from your workspace.")];
+            return [ui.fail(reply.message || "The helper list could not be read from your organization.")];
         }
         if (!body.wants)
             return body.lines;

package/out/commands/ask.js

@@ -48,7 +48,6 @@ exports.cmdAsk = cmdAsk;
  */
 const gateway_1 = require("../lib/gateway");
 const connection_1 = require("../lib/connection");
-const config_1 = require("../lib/config");
 const ui = __importStar(require("../lib/ui"));
 const render_1 = require("../agent/render");
 const prompt_1 = require("../lib/prompt");
@@ -87,12 +86,13 @@ async function cmdAsk(args) {
     // remember what they set last week is asking them to take the figure on
     // trust. Shown every time, so the number that comes back is never a surprise.
     const flagged = args.indexOf('--model');
-    const comparedTo = (flagged >= 0 ? args[flagged + 1] : undefined)
-        || (0, config_1.loadConfig)().defaultModel
-        || 'claude-sonnet-5';
-    out(ui.c.dim(`  comparing against ${ui.c.bold(comparedTo)}`)
-        + ui.c.dim('   change it with `comprism model`'));
-    out();
+    // Named on the line, or else the person's own comparison model, which the
+    // service fills in and names in its reply (service catalog 14).
+    const comparedTo = flagged >= 0 ? args[flagged + 1] : undefined;
+    if (comparedTo) {
+        out(ui.c.dim(`  comparing against ${ui.c.bold(comparedTo)}`));
+        out();
+    }
     // Either way round: on the line for somebody who knows what they want, or
     // asked for when they simply typed the command.
     // Text piped in is read to its end first and attached as `standard input`:
@@ -202,7 +202,7 @@ async function cmdAsk(args) {
         const verb = saved !== null && saved !== undefined && saved < 0 ? 'more' : 'less';
         const amount = money(Math.abs(saved ?? 0));
         out(`  ran on ${ui.c.bold(ran)}  ${ours} to finish`);
-        out(`  ${ui.c.dim(`on ${callingModel} it would have been ${theirs}, so ${amount} ${verb}`)}`);
+        out(`  ${ui.c.dim(`on ${reply.decision.would_have_used || callingModel} it would have been ${theirs}, so ${amount} ${verb}`)}`);
     }
     else {
         out(`  ran on ${ui.c.bold(ran)}`);

package/out/commands/codemap.d.ts

@@ -1,2 +1,2 @@
-export declare const MAP_HELP = "\n  comprism map                   what the map of this project holds\n  comprism map refresh           read every file again, now\n  comprism map forget            remove this project's map from the service\n  comprism map off               ask your administrator to switch it off\n\n  The map is a record of what your project is made of: its functions, screens,\n  endpoints and tables, and what connects to what. It is read on this machine\n  and only its structure is sent. Your source code never leaves here.\n\n  It is kept current by itself. Every job checks the files first and reads back\n  whatever moved, so you should not normally need any of this.\n";
+export declare const MAP_HELP = "\n  comprism map                   what the map of this workspace holds\n  comprism map refresh           read every file again, now\n  comprism map forget            remove this workspace's map from the service\n  comprism map off               ask your administrator to switch it off\n\n  The map is a record of what your workspace is made of: its functions, screens,\n  endpoints and tables, and what connects to what. It is read on this machine\n  and only its structure is sent. Your source code never leaves here.\n\n  It is kept current by itself. Every job checks the files first and reads back\n  whatever moved, so you should not normally need any of this.\n";
 export declare function cmdMap(args: string[]): Promise<number>;

package/out/commands/codemap.js

@@ -55,12 +55,12 @@ const sync_1 = require("../graph/sync");
 const settings_1 = require("./settings");
 const out = (s = "") => process.stdout.write(`${s}\n`);
 exports.MAP_HELP = `
-  comprism map                   what the map of this project holds
+  comprism map                   what the map of this workspace holds
   comprism map refresh           read every file again, now
-  comprism map forget            remove this project's map from the service
+  comprism map forget            remove this workspace's map from the service
   comprism map off               ask your administrator to switch it off
 
-  The map is a record of what your project is made of: its functions, screens,
+  The map is a record of what your workspace is made of: its functions, screens,
   endpoints and tables, and what connects to what. It is read on this machine
   and only its structure is sent. Your source code never leaves here.
 

package/out/commands/commands-thin.js

@@ -178,14 +178,14 @@ async function cmdStatus() {
             process.exitCode = 3;
         }
         else if (reply.httpStatus) {
-            out(ui.fail('The workspace could not confirm this account.'));
+            out(ui.fail('The organization could not confirm this account.'));
             out(`      ${ui.c.dim(reply.message || 'the service refused the request')}`);
             process.exitCode = 1;
         }
         else {
             // Only what this machine knows, and said to be only that (manual 1.4).
             out(ui.fail(`This machine is pointed at ${ui.c.bold(c.url)}, which did not answer.`));
-            out(`      ${ui.c.dim(reply.message || 'no answer from the workspace')}`);
+            out(`      ${ui.c.dim(reply.message || 'no answer from the organization')}`);
             out(`      ${ui.c.dim('on this machine only:')} ${machineLine(c)}`);
             process.exitCode = 6;
         }
@@ -194,12 +194,12 @@ async function cmdStatus() {
     }
     if (reply.served === false) {
         out(ui.warn(`${ui.c.bold(c.url)} answered, but is running a build that cannot report a session.`));
-        out(ui.c.dim(reply.message || 'Ask your workspace administrator to update the service.'));
+        out(ui.c.dim(reply.message || 'Ask your organization administrator to update the service.'));
         process.exitCode = 1;
         return;
     }
     if (reply.granted === false || !me?.signed_in) {
-        out(ui.fail(reply.message || 'The workspace did not confirm a signed in account.'));
+        out(ui.fail(reply.message || 'The organization did not confirm a signed in account.'));
         out('  Run comprism login to sign in.');
         process.exitCode = 3;
         return;

package/out/commands/config.js

@@ -67,7 +67,7 @@ async function service(op, payload) {
 const out = (s = '') => process.stdout.write(s + '\n');
 function notHere(key) {
     out(ui.fail(`\`${key}\` is not a setting for this machine, so nothing was changed.`));
-    out(ui.c.dim(`  This machine keeps: ${Object.keys(machine_1.MACHINE_KEYS).join(', ')}. Project and personal settings are kept by the service (manual 2.10).`));
+    out(ui.c.dim(`  This machine keeps: ${Object.keys(machine_1.MACHINE_KEYS).join(', ')}. Workspace and personal settings are kept by the service (manual 2.10).`));
     out();
     return 1;
 }

package/out/commands/cost.js

@@ -87,7 +87,7 @@ async function cmdCost(args) {
     // would tell somebody their work cost nothing.
     if (reply.served === false) {
         out();
-        out(ui.warn('This workspace is running a build that cannot answer this yet.'));
+        out(ui.warn('This organization is running a build that cannot answer this yet.'));
         out(`      ${ui.c.dim(reply.message || '')}`);
         out();
         return 1;
@@ -95,7 +95,7 @@ async function cmdCost(args) {
     const report = reply.spend;
     if (!report || !report.session) {
         out();
-        out(ui.info(reply.message || 'No work has been recorded in this workspace yet.'));
+        out(ui.info(reply.message || 'No work has been recorded in this organization yet.'));
         out();
         return 0;
     }
@@ -105,8 +105,8 @@ async function cmdCost(args) {
     const p = report.presentation;
     if (!p) {
         out();
-        out(ui.warn('This workspace answered without the breakdown this version draws.'));
-        out(`      ${ui.c.dim('Deploy the workspace, or run `comprism status` to see which one you are on.')}`);
+        out(ui.warn('This organization answered without the breakdown this version draws.'));
+        out(`      ${ui.c.dim('Deploy the organization, or run `comprism status` to see which one you are on.')}`);
         out();
         return 1;
     }

package/out/commands/hooks.js

@@ -43,7 +43,7 @@ exports.cmdHooks = cmdHooks;
  */
 const ui = __importStar(require("../lib/ui"));
 const project_ops_1 = require("../lib/project-ops");
-const hooks_1 = require("../executor/hooks");
+const hooks_1 = require("../machine/executor/hooks");
 const out = (s = "") => process.stdout.write(`${s}\n`);
 async function cmdHooks(args) {
     const facts = await (0, project_ops_1.currentProject)();

package/out/commands/install.d.ts

@@ -1,4 +1,4 @@
-import { type InstallMethod } from '../lib/self';
+import { type InstallMethod } from '../machine/runtime/self';
 /** The header the tenant reads to decide whether this machine may be served. */
 export declare const WORKSPACE_KEY_HEADER = "x-comprism-key";
 export declare function envScriptPath(): string;

package/out/commands/install.js

@@ -78,7 +78,8 @@ const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
 const config_1 = require("../lib/config");
 const connection_1 = require("../lib/connection");
-const self_1 = require("../lib/self");
+const self_1 = require("../machine/runtime/self");
+const words_1 = require("../lib/words");
 /** The header the tenant reads to decide whether this machine may be served. */
 exports.WORKSPACE_KEY_HEADER = 'x-comprism-key';
 const MARKER_START = '# >>> comprism >>>';
@@ -391,7 +392,7 @@ async function probeDesktopConnector(binary) {
         catch (err) {
             resolve({
                 ok: false,
-                detail: err instanceof Error ? err.message : 'the connector could not be started',
+                detail: err instanceof Error ? err.message : (0, words_1.word)('connectorNotStarted'),
             });
             return;
         }

package/out/commands/instructions.js

@@ -80,7 +80,7 @@ async function cmdInstructions(args) {
     const facts = await (0, project_ops_1.currentProject)();
     if (args[0] === "edit") {
         if (!args.includes("--personal")) {
-            out(ui.fail("Project instructions are files in the project; edit them there. "
+            out(ui.fail("Workspace instructions are files in the workspace; edit them there. "
                 + "For yours: comprism instructions edit --personal"));
             return 2;
         }

package/out/commands/integrations.js

@@ -41,7 +41,7 @@ exports.projectSettings = projectSettings;
  * adding one by address or by command, signing in, its tools, removing one.
  *
  * The service decides every status, tool, rule and word. This sends the
- * project's settings file so the project's own connections are known, writes
+ * project's settings file so the workspace's own connections are known, writes
  * the key the service returns for a project connection, starts an approved
  * local tool server only long enough to count its tools, opens the browser
  * for a sign in and waits for it. No token ever reaches this machine.
@@ -49,10 +49,10 @@ exports.projectSettings = projectSettings;
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const toolservers_1 = require("../executor/toolservers");
+const toolservers_1 = require("../machine/executor/toolservers");
 const gateway_1 = require("../lib/gateway");
 const project_ops_1 = require("../lib/project-ops");
-const project_1 = require("../lib/project");
+const project_1 = require("../machine/folder/project");
 const ui = __importStar(require("../lib/ui"));
 const SETTINGS = ".completionprism/settings.json";
 const out = (s = "") => process.stdout.write(`${s}\n`);
@@ -77,7 +77,7 @@ async function call(root, payload) {
         body = reply.integrations;
     }
     if (!reply.ok || reply.served === false || !body) {
-        out(`  ${ui.fail(reply.message || "Your connections could not be read from your workspace.")}`);
+        out(`  ${ui.fail(reply.message || "Your connections could not be read from your organization.")}`);
         return null;
     }
     if (body.error) {

package/out/commands/keys.js

@@ -104,17 +104,17 @@ async function keyState() {
     // then this client's placeholder, and reading an empty `providers` as "no
     // keys" is precisely the fault above.
     if (!reply.ok)
-        return { reached: false, why: reply.message || 'the workspace could not be reached' };
+        return { reached: false, why: reply.message || 'the organization could not be reached' };
     // An older workspace that does not serve this question has also not told us
     // there are no keys. It has told us it cannot answer.
     if (reply.served === false)
-        return { reached: false, why: reply.message || 'this workspace is running an older build' };
+        return { reached: false, why: reply.message || 'this organization is running an older build' };
     // The workspace answered but could not establish part of what it answered.
     // An empty vendor list here is a list we failed to obtain, not a list of
     // nothing, and drawing it as "you have no keys" is the original fault with
     // one more layer in front of it.
     if (reply.complete === false)
-        return { reached: false, why: reply.message || 'your workspace could not check its vendor keys' };
+        return { reached: false, why: reply.message || 'your organization could not check its vendor keys' };
     return { reached: true, hasKey: reply.providers.some((p) => p.has_key) };
 }
 /**
@@ -182,15 +182,15 @@ async function show() {
     if (!reply.ok || reply.served === false || reply.complete === false) {
         // NOT "you have no keys". We did not get an answer, so nothing is known
         // about this account, and saying otherwise is the 17 September fault.
-        out(ui.fail('Your workspace could not be reached, so nothing is known about your keys.'));
-        out(`      ${ui.c.dim(reply.message || reply.decision.rationale || 'no answer from the workspace')}`);
+        out(ui.fail('Your organization could not be reached, so nothing is known about your keys.'));
+        out(`      ${ui.c.dim(reply.message || reply.decision.rationale || 'no answer from the organization')}`);
         out();
         return { reached: false, stored: 0, total: 0 };
     }
     if (reply.providers.length === 0) {
         // A workspace with no vendors at all is not a workspace that told us it
         // holds no keys. Treated as unreachable so no caller offers to take one.
-        out(ui.fail('Your workspace returned no vendors, so nothing is known about your keys.'));
+        out(ui.fail('Your organization returned no vendors, so nothing is known about your keys.'));
         out(`      ${ui.c.dim(reply.message || 'the vendor list came back empty')}`);
         out();
         return { reached: false, stored: 0, total: 0 };

package/out/commands/login.js

@@ -78,6 +78,7 @@ const connection_1 = require("../lib/connection");
 const gateway_1 = require("../lib/gateway");
 const ui = __importStar(require("../lib/ui"));
 const prompt_1 = require("../lib/prompt");
+const words_1 = require("../lib/words");
 const out = (s = '') => process.stdout.write(s + '\n');
 /** Where a named workspace lives. One format, stated once. */
 const WORKSPACE_DOMAIN = 'completionprism.illuminis.ai';
@@ -103,6 +104,21 @@ function workspaceUrl(typed) {
         return `https://${value}`;
     return `https://${value}.${WORKSPACE_DOMAIN}`;
 }
+/**
+ * Where an organization signs in. A full address is used as typed. A bare name
+ * is turned into its address by the service, so every client follows one rule
+ * (service catalog 1).
+ */
+async function addressOf(typed) {
+    const value = typed.trim().replace(/\/+$/, '');
+    if (/^[A-Za-z0-9][A-Za-z0-9-]{0,62}$/.test(value) && value.toLowerCase() !== 'localhost') {
+        const reply = await (0, gateway_1.askAt)(`https://${WORKSPACE_DOMAIN}`, { intent: 'resolve_workspace', prompt: value });
+        const url = reply.session?.workspace_url;
+        if (url)
+            return url.replace(/\/+$/, '');
+    }
+    return workspaceUrl(value);
+}
 /** Localhost needs the tenant named, because there is no subdomain to read. */
 function tenantFor(url, typed, flagged) {
     if (flagged)
@@ -168,8 +184,8 @@ async function approveInBrowser(url, tenant, noBrowser) {
         const res = await fetch(`${url}/oauth/device_authorization`, form({ client_id: CLIENT_ID, scope: 'api:read api:write' }));
         if (!res.ok) {
             out(ui.fail(res.status === 404 || res.status === 405
-                ? 'That workspace is running a build without browser sign in.'
-                : 'The workspace would not start a browser sign in.'));
+                ? 'That organization is running a build without browser sign in.'
+                : 'The organization would not start a browser sign in.'));
             return '';
         }
         started = await res.json();
@@ -253,7 +269,7 @@ async function runLogin(args) {
         out();
         return;
     }
-    const last = flag('--username') || flag('--email') || flag('--workspace') ? null : readLast();
+    const last = flag('--username') || flag('--email') || (flag('--organization') || flag('--workspace')) ? null : readLast();
     if (last) {
         out(`  ${ui.c.dim('last time')}  ${ui.c.bold(last.email)} ${ui.c.dim('at')} ${ui.c.bold(last.workspace)}`);
         out(`  ${ui.c.dim('press Enter to sign in as them, or type another email')}`);
@@ -275,15 +291,15 @@ async function runLogin(args) {
         return;
     }
     // Where this person's workspace is. Asked of the product, not of them.
-    let typedWorkspace = flag('--workspace') || (again ? last?.workspace : undefined);
+    let typedWorkspace = (flag('--organization') || flag('--workspace')) || (again ? last?.workspace : undefined);
     // Captured BEFORE the email lookup can fill it in. A workspace the product
     // worked out is not a workspace the person typed, and only the second may be
     // a local address. See the fence in `writeConnection`. The last sign in
     // counts as typed only if it was typed then.
-    const typedByHand = Boolean(flag('--workspace')) || Boolean(again && last?.typed);
+    const typedByHand = Boolean((flag('--organization') || flag('--workspace'))) || Boolean(again && last?.typed);
     if (!typedWorkspace) {
         const live = new ui.LiveIndicator();
-        live.start('finding your workspace');
+        live.start('finding your organization');
         try {
             typedWorkspace = (await resolveWorkspace(username)) || undefined;
         }
@@ -295,18 +311,18 @@ async function runLogin(args) {
         process.stdout.write('\r');
         if (!typedWorkspace) {
             out();
-            out(ui.fail('No workspace is registered for that email address.'));
-            out(`      ${ui.c.dim('if your company uses a different domain, pass --workspace <name>')}`);
+            out(ui.fail('No organization is registered for that email address.'));
+            out(`      ${ui.c.dim('if your company uses a different domain, pass --organization <name>')}`);
             out();
             process.exitCode = 1;
             return;
         }
     }
-    const url = workspaceUrl(typedWorkspace);
+    const url = await addressOf(typedWorkspace);
     const tenant = tenantFor(url, typedWorkspace, flag('--tenant'));
     // Said before the password is asked for, so a person can see which company
     // they are about to sign in to (manual 1.3).
-    out(`  workspace: ${url}`);
+    out(`  organization: ${url}`);
     // COMPANY LOGIN (manual 1.10). A workspace whose company signs in through
     // its own identity provider is signed in to in a browser; this tool never
     // sees that password. `--device` is the same thing for a machine with no
@@ -346,8 +362,8 @@ async function runLogin(args) {
         }, tenant);
         if (reply.served === false) {
             out();
-            out(ui.fail('That workspace is running a build that cannot sign you in yet.'));
-            out(`      ${ui.c.dim(reply.message || 'the workspace is behind this copy of the tool')}`);
+            out(ui.fail('That organization is running a build that cannot sign you in yet.'));
+            out(`      ${ui.c.dim(reply.message || 'the organization is behind this copy of the tool')}`);
             out();
             process.exitCode = 1;
             return;
@@ -394,7 +410,7 @@ async function runLogin(args) {
                 forgetPassword(username, typedWorkspace);
             out();
             out(ui.fail(reply.message || 'That username and password were not accepted.'));
-            out(`      ${ui.c.dim('check the workspace name too: a right password in the wrong workspace looks the same')}`);
+            out(`      ${ui.c.dim('check the organization name too: a right password in the wrong organization looks the same')}`);
             out();
             process.exitCode = 1;
             return;
@@ -447,7 +463,7 @@ async function runLogin(args) {
     }
     catch (err) {
         out();
-        out(ui.fail(err instanceof Error ? err.message : 'the workspace address was refused'));
+        out(ui.fail(err instanceof Error ? err.message : (0, words_1.word)('addressRefused')));
         out();
         process.exitCode = 1;
         return;
@@ -489,7 +505,7 @@ async function runLogin(args) {
         // The workspace's OWN reason, carried back with the sign in. It used to
         // come from a local variable set by a separate call, which meant a blank
         // line whenever that call had not been the thing that failed.
-        out(`      ${ui.c.dim(signInMessage || 'the workspace did not say why')}`);
+        out(`      ${ui.c.dim(signInMessage || 'the organization did not say why')}`);
         out(`      ${ui.c.dim('you are signed in; this machine cannot ask for work until it is enrolled')}`);
     }
     out();
@@ -500,13 +516,13 @@ async function loginWithKey(key, args) {
         const i = args.indexOf(name);
         return i >= 0 ? args[i + 1] : undefined;
     };
-    const typed = flag('--workspace');
+    const typed = (flag('--organization') || flag('--workspace'));
     if (!key || !typed) {
-        out(ui.fail('Signing in with a key needs the key and the workspace: comprism login --key <key> --workspace <address>'));
+        out(ui.fail('Signing in with a key needs the key and the organization: comprism login --key <key> --organization <address>'));
         process.exitCode = 1;
         return;
     }
-    const url = workspaceUrl(typed);
+    const url = await addressOf(typed);
     const tenant = tenantFor(url, typed, flag('--tenant'));
     const { ask: askWith } = await Promise.resolve().then(() => __importStar(require('../lib/gateway')));
     const existing = (0, connection_1.readConnection)();
@@ -518,7 +534,7 @@ async function loginWithKey(key, args) {
         }, true);
     }
     catch (err) {
-        out(ui.fail(err instanceof Error ? err.message : 'the workspace address was refused'));
+        out(ui.fail(err instanceof Error ? err.message : (0, words_1.word)('addressRefused')));
         process.exitCode = 1;
         return;
     }
@@ -555,7 +571,7 @@ async function resolveWorkspace(email) {
     //
     // Working against a local server is still supported and is now something a
     // person SAYS rather than something an environment does to them:
-    // `comprism login --workspace localhost:8009`.
+    // `comprism login --organization localhost:8009`.
     // ASKED OF THE ONE SERVICE, at the product's own address.
     //
     // This used to post to the authentication route directly, which made the
@@ -565,7 +581,7 @@ async function resolveWorkspace(email) {
     const root = `https://${WORKSPACE_DOMAIN}`;
     const reply = await (0, gateway_1.askAt)(root, { intent: 'resolve_workspace', prompt: email });
     if (!reply.ok || reply.served === false || reply.complete === false) {
-        throw new Error(reply.message || 'Your workspace could not be looked up. Try again later.');
+        throw new Error(reply.message || 'Your organization could not be looked up. Try again later.');
     }
     const url = reply.session?.workspace_url;
     if (!url)

package/out/commands/permissions.js

@@ -64,7 +64,7 @@ async function cmdPermissions(args) {
         process.stderr.write(`  ${USAGE}\n`);
         return 2;
     }
-    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
     const { currentWorkspace } = await Promise.resolve().then(() => __importStar(require('./settings')));
     const facts = resolveProject(currentWorkspace().path, []);
     const files = {};
@@ -85,7 +85,7 @@ async function cmdPermissions(args) {
     const lines = reply.permissions?.lines;
     if (!reply.ok || !Array.isArray(lines)) {
         process.stderr.write(ui.fail(reply.served === false
-            ? 'Your workspace is running a build without permission answers yet.'
+            ? 'Your organization is running a build without permission answers yet.'
             : (0, sessions_1.failure)(reply)) + '\n');
         return (0, sessions_1.exitFor)(reply);
     }

package/out/commands/plugins.js

@@ -48,7 +48,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const readline = __importStar(require("readline"));
 const gateway_1 = require("../lib/gateway");
-const project_1 = require("../lib/project");
+const project_1 = require("../machine/folder/project");
 const ui = __importStar(require("../lib/ui"));
 const out = (s = "") => process.stdout.write(`${s}\n`);
 const MAX_FILES = 200;
@@ -81,7 +81,7 @@ async function call(payload) {
     const reply = await (0, gateway_1.ask)({ intent: "plugins", prompt: "", pluginsPayload: payload });
     const body = reply.plugins;
     if (!reply.ok || reply.served === false || !body) {
-        out(`  ${ui.fail(reply.message || "Your plugins could not be read from your workspace.")}`);
+        out(`  ${ui.fail(reply.message || "Your plugins could not be read from your organization.")}`);
         return null;
     }
     if (body.error) {
@@ -136,7 +136,7 @@ async function cmdPlugins(args) {
             out(`  ${l}`);
         let scope = args.indexOf("--scope") >= 0 ? args[args.indexOf("--scope") + 1] : undefined;
         if (!scope) {
-            const said = await question(`  Install for: 1 this project  2 just me  3 cancel  `);
+            const said = await question(`  Install for: 1 this workspace  2 just me  3 cancel  `);
             scope = said === "1" ? "project" : said === "2" ? "personal" : undefined;
             if (!scope) {
                 out("  Nothing was installed.");