@illuminis/comprism 0.1.5 → 0.1.7

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.");

package/out/commands/privacy.js

@@ -45,8 +45,8 @@ async function cmdPrivacy() {
     const reply = await (0, gateway_1.ask)({ intent: "privacy", prompt: "" });
     if (!reply.ok || reply.served === false) {
         out(ui.fail(reply.served === false
-            ? "Your workspace is running an older build that does not answer this yet."
-            : `Your workspace could not be reached: ${reply.message || "no answer"}`));
+            ? "Your organization is running an older build that does not answer this yet."
+            : `Your organization could not be reached: ${reply.message || "no answer"}`));
         return 1;
     }
     out();

package/out/commands/repl.js

@@ -80,7 +80,7 @@ const keyboard_1 = require("../lib/keyboard");
 const machine_1 = require("../lib/machine");
 const ui = __importStar(require("../lib/ui"));
 const render_1 = require("../agent/render");
-const shell_1 = require("../executor/shell");
+const shell_1 = require("../machine/executor/shell");
 const voice = __importStar(require("../lib/voice"));
 const out = (s = '') => process.stdout.write(s + '\n');
 /**
@@ -285,7 +285,7 @@ function sessionWords() {
     return [...COMMANDS, 'project', 'folders', 'instructions', 'remember', 'detach', 'output', 'processes', 'stop', 'agents'];
 }
 async function refreshList() {
-    const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+    const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
     const root = resolveProject(await sessionFolder(), place.added).root;
     const got = await (0, commandlist_1.fetchCommandList)(root, sessionWords());
     // A failed refresh keeps the list already held rather than emptying it.
@@ -356,11 +356,12 @@ async function showHelpers() {
     out();
 }
 /** The permission modes, in the order Shift+Tab moves through them (4.5). */
+/** The modes Shift+Tab steps through, as the service last listed them. */
 const MODES = ['read_only', 'approve_writes', 'auto_edit', 'full_auto'];
 /** How the next job in this session runs: its mode and whether it plans first
  *  (manual 4.1, 4.5). Changed by `mode`, Shift+Tab, `plan` and `plan off`, and
  *  applied from the next job; the service still decides what each mode allows. */
-const steering_ = { mode: 'approve_writes', plan: false, pin: '', effort: '' };
+const steering_ = { mode: 'approve_writes', plan: false, pin: '', effort: '', modes: MODES };
 /**
  * The line as a command, with a leading slash taken off.
  *
@@ -623,7 +624,7 @@ function printHelp() {
     out();
     drawList(listedItems());
     if (!listed?.ok) {
-        out(ui.c.amber('  Your workspace could not be asked for its skills, so only this tool\'s own words are shown.'));
+        out(ui.c.amber('  Your organization could not be asked for its skills, so only this tool\'s own words are shown.'));
         out();
     }
     else if (listed.needsUpdate.length > 0) {
@@ -645,9 +646,42 @@ function printHelp() {
 /**
  * The folders this session works in (manual 2.1 and 2.3). `project <path>`
  * changes the folder for the rest of the session; `folders add <path>` allows
- * another. Neither changes the saved default, which is `comprism project`.
+ * another. Neither changes the saved default, which is `comprism workspace`.
  */
-const place = { folder: null, added: [] };
+const place = { folder: null, added: [], workspace: '' };
+/**
+ * One command the service runs itself (web manual 13.2, 13.3). The service says
+ * what it means and writes every line; this answers whether a folder exists on
+ * this computer when asked, prints the lines, and carries out the one action it
+ * names. True when the session's workspace or folders changed; the request to
+ * run when a next step was chosen.
+ */
+async function serviceCommand(words) {
+    const { runServiceCommand } = await Promise.resolve().then(() => __importStar(require('../lib/servicecommand')));
+    const said = await runServiceCommand(words, { cwd: await sessionFolder(), current: place.workspace });
+    if (!said.reached) {
+        out(ui.fail(said.message || 'Your organization could not answer that.'));
+        return false;
+    }
+    for (const line of said.lines)
+        out(line);
+    const a = said.action;
+    if (!a)
+        return false;
+    if (a.run)
+        return a.run;
+    if (a.open_workspace)
+        place.workspace = a.open_workspace;
+    if (a.use_folder) {
+        place.folder = a.use_folder;
+        (await Promise.resolve().then(() => __importStar(require('../lib/project-ops')))).useSessionFolder(a.use_folder);
+    }
+    if (a.add_folder && !place.added.includes(a.add_folder))
+        place.added.push(a.add_folder);
+    if (a.remove_folder)
+        place.added = place.added.filter((f) => f !== a.remove_folder);
+    return true;
+}
 async function sessionFolder() {
     if (place.folder)
         return place.folder;
@@ -656,7 +690,7 @@ async function sessionFolder() {
 }
 /** The line this session begins with, as the service wrote it (manual 2.2). */
 async function projectLine() {
-    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
     const { ask } = await Promise.resolve().then(() => __importStar(require('../lib/gateway')));
     const facts = resolveProject(await sessionFolder(), place.added);
     const reply = await ask({ intent: 'project', prompt: '', project: asWire(facts, 'approve_writes') });
@@ -685,7 +719,7 @@ async function contextOf(intent, jobId, keep = '', sessionKey) {
         intent, prompt: keep, ...(jobId ? { jobId } : {}), ...(sessionKey ? { spendSession: sessionKey } : {}),
     });
     if (!reply.ok || !reply.context) {
-        out(ui.fail(reply.message || 'Your workspace could not answer that.'));
+        out(ui.fail(reply.message || 'Your organization could not answer that.'));
     }
     else {
         for (const line of reply.context.lines)
@@ -704,7 +738,7 @@ async function showTranscript(jobId) {
     const { ask } = await Promise.resolve().then(() => __importStar(require('../lib/gateway')));
     const reply = await ask({ intent: 'transcript', prompt: '', jobId });
     if (!reply.ok || !reply.transcript) {
-        out(ui.fail(reply.message || 'The transcript could not be read from your workspace.'));
+        out(ui.fail(reply.message || 'The transcript could not be read from your organization.'));
     }
     else {
         for (const line of reply.transcript.lines)
@@ -1022,7 +1056,7 @@ async function runRepl(how = {}) {
         });
     }
     if (!state.reached) {
-        out(ui.fail(`Your workspace could not be reached, so ${ui.c.bold('nothing is known')} about your keys.`));
+        out(ui.fail(`Your organization could not be reached, so ${ui.c.bold('nothing is known')} about your keys.`));
         out(`      ${ui.c.dim(state.why)}`);
         out(`      ${ui.c.dim('check the address with')} ${ui.c.bold('comprism status')}${ui.c.dim(', or sign in again with')} ${ui.c.bold('comprism login')}`);
         out();
@@ -1059,6 +1093,14 @@ async function runRepl(how = {}) {
         }
         steering_.pin = said.pin ?? '';
         steering_.effort = said.effort === 'normal' ? '' : said.effort;
+        // Mode and plan are the service's too (CLI manual 4.1, 4.5); kept here only
+        // to send with the next job and to draw the prompt.
+        if (said.mode)
+            steering_.mode = said.mode;
+        if (typeof said.plan === 'boolean')
+            steering_.plan = said.plan;
+        if (said.modes?.length)
+            steering_.modes = said.modes;
         return said;
     };
     if (how.latest || how.resume || how.pick) {
@@ -1346,7 +1388,7 @@ async function runRepl(how = {}) {
      * a drag and drop, and the files wait for the question that follows.
      */
     const gather = async (typed) => {
-        const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+        const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
         const here = await sessionFolder();
         const root = resolveProject(here, place.added).root;
         completion.root = root;
@@ -1639,11 +1681,15 @@ async function runRepl(how = {}) {
     keys().on('keypress', (_s, key) => {
         if (!key || key.name !== 'tab' || !key.shift || working || answering || leaving)
             return;
-        const next = MODES[(MODES.indexOf(steering_.mode) + 1) % MODES.length];
-        steering_.mode = next;
+        // The next mode in the service's own list, set by the service.
+        const modes = steering_.modes;
+        const next = modes[(modes.indexOf(steering_.mode) + 1) % modes.length];
         out();
-        out(ui.c.dim(`  mode ${ui.c.bold(next)}, from the next job`));
-        prompt();
+        void steer({ mode: next }).then((said) => {
+            for (const line of said?.lines ?? [])
+                out(ui.c.dim(line));
+            prompt();
+        });
     });
     async function handle(line) {
         const typed = line.trim();
@@ -1669,38 +1715,27 @@ async function runRepl(how = {}) {
             out();
             return prompt();
         }
-        const where = /^(project|workspace)(?:\s+(.+))?$/i.exec(bare);
-        const addFolder = /^folders\s+add\s+(.+)$/i.exec(bare);
-        if (where || addFolder || /^folders$/i.test(bare)) {
-            const { checkFolder, resolveProject } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
-            const named = where ? where[2] : addFolder ? addFolder[1] : undefined;
-            if (named) {
-                const found = checkFolder(named.trim());
-                if (!found.ok) {
-                    out(ui.fail(found.why));
-                    out();
-                    return prompt();
-                }
-                if (where) {
-                    place.folder = found.path;
-                    (await Promise.resolve().then(() => __importStar(require('../lib/project-ops')))).useSessionFolder(found.path);
-                }
-                else if (!place.added.includes(found.path))
-                    place.added.push(found.path);
-            }
-            if (/^folders$/i.test(bare)) {
-                const facts = resolveProject(await sessionFolder(), place.added);
-                out();
-                out(`  ${ui.c.bold(facts.root)}  ${ui.c.dim('project')}`);
-                for (const f of facts.added)
-                    out(`  ${ui.c.bold(f)}  ${ui.c.dim('added for this session')}`);
-                out();
-                return prompt();
-            }
+        // Commands the service runs itself (web manual 13.2, 13.3): any word the
+        // service lists as its own, and `project`, the old name for `workspace`.
+        // What they mean and every line printed are the service's; this sends what
+        // was typed, answers whether a folder exists, and carries out the action.
+        const head = (bare.split(/\s+/)[0] ?? '').toLowerCase();
+        const { waitingNextSteps } = await Promise.resolve().then(() => __importStar(require('../agent/session')));
+        const serviceWord = head === 'project'
+            || (/^\d+$/.test(bare) && waitingNextSteps > 0)
+            || (listed?.items ?? []).some((i) => i.source === 'service' && i.name === head);
+        if (serviceWord) {
+            const words = head === 'project' ? bare.replace(/^project\b/i, 'workspace') : bare;
+            const acted = await serviceCommand(words);
             out();
-            await showProjectLine();
-            // Another folder has other skills.
-            await refreshList();
+            // A next step chosen: it runs as the request it stands for.
+            if (typeof acted === 'string')
+                return handle(`work ${acted}`);
+            if (acted) {
+                await showProjectLine();
+                // Another folder has other skills.
+                await refreshList();
+            }
             return prompt();
         }
         // `pin <model>` and `effort <level>` (manual 4.17, 4.18), kept by the
@@ -1736,16 +1771,12 @@ async function runRepl(how = {}) {
         }
         const effortTo = /^effort\s+(\S+)$/.exec(word);
         if (effortTo) {
-            const level = effortTo[1];
-            if (!['low', 'medium', 'normal', 'high'].includes(level))
-                out(ui.fail('Effort is low, normal or high.'));
-            else {
-                const said = await steer({ effort: level === 'medium' ? 'normal' : level });
-                if (said) {
-                    out(ui.c.dim(`  effort ${ui.c.bold(said.effort)} for the next requests`));
-                    if (said.effort_note)
-                        out(ui.c.dim(`  ${said.effort_note}`));
-                }
+            // The service checks the word and says what is allowed.
+            const said = await steer({ effort: effortTo[1] });
+            if (said) {
+                out(ui.c.dim(`  effort ${ui.c.bold(said.effort)} for the next requests`));
+                if (said.effort_note)
+                    out(ui.c.dim(`  ${said.effort_note}`));
             }
             out();
             return prompt();
@@ -1753,20 +1784,16 @@ async function runRepl(how = {}) {
         // `mode <name>` and `plan off` (manual 4.1, 4.5).
         const modeTo = /^mode\s+(\S+)$/.exec(word);
         if (modeTo) {
-            const named = modeTo[1];
-            if (!MODES.includes(named)) {
-                out(ui.fail(`${named} is not a permission mode. One of: ${MODES.join(', ')}`));
-            }
-            else {
-                steering_.mode = named;
-                out(ui.c.dim(`  mode ${ui.c.bold(named)}, from the next job`));
-            }
+            const said = await steer({ mode: modeTo[1] });
+            for (const line of said?.lines ?? [])
+                out(ui.c.dim(line));
             out();
             return prompt();
         }
         if (word === 'plan off') {
-            steering_.plan = false;
-            out(ui.c.dim('  planning off: the next requests are carried out'));
+            const said = await steer({ plan: false });
+            for (const line of said?.lines ?? [])
+                out(ui.c.dim(line));
             out();
             return prompt();
         }
@@ -1784,7 +1811,7 @@ async function runRepl(how = {}) {
         // `output 3`: a command's whole output, kept on this machine (5.12).
         const outputOf = /^output(?:\s+(\d+))?$/.exec(word);
         if (outputOf) {
-            const { keptOutput } = await Promise.resolve().then(() => __importStar(require('../executor/shell')));
+            const { keptOutput } = await Promise.resolve().then(() => __importStar(require('../machine/executor/shell')));
             const kept = outputOf[1] ? keptOutput(Number(outputOf[1])) : undefined;
             if (!outputOf[1])
                 out(ui.c.dim('  output N shows the whole output of command N, the number on its line.'));
@@ -1893,16 +1920,20 @@ async function runRepl(how = {}) {
         }
         if (COMMANDS.has(word)) {
             switch (word) {
-                case 'plan':
-                    steering_.plan = true;
-                    out(ui.c.dim('  planning on: the next requests are planned first and change nothing. `plan off` stops.'));
+                case 'plan': {
+                    const said = await steer({ plan: true });
+                    for (const line of said?.lines ?? [])
+                        out(ui.c.dim(line));
                     out();
                     break;
-                case 'mode':
-                    out(`  ${ui.c.dim('mode')} ${ui.c.bold(steering_.mode)}${steering_.plan ? ui.c.dim(', planning first') : ''}`);
-                    out(ui.c.dim(`  one of ${MODES.join(', ')}. \`mode <name>\` or Shift+Tab changes it.`));
+                }
+                case 'mode': {
+                    const said = await steer({});
+                    for (const line of said?.lines ?? [])
+                        out(ui.c.dim(line));
                     out();
                     break;
+                }
                 case 'pin': {
                     const said = await steer({});
                     out(said?.pin
@@ -2096,17 +2127,10 @@ async function runRepl(how = {}) {
                 // session the moment two are open, and this one is on the screen.
                 case 'cost':
                 case 'spend': {
-                    // Nothing sent is nothing charged, and the service has no record of
-                    // a session before its first job, so it would answer "no such
-                    // session" to a person checking that a refusal cost them nothing
-                    // (manual 6.1).
-                    if (session.jobs.length === 0) {
-                        out(`  ${ui.c.dim('session')} ${ui.c.bold(session.id)}  ${ui.c.dim('nothing has run yet, so it has cost')} $0.00`);
-                        out();
-                        break;
-                    }
+                    // Nothing sent is nothing charged: the service answers even before
+                    // the first job, so a refusal can be checked as costing nothing (6.1).
                     const { cmdCost } = await Promise.resolve().then(() => __importStar(require('./cost')));
-                    await cmdCost([session.id]);
+                    await cmdCost([session.serverId || session.id]);
                     break;
                 }
                 case 'model': {

package/out/commands/review.js

@@ -52,8 +52,8 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const ui = __importStar(require("../lib/ui"));
 const gateway_1 = require("../lib/gateway");
-const project_1 = require("../lib/project");
-const project_2 = require("../lib/project");
+const project_1 = require("../machine/folder/project");
+const project_2 = require("../machine/folder/project");
 const out = (s = "") => process.stdout.write(`${s}\n`);
 const err = (s = "") => process.stderr.write(`${s}\n`);
 async function review(op, payload, cwd = process.cwd()) {
@@ -62,9 +62,9 @@ async function review(op, payload, cwd = process.cwd()) {
 }
 function refused(reply) {
     if (!reply.ok)
-        return reply.message || "Your workspace could not be reached.";
+        return reply.message || "Your organization could not be reached.";
     if (reply.served === false)
-        return "Your workspace is running an older build that does not answer this yet.";
+        return "Your organization is running an older build that does not answer this yet.";
     if (reply.granted === false)
         return reply.message || "Refused.";
     return null;
@@ -162,7 +162,7 @@ async function cmdRewind(args, confirmWith) {
     for (const item of items) {
         const where = inside(project.root, item.path);
         if (!where) {
-            results.push({ path: item.path, result: "outside this project, not restored" });
+            results.push({ path: item.path, result: "outside this workspace, not restored" });
             continue;
         }
         // Your later changes are never overwritten (7.4): the file must still be
@@ -190,7 +190,7 @@ async function cmdRewind(args, confirmWith) {
             else if (item.action === "rename_back" && item.to) {
                 const from = inside(project.root, item.to);
                 if (!from)
-                    throw new Error("the new name is outside this project");
+                    throw new Error("the new name is outside this workspace");
                 fs.mkdirSync(path.dirname(where), { recursive: true });
                 if (fs.existsSync(from))
                     fs.renameSync(from, where);