feat(workspace-team): team workspaces, shared resources, workspace-scoped billing, and the #5517 redesign

.github/workflows/ci.yml

@@ -753,6 +753,8 @@ jobs:
               handoff_dir="$(python3 .github/scripts/handoff.py dir comment "$handoff_id" --root "$handoff_root")"
               mkdir -p "$handoff_dir"
               marker="<!-- merge-queue-needs-validation -->"
+              # Markdown code spans are intentionally literal in these single-quoted strings.
+              # shellcheck disable=SC2016
               {
                 printf '%s\n' "$marker"
                 # Markdown code spans are intentional literal text.

.github/workflows/release-beta.yml

@@ -55,6 +55,11 @@ on:
         required: false
         type: string
         default: ""
+      amr_profile:
+        description: "Optional AMR profile baked into the build (e.g. feature-test to point the packaged app at that profile's AMR backend and enable the workspace-team transport). Empty leaves the default (prod)."
+        required: false
+        type: string
+        default: ""
       mac_arm64_sign_mode:
         description: "macOS arm64 signing mode."
         required: true
@@ -205,6 +210,10 @@ on:
         required: false
         type: string
         default: ""
+      amr_profile:
+        required: false
+        type: string
+        default: ""
       mac_arm64_sign_mode:
         required: false
         type: string
@@ -307,6 +316,20 @@ env:
   POSTHOG_HOST: ${{ inputs.publish && vars.POSTHOG_HOST || '' }}
   POSTHOG_CLI_API_KEY: ${{ inputs.publish && secrets.POSTHOG_CLI_API_KEY || '' }}
   POSTHOG_CLI_PROJECT_ID: ${{ inputs.publish && vars.POSTHOG_CLI_PROJECT_ID || '' }}
+  # Vela web console origin for the AMR profile this build targets. Held in a
+  # per-profile repository secret instead of the source tree: the non-prod AMR
+  # environments are internal deployments and this repository is public, so
+  # neither the workflow nor the product code may name their hostnames.
+  #
+  # tools-pack bakes it into open-design-config.json and the packaged runtime
+  # forwards it to the daemon as OD_VELA_WEB_URL, which is the second half of the
+  # workspace-team gate (the first being the AMR profile allowlist). A profile
+  # whose secret is not configured therefore ships with workspace-team dormant
+  # rather than pointed at an unknown backend. `prod` never gets an origin — the
+  # packaged gate rejects it regardless.
+  #
+  # Secrets read here: VELA_WEB_URL_FEATURE_TEST, VELA_WEB_URL_TEST.
+  OD_VELA_WEB_URL: ${{ inputs.amr_profile == 'feature-test' && secrets.VELA_WEB_URL_FEATURE_TEST || inputs.amr_profile == 'test' && secrets.VELA_WEB_URL_TEST || '' }}
   RELEASE_BRANCH: ${{ github.ref_name }}
   RELEASE_REPOSITORY: ${{ github.repository }}
   RELEASE_RUN_ATTEMPT: ${{ github.run_attempt }}
@@ -475,6 +498,13 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          # Bake the AMR profile (tools-pack reads OPEN_DESIGN_AMR_PROFILE) so a
+          # feature-test dispatch produces a packaged app that targets that
+          # profile's AMR backend and enables the workspace-team transport. The
+          # matching console origin arrives via the workflow-level
+          # OD_VELA_WEB_URL. Empty = default (prod) — the normal beta pipeline is
+          # unaffected.
+          OPEN_DESIGN_AMR_PROFILE: ${{ inputs.amr_profile }}
         run: |
           set -euo pipefail
           mkdir -p "$RUNNER_TEMP/release-build/mac_arm64"
@@ -508,6 +538,11 @@ jobs:
 
       - name: Retry beta mac_arm64 without restored cache
         if: ${{ steps.mac_arm64_tools_pack_build.outcome == 'failure' }}
+        env:
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          OPEN_DESIGN_AMR_PROFILE: ${{ inputs.amr_profile }}
         run: |
           set -euo pipefail
           rm -rf "$RUNNER_TEMP/tools-pack-cache"
@@ -540,6 +575,42 @@ jobs:
             exit "$build_status"
           fi
 
+      - name: Upload mac_arm64 DMG for manual distribution
+        # Only when NOT publishing to the release feed: this is the downloadable
+        # artifact for a manual dispatch (e.g. a signed feature-test build handed
+        # to teammates). The normal publish=true release pipeline is unchanged.
+        if: ${{ !cancelled() && !inputs.publish }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: open-design-beta-mac-arm64-dmg
+          path: ${{ runner.temp }}/tools-pack/out/mac/namespaces/release-beta/**/*.dmg
+          if-no-files-found: warn
+          retention-days: 14
+
+      - name: Upload mac_arm64 dogfood build to release storage
+        # Companion to the artifact step above, for publish=false only. A GitHub
+        # artifact needs a logged-in teammate and a zip round-trip; this puts the
+        # same DMG in R2 under dogfood/<version>/<build>/ so the link can be
+        # handed over directly. It writes no channel metadata and no latest
+        # pointer (enforced by the guard in tools/release/src/storage/dogfood.ts),
+        # so it cannot change what an installed client sees as an available
+        # update. The publish=true pipeline is untouched.
+        if: ${{ !cancelled() && !inputs.publish }}
+        continue-on-error: true
+        env:
+          DOGFOOD_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
+          DOGFOOD_BUILD_JSON_KEYS: dmgPath
+          DOGFOOD_BUILD_JSON_PATH: ${{ runner.temp }}/release-build/mac_arm64/build.json
+          DOGFOOD_LABEL: macOS arm64 beta ${{ needs.metadata.outputs.beta_version }}
+          DOGFOOD_VERSION: ${{ needs.metadata.outputs.beta_version }}
+          RELEASE_PUBLIC_ORIGIN: ${{ inputs.release_public_origin != '' && inputs.release_public_origin || vars.CLOUDFLARE_R2_RELEASES_PUBLIC_ORIGIN }}
+          RELEASE_STORAGE_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_R2_RELEASES_AK }}
+          RELEASE_STORAGE_BUCKET: ${{ secrets.CLOUDFLARE_R2_RELEASES_BUCKET }}
+          RELEASE_STORAGE_ENDPOINT: ${{ secrets.CLOUDFLARE_R2_RELEASES_URL }}
+          RELEASE_STORAGE_REGION: auto
+          RELEASE_STORAGE_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_R2_RELEASES_SK }}
+        run: pnpm exec tools-release publish-dogfood
+
       - name: Delete failed mac_arm64 tools-pack cache
         if: ${{ steps.mac_arm64_tools_pack_build.outcome == 'failure' && steps.mac_arm64_tools_pack_cache_restore.outputs.cache-matched-key != '' }}
         continue-on-error: true
@@ -1054,6 +1125,14 @@ jobs:
           OD_BETA_WINDOWS_SIGN_CERT_SHA1: ${{ steps.sign_probe.outputs.thumbprint }}
           OD_PACKAGED_E2E_WIN_UPDATE_METADATA_URL: ${{ inputs.win_x64_update_metadata_url }}
           OD_PACKAGED_E2E_WIN_UPDATE_VERSION: ${{ inputs.win_x64_update_target_version }}
+          # Bake the AMR profile (tools-pack reads OPEN_DESIGN_AMR_PROFILE) so a
+          # feature-test dispatch produces a packaged app that targets that
+          # profile's AMR backend and enables the workspace-team transport. Empty
+          # = default (prod) — the normal beta pipeline is unaffected. Mirrors the
+          # mac_arm64 build step above; this was missing here, so every win_x64
+          # dogfood build silently fell back to prod and could not sign in to a
+          # feature-test AMR environment.
+          OPEN_DESIGN_AMR_PROFILE: ${{ inputs.amr_profile }}
         run: |
           $ErrorActionPreference = "Stop"
           New-Item -ItemType Directory -Force -Path "${{ runner.temp }}\release-build\win_x64" | Out-Null
@@ -1070,6 +1149,8 @@ jobs:
         id: win_tools_pack_build_retry
         if: ${{ steps.win_tools_pack_build.outcome == 'failure' }}
         shell: pwsh
+        env:
+          OPEN_DESIGN_AMR_PROFILE: ${{ inputs.amr_profile }}
         run: |
           $ErrorActionPreference = "Stop"
           Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "${{ runner.temp }}\tools-pack-cache"
@@ -1083,6 +1164,45 @@ jobs:
           $build = $buildOutput | ConvertFrom-Json
           pnpm.cmd exec tools-pack win validate-payload --namespace release-beta-win --payload-path $build.payloadPath --expected-version "${{ needs.metadata.outputs.beta_version }}" --json
 
+      - name: Upload win_x64 installer for manual distribution
+        # Only when NOT publishing to the release feed, mirroring the mac DMG
+        # step. Before this existed a publish=false dispatch left the Windows job
+        # with nothing retrievable at all, so a QA/dogfood build could not be
+        # handed to a teammate without also publishing to the public feed. The
+        # glob covers every win_x64_target: nsis produces the setup exe, zip the
+        # portable zip, all both. The normal publish=true pipeline is unchanged.
+        if: ${{ !cancelled() && !inputs.publish }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: open-design-beta-win-x64-installer
+          path: |
+            ${{ runner.temp }}\tools-pack\out\win\namespaces\release-beta-win\builder\*-setup.exe
+            ${{ runner.temp }}\tools-pack\out\win\namespaces\release-beta-win\builder\*-portable.zip
+          if-no-files-found: warn
+          retention-days: 14
+
+      - name: Upload win_x64 dogfood build to release storage
+        # publish=false only. Artifact paths come from the build's own --json
+        # output rather than a hardcoded layout, so whichever of installerPath /
+        # portableZipPath the selected win_x64_target actually produced is what
+        # gets uploaded. Writes under dogfood/<version>/<build>/ and nowhere
+        # else; see the guard in tools/release/src/storage/dogfood.ts.
+        if: ${{ !cancelled() && !inputs.publish }}
+        continue-on-error: true
+        env:
+          DOGFOOD_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
+          DOGFOOD_BUILD_JSON_KEYS: installerPath,portableZipPath
+          DOGFOOD_BUILD_JSON_PATH: ${{ runner.temp }}\release-build\win_x64\build.json
+          DOGFOOD_LABEL: Windows x64 beta ${{ needs.metadata.outputs.beta_version }}
+          DOGFOOD_VERSION: ${{ needs.metadata.outputs.beta_version }}
+          RELEASE_PUBLIC_ORIGIN: ${{ inputs.release_public_origin != '' && inputs.release_public_origin || vars.CLOUDFLARE_R2_RELEASES_PUBLIC_ORIGIN }}
+          RELEASE_STORAGE_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_R2_RELEASES_AK }}
+          RELEASE_STORAGE_BUCKET: ${{ secrets.CLOUDFLARE_R2_RELEASES_BUCKET }}
+          RELEASE_STORAGE_ENDPOINT: ${{ secrets.CLOUDFLARE_R2_RELEASES_URL }}
+          RELEASE_STORAGE_REGION: auto
+          RELEASE_STORAGE_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_R2_RELEASES_SK }}
+        run: pnpm exec tools-release publish-dogfood
+
       - name: Delete failed Windows tools-pack cache
         if: ${{ steps.win_tools_pack_build.outcome == 'failure' && steps.win_tools_pack_cache_restore.outputs.cache-matched-key != '' }}
         shell: pwsh

.github/workflows/release-branch-direct-pr-guard.yml

@@ -51,11 +51,11 @@ jobs:
           body="$(printf '%s\n' \
             '🚫 Direct PRs into release branches are not accepted.' \
             '' \
-            'Changes reach a release branch through the **backport flow**, not by targeting `release/*` directly:' \
+            "Changes reach a release branch through the **backport flow**, not by targeting \`release/*\` directly:" \
             '' \
-            '1. Open your PR against **`main`** and get it merged there.' \
-            '2. Add the **`backport release/vX.Y.Z`** label to that main PR — the release bot cherry-picks it onto the release branch automatically (resolving conflicts in a draft if needed).' \
+            "1. Open your PR against **\`main\`** and get it merged there." \
+            "2. Add the **\`backport release/vX.Y.Z\`** label to that main PR — the release bot cherry-picks it onto the release branch automatically (resolving conflicts in a draft if needed)." \
             '' \
-            'Closing this PR. If this is a genuine release-only fix that cannot go through `main`, ask a maintainer to handle it directly.')"
+            "Closing this PR. If this is a genuine release-only fix that cannot go through \`main\`, ask a maintainer to handle it directly.")"
           gh pr comment "$PR" --repo "$REPO" --body "$body"
           gh pr close "$PR" --repo "$REPO"

apps/daemon/AGENTS.md

@@ -25,6 +25,7 @@ The daemon is not a shared library for the web app. Do not import daemon private
 - `src/runtimes/` owns agent runtime definitions, spawning, parser integration, executable discovery, and runtime environment shaping. Agent argument definitions belong in `src/runtimes/defs/`.
 - `src/prompts/` owns daemon-side prompt construction. Keep mirrored BYOK/API wording in `packages/contracts/src/prompts/` when the same text is exposed outside the daemon.
 - `src/plugins/`, `src/connectors/`, `src/registry/`, `src/research/`, `src/media-adapters/`, `src/live-artifacts/`, `src/storage/`, and `src/critique/` own their named domains. Prefer adding code inside the existing domain folder before creating a new top-level folder.
+- Team resource storage is Vela-owned. Daemon adapters under `src/collab/vela-cli-*` must invoke Vela through `src/integrations/vela-command.ts`, which shares the login/agent binary resolver and environment. Do not add Resource Hub tokens, direct HTTP clients, or a second content-addressed drive implementation to Open Design. `od resource` is only a thin Vela CLI compatibility entry point.
 - `tests/` contains daemon tests. Keep test paths roughly parallel to `src/` when useful.
 
 Do not edit generated `dist/` output.

apps/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-design/daemon",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "private": true,
   "type": "module",
   "main": "./dist/cli.js",

apps/daemon/src/agent-protocol/acp/json.ts

@@ -132,3 +132,16 @@ export function extractAcpUpdateText(update: JsonObject): string | null {
   }
   return null;
 }
+
+/**
+ * Pull a short human-readable status detail (`message` / `detail`) off an ACP
+ * `session/update`, so a status event can carry e.g. a "compacting context"
+ * reason. Returns `undefined` when neither field is a non-empty string.
+ */
+export function extractAcpStatusDetail(update: JsonObject): string | undefined {
+  for (const key of ['message', 'detail']) {
+    const value = update[key];
+    if (typeof value === 'string' && value.trim()) return value;
+  }
+  return undefined;
+}

apps/daemon/src/agent-protocol/acp/rpc.ts

@@ -87,6 +87,27 @@ export function rpcErrorRetryable(data: unknown): boolean | undefined {
   const details = asObject(data);
   return typeof details?.retryable === 'boolean' ? details.retryable : undefined;
 }
+/**
+ * Fallback retryability inference from the error message/details text, used when
+ * the runtime does not set an explicit `retryable` field. `request_too_large`
+ * (the prompt must shrink) is non-retryable; upstream transport blips
+ * (`stream idle timeout`, `overloaded`, gateway/service outages) are retryable.
+ * Returns `undefined` when nothing matches so callers keep their own default.
+ */
+export function inferRpcErrorRetryable(message: string, data: unknown): boolean | undefined {
+  const details = asObject(data);
+  const text = [
+    message,
+    details ? JSON.stringify(details) : '',
+  ].join('\n');
+  if (/\b(request_too_large|request body exceeds configured limit)\b/i.test(text)) {
+    return false;
+  }
+  if (/\b(upstream_error|stream idle timeout|no data received within configured window|temporarily unavailable|overloaded|gateway timeout|service unavailable)\b/i.test(text)) {
+    return true;
+  }
+  return undefined;
+}
 /**
  * Promotes an opencode `ROLE_MARKER_HALLUCINATION` error embedded in an ACP
  * JSON-RPC `error.data` payload into a canonical Open Design error object.

apps/daemon/src/agent-protocol/acp/session.ts

@@ -22,14 +22,15 @@ import {
   ACP_RAW_EVENT_SHAPE_DIAGNOSTIC_LIMIT,
   AMR_STDERR_RETRY_TAIL_LIMIT,
 } from './constants.js';
-import { errorMessage, asObject, extractAcpUpdateText } from './json.js';
+import { errorMessage, asObject, extractAcpUpdateText, extractAcpStatusDetail } from './json.js';
 import {
   sendRpc,
   sendRpcResult,
   isJsonRpcId,
   rpcErrorMessage,
   rpcErrorData,
   rpcErrorRetryable,
+  inferRpcErrorRetryable,
   promotedOpenCodeSessionErrorPayload,
   formatUsage,
   choosePermissionOutcome,
@@ -92,9 +93,11 @@ export interface AttachAcpSessionOptions {
   // `onCliReady` fires once on the first well-formed ACP JSON-RPC message
   // (the CLI is up and speaking the protocol); `onSessionInit` fires once when
   // the `session/new` handshake is acknowledged (a session id is established).
-  // Both are best-effort and the caller dedupes, so extra calls are harmless.
+  // `onPromptComplete` fires once when a clean `session/prompt` result is
+  // accepted. Error paths never invoke it.
   onCliReady?: () => void;
   onSessionInit?: () => void;
+  onPromptComplete?: () => void;
 }
 /**
  * Attaches an ACP protocol session to an already-spawned child process and
@@ -139,6 +142,7 @@ export function attachAcpSession({
   resumeSessionId,
   onCliReady,
   onSessionInit,
+  onPromptComplete,
 }: AttachAcpSessionOptions) {
   const runStartedAt = Date.now();
   const effectiveCwd = path.resolve(cwd || process.cwd());
@@ -511,6 +515,10 @@ export function attachAcpSession({
 
   const finishCleanPrompt = (usageSource?: unknown) => {
     if (finished) return;
+    // Mark the prompt finished before notifying observers so duplicate results
+    // and callback re-entry cannot report clean completion more than once.
+    finished = true;
+    onPromptComplete?.();
     // Flush any tools still open when the prompt completes so traces stay
     // complete (one tool_use + tool_result per id).
     flushOpenAcpTools();
@@ -524,7 +532,6 @@ export function attachAcpSession({
     emitToolCallTextSuppressionSummary();
     emitArtifactTextSuppressionSummary();
     emitUsageIfPresent(usageSource);
-    finished = true;
     clearStageTimer();
     stdin.end();
     // Some ACP agents keep the child process alive after stdin closes,
@@ -607,7 +614,7 @@ export function attachAcpSession({
         failWithPayload(promotedPayload);
         return;
       }
-      const retryable = rpcErrorRetryable(details);
+      const retryable = rpcErrorRetryable(details) ?? inferRpcErrorRetryable(rpcErr, details);
       fail(rpcErr, {
         details,
         ...(retryable === undefined ? {} : { retryable }),
@@ -628,9 +635,11 @@ export function attachAcpSession({
         }
       }
       if (update.sessionUpdate !== 'agent_message_chunk' && update.sessionUpdate !== 'agent_thought_chunk') {
+        const detail = extractAcpStatusDetail(update);
         send('agent', {
           type: 'status',
           label: String(update.sessionUpdate || 'session_update'),
+          ...(detail ? { detail } : {}),
           elapsedMs: Date.now() - runStartedAt,
         });
         emitAcpRawShapeDiagnostic(update);

apps/daemon/src/analytics.ts

@@ -234,13 +234,20 @@ export interface AnalyticsService {
     properties?: Record<string, unknown>;
     insertId?: string;
   }): Promise<void>;
+  identifyGroup(args: {
+    context: AnalyticsContext;
+    groupType: 'workspace';
+    groupKey: string;
+    properties: Record<string, unknown>;
+  }): Promise<void>;
   shutdown(): Promise<void>;
 }
 
 const NOOP_SERVICE: AnalyticsService = {
   capture: async () => undefined,
   captureSafety: async () => undefined,
   mergeAnonymousPerson: async () => undefined,
+  identifyGroup: async () => undefined,
   shutdown: async () => undefined,
 };
 
@@ -414,6 +421,22 @@ export function createAnalyticsService(args: {
         // Attribution merge failures must not block app startup or consent.
       }
     },
+    identifyGroup: async ({ context, groupType, groupKey, properties }) => {
+      try {
+        const appCfg = await readAppConfig(args.dataDir);
+        if (appCfg.telemetry?.metrics !== true) return;
+        const cleanProperties = cleanPosthogPersonProperties(properties);
+        if (!groupKey || Object.keys(cleanProperties).length === 0) return;
+        client.groupIdentify({
+          groupType,
+          groupKey,
+          distinctId: context.deviceId,
+          properties: cleanProperties,
+        });
+      } catch {
+        // Group updates are best-effort and must never affect product reads.
+      }
+    },
     shutdown: async () => {
       try {
         await client.shutdown();