@harness-lab/cli 0.2.8 → 0.2.9

package/README.md

@@ -9,9 +9,14 @@ Current shipped scope:
 - `harness auth login`
 - `harness auth logout`
 - `harness auth status`
+- `harness workshop current-instance`
+- `harness workshop select-instance`
 - `harness workshop status`
+- `harness workshop list-instances`
+- `harness workshop show-instance`
 - `harness workshop create-instance`
 - `harness workshop update-instance`
+- `harness workshop reset-instance`
 - `harness workshop prepare`
 - `harness workshop remove-instance`
 - `harness workshop archive`
@@ -120,16 +125,37 @@ Workshop commands:
 ```bash
 harness auth status
 harness skill install
+harness workshop list-instances
+harness workshop select-instance sample-workshop-demo-orbit
+harness workshop current-instance
 harness workshop status
+harness workshop show-instance sample-workshop-demo-orbit
 harness workshop create-instance sample-workshop-demo-orbit --event-title "Sample Workshop Demo"
-harness workshop update-instance sample-workshop-demo-orbit --room-name Orbit
-harness workshop prepare sample-workshop-demo-orbit
-harness workshop remove-instance sample-workshop-demo-orbit
+harness workshop update-instance --room-name Orbit
+harness workshop reset-instance --template-id blueprint-default
+harness workshop prepare
+harness workshop remove-instance
 harness workshop phase set rotation
 harness workshop archive --notes "Manual archive"
+harness workshop select-instance --clear
 harness auth logout
 ```
 
+Targeting model:
+
+- `harness workshop list-instances` is the discovery entrypoint for facilitator-visible workshops
+- `harness workshop select-instance <instance-id>` stores a local current target for later workshop commands
+- `harness workshop current-instance` reports the stored target and resolves its current server state
+- `harness workshop status` and `harness workshop phase set <phase-id>` use the selected instance when present, otherwise they fall back to deployment default behavior
+- `harness workshop show-instance`, `update-instance`, `reset-instance`, `prepare`, and `remove-instance` accept an explicit `<instance-id>` but may also use the stored selection as a fallback
+- `harness workshop select-instance --clear` removes the stored selection
+- `HARNESS_WORKSHOP_INSTANCE_ID` remains an environment fallback when no local selection is stored
+
+Machine-readable output:
+
+- `harness --json ...` prints strict JSON output without headings
+- prefer this for agent or script consumption instead of parsing human-oriented terminal copy
+
 Facilitator lifecycle commands are intentionally CLI-first:
 
 - skill invokes `harness`

package/assets/workshop-bundle/SKILL.md

@@ -214,18 +214,34 @@ This is a facilitator-only command — do not surface to participants.
 
 Show the current instance state, agenda phase, facilitator list, and team count.
 Requires active facilitator session.
+If a local current instance is selected, prefer that target over deployment-default status.
+When an agent needs machine-readable output, prefer `harness --json workshop status`.
+
+### `workshop facilitator current-instance`
+
+Show the locally selected facilitator target, where it came from, and the resolved instance record.
+Prefer invoking `harness workshop current-instance`.
+Use this to confirm the CLI target before update, reset, prepare, remove, or phase operations.
+
+### `workshop facilitator select-instance <instance-id>`
+
+Persist a facilitator-local current target for later workshop commands.
+Prefer invoking `harness workshop select-instance <instance-id>`.
+Use `harness workshop select-instance --clear` to remove the stored selection.
 
 ### `workshop facilitator list-instances`
 
 List the facilitator-visible workshop instance registry.
 Prefer invoking `harness workshop list-instances` over raw API scripts or local session-file inspection.
 Use this when the facilitator needs to discover what currently exists on a shared dashboard before choosing an explicit instance for reset, update, or agenda work.
+When an agent needs strict parsing, prefer `harness --json workshop list-instances`.
 
 ### `workshop facilitator show-instance <instance-id>`
 
 Inspect one explicit workshop instance.
 Prefer invoking `harness workshop show-instance <instance-id>` over raw API scripts.
 Use this when the facilitator needs the full record for one instance rather than the deployment-default runtime status returned by `workshop facilitator status`.
+If a current instance is already selected, the CLI may omit `<instance-id>` and use the stored target.
 
 ### `workshop facilitator grant <email> <role>`
 
@@ -263,6 +279,7 @@ Support `contentLang` changes explicitly so facilitators can choose workshop del
 
 Facilitator discovery rule:
 - for routine discovery, use `harness workshop list-instances` and `harness workshop show-instance`
+- for repeated work on one live workshop, use `harness workshop select-instance <instance-id>` and `harness workshop current-instance`
 - do not read local CLI session files or improvise authenticated `node -e` fetch scripts unless you are diagnosing the CLI itself
 
 ### `workshop facilitator reset-instance <instance-id>`
@@ -270,16 +287,19 @@ Facilitator discovery rule:
 Reset one existing workshop instance from the selected blueprint template. Requires facilitator session.
 Prefer invoking `harness workshop reset-instance` over raw API scripts.
 Use this when the facilitator wants fresh canonical agenda, runner, and presenter content for a live instance and accepts that local runtime state will be reinitialized.
+If a current instance is already selected, the CLI may omit `<instance-id>` and use the stored target.
 
 ### `workshop facilitator remove-instance`
 
 Remove a workshop instance from the active list without deleting its archive history. Requires facilitator session.
 Prefer invoking `harness workshop remove-instance`.
+If a current instance is already selected, the CLI may omit `<instance-id>` and use the stored target.
 
 ### `workshop facilitator prepare`
 
 Set the current instance to `prepared` state. Verify event code is ready.
 Prefer invoking `harness workshop prepare`.
+If a current instance is already selected, the CLI may omit `<instance-id>` and use the stored target.
 
 ### `workshop facilitator agenda`
 

package/assets/workshop-bundle/bundle-manifest.json

@@ -1,8 +1,8 @@
 {
   "manifestVersion": 1,
   "bundleName": "harness-lab-workshop",
-  "bundleVersion": "0.2.8",
-  "contentHash": "6194a59089ff94131b647282c1b5e7574a6a9d112c48b4b9d58b600f5775736a",
+  "bundleVersion": "0.2.9",
+  "contentHash": "671837951cf6679bea1d517c900927aab5d457806695e1a6da25574b8573f325",
   "files": [
     {
       "path": "content/challenge-cards/.gitkeep",
@@ -34,7 +34,7 @@
     },
     {
       "path": "content/facilitation/master-guide.md",
-      "sha256": "f0edc5eef8c7bc0efc67672e184edecce46fa5fd5e9820cfda0b28fbb8cb1a8f"
+      "sha256": "845adbcf9284cedd589d461b40ae1cd336d816b92bcc239df4574148a57b263a"
     },
     {
       "path": "content/project-briefs/.gitkeep",
@@ -98,11 +98,11 @@
     },
     {
       "path": "content/talks/context-is-king.md",
-      "sha256": "4d0972fefac067de0b8803698b44bdf8ab0bee64b181d50d1ac5e26a92eb7089"
+      "sha256": "0bb48497b458474a546c351118ad455c00ad997c9efc0e227b388f81dd0b55e3"
     },
     {
       "path": "docs/harness-cli-foundation.md",
-      "sha256": "f3b6125a4575c27dcb7b88474003f2a9b189a4b1b25bfaa462861571b69f7a51"
+      "sha256": "cff448e5c1ee4e7129724e4f8294add35cd1efb621c83182b341a1b7e5a16b86"
     },
     {
       "path": "docs/learner-reference-gallery.md",
@@ -134,7 +134,7 @@
     },
     {
       "path": "SKILL.md",
-      "sha256": "de24b73c431855143630f6d312d9bb2af0a16178c2c70f928c5c3a426e569777"
+      "sha256": "d1e242a857f61bc2fae29c74a9e0efbd1ba0ed5beb25087dbaeffabc5f53b4a5"
     },
     {
       "path": "workshop-blueprint/agenda.json",
@@ -182,7 +182,7 @@
     },
     {
       "path": "workshop-skill/facilitator.md",
-      "sha256": "f0e977df5979d0d218eabad026b66ecefa90802c71dc8a9468959334570f1c1c"
+      "sha256": "525fc9fdad22cf42b47854ff9ad90579d728daf2c4ac484aba13f93193eb56d3"
     },
     {
       "path": "workshop-skill/follow-up-package.md",

package/assets/workshop-bundle/content/facilitation/master-guide.md

@@ -64,14 +64,14 @@ Pravidla:
 
 Po launchi potřebuje místnost ještě jednu konkrétní věc:
 
-- co má být po prvním build bloku opravdu vidět
-- co nestačí jen slíbit
+- co má být po prvním build bloku opravdu vidět v repu
+- co nestačí jen slíbit nebo dovysvětlit u stolu
 
 Do oběda má být vidět:
 
-- repo a `README`, které dávají smysl cizímu člověku
-- `AGENTS.md` jako krátká mapa
-- plan nebo jasně vedená implementační stopa
+- `README`, které dává smysl cizímu člověku
+- `AGENTS.md` jako krátká mapa, ne sklad všeho
+- plan nebo jasně vedená implementační stopa, ze které je poznat další safe move
 - první explicitní check před dalším generováním
 
 ## Context is King talk
@@ -93,6 +93,8 @@ Proměnit energii z openingu v přesnou tezi a čistý most do Build fáze 1.
 
 ### Mikro-cvičení
 
+Tohle je krátká facilitátorova ukázka, ne zadání pro celý room.
+
 Použijte stejný malý task ve dvou podmínkách:
 
 1. prompt blob
@@ -112,6 +114,7 @@ Na konci talku má být jasné:
 
 - teorie tím končí
 - tým se vrací k repu
+- pokud tým ještě nemá workshop skill, teď je chvíle na `harness skill install`, pak `Codex: $workshop setup` nebo `pi: /skill:workshop`
 - nejdřív vzniká mapa a první explicitní check
 - teprve potom dává smysl další feature motion
 

package/assets/workshop-bundle/content/talks/context-is-king.md

@@ -30,7 +30,9 @@ Pointa analogie:
 
 ## Mikro-cvičení
 
-Všichni dostanou stejný malý task. Jedna varianta bude prompt blob. Druhá varianta bude krátké zadání se 4 prvky a s odkazem na kontext zapsaný v repu. Pak porovnáme výsledky. Nehledáme „nejhezčí prompt“. Hledáme způsob práce, který přenese záměr, omezení a done criteria i do dalšího kroku.
+Tohle je krátká facilitátorova ukázka, ne práce pro celý room.
+
+Vezmeme stejný malý task ve dvou podmínkách. Jedna varianta bude prompt blob. Druhá varianta bude krátké zadání se 4 prvky a s odkazem na kontext zapsaný v repu. Pak porovnáme výsledky. Nehledáme „nejhezčí prompt“. Hledáme způsob práce, který přenese záměr, omezení a done criteria i do dalšího kroku.
 
 4 prvky pro druhou variantu:
 
@@ -64,6 +66,7 @@ Všichni dostanou stejný malý task. Jedna varianta bude prompt blob. Druhá va
 
 Po tomhle talku se tým nemá vracet k repu s pocitem, že potřebuje jen chytřejší prompt. Má se vracet s jedním jasným očekáváním:
 
+- pokud ještě nemá workshop skill, teď je chvíle na `harness skill install`, pak `Codex: $workshop setup` nebo `pi: /skill:workshop`
 - nejdřív krátká mapa v repu
 - potom plan
 - potom první explicitní check

package/assets/workshop-bundle/docs/harness-cli-foundation.md

@@ -8,7 +8,7 @@ Current implementation in this repo:
 
 - lives in the repository `harness-cli/` package and ships publicly as `@harness-lab/cli`
 - distributes a portable participant workshop skill bundle through `harness skill install`
-- covers `auth login/logout/status` plus `workshop status/list-instances/show-instance/create-instance/update-instance/reset-instance/prepare/remove-instance/archive/phase set`
+- covers `auth login/logout/status` plus `workshop current-instance/select-instance/status/list-instances/show-instance/create-instance/update-instance/reset-instance/prepare/remove-instance/archive/phase set`
 - targets the existing shared dashboard facilitator APIs
 - is tested for browser/device auth, local-dev Basic Auth fallback, and cookie-backed Neon bootstrap fallback
 - stores sessions in a local file under `HARNESS_CLI_HOME` or `~/.harness` by default
@@ -38,6 +38,8 @@ Required commands:
 - `harness auth login`
 - `harness auth logout`
 - `harness auth status`
+- `harness workshop current-instance`
+- `harness workshop select-instance <instance-id>`
 - `harness workshop status`
 - `harness workshop list-instances`
 - `harness workshop show-instance <instance-id>`
@@ -85,33 +87,41 @@ Current auth layering:
 Current target-selection order:
 
 1. an explicit command or route instance id
-2. the selected control-room instance in the dashboard
+2. the CLI-local persisted selection set by `harness workshop select-instance`
 3. the deployment default `HARNESS_WORKSHOP_INSTANCE_ID`
 4. a repository fallback only on surfaces that intentionally present a workspace-level default
 
 Current command posture:
 
 - explicit workspace-discovery commands:
+  - `harness workshop current-instance`
+  - `harness workshop select-instance <instance-id>`
   - `harness workshop list-instances`
-- explicit target required:
-  - `harness workshop show-instance <instance-id>`
-- explicit target required:
-  - `harness workshop update-instance <instance-id>`
-  - `harness workshop reset-instance <instance-id>`
-  - `harness workshop prepare <instance-id>`
-  - `harness workshop remove-instance <instance-id>`
+- explicit target preferred but selected-instance fallback allowed:
+  - `harness workshop show-instance [<instance-id>]`
+  - `harness workshop update-instance [<instance-id>]`
+  - `harness workshop reset-instance [<instance-id>]`
+  - `harness workshop prepare [<instance-id>]`
+  - `harness workshop remove-instance [<instance-id>]`
 - explicit target is the created resource:
   - `harness workshop create-instance [<instance-id>]`
-- deployment-default target:
+- selected-instance target first, otherwise deployment-default target:
   - `harness workshop status`
-  - `harness workshop archive`
   - `harness workshop phase set <phase-id>`
+- deployment-default target:
+  - `harness workshop archive`
 
 Current discoverability path:
 
 - facilitators can inspect available workshop instances through the dashboard workspace view
 - the same platform-scoped list lives behind the authenticated instances API surface at `/api/workshop/instances`
 - the CLI should expose that list directly so facilitator skills do not need session-file inspection or raw authenticated scripts for routine discovery
+- the CLI should also expose a local current-target selector so repeated facilitator work does not depend on ambient dashboard selection or deployment-default routing
+
+Machine-readable posture:
+
+- facilitator commands should support `--json` for strict machine parsing without headings or prose wrappers
+- skills and agents should prefer `harness --json ...` over scraping human-oriented terminal formatting
 
 For the current facilitator lifecycle slice:
 

package/assets/workshop-bundle/workshop-skill/facilitator.md

@@ -41,6 +41,20 @@ Note:
 - if the facilitator wants OS-native storage, they can use `HARNESS_SESSION_STORAGE=keychain`, `credential-manager`, or `secret-service`
 - `--auth basic` and `--auth neon` remain explicit fallbacks for local dev/bootstrap
 
+Preferred operator flow after login:
+
+```bash
+harness workshop list-instances
+harness workshop select-instance sample-workshop-demo-orbit
+harness workshop current-instance
+harness workshop status
+```
+
+Rules:
+- prefer this flow over reading local CLI session files or composing ad hoc authenticated `node -e` scripts
+- once a local selection exists, the CLI may use it as the default target for subsequent facilitator operations
+- when an agent needs machine-readable output, prefer `harness --json ...`
+
 ### `/workshop facilitator logout`
 
 Ask the facilitator to run:
@@ -68,6 +82,48 @@ Show:
 Use this for the current default or selected workshop context.
 If the facilitator needs the full workspace registry first, use `list-instances` instead of probing local session files or writing raw authenticated fetch scripts.
 
+Targeting behavior:
+- if the facilitator previously ran `harness workshop select-instance <instance-id>`, `status` reports that selected instance
+- if no local selection exists, `status` falls back to the deployment-default workshop context
+- for exact machine parsing, prefer `harness --json workshop status`
+
+### `/workshop facilitator current-instance`
+
+Preferred path:
+
+```bash
+harness workshop current-instance
+```
+
+Show:
+- the locally selected instance id when one exists
+- whether the current target came from persisted selection or `HARNESS_WORKSHOP_INSTANCE_ID`
+- the resolved instance summary and full record for operator verification
+
+Rules:
+- use this after `select-instance` when the facilitator wants to confirm the CLI target before update, reset, or remove
+- if nothing is selected, the command should say so clearly instead of forcing the facilitator into session-file inspection
+
+### `/workshop facilitator select-instance <instance-id>`
+
+Preferred path:
+
+```bash
+harness workshop select-instance sample-workshop-demo-orbit
+```
+
+Clear the stored selection:
+
+```bash
+harness workshop select-instance --clear
+```
+
+Rules:
+- use this when a facilitator will perform several operations against the same live workshop instance
+- the CLI should validate the instance through the server before persisting the selection
+- after selection, `status` and `phase set` should target that instance instead of the deployment default
+- `show-instance`, `update-instance`, `reset-instance`, `prepare`, and `remove-instance` may omit `<instance-id>` when a valid selection already exists
+
 ### `/workshop facilitator list-instances`
 
 Preferred path:
@@ -93,6 +149,7 @@ Rules:
 - prefer this over inspecting local session files or composing one-off authenticated scripts
 - use it when the facilitator needs to discover which live instances exist before reset, update, or scene work
 - keep raw API usage as a diagnostic fallback, not the default operator workflow
+- when an agent needs to parse the output, prefer `harness --json workshop list-instances`
 
 ### `/workshop facilitator show-instance <instance-id>`
 
@@ -117,6 +174,7 @@ Rules:
 - use this when the facilitator needs one specific instance, not the deployment-default `workshop status`
 - if the route returns `404`, the instance does not exist or is not visible to the facilitator
 - prefer this over ad hoc authenticated scripts for routine discovery
+- if a local selection already exists, the facilitator may omit `<instance-id>` and let the CLI use the stored target
 
 ### `/workshop facilitator grant <email> <role>`
 
@@ -230,6 +288,7 @@ Rules:
 - do not use reset for an ordinary title, venue, or room correction
 - if the route returns `400`, the payload is wrong; if it returns `404`, the instance does not exist
 - use `--content-lang cs|en` when the facilitator intends to change the workshop delivery language for that instance
+- if the facilitator already selected a local current instance, the CLI may omit `<instance-id>` and use the stored target
 
 ### `/workshop facilitator reset-instance <instance-id>`
 
@@ -256,6 +315,7 @@ Rules:
 - warn that reset archives current runtime state first and then clears live runtime state for the instance
 - prefer `update-instance` for ordinary metadata corrections; reset is the high-impact operation
 - if the facilitator does not specify a template, keep the current template unless there is a clear reason to switch
+- if the facilitator already selected a local current instance, the CLI may omit `<instance-id>` and use the stored target
 
 ### `/workshop facilitator prepare`
 
@@ -275,6 +335,7 @@ Content-Type: application/json
 ```
 
 This sets the instance to `prepared` state and verifies the event code.
+If a local current instance is already selected, the CLI may omit `<instance-id>` and use the stored target.
 
 ### `/workshop facilitator remove-instance <instance-id>`
 
@@ -296,6 +357,7 @@ Content-Type: application/json
 Rules:
 - remove remains an owner-only operation
 - the skill should warn the facilitator that this is destructive removal from the active list, not routine metadata editing
+- if the facilitator already selected a local current instance, the CLI may omit `<instance-id>` and use the stored target
 
 ### `/workshop facilitator agenda`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harness-lab/cli",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Participant-facing Harness Lab CLI for facilitator auth and workshop operations",
   "license": "MIT",
   "type": "module",

package/src/client.js

@@ -99,9 +99,18 @@ export function createHarnessClient({ fetchFn, session }) {
     getAgenda() {
       return request("/api/agenda");
     },
+    getWorkshopAgenda(instanceId) {
+      return request(`/api/workshop/instances/${encodeURIComponent(instanceId)}/agenda`);
+    },
     setCurrentPhase(currentId) {
       return request("/api/agenda", { method: "PATCH", body: { currentId } });
     },
+    setCurrentPhaseForInstance(instanceId, currentId) {
+      return request(`/api/workshop/instances/${encodeURIComponent(instanceId)}/agenda`, {
+        method: "PATCH",
+        body: { itemId: currentId },
+      });
+    },
     archiveWorkshop(notes) {
       return request("/api/workshop/archive", { method: "POST", body: notes ? { notes } : {} });
     },

package/src/io.js

@@ -84,7 +84,9 @@ function writeWrapped(stream, text, options = {}) {
   }
 }
 
-export function createCliUi(io) {
+export function createCliUi(io, options = {}) {
+  const jsonMode = options.jsonMode === true;
+
   function streamFor(target) {
     return target === "stderr" ? io.stderr : io.stdout;
   }
@@ -115,6 +117,10 @@ export function createCliUi(io) {
   function status(kind, text, options = {}) {
     const target = options.stream ?? (kind === "error" ? "stderr" : "stdout");
     const stream = streamFor(target);
+    if (jsonMode) {
+      writeLine(stream, JSON.stringify({ ok: kind !== "error", level: kind, message: text }));
+      return;
+    }
     const chalk = createStyler(stream, io.env);
     const prefixMap = {
       ok: chalk.green.bold("[ok]"),
@@ -178,7 +184,9 @@ export function createCliUi(io) {
 
   function json(title, value, options = {}) {
     const target = options.stream ?? "stdout";
-    heading(title, { stream: target });
+    if (!jsonMode) {
+      heading(title, { stream: target });
+    }
     writeLine(streamFor(target), JSON.stringify(value, null, 2));
   }
 

package/src/run-cli.js

@@ -16,6 +16,7 @@ function sleep(ms) {
 function parseArgs(argv) {
   const positionals = [];
   const flags = {};
+  const booleanFlags = new Set(["json", "help", "version", "force", "no-open", "clear"]);
 
   for (let index = 0; index < argv.length; index += 1) {
     const value = argv[index];
@@ -29,6 +30,10 @@ function parseArgs(argv) {
     }
     if (value.startsWith("--")) {
       const key = value.slice(2);
+      if (booleanFlags.has(key)) {
+        flags[key] = true;
+        continue;
+      }
       const next = argv[index + 1];
       if (!next || next.startsWith("--")) {
         flags[key] = true;
@@ -161,12 +166,34 @@ function summarizeWorkshopInstance(instance) {
   };
 }
 
+function resolveCurrentInstanceTarget(session, env) {
+  if (typeof session?.selectedInstanceId === "string" && session.selectedInstanceId.trim().length > 0) {
+    return {
+      instanceId: session.selectedInstanceId.trim(),
+      source: "session",
+    };
+  }
+
+  if (typeof env?.HARNESS_WORKSHOP_INSTANCE_ID === "string" && env.HARNESS_WORKSHOP_INSTANCE_ID.trim().length > 0) {
+    return {
+      instanceId: env.HARNESS_WORKSHOP_INSTANCE_ID.trim(),
+      source: "env",
+    };
+  }
+
+  return {
+    instanceId: null,
+    source: "none",
+  };
+}
+
 function printUsage(io, ui) {
   ui.heading("Harness CLI");
   ui.paragraph(`Version ${version}`);
   ui.blank();
   ui.section("Usage");
   ui.commandList([
+    "harness [--json] <command>",
     "harness --help",
     "harness --version",
     "harness version",
@@ -178,6 +205,8 @@ function printUsage(io, ui) {
     "harness auth logout",
     "harness auth status",
     "harness skill install [--target PATH] [--force]",
+    "harness workshop current-instance",
+    "harness workshop select-instance <instance-id> [--clear]",
     "harness workshop status",
     "harness workshop list-instances",
     "harness workshop show-instance <instance-id>",
@@ -571,9 +600,30 @@ async function handleWorkshopStatus(io, ui, env, deps) {
 
   try {
     const client = createHarnessClient({ fetchFn: deps.fetchFn, session });
+    const target = resolveCurrentInstanceTarget(session, env);
+
+    if (target.source === "session" && target.instanceId) {
+      const [instanceResult, agenda] = await Promise.all([
+        client.getWorkshopInstance(target.instanceId),
+        client.getWorkshopAgenda(target.instanceId),
+      ]);
+      ui.json("Workshop Status", {
+        ok: true,
+        targetInstanceId: target.instanceId,
+        targetSource: target.source,
+        ...summarizeWorkshopInstance(instanceResult.instance),
+        workshopMeta: instanceResult.instance?.workshopMeta ?? null,
+        currentPhase: agenda.phase,
+        agendaItems: Array.isArray(agenda.items) ? agenda.items.length : null,
+      });
+      return 0;
+    }
+
     const [workshop, agenda] = await Promise.all([client.getWorkshopStatus(), client.getAgenda()]);
     ui.json("Workshop Status", {
       ok: true,
+      targetInstanceId: target.instanceId,
+      targetSource: target.source,
       workshopId: workshop.workshopId,
       workshopMeta: workshop.workshopMeta,
       currentPhase: agenda.phase,
@@ -589,6 +639,107 @@ async function handleWorkshopStatus(io, ui, env, deps) {
   }
 }
 
+async function handleWorkshopCurrentInstance(io, ui, env, deps) {
+  const session = await requireSession(io, ui, env);
+  if (!session) {
+    return 1;
+  }
+
+  const target = resolveCurrentInstanceTarget(session, env);
+  if (!target.instanceId) {
+    ui.json("Workshop Current Instance", {
+      ok: true,
+      instanceId: null,
+      source: target.source,
+      selectedInstanceId: session.selectedInstanceId ?? null,
+    });
+    return 0;
+  }
+
+  try {
+    const client = createHarnessClient({ fetchFn: deps.fetchFn, session });
+    const result = await client.getWorkshopInstance(target.instanceId);
+    ui.json("Workshop Current Instance", {
+      ok: true,
+      source: target.source,
+      selectedInstanceId: session.selectedInstanceId ?? null,
+      ...summarizeWorkshopInstance(result.instance),
+      instance: result.instance,
+    });
+    return 0;
+  } catch (error) {
+    if (error instanceof HarnessApiError) {
+      ui.status("error", `Current instance lookup failed: ${error.message}`, { stream: "stderr" });
+      return 1;
+    }
+    throw error;
+  }
+}
+
+async function handleWorkshopSelectInstance(io, ui, env, positionals, flags, deps) {
+  const session = await requireSession(io, ui, env);
+  if (!session) {
+    return 1;
+  }
+
+  if (flags.clear === true) {
+    const nextSession = { ...session };
+    delete nextSession.selectedInstanceId;
+    if (!(await persistSession(io, ui, env, nextSession))) {
+      return 1;
+    }
+
+    const target = resolveCurrentInstanceTarget(nextSession, env);
+    ui.json("Workshop Select Instance", {
+      ok: true,
+      selectedInstanceId: null,
+      currentInstanceId: target.instanceId,
+      source: target.source,
+      cleared: true,
+    });
+    return 0;
+  }
+
+  const instanceId = await readRequiredCommandValue(
+    io,
+    flags,
+    ["id", "instance-id"],
+    "Instance id: ",
+    readOptionalPositional(positionals, 2),
+  );
+  if (!instanceId) {
+    ui.status("error", "Instance id is required.", { stream: "stderr" });
+    return 1;
+  }
+
+  try {
+    const client = createHarnessClient({ fetchFn: deps.fetchFn, session });
+    const result = await client.getWorkshopInstance(instanceId);
+    const nextSession = {
+      ...session,
+      selectedInstanceId: result.instance?.id ?? instanceId,
+    };
+    if (!(await persistSession(io, ui, env, nextSession))) {
+      return 1;
+    }
+
+    ui.json("Workshop Select Instance", {
+      ok: true,
+      source: "session",
+      selectedInstanceId: nextSession.selectedInstanceId,
+      ...summarizeWorkshopInstance(result.instance),
+      instance: result.instance,
+    });
+    return 0;
+  } catch (error) {
+    if (error instanceof HarnessApiError) {
+      ui.status("error", `Select instance failed: ${error.message}`, { stream: "stderr" });
+      return 1;
+    }
+    throw error;
+  }
+}
+
 async function handleWorkshopListInstances(io, ui, env, deps) {
   const session = await requireSession(io, ui, env);
   if (!session) {
@@ -625,7 +776,7 @@ async function handleWorkshopShowInstance(io, ui, env, positionals, flags, deps)
     flags,
     ["id", "instance-id"],
     "Instance id: ",
-    readOptionalPositional(positionals, 2),
+    readOptionalPositional(positionals, 2) ?? session.selectedInstanceId,
   );
   if (!instanceId) {
     ui.status("error", "Instance id is required.", { stream: "stderr" });
@@ -724,7 +875,7 @@ async function handleWorkshopUpdateInstance(io, ui, env, positionals, flags, dep
     flags,
     ["id"],
     "Instance id: ",
-    readOptionalPositional(positionals, 2),
+    readOptionalPositional(positionals, 2) ?? session.selectedInstanceId,
   );
   if (!instanceId) {
     ui.status("error", "Instance id is required.", { stream: "stderr" });
@@ -739,7 +890,7 @@ async function handleWorkshopUpdateInstance(io, ui, env, positionals, flags, dep
   if (!hasWorkshopMetadataInput(payload)) {
     ui.status(
       "error",
-      "At least one metadata field is required. Use flags such as --event-title, --date-range, --venue-name, or --room-name.",
+      "At least one metadata field is required. Use flags such as --content-lang, --event-title, --date-range, --venue-name, or --room-name.",
       { stream: "stderr" },
     );
     return 1;
@@ -774,7 +925,7 @@ async function handleWorkshopPrepare(io, ui, env, positionals, flags, deps) {
     flags,
     ["id", "instance-id"],
     "Instance id: ",
-    readOptionalPositional(positionals, 2),
+    readOptionalPositional(positionals, 2) ?? session.selectedInstanceId,
   );
   if (!instanceId) {
     ui.status("error", "Instance id is required.", { stream: "stderr" });
@@ -810,7 +961,7 @@ async function handleWorkshopResetInstance(io, ui, env, positionals, flags, deps
     flags,
     ["id", "instance-id"],
     "Instance id: ",
-    readOptionalPositional(positionals, 2),
+    readOptionalPositional(positionals, 2) ?? session.selectedInstanceId,
   );
   if (!instanceId) {
     ui.status("error", "Instance id is required.", { stream: "stderr" });
@@ -845,7 +996,7 @@ async function handleWorkshopRemoveInstance(io, ui, env, positionals, flags, dep
     flags,
     ["id", "instance-id"],
     "Instance id: ",
-    readOptionalPositional(positionals, 2),
+    readOptionalPositional(positionals, 2) ?? session.selectedInstanceId,
   );
   if (!instanceId) {
     ui.status("error", "Instance id is required.", { stream: "stderr" });
@@ -884,7 +1035,11 @@ async function handleWorkshopPhaseSet(io, ui, env, positionals, deps) {
 
   try {
     const client = createHarnessClient({ fetchFn: deps.fetchFn, session });
-    const result = await client.setCurrentPhase(phaseId);
+    const target = resolveCurrentInstanceTarget(session, env);
+    const result =
+      target.source === "session" && target.instanceId
+        ? await client.setCurrentPhaseForInstance(target.instanceId, phaseId)
+        : await client.setCurrentPhase(phaseId);
     ui.json("Workshop Phase", result);
     return 0;
   } catch (error) {
@@ -899,8 +1054,8 @@ async function handleWorkshopPhaseSet(io, ui, env, positionals, deps) {
 export async function runCli(argv, io, deps = {}) {
   const fetchFn = deps.fetchFn ?? globalThis.fetch;
   const mergedDeps = { fetchFn, sleepFn: deps.sleepFn, openUrl: deps.openUrl, cwd: deps.cwd };
-  const ui = createCliUi(io);
   const { positionals, flags } = parseArgs(argv);
+  const ui = createCliUi(io, { jsonMode: flags.json === true || flags.output === "json" });
   const [scope, action, subaction] = positionals;
 
   if (flags.help === true) {
@@ -943,6 +1098,14 @@ export async function runCli(argv, io, deps = {}) {
     return handleSkillInstall(io, ui, mergedDeps, flags);
   }
 
+  if (scope === "workshop" && action === "current-instance") {
+    return handleWorkshopCurrentInstance(io, ui, io.env, mergedDeps);
+  }
+
+  if (scope === "workshop" && action === "select-instance") {
+    return handleWorkshopSelectInstance(io, ui, io.env, positionals, flags, mergedDeps);
+  }
+
   if (scope === "workshop" && action === "status") {
     return handleWorkshopStatus(io, ui, io.env, mergedDeps);
   }

package/src/session-store.js

@@ -314,6 +314,7 @@ export function sanitizeSession(session, env) {
     authType: session.authType,
     username: session.username ?? null,
     email: session.email ?? null,
+    selectedInstanceId: session.selectedInstanceId ?? null,
     loggedInAt: session.loggedInAt,
     expiresAt: session.expiresAt ?? null,
     mode: session.mode ?? "local-dev",

package/src/workshop-bundle.js

@@ -225,6 +225,20 @@ async function writeWorkshopBundleManifest(bundleRoot, manifest) {
   );
 }
 
+async function pruneBundleFiles(bundleRoot, manifest) {
+  const expectedFiles = new Set([
+    WORKSHOP_BUNDLE_MANIFEST,
+    ...manifest.files.map((file) => file.path),
+  ]);
+  const currentFiles = await listFilesRecursive(bundleRoot);
+
+  for (const file of currentFiles) {
+    if (!expectedFiles.has(file.relativePath)) {
+      await fs.rm(file.absolutePath, { force: true });
+    }
+  }
+}
+
 export async function createWorkshopBundleFromSource(sourceRoot, targetRoot, options = {}) {
   if (options.clean === true) {
     await fs.rm(targetRoot, { recursive: true, force: true });
@@ -234,6 +248,9 @@ export async function createWorkshopBundleFromSource(sourceRoot, targetRoot, opt
   await fs.rm(path.join(targetRoot, "workshop-skill", "SKILL.md"), { force: true });
   await copyBundleFiles(sourceRoot, targetRoot);
   const manifest = await createWorkshopBundleManifestFromSource(sourceRoot);
+  if (options.prune === true) {
+    await pruneBundleFiles(targetRoot, manifest);
+  }
   await writeWorkshopBundleManifest(targetRoot, manifest);
 }
 
@@ -250,7 +267,7 @@ export async function syncPackagedWorkshopBundle() {
 export async function syncRepoBundledWorkshopSkill() {
   const sourceRoot = getRepoWorkshopSourceRoot();
   const bundleRoot = getRepoBundledWorkshopSkillPath();
-  await createWorkshopBundleFromSource(sourceRoot, bundleRoot, { clean: true });
+  await createWorkshopBundleFromSource(sourceRoot, bundleRoot, { prune: true });
   return {
     sourceRoot,
     bundleRoot,