orizu 0.5.31 → 0.5.32

package/dist/setup-and-skills-commands.js

@@ -9,7 +9,7 @@ import { spawnSync } from 'child_process';
 import { isInteractiveTerminal, getArg, getArgs, hasJsonFlag, hasArg, normalizeSlugInput, getOptionalArgValue, expandHomePath, cliArgs, } from './command-line-arguments.js';
 import { printLine, getCliVersion, getErrorMessage, printJson, printBannerIfInteractive, } from './cli-console-output.js';
 import { sanitizeTerminalText } from './json-response.js';
-import { SKILL_INSTALL_AGENTS, SKILL_INSTALL_TARGETS, getTargetForAgent, getSkillInstallPath, isSkillInstallAgent, isSkillInstallTarget, installSkillTarget, targetNeedsOverwrite, resolveSkillSource, getSkillTargetStatus, computeSkillContentHash, } from './skill-installer.js';
+import { SKILL_INSTALL_AGENTS, SKILL_INSTALL_TARGETS, getTargetForAgent, getSkillInstallPath, isSkillInstallAgent, isSkillInstallTarget, installSkillTarget, targetNeedsOverwrite, resolveSkillSource, getSkillTargetStatus, computeSkillContentHash, findLegacySkillInstalls, replaceLegacySkillInstalls, } from './skill-installer.js';
 import { createTeamOnServer, fetchTeams, fetchProjects, createProjectOnServer, } from './account-directory.js';
 import { authedFetch, captureAuthenticatedRequestContext } from './http.js';
 import { promptKeyboardSelect } from './keyboard-select.js';
@@ -74,7 +74,7 @@ async function waitForAnyKeyOrEscape(message) {
         rawInput.setRawMode?.(true);
     });
 }
-async function promptKeyboardMultiSelect(title, items, label, defaultSelected) {
+async function promptKeyboardMultiSelect(title, items, label, defaultSelected, options = {}) {
     if (items.length === 0) {
         return [];
     }
@@ -82,7 +82,7 @@ async function promptKeyboardMultiSelect(title, items, label, defaultSelected) {
         throw new Error(`${title} selection requires interactive terminal. Provide flags explicitly instead.`);
     }
     printLine(`\n${sanitizeTerminalText(title)}`);
-    printLine('Use ↑/↓ to move, Space to toggle, Enter to confirm, or Esc to skip.');
+    printLine(options.hint ?? 'Use ↑/↓ to move, Space to toggle, Enter to confirm, or Esc to skip.');
     let selected = 0;
     let rendered = false;
     const checked = new Set();
@@ -126,7 +126,7 @@ async function promptKeyboardMultiSelect(title, items, label, defaultSelected) {
             }
             if (key.name === 'escape') {
                 cleanup();
-                resolvePromise([]);
+                resolvePromise(options.escapeKeepsDefaults ? items.filter((item, index) => defaultSelected(item, index)) : []);
                 return;
             }
             if (key.name === 'up') {
@@ -423,9 +423,80 @@ async function installSkillCommand() {
         return;
     }
     const outcomes = await applySkillInstallTargets(targets, { mode, skipConfirm, dryRun });
+    const legacy = replaceLegacySkillInstalls({
+        ...legacyScopeAfterInstall(targets, outcomes, dryRun),
+        mode,
+        dryRun,
+        cliVersion: getCliVersion(),
+    });
     if (hasJsonFlag()) {
-        printJson({ dryRun, installs: outcomes });
+        printJson({ dryRun, installs: outcomes, legacy: legacy.replacements, legacyProblems: legacy.problems });
+        return;
+    }
+    printLegacyReport(legacy);
+}
+// install-skill and setup only touch old installs in the targets the user
+// chose. A chosen target whose own install was skipped or failed keeps its
+// old install, with that reason.
+function legacyScopeAfterInstall(targets, outcomes, dryRun) {
+    const heldBack = {};
+    if (!dryRun) {
+        for (const outcome of outcomes) {
+            if (outcome.action === 'skipped') {
+                heldBack[outcome.target] = 'you chose not to replace the current skill there';
+            }
+            else if (outcome.action === 'failed') {
+                heldBack[outcome.target] = `the current skill could not be installed there: ${outcome.error}`;
+            }
+        }
+    }
+    return { targets, heldBack };
+}
+function printLegacyReport(report) {
+    for (const line of describeLegacyReport(report)) {
+        printLine(sanitizeSetupHumanInlineText(line));
+    }
+}
+function describeLegacyReplacement(replacement) {
+    const moved = replacement.backupPath;
+    if (replacement.action === 'replaced') {
+        return `Replaced old Orizu skill ${replacement.path} with ${replacement.installedPath}`
+            + (moved ? `; moved the old copy to ${moved}` : '');
+    }
+    if (replacement.action === 'removed') {
+        return `Removed old Orizu skill ${replacement.path}` + (moved ? `; moved it to ${moved}` : '');
+    }
+    if (replacement.action === 'would-replace') {
+        return `Would replace old Orizu skill ${replacement.path} with ${replacement.installedPath}`;
+    }
+    if (replacement.action === 'would-remove') {
+        return `Would remove old Orizu skill ${replacement.path}`;
+    }
+    if (replacement.action === 'left-in-place') {
+        return `Left old Orizu skill ${replacement.path} in place (${replacement.reason}). Run \`orizu skills update\` to replace it.`;
     }
+    if (replacement.installedPath) {
+        return `Installed the current skill at ${replacement.installedPath}, but could not move old Orizu skill ${replacement.path}: ${replacement.error}. The old copy is still in place.`;
+    }
+    return `Could not replace old Orizu skill ${replacement.path}: ${replacement.error}`;
+}
+function describeLegacyProblem(problem) {
+    return `Could not check ${problem.path}: ${problem.error}`;
+}
+function describeLegacyReport(report) {
+    return [
+        ...report.replacements.map(describeLegacyReplacement),
+        ...report.problems.map(describeLegacyProblem),
+    ];
+}
+function describeLegacyInstall(install) {
+    if (install.kind === 'broken-link') {
+        return `outdated link to ${install.linkTarget}, which no longer exists`;
+    }
+    if (install.kind === 'link') {
+        return `outdated link to ${install.linkTarget}`;
+    }
+    return 'outdated copy';
 }
 function describeSkillTargetState(status) {
     if (status.state === 'current')
@@ -441,6 +512,7 @@ function describeSkillTargetState(status) {
 function skillsStatusCommand() {
     const source = resolveSkillSource();
     const statuses = SKILL_INSTALL_TARGETS.map(target => getSkillTargetStatus(target));
+    const { installs: legacyInstalls, problems: legacyProblems } = findLegacySkillInstalls();
     if (hasJsonFlag()) {
         printJson({
             name: source.name,
@@ -457,6 +529,8 @@ function skillsStatusCommand() {
                 installedHash: status.installedHash,
                 meta: status.meta,
             })),
+            legacyInstalls,
+            legacyProblems,
         });
         return;
     }
@@ -467,11 +541,27 @@ function skillsStatusCommand() {
         printLine(`  ${status.target.padEnd(16)} ${describeSkillTargetState(status)}${mode}`);
         printLine(`  ${''.padEnd(16)} ${status.path}`);
     }
+    if (legacyInstalls.length > 0) {
+        printLine('');
+        printLine('Old Orizu skill installs (outdated; agents may still load these):');
+        for (const install of legacyInstalls) {
+            printLine(sanitizeSetupHumanInlineText(`  ${install.name.padEnd(16)} ${describeLegacyInstall(install)}`));
+            printLine(sanitizeSetupHumanInlineText(`  ${''.padEnd(16)} ${install.path}`));
+        }
+        printLine('Run `orizu skills update` to replace them.');
+    }
+    if (legacyProblems.length > 0) {
+        printLine('');
+        for (const problem of legacyProblems) {
+            printLine(sanitizeSetupHumanInlineText(describeLegacyProblem(problem)));
+        }
+    }
 }
 async function skillsUpdateCommand() {
     const dryRun = hasArg('--dry-run');
     const cliVersion = getCliVersion();
     const updates = [];
+    const legacy = replaceLegacySkillInstalls({ dryRun, cliVersion });
     for (const target of SKILL_INSTALL_TARGETS) {
         const status = getSkillTargetStatus(target);
         if (status.state === 'missing' || status.state === 'unmanaged') {
@@ -498,10 +588,11 @@ async function skillsUpdateCommand() {
         });
     }
     if (hasJsonFlag()) {
-        printJson({ updates });
+        printJson({ updates, legacy: legacy.replacements, legacyProblems: legacy.problems });
         return;
     }
-    if (updates.length === 0) {
+    printLegacyReport(legacy);
+    if (updates.length === 0 && legacy.replacements.length === 0 && legacy.problems.length === 0) {
         printLine('No Orizu skill installs found. Run `orizu install-skill` first.');
         return;
     }
@@ -605,7 +696,7 @@ async function resolveSetupProjects(team, projectSlugArg, createProjectName, noI
             throw new Error('--create-project requires a non-empty project name.');
         const selected = await createProjectOnServer(team.slug, name, request);
         printLine(`Created project ${sanitizeTerminalText(`${selected.teamSlug}/${selected.slug}`)}`);
-        return { selected, projects: [...projects, selected] };
+        return { selected, projects: [selected] };
     }
     const normalizedProjectSlug = projectSlugArg ? normalizeSlugInput(projectSlugArg) : null;
     if (normalizedProjectSlug) {
@@ -613,7 +704,7 @@ async function resolveSetupProjects(team, projectSlugArg, createProjectName, noI
         if (!selected) {
             throw new Error(`Project '${team.slug}/${normalizedProjectSlug}' was not found.`);
         }
-        return { selected, projects };
+        return { selected, projects: [selected] };
     }
     if (projects.length === 0) {
         if (!canCreateProject)
@@ -643,6 +734,17 @@ async function resolveSetupProjects(team, projectSlugArg, createProjectName, noI
     printLine(`Created project ${sanitizeTerminalText(`${selected.teamSlug}/${selected.slug}`)}`);
     return { selected, projects: [...projects, selected] };
 }
+// Every project starts checked and Esc keeps them all. The active project is
+// always set up, so Enter with nothing checked sets up only that one.
+async function chooseProjectsToScaffold(projects, active) {
+    const checked = await promptKeyboardMultiSelect('Choose the team projects to set up in this workspace', projects, project => project.slug === active.slug
+        ? `${project.name} (${project.slug}) — active project, always set up`
+        : `${project.name} (${project.slug})`, () => true, {
+        hint: 'Use ↑/↓ to move, Space to toggle, Enter to confirm, or Esc to keep them all. With nothing checked, only the active project is set up.',
+        escapeKeepsDefaults: true,
+    });
+    return projects.filter(project => project.slug === active.slug || checked.includes(project));
+}
 function projectSeedsFromProjects(projects) {
     return projects.map(project => ({
         slug: project.slug,
@@ -789,6 +891,9 @@ async function setupCommand() {
             setupProjects = selection.projects;
             printLine(`Selected project ${sanitizeTerminalText(`${setupTeam.slug}/${selectedProject.slug}`)}`);
             printLine('');
+            if (!noInput && setupProjects.length > 1 && !hasArg('--no-workspace')) {
+                setupProjects = await chooseProjectsToScaffold(setupProjects, selectedProject);
+            }
         }
     }
     // Step 2: local workspace
@@ -902,6 +1007,15 @@ async function setupCommand() {
             if (dryRun) {
                 printLine('Dry run: no skill files were changed.');
             }
+            const legacy = replaceLegacySkillInstalls({
+                ...legacyScopeAfterInstall(targets, installOutcomes, dryRun),
+                mode: installMode,
+                dryRun,
+                cwd: workspaceRoot,
+                homeDir: setupSkillHome,
+                cliVersion: getCliVersion(),
+            });
+            printLegacyReport(legacy);
             for (const outcome of installOutcomes) {
                 const label = setupSkillLabel(outcome.target);
                 if (outcome.action === 'failed') {

package/dist/skill-installer.d.ts

@@ -65,4 +65,36 @@ export interface SkillTargetStatus {
 }
 export declare function getSkillTargetStatus(target: SkillInstallTarget, options?: SkillInstallOptions): SkillTargetStatus;
 export declare function isSkillInstallTarget(value: string): value is SkillInstallTarget;
+export interface LegacySkillInstall {
+    target: SkillInstallTarget;
+    name: string;
+    path: string;
+    kind: 'directory' | 'link' | 'broken-link';
+    linkTarget: string | null;
+    resolvedPath: string | null;
+}
+export interface LegacySkillProblem {
+    path: string;
+    error: string;
+}
+export interface LegacySkillScan {
+    installs: LegacySkillInstall[];
+    problems: LegacySkillProblem[];
+}
+export interface LegacySkillReplacement extends LegacySkillInstall {
+    action: 'replaced' | 'removed' | 'would-replace' | 'would-remove' | 'left-in-place' | 'failed';
+    installedPath: string | null;
+    backupPath: string | null;
+    reason: string | null;
+    error: string | null;
+}
+export interface LegacySkillReplaceOptions extends SkillInstallOptions {
+    targets?: readonly SkillInstallTarget[];
+    heldBack?: Partial<Record<SkillInstallTarget, string>>;
+}
+export declare function findLegacySkillInstalls(options?: SkillInstallOptions): LegacySkillScan;
+export declare function replaceLegacySkillInstalls(options?: LegacySkillReplaceOptions): {
+    replacements: LegacySkillReplacement[];
+    problems: LegacySkillProblem[];
+};
 //# sourceMappingURL=skill-installer.d.ts.map

package/dist/skill-installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-installer.d.ts","sourceRoot":"","sources":["../src/skill-installer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skill-installer.d.ts","sourceRoot":"","sources":["../src/skill-installer.ts"],"names":[],"mappings":"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"}

package/dist/skill-installer.js

@@ -1,10 +1,13 @@
-import { cpSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, readlinkSync, realpathSync, rmSync, symlinkSync, writeFileSync, } from 'fs';
+import { cpSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, readlinkSync, realpathSync, renameSync, rmdirSync, rmSync, symlinkSync, unlinkSync, writeFileSync, } from 'fs';
 import { dirname, isAbsolute, join, relative, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { homedir } from 'os';
 import { createHash } from 'crypto';
 import { workspaceExists } from './workspace.js';
 export const SKILL_NAME = 'orizu';
+// The name earlier releases installed the skill under. Agents still load
+// these old copies, so status, update, install and setup find and replace them.
+const LEGACY_SKILL_NAME = 'orizu-cli';
 export const AGENTS_START_MARKER = '<!-- orizu-cli:start -->';
 export const AGENTS_END_MARKER = '<!-- orizu-cli:end -->';
 export const SKILL_INSTALL_TARGETS = [
@@ -463,3 +466,227 @@ export function getSkillTargetStatus(target, options) {
 export function isSkillInstallTarget(value) {
     return SKILL_INSTALL_TARGETS.includes(value);
 }
+function getLegacySkillInstallPath(target, options) {
+    return resolve(dirname(getSkillInstallPath(target, options)), LEGACY_SKILL_NAME);
+}
+// The closing delimiter must be a whole `---` line.
+const FRONTMATTER_BLOCK = /^---\r?\n([\s\S]*?)\r?\n---[ \t]*(?:\r?\n|$)/;
+function readFrontmatterName(markdown) {
+    const frontmatter = markdown.match(FRONTMATTER_BLOCK);
+    if (!frontmatter) {
+        return null;
+    }
+    const name = frontmatter[1].match(/^name:\s*['"]?([^'"\r\n]*?)['"]?\s*$/m);
+    return name ? name[1] : null;
+}
+function stripFrontmatterName(markdown) {
+    return markdown.replace(FRONTMATTER_BLOCK, frontmatter => frontmatter.replace(/^name:.*$/m, ''));
+}
+// Only a folder that is positively an old Orizu skill counts: its SKILL.md
+// header carries the old name and the rest of the file names Orizu. Every
+// past install, ours or a hand copy, has that SKILL.md. A user's own folder
+// that happens to share the name is never reported or touched.
+function isOrizuLegacySkillDir(dir) {
+    const skillMd = join(dir, 'SKILL.md');
+    if (!existsSync(skillMd)) {
+        return false;
+    }
+    const markdown = readFileSync(skillMd, 'utf8');
+    return readFrontmatterName(markdown) === LEGACY_SKILL_NAME
+        && /orizu/i.test(stripFrontmatterName(markdown));
+}
+function inspectLegacySkillPath(target, path) {
+    let stats;
+    try {
+        stats = lstatSync(path);
+    }
+    catch {
+        return null;
+    }
+    const base = { target, name: LEGACY_SKILL_NAME, path };
+    if (stats.isSymbolicLink()) {
+        const linkTarget = readlinkSync(path);
+        if (!existsSync(path)) {
+            // The folder behind it is gone, so there is no SKILL.md to read. Every
+            // past installer linked to a folder called skills/<old name>.
+            return linkTarget.replace(/\\/g, '/').replace(/\/+$/, '').endsWith(`skills/${LEGACY_SKILL_NAME}`)
+                ? { ...base, kind: 'broken-link', linkTarget, resolvedPath: null }
+                : null;
+        }
+        const resolvedPath = realpathSync(path);
+        return isOrizuLegacySkillDir(resolvedPath)
+            ? { ...base, kind: 'link', linkTarget, resolvedPath }
+            : null;
+    }
+    return stats.isDirectory() && isOrizuLegacySkillDir(path)
+        ? { ...base, kind: 'directory', linkTarget: null, resolvedPath: null }
+        : null;
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function errorCode(error) {
+    return error && typeof error === 'object' && 'code' in error ? String(error.code) : undefined;
+}
+export function findLegacySkillInstalls(options) {
+    const installs = [];
+    const problems = [];
+    const seenPaths = new Set();
+    for (const target of SKILL_INSTALL_TARGETS) {
+        if (target === 'agents-md') {
+            continue;
+        }
+        const path = getLegacySkillInstallPath(target, options);
+        if (seenPaths.has(path)) {
+            continue;
+        }
+        seenPaths.add(path);
+        try {
+            const install = inspectLegacySkillPath(target, path);
+            if (install) {
+                installs.push(install);
+            }
+        }
+        catch (error) {
+            problems.push({ path, error: errorMessage(error) });
+        }
+    }
+    return { installs, problems };
+}
+function backupDirectoryFor(options) {
+    return resolve(resolveHome(options), '.orizu', 'skill-backups');
+}
+function uniqueBackupPath(install, options) {
+    const stamp = new Date().toISOString().replace(/[-:]/g, '').replace(/\.\d+Z$/, 'Z');
+    const base = join(backupDirectoryFor(options), `${LEGACY_SKILL_NAME}-${stamp}-${install.target}`);
+    let candidate = base;
+    for (let attempt = 2; pathEntryExists(candidate); attempt += 1) {
+        candidate = `${base}-${attempt}`;
+    }
+    return candidate;
+}
+// A user may have edited their old copy, so a folder is moved to a backup
+// folder that no agent scans, never deleted.
+function moveToBackup(path, backupPath) {
+    mkdirSync(dirname(backupPath), { recursive: true });
+    try {
+        renameSync(path, backupPath);
+    }
+    catch (error) {
+        if (errorCode(error) !== 'EXDEV') {
+            throw error;
+        }
+        // A project on another disk cannot be renamed into the home folder.
+        cpSync(path, backupPath, { recursive: true, verbatimSymlinks: true });
+        rmSync(path, { recursive: true });
+    }
+}
+// Links are removed as links, never by following them. Windows refuses
+// unlink on a directory link, and rmdir removes only the link there.
+function removeLink(path) {
+    try {
+        unlinkSync(path);
+    }
+    catch (error) {
+        const code = errorCode(error);
+        if (code !== 'EPERM' && code !== 'EISDIR') {
+            throw error;
+        }
+        rmdirSync(path);
+    }
+}
+// Returns where a folder was moved to, or null for a link. A folder is checked
+// again right before it is moved, in case it changed since it was found.
+function removeLegacySkillInstall(install, options) {
+    const current = inspectLegacySkillPath(install.target, install.path);
+    if (!current || (current.kind === 'directory') !== (install.kind === 'directory')) {
+        throw new Error(`${install.path} changed while Orizu was replacing it; it was left in place.`);
+    }
+    if (current.kind !== 'directory') {
+        removeLink(install.path);
+        return null;
+    }
+    const backupPath = uniqueBackupPath(install, options);
+    moveToBackup(install.path, backupPath);
+    return backupPath;
+}
+function replaceOneLegacySkillInstall(install, options, heldBackReason) {
+    const installedPath = getSkillInstallPath(install.target, options);
+    const needsInstall = !pathEntryExists(installedPath);
+    const result = {
+        ...install,
+        installedPath: needsInstall ? installedPath : null,
+        backupPath: null,
+        reason: null,
+        error: null,
+    };
+    if (heldBackReason) {
+        return { ...result, action: 'left-in-place', installedPath: null, reason: heldBackReason };
+    }
+    if (options?.dryRun) {
+        return { ...result, action: needsInstall ? 'would-replace' : 'would-remove' };
+    }
+    let didInstall = false;
+    try {
+        if (needsInstall) {
+            installSkillTarget(install.target, {
+                ...options,
+                overwrite: false,
+                dryRun: false,
+                mode: options?.mode ?? (install.kind === 'directory' ? 'copy' : 'auto'),
+            });
+            didInstall = true;
+        }
+        const backupPath = removeLegacySkillInstall(install, options);
+        return { ...result, action: needsInstall ? 'replaced' : 'removed', backupPath };
+    }
+    catch (error) {
+        // Keep the new path when the install worked, so both facts are reported.
+        return {
+            ...result,
+            action: 'failed',
+            installedPath: didInstall ? installedPath : null,
+            error: errorMessage(error),
+        };
+    }
+}
+// Why an old install must be left alone, or null when it may be replaced.
+function heldBackReasonFor(install, installs, options) {
+    const isSelected = (target) => !options?.targets || options.targets.includes(target);
+    const heldBack = options?.heldBack?.[install.target];
+    if (heldBack) {
+        return heldBack;
+    }
+    if (!isSelected(install.target)) {
+        return 'not a selected target';
+    }
+    if (install.kind !== 'directory') {
+        return null;
+    }
+    // Moving a folder would leave a link from an unselected target pointing
+    // nowhere, so the folder stays until that link can go too.
+    let folder;
+    try {
+        folder = realpathSync(install.path);
+    }
+    catch (error) {
+        return `it could not be checked: ${errorMessage(error)}`;
+    }
+    const blockingLink = installs.find(other => other.kind === 'link'
+        && other.resolvedPath === folder
+        && (!isSelected(other.target) || Boolean(options?.heldBack?.[other.target])));
+    return blockingLink ? `${blockingLink.path} links to it and is left in place` : null;
+}
+export function replaceLegacySkillInstalls(options) {
+    const { installs, problems } = findLegacySkillInstalls(options);
+    // Remove links before folders, so no link is left pointing at a moved folder.
+    const ordered = [
+        ...installs.filter(install => install.kind !== 'directory'),
+        ...installs.filter(install => install.kind === 'directory'),
+    ];
+    const reasons = new Map(ordered.map(install => [install, heldBackReasonFor(install, installs, options)]));
+    return {
+        replacements: ordered.map(install => replaceOneLegacySkillInstall(install, options, reasons.get(install) ?? null)),
+        problems,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orizu",
-  "version": "0.5.31",
+  "version": "0.5.32",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",

package/src/app-commands.ts

@@ -2,6 +2,7 @@
 
 import {
   readFileSync,
+  statSync,
   mkdirSync,
   writeFileSync,
   realpathSync,
@@ -446,6 +447,14 @@ async function appDetail() {
   printLine(`  Updated: ${sanitizeTerminalText(detail.updatedAt)}`)
 }
 
+/** `--out` may be a file path or a directory; a directory gets the default file name. */
+export function resolveAppExportPath(outPathArg: string | null | undefined, defaultFilename: string): string {
+  if (!outPathArg) return defaultFilename
+  const expanded = expandHomePath(outPathArg)
+  const isDirectory = /[\\/]$/.test(outPathArg) || statSync(expanded, { throwIfNoEntry: false })?.isDirectory() === true
+  return isDirectory ? join(expanded, defaultFilename) : expanded
+}
+
 async function exportAppSource() {
   const project = getArg('--project')
   const versionArg = getArg('--version')
@@ -480,9 +489,10 @@ async function exportAppSource() {
   }
 
   const data = await parseJsonResponse<AppExportPayload>(response, 'App export')
-  const filename = outPathArg
-    ? expandHomePath(outPathArg)
-    : defaultAppExportFilename(data.app.name, data.version.versionNum)
+  const filename = resolveAppExportPath(
+    outPathArg,
+    defaultAppExportFilename(data.app.name, data.version.versionNum)
+  )
 
   writeTextFileEnsuringDir(filename, data.version.code)
   if (hasJsonFlag()) {

package/src/help.ts

@@ -307,13 +307,13 @@ export const COMMAND_DOCS: CliCommandDoc[] = [
     options: [
       { name: '--team <slug>', help: 'Choose an existing accessible team.' },
       { name: '--create-team <name>', help: 'Create and select a new team; mutually exclusive with --team.' },
-      { name: '--project <slug>', help: 'Choose the project to use as coding-agent handoff context. The workspace still materializes all team projects.' },
-      { name: '--create-project <name>', help: 'Create and select a project in the chosen team; mutually exclusive with --project.' },
+      { name: '--project <slug>', help: 'Choose the project to work in. Only that project is set up in the workspace, and the team-project checklist is skipped, interactive or not.' },
+      { name: '--create-project <name>', help: 'Create and select a project in the chosen team, and set up only that project (no checklist); mutually exclusive with --project.' },
       { name: '--workspace [path]', help: 'Initialize or validate a workspace path, or the current directory when no path is provided. If provided, the value must be a filesystem path.' },
       { name: '--service-origin <url>', help: 'Service origin written to setup metadata. Defaults to the active CLI server.' },
       { name: '--attach-workspace <id>', help: 'Record an existing Orizu workspace id for future attachment.' },
       { name: '--validate', help: 'Inspect the workspace contract without writing files.' },
-      { name: '--fix', help: 'Apply safe idempotent repairs only.' },
+      { name: '--fix', help: 'Apply safe idempotent repairs only, restoring every team project.' },
       { name: '--no-symlinks', help: 'Write CLAUDE.md as a pointer file instead of a symlink to AGENTS.md.' },
       { name: '--verbose', help: 'Show per-file setup actions. Default setup output is summary-oriented.' },
       { name: '--agent <agent>', help: 'Non-interactive opt-in to install the shared global Orizu skill plus any applicable native target. Repeat for multiple agents.', repeatable: true, choices: ['claude', 'codex', 'pi', 'devin', 'droid', 'grok', 'windsurf', 'opencode'] },
@@ -775,8 +775,8 @@ export const COMMAND_DOCS: CliCommandDoc[] = [
   },
   {
     path: ['apps', 'export'],
-    usage: 'orizu apps export [--app <appId>] [--project <team/project>] [--version <n>] [--out <path>]',
-    summary: 'Export app source for the selected app version.',
+    usage: 'orizu apps export [--app <appId>] [--project <team/project>] [--version <n>] [--out <file-or-directory>]',
+    summary: 'Export app source for the selected app version. --out is a file path, or a directory (the file is named <app>.v<version>.tsx inside it).',
     group: 'Apps',
   },
   {

package/src/hosted-agent-prompt.ts

@@ -0,0 +1,18 @@
+/**
+ * The system prompt for the hosted agent (ORI-2207).
+ *
+ * OpenCode (the program that runs the agent in a hosted session) ships its own
+ * built-in prompt that starts "You are opencode, an interactive CLI tool…", so
+ * the agent used to introduce itself as OpenCode. We register our own "primary
+ * agent" in the OpenCode config with this text, and every prompt request picks
+ * it by name. That replaces OpenCode's built-in prompt entirely, so this text
+ * carries the working rules we still want: use the tools, keep answers short.
+ * AGENTS.md is still added after it, as before.
+ */
+export const HOSTED_AGENT_NAME = 'orizu'
+
+export const HOSTED_AGENT_PROMPT = `You are the Orizu agent. You work in the person's repository inside an Orizu workbench, helping them with software engineering tasks. If asked who or what you are, say you are the Orizu agent. Never call yourself OpenCode.
+
+- Do the work with your tools: read files, search, edit, and run commands. Do not guess at what a file contains when you can look.
+- Keep answers short and plain. Say what you did and what the person needs to know next.
+- Follow the repository's own conventions and any instructions in its AGENTS.md.`

package/src/hosted-harness-opencode.ts

@@ -51,6 +51,7 @@
 
 import { readFileSync } from 'fs'
 
+import { HOSTED_AGENT_NAME, HOSTED_AGENT_PROMPT } from './hosted-agent-prompt.js'
 import { findProvider, parseModelIdentity } from './provider-registry.js'
 
 import { HARNESS_NAMES } from './hosted-harness.js'
@@ -193,6 +194,7 @@ export function buildPromptRequestBody(
   const body: Record<string, unknown> = {
     parts: [{ type: 'text', text: content }],
     messageID: opencodeMessageId,
+    agent: HOSTED_AGENT_NAME,
   }
   if (!model) return body
 
@@ -1133,6 +1135,8 @@ export function buildOpenCodeConfigContent(opts: OpenCodeConfigOptions): string
   return JSON.stringify({
     model: opts.model,
     permission: opts.permission ?? defaultHeadlessPermission(),
+    // Replaces OpenCode's built-in "You are opencode…" prompt (ORI-2207).
+    agent: { [HOSTED_AGENT_NAME]: { mode: 'primary', prompt: HOSTED_AGENT_PROMPT } },
   })
 }