diff --git a/.codacy/cli.sh b/.codacy/cli.sh
new file mode 100755
index 00000000..7057e3bf
--- /dev/null
+++ b/.codacy/cli.sh
@@ -0,0 +1,149 @@
+#!/usr/bin/env bash
+
+
+set -e +o pipefail
+
+# Set up paths first
+bin_name="codacy-cli-v2"
+
+# Determine OS-specific paths
+os_name=$(uname)
+arch=$(uname -m)
+
+case "$arch" in
+"x86_64")
+  arch="amd64"
+  ;;
+"x86")
+  arch="386"
+  ;;
+"aarch64"|"arm64")
+  arch="arm64"
+  ;;
+esac
+
+if [ -z "$CODACY_CLI_V2_TMP_FOLDER" ]; then
+    if [ "$(uname)" = "Linux" ]; then
+        CODACY_CLI_V2_TMP_FOLDER="$HOME/.cache/codacy/codacy-cli-v2"
+    elif [ "$(uname)" = "Darwin" ]; then
+        CODACY_CLI_V2_TMP_FOLDER="$HOME/Library/Caches/Codacy/codacy-cli-v2"
+    else
+        CODACY_CLI_V2_TMP_FOLDER=".codacy-cli-v2"
+    fi
+fi
+
+version_file="$CODACY_CLI_V2_TMP_FOLDER/version.yaml"
+
+
+get_version_from_yaml() {
+    if [ -f "$version_file" ]; then
+        local version=$(grep -o 'version: *"[^"]*"' "$version_file" | cut -d'"' -f2)
+        if [ -n "$version" ]; then
+            echo "$version"
+            return 0
+        fi
+    fi
+    return 1
+}
+
+get_latest_version() {
+    local response
+    if [ -n "$GH_TOKEN" ]; then
+        response=$(curl -Lq --header "Authorization: Bearer $GH_TOKEN" "https://api.github.com/repos/codacy/codacy-cli-v2/releases/latest" 2>/dev/null)
+    else
+        response=$(curl -Lq "https://api.github.com/repos/codacy/codacy-cli-v2/releases/latest" 2>/dev/null)
+    fi
+
+    handle_rate_limit "$response"
+    local version=$(echo "$response" | grep -m 1 tag_name | cut -d'"' -f4)
+    echo "$version"
+}
+
+handle_rate_limit() {
+    local response="$1"
+    if echo "$response" | grep -q "API rate limit exceeded"; then
+          fatal "Error: GitHub API rate limit exceeded. Please try again later"
+    fi
+}
+
+download_file() {
+    local url="$1"
+
+    echo "Downloading from URL: ${url}"
+    if command -v curl > /dev/null 2>&1; then
+        curl -# -LS "$url" -O
+    elif command -v wget > /dev/null 2>&1; then
+        wget "$url"
+    else
+        fatal "Error: Could not find curl or wget, please install one."
+    fi
+}
+
+download() {
+    local url="$1"
+    local output_folder="$2"
+
+    ( cd "$output_folder" && download_file "$url" )
+}
+
+download_cli() {
+    # OS name lower case
+    suffix=$(echo "$os_name" | tr '[:upper:]' '[:lower:]')
+
+    local bin_folder="$1"
+    local bin_path="$2"
+    local version="$3"
+
+    if [ ! -f "$bin_path" ]; then
+        echo "📥 Downloading CLI version $version..."
+
+        remote_file="codacy-cli-v2_${version}_${suffix}_${arch}.tar.gz"
+        url="https://github.com/codacy/codacy-cli-v2/releases/download/${version}/${remote_file}"
+
+        download "$url" "$bin_folder"
+        tar xzfv "${bin_folder}/${remote_file}" -C "${bin_folder}"
+    fi
+}
+
+# Warn if CODACY_CLI_V2_VERSION is set and update is requested
+if [ -n "$CODACY_CLI_V2_VERSION" ] && [ "$1" = "update" ]; then
+    echo "⚠️  Warning: Performing update with forced version $CODACY_CLI_V2_VERSION"
+    echo "    Unset CODACY_CLI_V2_VERSION to use the latest version"
+fi
+
+# Ensure version.yaml exists and is up to date
+if [ ! -f "$version_file" ] || [ "$1" = "update" ]; then
+    echo "ℹ️  Fetching latest version..."
+    version=$(get_latest_version)
+    mkdir -p "$CODACY_CLI_V2_TMP_FOLDER"
+    echo "version: \"$version\"" > "$version_file"
+fi
+
+# Set the version to use
+if [ -n "$CODACY_CLI_V2_VERSION" ]; then
+    version="$CODACY_CLI_V2_VERSION"
+else
+    version=$(get_version_from_yaml)
+fi
+
+
+# Set up version-specific paths
+bin_folder="${CODACY_CLI_V2_TMP_FOLDER}/${version}"
+
+mkdir -p "$bin_folder"
+bin_path="$bin_folder"/"$bin_name"
+
+# Download the tool if not already installed
+download_cli "$bin_folder" "$bin_path" "$version"
+chmod +x "$bin_path"
+
+run_command="$bin_path"
+if [ -z "$run_command" ]; then
+    fatal "Codacy cli v2 binary could not be found."
+fi
+
+if [ "$#" -eq 1 ] && [ "$1" = "download" ]; then
+    echo "Codacy cli v2 download succeeded"
+else
+    eval "$run_command $*"
+fi
\ No newline at end of file
diff --git a/.codacy/codacy.yaml b/.codacy/codacy.yaml
new file mode 100644
index 00000000..98315297
--- /dev/null
+++ b/.codacy/codacy.yaml
@@ -0,0 +1,15 @@
+runtimes:
+    - dart@3.7.2
+    - go@1.24.13
+    - java@17.0.10
+    - node@22.2.0
+    - python@3.11.11
+tools:
+    - dartanalyzer@3.7.2
+    - eslint@8.57.0
+    - lizard@1.17.31
+    - opengrep@1.16.4
+    - pmd@7.11.0
+    - pylint@3.3.6
+    - revive@1.7.0
+    - trivy@0.69.3
diff --git a/assets/skills/amazon-ordering/SKILL.md b/assets/skills/amazon-ordering/SKILL.md
new file mode 100644
index 00000000..cf923d53
--- /dev/null
+++ b/assets/skills/amazon-ordering/SKILL.md
@@ -0,0 +1,184 @@
+---
+name: amazon
+description: Buy and return items on Amazon using browser automation. Use for purchasing, reordering, checking order history, and processing returns.
+metadata: {"openclaw":{"skillKey":"amazon-ordering"}}
+---
+
+# Amazon Ordering
+
+Use this skill when the user wants an agent to buy something on Amazon, reorder a previous item, inspect Amazon order history, or start a return.
+
+## Trigger
+
+```json
+{
+  "activation": {
+    "anyPhrases": [
+      "amazon",
+      "buy on amazon",
+      "order on amazon",
+      "reorder on amazon",
+      "amazon order history",
+      "amazon return"
+    ]
+  },
+  "movement": {
+    "target": "shop",
+    "skipIfAlreadyThere": true
+  }
+}
+```
+
+When this skill is activated, the agent should walk to the office shop before handling the request.
+
+- Treat requests from Telegram or any other external surface as valid triggers when they ask for Amazon purchasing, reordering, order lookup, or return processing.
+- The physical behavior for this skill is: go to the shop, connect to the browser session, then perform the Amazon workflow.
+- If the agent is already at the shop, continue without adding extra movement narration.
+
+## Prerequisites
+
+- `agent-browser` CLI installed.
+- Chrome running with remote debugging enabled on port `9222`.
+- Logged into Amazon. If logged out, retrieve the password from the configured password manager or ask the user to complete login.
+- If running headless on Linux, use VNC or another visual path so the user can solve CAPTCHAs or 2FA when needed.
+
+## Setup
+
+Read `skills/amazon-ordering/defaults.json` before making a purchase or processing a return. Use these saved workspace defaults:
+
+```json
+{
+  "shippingAddress": "123 Main St, Springfield, IL 62704",
+  "paymentMethod": "Visa ending in 4242",
+  "returnDropoff": "Whole Foods"
+}
+```
+
+If `defaults.json` is missing, fall back to these environment variables:
+
+```bash
+export AMAZON_SHIPPING_ADDRESS="Your shipping address"
+export AMAZON_PAYMENT_METHOD="Your preferred card"
+export AMAZON_RETURN_DROPOFF="Whole Foods"
+```
+
+Always verify the shipping address and payment method before placing an order.
+
+## Communication rules
+
+- Do not narrate each click or intermediate browser step.
+- Only message the user when you need clarification, confirmation, or manual intervention.
+- If Amazon shows CAPTCHA, MFA, login recovery, or an unexpected checkout change, pause and ask the user to help.
+- When a purchase, reorder, or return is confirmed, reply with a brief summary of the result.
+
+## Ordering rules
+
+### Reorders
+
+- Go directly to Amazon order history and search for the item.
+- Use "Buy it again" when the correct previous item is found.
+- Verify the selected address and payment method.
+- Place the order once the item clearly matches the user's request.
+- No screenshot is required for a confirmed reorder unless something looks ambiguous.
+
+### New items
+
+- Search or navigate to the requested product.
+- Before adding to cart, send the user a screenshot that clearly shows the product image and price.
+- Wait for explicit user confirmation before continuing with a new item purchase.
+- Verify the address and payment method again on checkout before placing the order.
+
+### Order history and status
+
+- Use order history for lookup, reorder decisions, and return eligibility checks.
+- When the user asks about past purchases, summarize only the relevant orders instead of dumping the full page.
+- If multiple similar orders match, ask which one they mean before acting.
+
+## Return defaults
+
+Use these defaults unless the user says otherwise:
+
+- Return reason: "Changed Mind" -> "My needs changed".
+- Packaging opened: Yes.
+- Item in original packaging: Yes.
+- Have you used the item: Yes.
+- Signs of use: None.
+- Battery leaks or overheating: No.
+- All accessories included: Yes.
+- Refund type: Refund to original payment method.
+- Drop-off location: Use `returnDropoff` from `defaults.json`, or `AMAZON_RETURN_DROPOFF`, or Whole Foods.
+
+## Return flow
+
+1. Open order history and find the item.
+2. Choose "Return or replace items".
+3. Select "Changed Mind" and then "My needs changed".
+4. Answer condition questions with the defaults in this document unless the user gave different facts.
+5. Continue past support suggestions.
+6. Select refund to the original payment method.
+7. Select the preferred drop-off location.
+8. Confirm the return.
+
+After a successful return, send only a short confirmation that includes the item name, refund amount, and drop-off location plus deadline if Amazon shows one.
+
+## Browser workflow
+
+### Connect to the browser
+
+```bash
+agent-browser connect 9222
+```
+
+Always open a new tab because other sessions may share the same Chrome profile. Use `--new-tab` on every open command.
+
+### Search order history
+
+```bash
+agent-browser open --new-tab "https://www.amazon.com/gp/your-account/order-history"
+agent-browser snapshot -i
+```
+
+Use the order-history search box to find the relevant item.
+
+### Reorder flow
+
+```bash
+agent-browser click @[buy-it-again-ref]
+agent-browser snapshot -i
+```
+
+Verify the address and payment method before clicking the place-order control.
+
+### Screenshot guidance
+
+- Scroll past Amazon navigation bars before taking the screenshot.
+- Ensure the product image and current price are both visible.
+- Save the screenshot to a temporary location and send it with a short caption.
+
+## Starting the browser if needed
+
+### Linux desktop session
+
+```bash
+google-chrome --user-data-dir=$HOME/.config/chrome-agent --no-first-run --remote-debugging-port=9222 https://www.amazon.com &
+```
+
+### Linux headless session
+
+```bash
+DISPLAY=:99 google-chrome --user-data-dir=$HOME/.config/chrome-agent --no-first-run --remote-debugging-port=9222 https://www.amazon.com &
+```
+
+### macOS
+
+```bash
+open -na "Google Chrome" --args --user-data-dir=$HOME/.config/chrome-agent --no-first-run --remote-debugging-port=9222 https://www.amazon.com
+```
+
+## Notes
+
+- The browser profile typically persists login at `$HOME/.config/chrome-agent`.
+- Workspace defaults live in `skills/amazon-ordering/defaults.json`.
+- Order confirmations go to the email on the Amazon account.
+- If the user asks for a new purchase but has not confirmed the item screenshot yet, do not place the order.
+- If the user asks for a return, use the silent return workflow and only surface the final result unless clarification is required.
diff --git a/src/features/office/components/panels/PackagedSkillSetupModal.tsx b/src/features/office/components/panels/PackagedSkillSetupModal.tsx
new file mode 100644
index 00000000..a0d9887c
--- /dev/null
+++ b/src/features/office/components/panels/PackagedSkillSetupModal.tsx
@@ -0,0 +1,160 @@
+"use client";
+
+import { useEffect, useMemo, useState } from "react";
+
+import type {
+  PackagedSkillSetupDefinition,
+  PackagedSkillSetupValues,
+} from "@/lib/skills/packaged-setup";
+
+type PackagedSkillSetupModalProps = {
+  skillName: string;
+  definition: PackagedSkillSetupDefinition;
+  initialValues?: PackagedSkillSetupValues;
+  busy?: boolean;
+  errorMessage?: string | null;
+  onClose: () => void;
+  onSubmit: (values: PackagedSkillSetupValues) => Promise<void> | void;
+};
+
+export function PackagedSkillSetupModal({
+  skillName,
+  definition,
+  initialValues,
+  busy = false,
+  errorMessage = null,
+  onClose,
+  onSubmit,
+}: PackagedSkillSetupModalProps) {
+  const [values, setValues] = useState<PackagedSkillSetupValues>(() => initialValues ?? {});
+
+  useEffect(() => {
+    setValues(initialValues ?? {});
+  }, [definition, initialValues, skillName]);
+
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key !== "Escape" || busy) {
+        return;
+      }
+      event.preventDefault();
+      onClose();
+    };
+    window.addEventListener("keydown", handleKeyDown);
+    return () => {
+      window.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [busy, onClose]);
+
+  const missingRequiredField = useMemo(
+    () =>
+      definition.fields.find((field) => field.required && !(values[field.key] ?? "").trim()) ?? null,
+    [definition.fields, values]
+  );
+
+  return (
+    <div
+      className="absolute inset-0 z-20 flex items-center justify-center bg-black/70 p-4"
+      role="dialog"
+      aria-modal="true"
+      aria-label={`${definition.title} for ${skillName}`}
+      onClick={() => {
+        if (!busy) {
+          onClose();
+        }
+      }}
+    >
+      <form
+        className="w-full max-w-lg rounded-3xl border border-cyan-500/20 bg-[#050607] p-5 shadow-2xl"
+        onClick={(event) => event.stopPropagation()}
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (busy || missingRequiredField) {
+            return;
+          }
+          void Promise.resolve(onSubmit(values)).catch(() => undefined);
+        }}
+      >
+        <div className="font-mono text-[10px] uppercase tracking-[0.22em] text-cyan-200/75">
+          Install setup
+        </div>
+        <div className="mt-2 font-mono text-[15px] font-semibold text-white">
+          {definition.title} for {skillName}
+        </div>
+        <div className="mt-2 text-sm leading-relaxed text-white/65">{definition.description}</div>
+
+        <div className="mt-4 space-y-3">
+          {definition.fields.map((field) => {
+            const value = values[field.key] ?? "";
+            return (
+              <label key={field.key} className="block">
+                <div className="font-mono text-[10px] uppercase tracking-[0.14em] text-white/70">
+                  {field.label}
+                </div>
+                <div className="mt-1 text-[11px] text-white/45">{field.description}</div>
+                {field.multiline ? (
+                  <textarea
+                    value={value}
+                    rows={3}
+                    disabled={busy}
+                    placeholder={field.placeholder}
+                    onChange={(event) =>
+                      setValues((current) => ({
+                        ...current,
+                        [field.key]: event.target.value,
+                      }))
+                    }
+                    className="mt-2 w-full rounded-xl border border-white/10 bg-black/40 px-3 py-2 text-sm text-white outline-none transition focus:border-cyan-400/40 disabled:cursor-not-allowed disabled:opacity-60"
+                  />
+                ) : (
+                  <input
+                    value={value}
+                    disabled={busy}
+                    placeholder={field.placeholder}
+                    onChange={(event) =>
+                      setValues((current) => ({
+                        ...current,
+                        [field.key]: event.target.value,
+                      }))
+                    }
+                    className="mt-2 w-full rounded-xl border border-white/10 bg-black/40 px-3 py-2 text-sm text-white outline-none transition focus:border-cyan-400/40 disabled:cursor-not-allowed disabled:opacity-60"
+                  />
+                )}
+              </label>
+            );
+          })}
+        </div>
+
+        {missingRequiredField ? (
+          <div className="mt-4 rounded-xl border border-amber-500/20 bg-amber-500/10 px-3 py-2 text-sm text-amber-100">
+            {missingRequiredField.label} is required.
+          </div>
+        ) : null}
+
+        {errorMessage ? (
+          <div className="mt-4 rounded-xl border border-rose-500/20 bg-rose-500/10 px-3 py-2 text-sm text-rose-100">
+            {errorMessage}
+          </div>
+        ) : null}
+
+        <div className="mt-5 flex flex-wrap justify-end gap-2">
+          <button
+            type="button"
+            onClick={onClose}
+            disabled={busy}
+            className="rounded-xl border border-white/10 bg-white/5 px-4 py-2 font-mono text-[10px] uppercase tracking-[0.14em] text-white/75 transition-colors hover:bg-white/10 disabled:cursor-not-allowed disabled:opacity-45"
+          >
+            Cancel
+          </button>
+          <button
+            type="submit"
+            disabled={busy || Boolean(missingRequiredField)}
+            className="rounded-xl border border-cyan-500/25 bg-cyan-500/10 px-4 py-2 font-mono text-[10px] uppercase tracking-[0.14em] text-cyan-100 transition-colors hover:border-cyan-400/40 disabled:cursor-not-allowed disabled:opacity-45"
+          >
+            {busy ? "Working..." : definition.submitLabel}
+          </button>
+        </div>
+      </form>
+    </div>
+  );
+}
diff --git a/src/features/office/components/panels/ShopDisabledPanel.tsx b/src/features/office/components/panels/ShopDisabledPanel.tsx
new file mode 100644
index 00000000..939e37ac
--- /dev/null
+++ b/src/features/office/components/panels/ShopDisabledPanel.tsx
@@ -0,0 +1,90 @@
+"use client";
+
+type ShopDisabledPanelProps = {
+  onClose: () => void;
+  onInstall: () => void;
+  installing?: boolean;
+  progressPercent?: number;
+  progressMessage?: string | null;
+  errorMessage?: string | null;
+};
+
+export function ShopDisabledPanel({
+  onClose,
+  onInstall,
+  installing = false,
+  progressPercent = 0,
+  progressMessage = null,
+  errorMessage = null,
+}: ShopDisabledPanelProps) {
+  return (
+    <div className="absolute inset-0 z-50 flex items-center justify-center bg-black/60 p-6">
+      <div className="w-full max-w-sm rounded-3xl border border-slate-700/40 bg-slate-950/95 p-8 text-center shadow-2xl">
+        <div className="mx-auto mb-4 flex h-16 w-16 items-center justify-center rounded-2xl border border-slate-700/40 bg-slate-800/60 text-4xl">
+          🛒
+        </div>
+
+        <div className="font-mono text-[10px] uppercase tracking-[0.24em] text-slate-500">
+          Amazon Ordering
+        </div>
+        <h2 className="mt-1 text-xl font-semibold text-white">Shop Skill Not Installed</h2>
+        <p className="mt-3 text-sm leading-relaxed text-slate-400">
+          Install the <span className="text-cyan-400">AMAZON-ORDERING</span> skill to let your
+          agents walk to the office shop, manage shopping lists, and review Amazon order history.
+        </p>
+
+        {installing ? (
+          <div className="mt-5 rounded-2xl border border-cyan-500/20 bg-cyan-500/5 p-4 text-left">
+            <div className="flex items-center justify-between gap-3">
+              <span className="font-mono text-[10px] uppercase tracking-[0.18em] text-cyan-300/80">
+                Installing
+              </span>
+              <span className="font-mono text-[10px] text-cyan-100/70">
+                {Math.max(0, Math.min(100, Math.round(progressPercent)))}%
+              </span>
+            </div>
+            <div className="mt-3 h-2 overflow-hidden rounded-full bg-slate-800/90">
+              <div
+                className="h-full rounded-full bg-cyan-400 transition-[width] duration-500 ease-out"
+                style={{ width: `${Math.max(6, Math.min(100, progressPercent))}%` }}
+              />
+            </div>
+            <p className="mt-3 text-sm leading-relaxed text-slate-300">
+              {progressMessage?.trim() || "Installing the amazon-ordering skill."}
+            </p>
+            <p className="mt-2 text-xs leading-relaxed text-slate-500">
+              Once it&apos;s installed, Claw3D will unlock the office shop and shopping workflow.
+            </p>
+          </div>
+        ) : null}
+
+        {errorMessage ? (
+          <div className="mt-4 rounded-2xl border border-rose-500/20 bg-rose-500/8 px-4 py-3 text-sm text-rose-200">
+            {errorMessage}
+          </div>
+        ) : null}
+
+        <div className="mt-6 flex flex-col gap-3">
+          <button
+            type="button"
+            className="rounded-xl bg-cyan-500 px-5 py-2.5 text-sm font-medium text-slate-950 transition hover:bg-cyan-400 active:scale-95 disabled:cursor-not-allowed disabled:bg-cyan-700/60 disabled:text-slate-200"
+            onClick={onInstall}
+            disabled={installing}
+          >
+            {installing
+              ? "Installing AMAZON-ORDERING skill..."
+              : "Install AMAZON-ORDERING skill"}
+          </button>
+          <button
+            type="button"
+            className="rounded-xl border border-slate-700/40 px-5 py-2.5 text-sm text-slate-400 transition hover:bg-slate-800/50 disabled:cursor-not-allowed disabled:opacity-50"
+            onClick={onClose}
+            disabled={installing}
+          >
+            Dismiss
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/features/office/components/panels/SkillsMarketplacePanel.tsx b/src/features/office/components/panels/SkillsMarketplacePanel.tsx
index ea35fcd4..25413c68 100644
--- a/src/features/office/components/panels/SkillsMarketplacePanel.tsx
+++ b/src/features/office/components/panels/SkillsMarketplacePanel.tsx
@@ -14,7 +14,12 @@ import {
   X,
 } from "lucide-react";
 
+import { PackagedSkillSetupModal } from "@/features/office/components/panels/PackagedSkillSetupModal";
 import type { OfficeSkillsMarketplaceController } from "@/features/office/hooks/useOfficeSkillsMarketplace";
+import {
+  getPackagedSkillSetupDefinition,
+  type PackagedSkillSetupValues,
+} from "@/lib/skills/packaged-setup";
 import type { SkillMarketplaceCollectionId, SkillMarketplaceEntry } from "@/lib/skills/marketplace";
 import { buildSkillMarketplaceCollections } from "@/lib/skills/marketplace";
 import { buildAgentSkillsAllowlistSet, deriveAgentSkillsAccessMode } from "@/lib/skills/presentation";
@@ -102,6 +107,10 @@ export function SkillsMarketplacePanel({
   const [query, setQuery] = useState("");
   const [activeFilter, setActiveFilter] = useState<MarketplaceFilter>("claw3d");
   const [detailSkillKey, setDetailSkillKey] = useState<string | null>(null);
+  const [installSetupSkillKey, setInstallSetupSkillKey] = useState<string | null>(null);
+  const [installSetupDrafts, setInstallSetupDrafts] = useState<Record<string, PackagedSkillSetupValues>>(
+    {}
+  );
 
   const entries = useMemo(
     () => marketplace.marketplaceSkills ?? marketplace.skillsReport?.skills ?? [],
@@ -175,6 +184,38 @@ export function SkillsMarketplacePanel({
     collections
       .flatMap((collection) => collection.entries)
       .find((entry) => entry.skill.skillKey === detailSkillKey) ?? null;
+  const installSetupSkill = installSetupSkillKey
+    ? marketplace.packagedSkillsByKey.get(installSetupSkillKey) ?? null
+    : null;
+  const installSetupDefinition = installSetupSkill
+    ? getPackagedSkillSetupDefinition(installSetupSkill.packageId)
+    : null;
+
+  const triggerPackagedInstall = (skillKey: string) => {
+    const packagedSkill = marketplace.packagedSkillsByKey.get(skillKey);
+    if (!packagedSkill) {
+      void marketplace.handleInstallPackagedSkill(skillKey).catch(() => undefined);
+      return;
+    }
+    const definition = getPackagedSkillSetupDefinition(packagedSkill.packageId);
+    if (!definition) {
+      void marketplace.handleInstallPackagedSkill(skillKey).catch(() => undefined);
+      return;
+    }
+    setInstallSetupSkillKey(skillKey);
+  };
+
+  const submitPackagedInstallSetup = async (
+    skillKey: string,
+    values: PackagedSkillSetupValues
+  ) => {
+    setInstallSetupDrafts((current) => ({
+      ...current,
+      [skillKey]: values,
+    }));
+    await marketplace.handleInstallPackagedSkill(skillKey, values);
+    setInstallSetupSkillKey(null);
+  };
 
   return (
     <section className="relative flex h-full min-h-0 flex-col">
@@ -390,7 +431,7 @@ export function SkillsMarketplacePanel({
                     packageOnly
                       ? {
                           label: "Install skill",
-                          run: () => void marketplace.handleInstallPackagedSkill(entry.skill.skillKey),
+                          run: () => triggerPackagedInstall(entry.skill.skillKey),
                           icon: Download,
                         }
                       : entry.readiness === "needs-setup" && entry.installable
@@ -673,7 +714,7 @@ export function SkillsMarketplacePanel({
               !detailEntry.skill.baseDir.trim() ? (
                 <button
                   type="button"
-                  onClick={() => void marketplace.handleInstallPackagedSkill(detailEntry.skill.skillKey)}
+                  onClick={() => triggerPackagedInstall(detailEntry.skill.skillKey)}
                   disabled={marketplace.busySkillKey === detailEntry.skill.skillKey}
                   className="inline-flex items-center gap-1 rounded border border-cyan-500/25 bg-cyan-500/10 px-2 py-1.5 font-mono text-[10px] uppercase tracking-[0.14em] text-cyan-100 transition-colors hover:border-cyan-400/40 disabled:cursor-not-allowed disabled:opacity-45"
                 >
@@ -737,6 +778,23 @@ export function SkillsMarketplacePanel({
           </div>
         </div>
       ) : null}
+      {installSetupSkill && installSetupDefinition ? (
+        <PackagedSkillSetupModal
+          skillName={installSetupSkill.name}
+          definition={installSetupDefinition}
+          initialValues={installSetupDrafts[installSetupSkill.skillKey]}
+          busy={marketplace.busySkillKey === installSetupSkill.skillKey}
+          errorMessage={
+            marketplace.message?.kind === "error" ? marketplace.message.text : marketplace.error
+          }
+          onClose={() => {
+            if (!marketplace.busySkillKey) {
+              setInstallSetupSkillKey(null);
+            }
+          }}
+          onSubmit={(values) => submitPackagedInstallSetup(installSetupSkill.skillKey, values)}
+        />
+      ) : null}
     </section>
   );
 }
diff --git a/src/features/office/hooks/useOfficeSkillsMarketplace.ts b/src/features/office/hooks/useOfficeSkillsMarketplace.ts
index 2ecac203..29e2a68b 100644
--- a/src/features/office/hooks/useOfficeSkillsMarketplace.ts
+++ b/src/features/office/hooks/useOfficeSkillsMarketplace.ts
@@ -12,6 +12,7 @@ import {
   listPackagedSkills,
 } from "@/lib/skills/catalog";
 import { installPackagedSkillViaGatewayAgent } from "@/lib/skills/install-gateway";
+import type { PackagedSkillSetupValues } from "@/lib/skills/packaged-setup";
 import { resolvePreferredInstallOption } from "@/lib/skills/presentation";
 import { removeSkillFromGateway } from "@/lib/skills/remove";
 import {
@@ -161,6 +162,7 @@ export const useOfficeSkillsMarketplace = ({
       skillKey: string;
       successMessage: string;
       run: (agentId: string, report: SkillStatusReport) => Promise<void>;
+      rethrowOnError?: boolean;
     }) => {
       const agentId = selectedAgentId?.trim() ?? "";
       const report = skillsReport;
@@ -204,6 +206,9 @@ export const useOfficeSkillsMarketplace = ({
         if (!isGatewayDisconnectLikeError(err)) {
           console.error(nextMessage);
         }
+        if (params.rethrowOnError) {
+          throw err instanceof Error ? err : new Error(nextMessage);
+        }
       } finally {
         onSkillActivityEnd?.(agentId);
         setBusySkillKey((current) =>
@@ -265,7 +270,7 @@ export const useOfficeSkillsMarketplace = ({
   );
 
   const handleInstallPackagedSkill = useCallback(
-    async (skillKey: string) => {
+    async (skillKey: string, setupValues?: PackagedSkillSetupValues) => {
       const packagedSkill = getPackagedSkillBySkillKey(skillKey);
       if (!packagedSkill) {
         setMessage({
@@ -277,7 +282,11 @@ export const useOfficeSkillsMarketplace = ({
 
       await runSkillMutation({
         skillKey: packagedSkill.skillKey,
-        successMessage: `Successfully installed ${packagedSkill.name.trim()} in the selected workspace. Enable it for the agent from the CLAW3D tab.`,
+        successMessage:
+          packagedSkill.packageId === "amazon-ordering" && setupValues
+            ? `Installed ${packagedSkill.name.trim()} and saved workspace checkout defaults. Enable it for the agent from the CLAW3D tab.`
+            : `Successfully installed ${packagedSkill.name.trim()} in the selected workspace. Enable it for the agent from the CLAW3D tab.`,
+        rethrowOnError: true,
         run: async (_agentId, report) => {
           await installPackagedSkillViaGatewayAgent({
             client,
@@ -288,6 +297,7 @@ export const useOfficeSkillsMarketplace = ({
               managedSkillsDir: report.managedSkillsDir,
               agentId: selectedAgent?.agentId ?? undefined,
               agentName: selectedAgent?.name ?? undefined,
+              setupValues,
             },
           });
         },
@@ -300,6 +310,7 @@ export const useOfficeSkillsMarketplace = ({
     async (params: {
       skillKey: string;
       agentId?: string | null;
+      setupValues?: PackagedSkillSetupValues;
       onProgress?: (progress: { percent: number; message: string }) => void;
     }) => {
       const packagedSkill = getPackagedSkillBySkillKey(params.skillKey);
@@ -331,9 +342,13 @@ export const useOfficeSkillsMarketplace = ({
           message: "Preparing the workspace skill install.",
         });
         const initialReport = await loadAgentSkillStatus(client, targetAgentId);
+        const packagedSkillLabel = packagedSkill.name.trim();
         params.onProgress?.({
           percent: 38,
-          message: "Installing task-manager into the workspace.",
+          message:
+            packagedSkill.packageId === "amazon-ordering" && params.setupValues
+              ? `Installing ${packagedSkillLabel} and writing workspace defaults.`
+              : `Installing ${packagedSkillLabel} into the workspace.`,
         });
         await installPackagedSkillViaGatewayAgent({
           client,
@@ -345,16 +360,17 @@ export const useOfficeSkillsMarketplace = ({
             agentId: targetAgentId,
             agentName:
               agents.find((agent) => agent.agentId === targetAgentId)?.name ?? undefined,
+            setupValues: params.setupValues,
           },
         });
         params.onProgress?.({
           percent: 62,
-          message: "Enabling task-manager for this gateway.",
+          message: `Enabling ${packagedSkillLabel} for this gateway.`,
         });
         await updateSkill(client, { skillKey: packagedSkill.skillKey, enabled: true });
         params.onProgress?.({
           percent: 78,
-          message: "Enabling task-manager for the main agent.",
+          message: `Enabling ${packagedSkillLabel} for the selected agent.`,
         });
         const refreshedReport = await loadAgentSkillStatus(client, targetAgentId);
         await setAgentSkillEnabled({
@@ -371,7 +387,10 @@ export const useOfficeSkillsMarketplace = ({
         await loadMarketplace(targetAgentId);
         params.onProgress?.({
           percent: 100,
-          message: "Task-manager installed and enabled.",
+          message:
+            packagedSkill.packageId === "amazon-ordering" && params.setupValues
+              ? `${packagedSkillLabel} installed, configured, and enabled.`
+              : `${packagedSkillLabel} installed and enabled.`,
         });
         const agentName =
           agents.find((agent) => agent.agentId === targetAgentId)?.name ?? "the main agent";
diff --git a/src/features/office/screens/OfficeScreen.tsx b/src/features/office/screens/OfficeScreen.tsx
index 237dea87..510e303d 100644
--- a/src/features/office/screens/OfficeScreen.tsx
+++ b/src/features/office/screens/OfficeScreen.tsx
@@ -97,6 +97,7 @@ import {
 import {
   TRANSCRIPT_V2_ENABLED,
   logTranscriptDebugMetric,
+  type TranscriptEntry,
 } from "@/features/agents/state/transcript";
 import {
   buildGatewayModelChoices,
@@ -139,7 +140,9 @@ import { AnalyticsPanel } from "@/features/office/components/panels/AnalyticsPan
 import { HistoryPanel } from "@/features/office/components/panels/HistoryPanel";
 import { InboxPanel } from "@/features/office/components/panels/InboxPanel";
 import { KanbanDisabledPanel } from "@/features/office/components/panels/KanbanDisabledPanel";
+import { PackagedSkillSetupModal } from "@/features/office/components/panels/PackagedSkillSetupModal";
 import { PlaybooksPanel } from "@/features/office/components/panels/PlaybooksPanel";
+import { ShopDisabledPanel } from "@/features/office/components/panels/ShopDisabledPanel";
 import { SkillsMarketplaceModal } from "@/features/office/components/panels/SkillsMarketplaceModal";
 import { TaskBoardPanel } from "@/features/office/components/panels/TaskBoardPanel";
 import { JukeboxPanel } from "@/features/spotify-jukebox/components/JukeboxPanel";
@@ -186,6 +189,10 @@ import {
   type OfficeDeskMonitor,
 } from "@/lib/office/deskMonitor";
 import { deriveSkillReadinessState } from "@/lib/skills/presentation";
+import {
+  getPackagedSkillSetupDefinition,
+  type PackagedSkillSetupValues,
+} from "@/lib/skills/packaged-setup";
 import type { StandupAgentSnapshot } from "@/lib/office/standup/types";
 import type { SkillStatusEntry } from "@/lib/skills/types";
 
@@ -217,6 +224,7 @@ const MAX_OPENCLAW_AGENT_OUTPUT_LINES = 12;
 const OFFICE_DANCE_MS = 60_000;
 const GATEWAY_LOADING_OVERLAY_DELAY_MS = 1_200;
 const GATEWAY_CONNECT_OVERLAY_DELAY_MS = 1_500;
+const AMAZON_ORDERING_SETUP = getPackagedSkillSetupDefinition("amazon-ordering");
 
 const getLatestUserRequestForAgent = (
   agent: AgentState,
@@ -242,6 +250,62 @@ const getLatestUserRequestForAgent = (
   };
 };
 
+type ShopRequestForAgent = {
+  text: string;
+  requestKey: string;
+  sequenceKey: number;
+};
+
+const SHOP_ORDER_COMPLETION_PATTERNS = [
+  /\byour\s+order\s+has\s+been\s+placed\b/i,
+  /\bplaced\s+(?:the\s+)?order\b/i,
+  /\b(?:order|purchase)\s+(?:has\s+been\s+)?(?:placed|completed|submitted|confirmed)\b/i,
+  /\bcheckout\s+(?:is\s+)?complete\b/i,
+  /\bcompleted\s+(?:the\s+)?checkout\b/i,
+] as const;
+
+const isShopOrderCompletionText = (text: string): boolean => {
+  const normalized = stripUiMetadata(text).trim();
+  return SHOP_ORDER_COMPLETION_PATTERNS.some((pattern) => pattern.test(normalized));
+};
+
+const getLatestShopRequestForAgent = (agent: AgentState): ShopRequestForAgent | null => {
+  const transcriptEntries = Array.isArray(agent.transcriptEntries)
+    ? agent.transcriptEntries
+    : [];
+  for (let index = transcriptEntries.length - 1; index >= 0; index -= 1) {
+    const entry = transcriptEntries[index];
+    if (!entry || entry.role !== "user") continue;
+    const text = entry.text.trim();
+    if (!text || resolveOfficeIntentSnapshot(text).shop !== "shop") continue;
+    return {
+      text,
+      requestKey: `${agent.sessionKey}:${entry.entryId}:${text}`,
+      sequenceKey: entry.sequenceKey,
+    };
+  }
+  return null;
+};
+
+const findLatestShopCompletionForAgent = (
+  agent: AgentState,
+  shopRequest: ShopRequestForAgent,
+): TranscriptEntry | null => {
+  const transcriptEntries = Array.isArray(agent.transcriptEntries)
+    ? agent.transcriptEntries
+    : [];
+  for (let index = transcriptEntries.length - 1; index >= 0; index -= 1) {
+    const entry = transcriptEntries[index];
+    if (!entry) continue;
+    if (entry.sequenceKey <= shopRequest.sequenceKey) break;
+    if (entry.role !== "assistant") continue;
+    if (isShopOrderCompletionText(entry.text)) {
+      return entry;
+    }
+  }
+  return null;
+};
+
 type OpenClawLogEntry = {
   id: string;
   timestamp: string;
@@ -886,6 +950,7 @@ export function OfficeScreen({
         officeAgent: OfficeAgent;
         phoneBoothHeld: boolean;
         qaHeld: boolean;
+        shopHeld: boolean;
         smsBoothHeld: boolean;
       }
     >
@@ -999,6 +1064,24 @@ export function OfficeScreen({
     message: "",
     error: null,
   });
+  const [shopOpen, setShopOpen] = useState(false);
+  const [shopInstallSetupOpen, setShopInstallSetupOpen] = useState(false);
+  const [shopInstallSetupValues, setShopInstallSetupValues] = useState<PackagedSkillSetupValues>({});
+  const [shopInstallProgress, setShopInstallProgress] = useState<{
+    active: boolean;
+    percent: number;
+    message: string;
+    error: string | null;
+  }>({
+    active: false,
+    percent: 0,
+    message: "",
+    error: null,
+  });
+  const [suppressedShopRequestKeyByAgentId, setSuppressedShopRequestKeyByAgentId] =
+    useState<Record<string, string>>({});
+  const [shopOrderCompletionSignal, setShopOrderCompletionSignal] = useState(0);
+  const handledShopCompletionKeysRef = useRef<Set<string>>(new Set());
   const [danceUntilByAgentId, setDanceUntilByAgentId] = useState<Record<string, number>>({});
   const initJukeboxStore = useJukeboxStore((state) => state.init);
   const jukeboxToken = useJukeboxStore((state) => state.token);
@@ -2773,6 +2856,51 @@ export function OfficeScreen({
     onSkillActivityStart: handleMarketplaceGymStart,
     onSkillActivityEnd: handleMarketplaceGymEnd,
   });
+  const handleShopAmazonInstall = useCallback(
+    async (setupValues: PackagedSkillSetupValues) => {
+      const targetAgentId =
+        (selectedChatAgentId ?? state.selectedAgentId ?? state.agents[0]?.agentId ?? "").trim() || null;
+      setShopInstallSetupValues(setupValues);
+      setShopInstallSetupOpen(false);
+      setShopInstallProgress({
+        active: true,
+        percent: 8,
+        message: "Starting AMAZON skill installation.",
+        error: null,
+      });
+      try {
+        await marketplace.handleInstallPackagedSkillAndEnable({
+          skillKey: "amazon-ordering",
+          agentId: targetAgentId,
+          setupValues,
+          onProgress: ({ percent, message }) => {
+            setShopInstallProgress({
+              active: true,
+              percent,
+              message,
+              error: null,
+            });
+          },
+        });
+        setShopInstallProgress({
+          active: false,
+          percent: 0,
+          message: "",
+          error: null,
+        });
+        setShopOpen(false);
+      } catch (error) {
+        setShopInstallProgress((current) => ({
+          ...current,
+          active: false,
+          error: error instanceof Error ? error.message : "Failed to install AMAZON.",
+        }));
+        setShopInstallSetupOpen(true);
+        throw error;
+      }
+    },
+    [marketplace, selectedChatAgentId, state.agents, state.selectedAgentId]
+  );
   const skillTriggers = useOfficeSkillTriggers({
     client,
     status,
@@ -2790,6 +2918,20 @@ export function OfficeScreen({
     const skillTriggerHoldMaps = buildOfficeSkillTriggerHoldMaps(
       skillTriggers.movementTargetByAgentId,
     );
+    const shopHoldByAgentId = {
+      ...base.shopHoldByAgentId,
+      ...skillTriggerHoldMaps.shopHoldByAgentId,
+    };
+    for (const agent of state.agents) {
+      const latestShopRequest = getLatestShopRequestForAgent(agent);
+      if (!latestShopRequest) continue;
+      if (
+        suppressedShopRequestKeyByAgentId[agent.agentId] ===
+        latestShopRequest.requestKey
+      ) {
+        delete shopHoldByAgentId[agent.agentId];
+      }
+    }
 
     return {
       ...base,
@@ -2806,6 +2948,7 @@ export function OfficeScreen({
         ...base.gymHoldByAgentId,
         ...skillTriggerHoldMaps.gymHoldByAgentId,
       },
+      shopHoldByAgentId,
       jukeboxHoldByAgentId: {
         ...base.jukeboxHoldByAgentId,
         ...skillTriggerHoldMaps.jukeboxHoldByAgentId,
@@ -2826,7 +2969,67 @@ export function OfficeScreen({
     officeTriggerState,
     skillTriggers.movementTargetByAgentId,
     state.agents,
+    suppressedShopRequestKeyByAgentId,
   ]);
+  useEffect(() => {
+    const completions: Array<{
+      agentId: string;
+      agentName: string;
+      handledKey: string;
+      requestKey: string;
+    }> = [];
+    for (const agent of state.agents) {
+      if (!officeAnimationState.shopHoldByAgentId[agent.agentId]) continue;
+      const latestShopRequest = getLatestShopRequestForAgent(agent);
+      if (!latestShopRequest) continue;
+      const completionEntry = findLatestShopCompletionForAgent(agent, latestShopRequest);
+      if (!completionEntry) continue;
+      const handledKey = `${agent.agentId}:${latestShopRequest.requestKey}:${completionEntry.entryId}`;
+      if (handledShopCompletionKeysRef.current.has(handledKey)) continue;
+      completions.push({
+        agentId: agent.agentId,
+        agentName: agent.name || "Agent",
+        handledKey,
+        requestKey: latestShopRequest.requestKey,
+      });
+    }
+    if (completions.length === 0) return;
+    for (const completion of completions) {
+      handledShopCompletionKeysRef.current.add(completion.handledKey);
+    }
+    setSuppressedShopRequestKeyByAgentId((previous) => {
+      const next = { ...previous };
+      for (const completion of completions) {
+        next[completion.agentId] = completion.requestKey;
+      }
+      return next;
+    });
+    setShopOrderCompletionSignal((current) => current + 1);
+  }, [officeAnimationState.shopHoldByAgentId, state.agents]);
+  useEffect(() => {
+    if (!shopOrderCompletionSignal) return;
+    let cancelled = false;
+    void import("canvas-confetti")
+      .then(({ default: confetti }) => {
+        if (cancelled) return;
+        confetti({
+          particleCount: 120,
+          spread: 82,
+          startVelocity: 42,
+          origin: { x: 0.25, y: 0.7 },
+        });
+        confetti({
+          particleCount: 120,
+          spread: 82,
+          startVelocity: 42,
+          origin: { x: 0.75, y: 0.7 },
+        });
+      })
+      .catch(() => undefined);
+    return () => {
+      cancelled = true;
+    };
+  }, [shopOrderCompletionSignal]);
   const {
     deskHoldByAgentId,
     githubHoldByAgentId,
@@ -2836,6 +3039,7 @@ export function OfficeScreen({
     phoneBoothHoldByAgentId,
     phoneCallByAgentId,
     qaHoldByAgentId,
+    shopHoldByAgentId,
     smsBoothHoldByAgentId,
     skillGymHoldByAgentId,
     textMessageByAgentId,
@@ -3432,7 +3636,7 @@ export function OfficeScreen({
           createOpenClawLogEntry({
             eventName: "office-intent",
             eventKind: "derived",
-            summary: `agent=${agentId} gym=${intentSnapshot.gym?.source ?? "-"} qa=${intentSnapshot.qa ?? "-"} github=${intentSnapshot.github ?? "-"} desk=${intentSnapshot.desk ?? "-"} text=${intentSnapshot.text?.phase ?? "-"}`,
+            summary: `agent=${agentId} gym=${intentSnapshot.gym?.source ?? "-"} shop=${intentSnapshot.shop ?? "-"} qa=${intentSnapshot.qa ?? "-"} github=${intentSnapshot.github ?? "-"} desk=${intentSnapshot.desk ?? "-"} text=${intentSnapshot.text?.phase ?? "-"}`,
             payload: {
               agentId,
               message: trimmed,
@@ -3448,6 +3652,7 @@ export function OfficeScreen({
       const hasImmediateOfficeTrigger = Boolean(
         intentSnapshot.desk ||
           intentSnapshot.github ||
+          intentSnapshot.shop ||
           intentSnapshot.gym ||
           intentSnapshot.qa ||
           intentSnapshot.standup ||
@@ -3459,6 +3664,7 @@ export function OfficeScreen({
         !intentSnapshot.text &&
         !intentSnapshot.desk &&
         !intentSnapshot.github &&
+        !intentSnapshot.shop &&
         !intentSnapshot.gym &&
         !intentSnapshot.qa &&
         !intentSnapshot.standup;
@@ -3468,6 +3674,7 @@ export function OfficeScreen({
         !intentSnapshot.text &&
         !intentSnapshot.desk &&
         !intentSnapshot.github &&
+        !intentSnapshot.shop &&
         !intentSnapshot.gym &&
         !intentSnapshot.qa &&
         !intentSnapshot.standup;
@@ -3713,6 +3920,7 @@ export function OfficeScreen({
         officeAgent: OfficeAgent;
         phoneBoothHeld: boolean;
         qaHeld: boolean;
+        shopHeld: boolean;
         smsBoothHeld: boolean;
       }
     >();
@@ -3722,6 +3930,7 @@ export function OfficeScreen({
       const gymHeld = Boolean(gymHoldByAgentId[agent.agentId]);
       const phoneBoothHeld = Boolean(phoneBoothHoldByAgentId[agent.agentId]);
       const qaHeld = Boolean(qaHoldByAgentId[agent.agentId]);
+      const shopHeld = Boolean(shopHoldByAgentId[agent.agentId]);
       const smsBoothHeld = Boolean(smsBoothHoldByAgentId[agent.agentId]);
       const cached = officeAgentCacheRef.current.get(agent.agentId);
       if (
@@ -3732,6 +3941,7 @@ export function OfficeScreen({
         cached.gymHeld === gymHeld &&
         cached.phoneBoothHeld === phoneBoothHeld &&
         cached.qaHeld === qaHeld &&
+        cached.shopHeld === shopHeld &&
         cached.smsBoothHeld === smsBoothHeld
       ) {
         nextCache.set(agent.agentId, cached);
@@ -3753,6 +3963,8 @@ export function OfficeScreen({
                   agent.runId ??
                   (qaHeld
                     ? `qa-hold-${agent.agentId}`
+                    : shopHeld
+                      ? `shop-hold-${agent.agentId}`
                     : smsBoothHeld
                       ? `text-hold-${agent.agentId}`
                     : phoneBoothHeld
@@ -3771,6 +3983,7 @@ export function OfficeScreen({
         officeAgent,
         phoneBoothHeld,
         qaHeld,
+        shopHeld,
         smsBoothHeld,
       });
       return officeAgent;
@@ -3783,6 +3996,7 @@ export function OfficeScreen({
     gymHoldByAgentId,
     phoneBoothHoldByAgentId,
     qaHoldByAgentId,
+    shopHoldByAgentId,
     smsBoothHoldByAgentId,
     state.agents,
     workingUntilByAgentId,
@@ -4023,6 +4237,15 @@ export function OfficeScreen({
       }) ?? null,
     [marketplace.skillsReport],
   );
+  const amazonOrderingSkill = useMemo<SkillStatusEntry | null>(
+    () =>
+      marketplace.skillsReport?.skills.find((skill) => {
+        const normalizedKey = skill.skillKey.trim().toLowerCase();
+        const normalizedName = skill.name.trim().toLowerCase();
+        return normalizedKey === "amazon-ordering" || normalizedName === "amazon";
+      }) ?? null,
+    [marketplace.skillsReport],
+  );
   const taskManagerSkill = useMemo<SkillStatusEntry | null>(
     () =>
       marketplace.skillsReport?.skills.find((skill) => {
@@ -4040,6 +4263,13 @@ export function OfficeScreen({
     () => (soundclawSkill ? deriveSkillReadinessState(soundclawSkill) === "ready" : false),
     [soundclawSkill]
   );
+  const amazonOrderingReady = useMemo(
+    () =>
+      amazonOrderingSkill
+        ? deriveSkillReadinessState(amazonOrderingSkill) === "ready"
+        : false,
+    [amazonOrderingSkill],
+  );
 
   useEffect(() => {
     if (!soundclawReady || !jukeboxToken) {
@@ -4183,6 +4413,7 @@ export function OfficeScreen({
       agent.status === "running" ||
       deskHoldByAgentId[agent.agentId] ||
       gymHoldByAgentId[agent.agentId] ||
+      shopHoldByAgentId[agent.agentId] ||
       jukeboxHoldByAgentId[agent.agentId] ||
       phoneBoothHoldByAgentId[agent.agentId] ||
       smsBoothHoldByAgentId[agent.agentId] ||
@@ -4251,6 +4482,8 @@ export function OfficeScreen({
           monitorAgentId={monitorAgentId}
           monitorByAgentId={monitorByAgentId}
           githubSkill={githubSkill}
+          amazonOrderingEnabled={amazonOrderingReady}
+          shopOrderCompletionSignal={shopOrderCompletionSignal}
           taskManagerEnabled={taskManagerReady}
           soundclawEnabled={soundclawReady}
           officeTitle={officeTitle}
@@ -4353,6 +4586,9 @@ export function OfficeScreen({
           onJukeboxInteract={() => {
             setJukeboxOpen(true);
           }}
+          onShopInteract={() => {
+            setShopOpen(true);
+          }}
           onKanbanInteract={() => {
             setKanbanInstallPromptOpen(true);
           }}
@@ -4398,6 +4634,41 @@ export function OfficeScreen({
             />
           )
         ) : null}
+        {shopOpen && !shopInstallSetupOpen ? (
+          amazonOrderingReady ? null : (
+            <ShopDisabledPanel
+              onClose={() => setShopOpen(false)}
+              onInstall={() => {
+                setShopInstallProgress({
+                  active: false,
+                  percent: 0,
+                  message: "",
+                  error: null,
+                });
+                setShopInstallSetupOpen(true);
+              }}
+              installing={shopInstallProgress.active}
+              progressPercent={shopInstallProgress.percent}
+              progressMessage={shopInstallProgress.message}
+              errorMessage={shopInstallProgress.error}
+            />
+          )
+        ) : null}
+        {shopOpen && !amazonOrderingReady && shopInstallSetupOpen && AMAZON_ORDERING_SETUP ? (
+          <PackagedSkillSetupModal
+            skillName="amazon"
+            definition={AMAZON_ORDERING_SETUP}
+            initialValues={shopInstallSetupValues}
+            busy={shopInstallProgress.active}
+            errorMessage={shopInstallProgress.error}
+            onClose={() => {
+              if (!shopInstallProgress.active) {
+                setShopInstallSetupOpen(false);
+              }
+            }}
+            onSubmit={handleShopAmazonInstall}
+          />
+        ) : null}
         {kanbanInstallPromptOpen ? (
           <KanbanDisabledPanel
             onClose={() => {
diff --git a/src/features/office/screens/ShopImmersiveScreen.tsx b/src/features/office/screens/ShopImmersiveScreen.tsx
new file mode 100644
index 00000000..92f17d45
--- /dev/null
+++ b/src/features/office/screens/ShopImmersiveScreen.tsx
@@ -0,0 +1,233 @@
+"use client";
+
+import { Package, ShoppingCart, Store, Truck } from "lucide-react";
+
+type ShopImmersiveScreenProps = {
+  installed: boolean;
+};
+
+const SHOPPING_LIST = [
+  { title: "AA batteries, 24-pack", qty: 1, note: "Reorder candidate" },
+  { title: "Paper towels", qty: 2, note: "Restock office kitchen" },
+  { title: "USB-C cables", qty: 3, note: "Awaiting user confirmation" },
+];
+
+const ORDER_HISTORY = [
+  {
+    title: "Standing desk mat",
+    status: "Delivered",
+    date: "Mar 28, 2026",
+    detail: "Reorder available",
+  },
+  {
+    title: "Portable monitor",
+    status: "Returned",
+    date: "Mar 21, 2026",
+    detail: "Refund to original payment method",
+  },
+  {
+    title: "Mechanical keyboard switches",
+    status: "Shipped",
+    date: "Apr 04, 2026",
+    detail: "Arrives tomorrow",
+  },
+];
+
+export function ShopImmersiveScreen({
+  installed,
+}: ShopImmersiveScreenProps) {
+  const mutedClass = installed ? "" : "opacity-45 grayscale";
+
+  return (
+    <div className="absolute inset-0 overflow-y-auto bg-[radial-gradient(circle_at_top,#3a1a0f_0%,#190a06_42%,#060302_100%)] text-[#fff6ef]">
+      <div className="pointer-events-none absolute inset-0 opacity-[0.1] [background-image:linear-gradient(rgba(255,214,176,0.18)_1px,transparent_1px),linear-gradient(90deg,rgba(255,214,176,0.12)_1px,transparent_1px)] [background-size:24px_24px]" />
+      <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_center,transparent_54%,rgba(0,0,0,0.34)_100%)]" />
+
+      <div className="relative flex min-h-full flex-col gap-6 px-10 py-8 pb-14">
+        <div className="flex items-start justify-between gap-6">
+          <div>
+            <div className="flex items-center gap-3 text-[12px] uppercase tracking-[0.32em] text-[#ffd8b2]/70">
+              <Store className="h-4 w-4" />
+              OpenClaw Shop
+            </div>
+            <div className="mt-3 text-[13px] uppercase tracking-[0.24em] text-[#ffbf93]/62">
+              Amazon ordering desk
+            </div>
+            <div className="mt-2 text-[42px] font-semibold tracking-[0.08em] text-[#fff6ef]">
+              {installed ? "Ready to shop" : "Skill required"}
+            </div>
+            <div className="mt-2 max-w-2xl text-[15px] leading-relaxed text-[#ffd9c0]/78">
+              Review pending shopping items, recent Amazon history, and workflow notes from the
+              in-office shop.
+            </div>
+          </div>
+          <div className="w-[320px] rounded-[24px] border border-[#ffd1ae]/18 bg-black/24 p-5 shadow-[0_18px_50px_rgba(0,0,0,0.34)]">
+            <div className="flex items-center gap-2 text-[11px] uppercase tracking-[0.24em] text-[#ffd1aa]/62">
+              <ShoppingCart className="h-4 w-4" />
+              Shop controls
+            </div>
+            <div className="mt-4 grid grid-cols-2 gap-3">
+              <SummaryCard label="Skill" value={installed ? "Installed" : "Missing"} />
+              <SummaryCard label="Store" value="Amazon" />
+              <SummaryCard label="Queued items" value={String(SHOPPING_LIST.length)} />
+              <SummaryCard label="Recent orders" value={String(ORDER_HISTORY.length)} />
+            </div>
+            <div className="mt-4 rounded-2xl border border-[#ffd1ae]/12 bg-[#160b08]/85 px-4 py-3 text-[12px] leading-relaxed text-[#ffd9c0]/72">
+              {installed
+                ? "Agents can walk here when the AMAZON-ORDERING skill trigger fires."
+                : "Install AMAZON-ORDERING to let agents use the shop and Amazon workflow."}
+            </div>
+          </div>
+        </div>
+
+        <div className="grid grid-cols-1 gap-6 xl:grid-cols-[1.2fr_0.95fr]">
+          <SectionCard
+            title="Shopping List"
+            subtitle="Pending Amazon items and quick notes for the next run."
+            className={mutedClass}
+          >
+            <div className="space-y-3">
+              {SHOPPING_LIST.map((item, index) => (
+                <ListRow
+                  key={item.title}
+                  title={`Item ${String(index + 1).padStart(2, "0")} · ${item.title}`}
+                  primary={`Qty ${item.qty}`}
+                  secondary={item.note}
+                />
+              ))}
+            </div>
+          </SectionCard>
+
+          <SectionCard
+            title="Recent Amazon History"
+            subtitle="Past purchases, shipment states, and return outcomes."
+          >
+            <div className="space-y-3">
+              {ORDER_HISTORY.map((item, index) => (
+                <ListRow
+                  key={`${item.title}:${item.date}`}
+                  title={`Order ${String(index + 1).padStart(2, "0")} · ${item.title}`}
+                  primary={item.status}
+                  secondary={`${item.date} · ${item.detail}`}
+                />
+              ))}
+            </div>
+          </SectionCard>
+        </div>
+
+        <div className="grid grid-cols-1 gap-6 xl:grid-cols-2">
+          <SectionCard
+            title="Shop Workflow"
+            subtitle="How agents should use the in-office shopping station."
+          >
+            <div className="grid grid-cols-1 gap-3 md:grid-cols-3">
+              <WorkflowCard
+                icon={<ShoppingCart className="h-5 w-5" />}
+                title="New order"
+                body="Open product page, share a screenshot with price, wait for approval, then place the order."
+              />
+              <WorkflowCard
+                icon={<Package className="h-5 w-5" />}
+                title="Reorder"
+                body="Search order history, use Buy it again, verify address and payment, and place the order."
+              />
+              <WorkflowCard
+                icon={<Truck className="h-5 w-5" />}
+                title="Return"
+                body="Follow the silent return flow and report item, refund amount, and drop-off details."
+              />
+            </div>
+          </SectionCard>
+
+          <SectionCard
+            title="Install Requirement"
+            subtitle="This office station is intentionally gated behind the packaged Amazon skill."
+          >
+            <div className="rounded-2xl border border-[#ffd1ae]/12 bg-[#160b08]/85 px-5 py-4 text-[14px] leading-relaxed text-[#ffe6d4]/80">
+              <p>
+                The shop UI can always be opened, but shopping actions should only be considered
+                available once <span className="font-semibold text-[#fff4ea]">AMAZON-ORDERING</span>{" "}
+                is installed and enabled for the selected agent.
+              </p>
+              <p className="mt-3">
+                When the skill is missing, the shopping list stays grayed out to match the jukebox
+                disabled pattern.
+              </p>
+            </div>
+          </SectionCard>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function SectionCard({
+  title,
+  subtitle,
+  children,
+  className = "",
+}: {
+  title: string;
+  subtitle: string;
+  children: React.ReactNode;
+  className?: string;
+}) {
+  return (
+    <section className={`rounded-[28px] border border-[#ffd1ae]/16 bg-black/20 p-6 ${className}`}>
+      <div>
+        <div className="text-[12px] uppercase tracking-[0.24em] text-[#ffd5b2]/64">{title}</div>
+        <div className="mt-2 text-[14px] text-[#ffe2cf]/74">{subtitle}</div>
+      </div>
+      <div className="mt-5">{children}</div>
+    </section>
+  );
+}
+
+function SummaryCard({ label, value }: { label: string; value: string }) {
+  return (
+    <div className="rounded-2xl border border-[#ffd1ae]/10 bg-[#160b08]/78 px-4 py-3">
+      <div className="text-[11px] uppercase tracking-[0.18em] text-[#ffbc8d]/58">{label}</div>
+      <div className="mt-2 text-[16px] text-[#fff5ec]">{value}</div>
+    </div>
+  );
+}
+
+function ListRow({
+  title,
+  primary,
+  secondary,
+}: {
+  title: string;
+  primary: string;
+  secondary: string;
+}) {
+  return (
+    <div className="flex items-center justify-between gap-4 rounded-2xl border border-[#ffd1ae]/10 bg-[#160b08]/78 px-4 py-3">
+      <div className="min-w-0">
+        <div className="truncate text-[13px] uppercase tracking-[0.12em] text-[#fff2e8]">
+          {title}
+        </div>
+        <div className="mt-1 text-[11px] text-[#ffd0b0]/66">{secondary}</div>
+      </div>
+      <div className="shrink-0 text-right text-[15px] text-[#fff5ec]">{primary}</div>
+    </div>
+  );
+}
+
+function WorkflowCard({
+  icon,
+  title,
+  body,
+}: {
+  icon: React.ReactNode;
+  title: string;
+  body: string;
+}) {
+  return (
+    <div className="rounded-2xl border border-[#ffd1ae]/10 bg-[#160b08]/78 px-4 py-4">
+      <div className="flex items-center gap-2 text-[#ffe7d4]">{icon}</div>
+      <div className="mt-3 text-[12px] uppercase tracking-[0.18em] text-[#fff3e7]">{title}</div>
+      <div className="mt-2 text-[13px] leading-relaxed text-[#ffd8c1]/74">{body}</div>
+    </div>
+  );
+}
diff --git a/src/features/retro-office/RetroOffice3D.tsx b/src/features/retro-office/RetroOffice3D.tsx
index 12087a5b..c517f04e 100644
--- a/src/features/retro-office/RetroOffice3D.tsx
+++ b/src/features/retro-office/RetroOffice3D.tsx
@@ -35,6 +35,7 @@ import {
   PhoneBoothImmersiveScreen,
   type PhoneCallStep,
 } from "@/features/office/screens/PhoneBoothImmersiveScreen";
+import { ShopImmersiveScreen } from "@/features/office/screens/ShopImmersiveScreen";
 import {
   SmsBoothImmersiveScreen,
   type TextMessageStep,
@@ -85,8 +86,10 @@ import {
   ensureOfficePhoneBooth,
   ensureOfficePingPongTable,
   ensureOfficeQaLab,
+  ensureOfficeShopAnnexShelves,
   ensureOfficeSmsBooth,
   ensureOfficeJukebox,
+  ensureOfficeShop,
   ensureOfficeServerRoom,
   isRetiredPingPongLamp,
   materializeDefaults,
@@ -128,6 +131,7 @@ import {
   GYM_DEFAULT_TARGET,
   MEETING_OVERFLOW_LOCATIONS,
   QA_LAB_DEFAULT_TARGET,
+  resolveShopRoute,
   resolveDeskIndexForItem,
   resolveGymRoute,
   resolvePhoneBoothRoute,
@@ -144,6 +148,7 @@ import {
   markGymRoomMigrationApplied,
   markPhoneBoothMigrationApplied,
   markQaLabMigrationApplied,
+  markShopAnnexShelvesMigrationApplied,
   markSmsBoothMigrationApplied,
   markServerRoomMigrationApplied,
   saveFurniture,
@@ -159,7 +164,9 @@ import type {
 import type { NavGrid } from "@/features/retro-office/core/navigation";
 import type { OfficeLayoutSnapshot } from "@/lib/office/layoutSnapshot";
 import { AgentModel as AgentObjectModel } from "@/features/retro-office/objects/agents";
+import { GroceryShelfModel as InteractiveGroceryShelfModel } from "@/features/retro-office/objects/GroceryShelf";
 import { JukeboxModel as InteractiveJukeboxModel } from "@/features/retro-office/objects/Jukebox";
+import { ShopModel as InteractiveShopModel } from "@/features/retro-office/objects/Shop";
 import {
   FurnitureModel as GenericFurnitureModel,
   InstancedFurnitureItems as InstancedFurnitureItemsModel,
@@ -347,6 +354,12 @@ const PALETTE: PaletteEntry[] = [
     icon: "📚",
     defaults: { w: 80, h: 120 },
   },
+  {
+    type: "grocery_shelf",
+    label: "Grocery Shelf",
+    icon: "🛒",
+    defaults: { w: 70, h: 130, facing: 0 },
+  },
   { type: "plant", label: "Plant", icon: "🪴", defaults: {} },
   {
     type: "beanbag",
@@ -538,6 +551,19 @@ const ReadOnlyFurnitureClone = memo(function ReadOnlyFurnitureClone({
             onPointerOver={NOOP_FURNITURE_UID_HANDLER}
             onPointerOut={NOOP_FURNITURE_HANDLER}
           />
+        ) : item.type === "shop" ? (
+          <InteractiveShopModel
+            key={item._uid}
+            item={item}
+            active={false}
+            enabled={false}
+            isSelected={false}
+            isHovered={false}
+            editMode={false}
+            onPointerDown={NOOP_FURNITURE_UID_HANDLER}
+            onPointerOver={NOOP_FURNITURE_UID_HANDLER}
+            onPointerOut={NOOP_FURNITURE_HANDLER}
+          />
         ) : item.type === "sms_booth" ? (
           <InteractiveSmsBoothModel
             key={item._uid}
@@ -770,6 +796,17 @@ const ReadOnlyFurnitureClone = memo(function ReadOnlyFurnitureClone({
             onPointerOver={NOOP_FURNITURE_UID_HANDLER}
             onPointerOut={NOOP_FURNITURE_HANDLER}
           />
+        ) : item.type === "grocery_shelf" ? (
+          <InteractiveGroceryShelfModel
+            key={item._uid}
+            item={item}
+            isSelected={false}
+            isHovered={false}
+            editMode={false}
+            onPointerDown={NOOP_FURNITURE_UID_HANDLER}
+            onPointerOver={NOOP_FURNITURE_UID_HANDLER}
+            onPointerOut={NOOP_FURNITURE_HANDLER}
+          />
         ) : (
           <GenericFurnitureModel
             key={item._uid}
@@ -863,6 +900,7 @@ function useAgentTick(
   deskHoldByAgentId: Record<string, boolean> = {},
   danceUntilByAgentId: Record<string, number> = {},
   gymHoldByAgentId: Record<string, boolean> = {},
+  shopHoldByAgentId: Record<string, boolean> = {},
   smsBoothHoldByAgentId: Record<string, boolean> = {},
   phoneBoothHoldByAgentId: Record<string, boolean> = {},
   qaHoldByAgentId: Record<string, boolean> = {},
@@ -1015,6 +1053,7 @@ function useAgentTick(
       }
       const explicitDeskHold = Boolean(deskHoldByAgentId[agent.id]);
       const explicitGymHold = Boolean(gymHoldByAgentId[agent.id]);
+      const explicitShopHold = Boolean(shopHoldByAgentId[agent.id]);
       const explicitSmsBoothHold = Boolean(smsBoothHoldByAgentId[agent.id]);
       const explicitPhoneBoothHold = Boolean(phoneBoothHoldByAgentId[agent.id]);
       const explicitQaHold = Boolean(qaHoldByAgentId[agent.id]);
@@ -1073,6 +1112,8 @@ function useAgentTick(
         (furnitureRef.current ?? []).find(
           (item) => item.type === "phone_booth",
         ) ?? null;
+      const shopItem =
+        (furnitureRef.current ?? []).find((item) => item.type === "shop") ?? null;
 
       if (agent.status === "working" && !explicitDeskHold && deskPos)
         stickyUntilRef.current.set(agent.id, now + DESK_STICKY_MS);
@@ -1083,6 +1124,7 @@ function useAgentTick(
           : explicitMeetingHold ||
               explicitDeskHold ||
               explicitGymHold ||
+              explicitShopHold ||
               explicitSmsBoothHold ||
               explicitPhoneBoothHold ||
               explicitQaHold ||
@@ -1271,6 +1313,47 @@ function useAgentTick(
               ? "standing"
               : "walking";
           ns.facing = serverRoomRoute.facing;
+        } else if (explicitShopHold) {
+          const shopRoute = resolveShopRoute(shopItem, existing.x, existing.y);
+          ns.pingPongUntil = undefined;
+          ns.pingPongTargetX = undefined;
+          ns.pingPongTargetY = undefined;
+          ns.pingPongFacing = undefined;
+          ns.pingPongPartnerId = undefined;
+          ns.pingPongTableUid = undefined;
+          ns.pingPongSide = undefined;
+          ns.walkSpeed =
+            existing.pingPongPreviousWalkSpeed ?? existing.walkSpeed;
+          ns.pingPongPreviousWalkSpeed = undefined;
+          ns.interactionTarget = "shop";
+          ns.smsBoothStage = undefined;
+          ns.phoneBoothStage = undefined;
+          ns.serverRoomStage = undefined;
+          ns.gymStage = undefined;
+          ns.qaLabStage = undefined;
+          ns.qaLabStationType = undefined;
+          ns.workoutStyle = undefined;
+          const targetChanged =
+            existing.targetX !== shopRoute.targetX ||
+            existing.targetY !== shopRoute.targetY;
+          ns.targetX = shopRoute.targetX;
+          ns.targetY = shopRoute.targetY;
+          if (targetChanged) {
+            ns.path = planPath(
+              existing.x,
+              existing.y,
+              shopRoute.targetX,
+              shopRoute.targetY,
+            );
+          }
+          ns.state =
+            Math.hypot(
+              existing.x - shopRoute.targetX,
+              existing.y - shopRoute.targetY,
+            ) < 15
+              ? "standing"
+              : "walking";
+          ns.facing = shopRoute.facing;
         } else if (explicitSmsBoothHold) {
           const smsBoothRoute = resolveSmsBoothRoute(
             smsBoothItem,
@@ -1456,6 +1539,7 @@ function useAgentTick(
               existing.y,
               gymWorkoutPos,
             );
+            const shopRoute = resolveShopRoute(shopItem, existing.x, existing.y);
             const qaLabRoute = resolveQaLabRoute(
               existing.x,
               existing.y,
@@ -1466,6 +1550,8 @@ function useAgentTick(
                 ? { x: meetingTarget.x, y: meetingTarget.y }
                 : explicitGymHold
                   ? { x: gymRoute.targetX, y: gymRoute.targetY }
+                  : explicitShopHold
+                    ? { x: shopRoute.targetX, y: shopRoute.targetY }
                   : explicitSmsBoothHold
                     ? {
                         x: smsBoothRoute.targetX,
@@ -1506,6 +1592,8 @@ function useAgentTick(
               ? "meeting_room"
               : explicitGymHold
                 ? "gym"
+                : explicitShopHold
+                  ? "shop"
                 : explicitSmsBoothHold
                   ? "sms_booth"
                   : explicitPhoneBoothHold
@@ -1518,18 +1606,21 @@ function useAgentTick(
             ns.phoneBoothStage =
               explicitMeetingHold ||
               explicitGymHold ||
+              explicitShopHold ||
               explicitSmsBoothHold ||
               !explicitPhoneBoothHold
                 ? undefined
                 : phoneBoothRoute.stage;
             ns.smsBoothStage =
-              explicitMeetingHold || explicitGymHold || !explicitSmsBoothHold
+              explicitMeetingHold || explicitGymHold || explicitShopHold || !explicitSmsBoothHold
                 ? undefined
                 : smsBoothRoute.stage;
             ns.serverRoomStage = explicitMeetingHold
               ? undefined
               : explicitGymHold
                 ? undefined
+                : explicitShopHold
+                  ? undefined
                 : explicitSmsBoothHold
                   ? undefined
                   : explicitPhoneBoothHold
@@ -1544,6 +1635,8 @@ function useAgentTick(
                 : undefined;
             ns.qaLabStage = explicitMeetingHold
               ? undefined
+              : explicitShopHold
+                ? undefined
               : explicitSmsBoothHold
                 ? undefined
                 : explicitPhoneBoothHold
@@ -1602,6 +1695,7 @@ function useAgentTick(
         const smsBoothRoute = resolveSmsBoothRoute(smsBoothItem, sx, sy);
         const phoneBoothRoute = resolvePhoneBoothRoute(phoneBoothItem, sx, sy);
         const gymRoute = resolveGymRoute(sx, sy, gymWorkoutPos);
+        const shopRoute = resolveShopRoute(shopItem, sx, sy);
         const qaLabRoute = resolveQaLabRoute(sx, sy, qaStationPos);
         const initialTarget =
           effectiveStatus === "working"
@@ -1615,6 +1709,11 @@ function useAgentTick(
                     x: gymRoute.targetX,
                     y: gymRoute.targetY,
                   }
+                : explicitShopHold
+                  ? {
+                      x: shopRoute.targetX,
+                      y: shopRoute.targetY,
+                    }
                 : explicitSmsBoothHold
                   ? {
                       x: smsBoothRoute.targetX,
@@ -1650,6 +1749,7 @@ function useAgentTick(
             effectiveStatus === "working" &&
             (explicitMeetingHold ||
               explicitGymHold ||
+              explicitShopHold ||
               explicitSmsBoothHold ||
               explicitPhoneBoothHold ||
               explicitQaHold ||
@@ -1661,6 +1761,8 @@ function useAgentTick(
             ? "meeting_room"
             : explicitGymHold
               ? "gym"
+              : explicitShopHold
+                ? "shop"
               : explicitSmsBoothHold
                 ? "sms_booth"
                 : explicitPhoneBoothHold
@@ -1673,12 +1775,13 @@ function useAgentTick(
                         ? "desk"
                         : undefined,
           smsBoothStage:
-            explicitMeetingHold || explicitGymHold || !explicitSmsBoothHold
+            explicitMeetingHold || explicitGymHold || explicitShopHold || !explicitSmsBoothHold
               ? undefined
               : smsBoothRoute.stage,
           phoneBoothStage:
             explicitMeetingHold ||
             explicitGymHold ||
+            explicitShopHold ||
             explicitSmsBoothHold ||
             !explicitPhoneBoothHold
               ? undefined
@@ -1686,6 +1789,7 @@ function useAgentTick(
           serverRoomStage:
             explicitMeetingHold ||
             explicitGymHold ||
+            explicitShopHold ||
             explicitSmsBoothHold ||
             explicitPhoneBoothHold ||
             !explicitGithubHold
@@ -1697,6 +1801,7 @@ function useAgentTick(
               : gymRoute.stage,
           qaLabStage:
             explicitMeetingHold ||
+            explicitShopHold ||
             explicitSmsBoothHold ||
             explicitPhoneBoothHold ||
             !explicitQaHold
@@ -1730,6 +1835,7 @@ function useAgentTick(
     furnitureRef,
     gymHoldByAgentId,
     gymWorkoutLocations,
+    shopHoldByAgentId,
     smsBoothHoldByAgentId,
     phoneBoothHoldByAgentId,
     qaHoldByAgentId,
@@ -2331,6 +2437,8 @@ export function RetroOffice3D({
   monitorAgentId = null,
   monitorByAgentId = EMPTY_MONITOR_MAP,
   githubSkill = null,
+  amazonOrderingEnabled = false,
+  shopOrderCompletionSignal = 0,
   taskManagerEnabled = false,
   soundclawEnabled = false,
   officeTitle = "Luke Headquarters",
@@ -2390,6 +2498,7 @@ export function RetroOffice3D({
   onQaLabDismiss,
   onOpenGithubSkillSetup,
   onJukeboxInteract,
+  onShopInteract,
   onKanbanInteract,
   taskBoardAgents = [],
   taskBoardCardsByStatus = {
@@ -2422,6 +2531,7 @@ export function RetroOffice3D({
     | "githubHoldByAgentId"
     | "gymHoldByAgentId"
     | "phoneBoothHoldByAgentId"
+    | "shopHoldByAgentId"
     | "smsBoothHoldByAgentId"
     | "qaHoldByAgentId"
     | "jukeboxHoldByAgentId"
@@ -2444,6 +2554,8 @@ export function RetroOffice3D({
   monitorAgentId?: string | null;
   monitorByAgentId?: OfficeDeskMonitorMap;
   githubSkill?: SkillStatusEntry | null;
+  amazonOrderingEnabled?: boolean;
+  shopOrderCompletionSignal?: number;
   taskManagerEnabled?: boolean;
   soundclawEnabled?: boolean;
   officeTitle?: string;
@@ -2509,6 +2621,7 @@ export function RetroOffice3D({
   onQaLabDismiss?: () => void;
   onOpenGithubSkillSetup?: () => void;
   onJukeboxInteract?: () => void;
+  onShopInteract?: () => void;
   onKanbanInteract?: () => void;
   taskBoardAgents?: AgentState[];
   taskBoardCardsByStatus?: Record<TaskBoardStatus, TaskBoardCard[]>;
@@ -2561,25 +2674,32 @@ export function RetroOffice3D({
     (githubReviewAgentId
       ? { [githubReviewAgentId]: true }
       : EMPTY_BOOLEAN_RECORD);
+  const resolvedShopHoldByAgentId =
+    animationState?.shopHoldByAgentId ?? EMPTY_BOOLEAN_RECORD;
   const resolvedJukeboxHoldByAgentId =
     animationState?.jukeboxHoldByAgentId ?? EMPTY_BOOLEAN_RECORD;
+  const isShopActive = Object.values(resolvedShopHoldByAgentId).some(Boolean);
   const isJukeboxActive = Object.values(resolvedJukeboxHoldByAgentId).some(
     Boolean,
   );
 
-  const [furniture, setFurniture] = useState<FurnitureItem[]>(() =>
-    ensureOfficeKanbanBoard(
-      ensureOfficeJukebox(
-        ensureOfficeQaLab(
-          ensureOfficeGymRoom(
-            ensureOfficeServerRoom(
-              ensureOfficePhoneBooth(
-                ensureOfficeSmsBooth(
-                  ensureOfficeAtm(
-                    ensureOfficePingPongTable(
-                      (
-                        loadFurniture(storageNamespace) ?? materializeDefaults()
-                      ).filter((item) => !isRetiredPingPongLamp(item)),
+  const buildHydratedFurniture = useCallback(
+    (items: FurnitureItem[]) =>
+      ensureOfficeKanbanBoard(
+        ensureOfficeJukebox(
+          ensureOfficeShop(
+            ensureOfficeQaLab(
+              ensureOfficeGymRoom(
+                ensureOfficeServerRoom(
+                  ensureOfficePhoneBooth(
+                    ensureOfficeSmsBooth(
+                      ensureOfficeAtm(
+                        ensureOfficeShopAnnexShelves(
+                          ensureOfficePingPongTable(
+                            items.filter((item) => !isRetiredPingPongLamp(item)),
+                          ),
+                        ),
+                      ),
                     ),
                   ),
                 ),
@@ -2588,7 +2708,11 @@ export function RetroOffice3D({
           ),
         ),
       ),
-    ),
+    [],
+  );
+
+  const [furniture, setFurniture] = useState<FurnitureItem[]>(() =>
+    buildHydratedFurniture(loadFurniture(storageNamespace) ?? materializeDefaults()),
   );
   const defaultRemoteLayoutFurniture = useMemo(
     () =>
@@ -2743,6 +2867,8 @@ export function RetroOffice3D({
   const [monitorImmersiveReady, setMonitorImmersiveReady] = useState(false);
   const [activeAtmUid, setActiveAtmUid] = useState<string | null>(null);
   const [atmImmersiveReady, setAtmImmersiveReady] = useState(false);
+  const [activeShopUid, setActiveShopUid] = useState<string | null>(null);
+  const [shopImmersiveReady, setShopImmersiveReady] = useState(false);
   const [phoneBoothCommandArrived, setPhoneBoothCommandArrived] =
     useState(false);
   const [phoneBoothImmersiveReady, setPhoneBoothImmersiveReady] =
@@ -2817,6 +2943,10 @@ export function RetroOffice3D({
     markQaLabMigrationApplied(storageNamespace);
   }, [storageNamespace]);
 
+  useEffect(() => {
+    markShopAnnexShelvesMigrationApplied(storageNamespace);
+  }, [storageNamespace]);
+
   useEffect(() => {
     followAgentIdRef.current = followAgentId;
   }, [followAgentId]);
@@ -2926,6 +3056,7 @@ export function RetroOffice3D({
     resolvedDeskHoldByAgentId,
     resolvedDanceUntilByAgentId,
     resolvedGymHoldByAgentId,
+    resolvedShopHoldByAgentId,
     resolvedSmsBoothHoldByAgentId,
     resolvedPhoneBoothHoldByAgentId,
     resolvedQaHoldByAgentId,
@@ -3033,6 +3164,15 @@ export function RetroOffice3D({
         : null,
     [activeAtmUid, furniture],
   );
+  const activeShop = useMemo(
+    () =>
+      activeShopUid
+        ? (furniture.find(
+            (item) => item._uid === activeShopUid && item.type === "shop",
+          ) ?? null)
+        : null,
+    [activeShopUid, furniture],
+  );
   const activeKanbanBoard = useMemo(
     () =>
       activeKanbanUid
@@ -3048,6 +3188,7 @@ export function RetroOffice3D({
     [furniture],
   );
   const atmImmersive = Boolean(activeAtm && atmImmersiveReady);
+  const shopImmersive = Boolean(activeShop && shopImmersiveReady);
   const activeSmsBooth = useMemo(
     () => furniture.find((item) => item.type === "sms_booth") ?? null,
     [furniture],
@@ -3274,6 +3415,17 @@ export function RetroOffice3D({
     }
   }, [activeAtmUid, followAgentId]);
 
+  useEffect(() => {
+    if (followAgentId && activeShopUid) {
+      const timer = window.setTimeout(() => {
+        setFollowAgentId(null);
+      }, 0);
+      return () => {
+        window.clearTimeout(timer);
+      };
+    }
+  }, [activeShopUid, followAgentId]);
+
   useEffect(() => {
     if (followAgentId && smsBoothAgentId) {
       const timer = window.setTimeout(() => {
@@ -3561,6 +3713,17 @@ export function RetroOffice3D({
     }
   }, [activeAtmUid, monitorAgentId]);
 
+  useEffect(() => {
+    if (monitorAgentId && activeShopUid) {
+      const timer = window.setTimeout(() => {
+        setActiveShopUid(null);
+      }, 0);
+      return () => {
+        window.clearTimeout(timer);
+      };
+    }
+  }, [activeShopUid, monitorAgentId]);
+
   useEffect(() => {
     if (monitorAgentId && activeGithubTerminalUid) {
       const timer = window.setTimeout(() => {
@@ -3594,6 +3757,17 @@ export function RetroOffice3D({
     }
   }, [activeAtmUid, activeGithubTerminalUid]);
 
+  useEffect(() => {
+    if (activeShopUid && activeGithubTerminalUid) {
+      const timer = window.setTimeout(() => {
+        setActiveGithubTerminalUid(null);
+      }, 0);
+      return () => {
+        window.clearTimeout(timer);
+      };
+    }
+  }, [activeGithubTerminalUid, activeShopUid]);
+
   useEffect(() => {
     if (activeAtmUid && activeQaTerminalUid) {
       const timer = window.setTimeout(() => {
@@ -3605,6 +3779,17 @@ export function RetroOffice3D({
     }
   }, [activeAtmUid, activeQaTerminalUid]);
 
+  useEffect(() => {
+    if (activeShopUid && activeQaTerminalUid) {
+      const timer = window.setTimeout(() => {
+        setActiveQaTerminalUid(null);
+      }, 0);
+      return () => {
+        window.clearTimeout(timer);
+      };
+    }
+  }, [activeQaTerminalUid, activeShopUid]);
+
   useEffect(() => {
     if (!smsBoothAgentId) return;
     const timer = window.setTimeout(() => {
@@ -4208,6 +4393,33 @@ export function RetroOffice3D({
     };
   }, [activeAtmUid]);
 
+  useEffect(() => {
+    const resetTimer = window.setTimeout(() => {
+      setShopImmersiveReady(false);
+    }, 0);
+    if (!activeShopUid) {
+      return () => {
+        window.clearTimeout(resetTimer);
+      };
+    }
+    const timer = window.setTimeout(() => {
+      setShopImmersiveReady(true);
+    }, 900);
+    return () => {
+      window.clearTimeout(resetTimer);
+      window.clearTimeout(timer);
+    };
+  }, [activeShopUid]);
+  useEffect(() => {
+    if (!shopOrderCompletionSignal) return;
+    const timer = window.setTimeout(() => {
+      setActiveShopUid(null);
+    }, 0);
+    return () => {
+      window.clearTimeout(timer);
+    };
+  }, [shopOrderCompletionSignal]);
+
   useEffect(() => {
     const resetTimer = window.setTimeout(() => {
       setGithubImmersiveReady(false);
@@ -4984,7 +5196,7 @@ export function RetroOffice3D({
         .filter((item) => item.type === "desk_cubicle")
         .map((item) => item._uid),
     );
-    setFurniture(materializeDefaults());
+    setFurniture(buildHydratedFurniture(materializeDefaults()));
     setSelectedUid(null);
     setDrag({ kind: "idle" });
     setGhostPos(null);
@@ -5487,6 +5699,22 @@ export function RetroOffice3D({
                     onPointerOut={handleFurniturePointerOut}
                     onClick={handleDeskClick}
                   />
+                ) : item.type === "shop" ? (
+                  <InteractiveShopModel
+                    key={item._uid}
+                    item={item}
+                    active={isShopActive}
+                    enabled={amazonOrderingEnabled}
+                    isSelected={item._uid === selectedUid}
+                    isHovered={item._uid === hoverUid}
+                    editMode={editMode}
+                    onPointerDown={handleFurniturePointerDown}
+                    onPointerOver={handleFurniturePointerOver}
+                    onPointerOut={handleFurniturePointerOut}
+                    onClick={
+                      editMode ? handleDeskClick : () => onShopInteract?.()
+                    }
+                  />
                 ) : item.type === "jukebox" ? (
                   <InteractiveJukeboxModel
                     key={item._uid}
@@ -5751,6 +5979,18 @@ export function RetroOffice3D({
                     onPointerOver={handleFurniturePointerOver}
                     onPointerOut={handleFurniturePointerOut}
                   />
+                ) : item.type === "grocery_shelf" ? (
+                  <InteractiveGroceryShelfModel
+                    key={item._uid}
+                    item={item}
+                    isSelected={item._uid === selectedUid}
+                    isHovered={item._uid === hoverUid}
+                    editMode={editMode}
+                    onPointerDown={handleFurniturePointerDown}
+                    onPointerOver={handleFurniturePointerOver}
+                    onPointerOut={handleFurniturePointerOut}
+                    onClick={handleDeskClick}
+                  />
                 ) : (
                   <GenericFurnitureModel
                     key={item._uid}
@@ -6862,6 +7102,34 @@ export function RetroOffice3D({
         </div>
       ) : null}
 
+      {shopImmersive ? (
+        <div className="pointer-events-none absolute inset-0 z-20 overflow-hidden">
+          <div className="absolute inset-0 bg-black/32" />
+          <div className="absolute inset-x-0 top-0 h-[8vh] bg-[linear-gradient(180deg,rgba(0,0,0,0.92),rgba(0,0,0,0.65))]" />
+          <div className="absolute inset-x-0 bottom-0 h-[12vh] bg-[linear-gradient(0deg,rgba(0,0,0,0.94),rgba(0,0,0,0.55))]" />
+          <div className="absolute inset-y-0 left-0 w-[7vw] bg-black/92" />
+          <div className="absolute inset-y-0 right-0 w-[7vw] bg-black/92" />
+          <div className="absolute inset-[7vh_8vw_10vh_8vw] rounded-[34px] border border-[#fbbf24]/22 bg-[#090603] shadow-[0_0_0_18px_rgba(9,6,3,0.96),0_0_0_22px_rgba(251,191,36,0.16),0_28px_100px_rgba(0,0,0,0.72)]" />
+          <div className="absolute inset-[7.8vh_8.8vw_10.8vh_8.8vw] rounded-[24px] border border-[#fcd34d]/16 bg-[#120b03] shadow-[inset_0_0_0_1px_rgba(251,191,36,0.05)]" />
+          <div className="pointer-events-auto absolute inset-[8vh_9vw_11vh_9vw] overflow-hidden rounded-[22px] bg-[#100802]">
+            <ShopImmersiveScreen installed={amazonOrderingEnabled} />
+            <div className="pointer-events-none absolute inset-0 opacity-[0.08] [background-image:repeating-linear-gradient(to_bottom,rgba(255,255,255,0.22)_0px,rgba(255,255,255,0.22)_1px,transparent_2px,transparent_4px)]" />
+          </div>
+          <div className="absolute bottom-[4vh] left-1/2 h-[1.6vh] w-[16vw] -translate-x-1/2 rounded-full bg-[#171005] shadow-[0_0_0_1px_rgba(251,191,36,0.22)]" />
+          <div className="absolute bottom-[2vh] left-1/2 h-[2.2vh] w-[24vw] -translate-x-1/2 rounded-[999px] bg-[#130d04] shadow-[0_0_0_1px_rgba(251,191,36,0.18)]" />
+          <div className="pointer-events-auto absolute right-[5.2vw] top-[3.4vh]">
+            <button
+              type="button"
+              onClick={() => setActiveShopUid(null)}
+              aria-label="Close shop view"
+              className="flex h-10 w-10 items-center justify-center rounded-full border border-[#fcd34d]/20 bg-[#120a03]/82 text-[18px] leading-none text-[#fef3c7]/78 backdrop-blur-sm transition-colors hover:border-[#fcd34d]/40 hover:text-white"
+            >
+              X
+            </button>
+          </div>
+        </div>
+      ) : null}
+
       {/* Edit mode badge. */}
       {!immersiveOverlayActive && editMode && (
         <div className="absolute top-3 left-3 px-3 py-1 rounded-md bg-amber-500/90 text-[#1a1008] text-xs font-bold uppercase tracking-widest pointer-events-none z-10">
diff --git a/src/features/retro-office/core/constants.ts b/src/features/retro-office/core/constants.ts
index ed08eab9..c5edd48a 100644
--- a/src/features/retro-office/core/constants.ts
+++ b/src/features/retro-office/core/constants.ts
@@ -8,6 +8,8 @@ export const GYM_ROOM_MIGRATION_KEY = "openclaw-office-gym-room-migration-v3";
 export const QA_LAB_MIGRATION_KEY = "openclaw-office-qa-lab-migration-v3";
 export const PHONE_BOOTH_MIGRATION_KEY = "openclaw-office-phone-booth-migration-v1";
 export const SMS_BOOTH_MIGRATION_KEY = "openclaw-office-sms-booth-migration-v1";
+export const SHOP_ANNEX_SHELVES_MIGRATION_KEY =
+  "openclaw-office-shop-annex-shelves-migration-v7";
 export const ROTATION_STEP_DEG = 15;
 export const WALL_THICKNESS = 8;
 export const DOOR_THICKNESS = 8;
diff --git a/src/features/retro-office/core/district.ts b/src/features/retro-office/core/district.ts
index f53604ef..ae989645 100644
--- a/src/features/retro-office/core/district.ts
+++ b/src/features/retro-office/core/district.ts
@@ -19,28 +19,30 @@ export const LOCAL_OFFICE_ZONE: DistrictZone = {
   maxY: LOCAL_OFFICE_CANVAS_HEIGHT,
 };
 
-export const CITY_PATH_ZONE: DistrictZone = {
+export const SHOPPING_ZONE: DistrictZone = {
   minX: 0,
   maxX: LOCAL_OFFICE_CANVAS_WIDTH,
-  minY: 760,
-  maxY: 980,
+  minY: 720,
+  maxY: 1080,
 };
 
+export const CITY_PATH_ZONE: DistrictZone = SHOPPING_ZONE;
+
 export const REMOTE_OFFICE_ZONE: DistrictZone = {
   minX: 0,
   maxX: LOCAL_OFFICE_CANVAS_WIDTH,
-  minY: 1020,
-  maxY: 1020 + LOCAL_OFFICE_CANVAS_HEIGHT,
+  minY: SHOPPING_ZONE.maxY,
+  maxY: SHOPPING_ZONE.maxY + LOCAL_OFFICE_CANVAS_HEIGHT,
 };
 
 export const REMOTE_ROAM_POINTS = [
-  { x: 800, y: 1220 },
-  { x: 850, y: 1520 },
-  { x: 820, y: 1600 },
-  { x: 450, y: 1440 },
-  { x: 250, y: 1440 },
-  { x: 650, y: 1440 },
-  { x: 150, y: 1640 },
+  { x: 800, y: 1280 },
+  { x: 850, y: 1580 },
+  { x: 820, y: 1660 },
+  { x: 450, y: 1500 },
+  { x: 250, y: 1500 },
+  { x: 650, y: 1500 },
+  { x: 150, y: 1700 },
 ] as const;
 
 export const DISTRICT_CAMERA_POSITION: [number, number, number] = [14, 16, 18];
diff --git a/src/features/retro-office/core/furnitureDefaults.ts b/src/features/retro-office/core/furnitureDefaults.ts
index a610e4bd..4fbc7b2a 100644
--- a/src/features/retro-office/core/furnitureDefaults.ts
+++ b/src/features/retro-office/core/furnitureDefaults.ts
@@ -16,6 +16,7 @@ import {
   hasGymRoomMigrationApplied,
   hasPhoneBoothMigrationApplied,
   hasQaLabMigrationApplied,
+  hasShopAnnexShelvesMigrationApplied,
   hasSmsBoothMigrationApplied,
   hasServerRoomMigrationApplied,
 } from "@/features/retro-office/core/persistence";
@@ -60,6 +61,13 @@ const DEFAULT_JUKEBOX: FurnitureSeed = {
   facing: 90,
 };
 
+const DEFAULT_SHOP: FurnitureSeed = {
+  type: "shop",
+  x: 320,
+  y: 120,
+  facing: 90,
+};
+
 const DEFAULT_KANBAN_BOARD: FurnitureSeed = {
   type: "kanban_board",
   x: 460,
@@ -109,6 +117,82 @@ const DEFAULT_DINING_ITEMS: FurnitureSeed[] = [
   { type: "chair", x: 970, y: 130, facing: 270 },
 ];
 
+const DEFAULT_SHOPPING_STRIP_ITEMS: FurnitureSeed[] = [
+  { type: "table_rect", x: 110, y: 780, w: 140, h: 42, facing: 0 },
+  { type: "table_rect", x: 110, y: 940, w: 140, h: 42, facing: 0 },
+  { type: "table_rect", x: 1600, y: 780, w: 120, h: 38, facing: 0 },
+  { type: "table_rect", x: 1600, y: 840, w: 120, h: 38, facing: 0 },
+  { type: "table_rect", x: 1600, y: 900, w: 120, h: 38, facing: 0 },
+  { type: "table_rect", x: 1600, y: 960, w: 120, h: 38, facing: 0 },
+  { type: "couch", x: 1480, y: 1015, w: 90, h: 30, facing: 0 },
+  { type: "couch", x: 1635, y: 1015, w: 90, h: 30, facing: 0 },
+  { type: "plant", x: 300, y: 1040 },
+  { type: "plant", x: 540, y: 1040 },
+  { type: "plant", x: 780, y: 1040 },
+  { type: "plant", x: 1020, y: 1040 },
+  { type: "plant", x: 1260, y: 1040 },
+  { type: "plant", x: 1500, y: 1040 },
+];
+
+const LEGACY_SHOPPING_STRIP_SHELVES: FurnitureSeed[] = [
+  { type: "bookshelf", x: 390, y: 770, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 390, y: 930, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 600, y: 770, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 600, y: 930, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 810, y: 770, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 810, y: 930, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 1020, y: 770, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 1020, y: 930, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 1230, y: 770, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 1230, y: 930, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 1440, y: 770, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 1440, y: 930, w: 70, h: 130, facing: 0 },
+];
+
+const DEFAULT_GROCERY_ROOM_ITEMS: FurnitureSeed[] = [
+  { type: "grocery_shelf", x: 270, y: 56, w: 70, h: 86, facing: 90 },
+  { type: "grocery_shelf", x: 270, y: 156, w: 70, h: 86, facing: 90 },
+  { type: "grocery_shelf", x: 336, y: 52, w: 70, h: 84, facing: 0 },
+  { type: "grocery_shelf", x: 336, y: 172, w: 70, h: 84, facing: 180 },
+  { type: "table_rect", x: 312, y: 106, w: 54, h: 26, facing: 90 },
+  { type: "computer", x: 324, y: 108, facing: 90 },
+  { type: "keyboard", x: 330, y: 122, facing: 90 },
+];
+const LEGACY_SHOP_ANNEX_BOOKSHELVES: FurnitureSeed[] = [
+  { type: "bookshelf", x: 20, y: 730, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 260, y: 730, w: 70, h: 130, facing: 0 },
+  { type: "bookshelf", x: 20, y: 930, w: 70, h: 130, facing: 180 },
+  { type: "bookshelf", x: 260, y: 930, w: 70, h: 130, facing: 180 },
+  { type: "bookshelf", x: 10, y: 790, w: 70, h: 130, facing: 90 },
+  { type: "bookshelf", x: 10, y: 940, w: 70, h: 130, facing: 90 },
+  { type: "bookshelf", x: 280, y: 790, w: 70, h: 130, facing: 270 },
+  { type: "bookshelf", x: 280, y: 940, w: 70, h: 130, facing: 270 },
+];
+const LEGACY_SHOP_ANNEX_GROCERY_SHELVES: FurnitureSeed[] = [
+  { type: "grocery_shelf", x: 20, y: 730, w: 70, h: 130, facing: 0 },
+  { type: "grocery_shelf", x: 260, y: 730, w: 70, h: 130, facing: 0 },
+  { type: "grocery_shelf", x: 20, y: 930, w: 70, h: 130, facing: 180 },
+  { type: "grocery_shelf", x: 260, y: 930, w: 70, h: 130, facing: 180 },
+  { type: "grocery_shelf", x: 10, y: 790, w: 70, h: 130, facing: 90 },
+  { type: "grocery_shelf", x: 10, y: 940, w: 70, h: 130, facing: 90 },
+  { type: "grocery_shelf", x: 280, y: 790, w: 70, h: 130, facing: 270 },
+  { type: "grocery_shelf", x: 280, y: 940, w: 70, h: 130, facing: 270 },
+];
+const LEGACY_ART_ROOM_CONTENTS: FurnitureSeed[] = [
+  { type: "easel", x: 278, y: 84, facing: 90 },
+  { type: "easel", x: 278, y: 158, facing: 90 },
+  { type: "plant", x: 280, y: 60 },
+  { type: "plant", x: 280, y: 240 },
+  { type: "couch", x: 270, y: 90, w: 40, h: 80, vertical: true, facing: 180 },
+];
+const LEGACY_GROCERY_ROOM_ITEMS: FurnitureSeed[] = [
+  { type: "grocery_shelf", x: 270, y: 74, w: 70, h: 96, facing: 90 },
+  { type: "grocery_shelf", x: 338, y: 52, w: 70, h: 92, facing: 0 },
+  { type: "grocery_shelf", x: 338, y: 166, w: 70, h: 92, facing: 180 },
+  { type: "plant", x: 392, y: 60 },
+  { type: "plant", x: 392, y: 232 },
+];
+
 const DEFAULT_SERVER_ROOM_ITEMS: FurnitureSeed[] = [
   { type: "wall", x: 0, y: 560, w: 230, h: WALL_THICKNESS },
   { type: "wall", x: 220, y: 560, w: WALL_THICKNESS, h: 60 },
@@ -412,10 +496,7 @@ const DEFAULT_ART_ROOM_ITEMS: FurnitureSeed[] = [
   { type: "wall", x: 430, y: 40, w: 8, h: 90 },
   { type: "door", x: 420, y: 150, w: 40, h: 8, facing: 90 },
   { type: "wall", x: 430, y: 170, w: 8, h: 100 },
-  { type: "easel", x: 278, y: 84, facing: 90 },
-  { type: "easel", x: 278, y: 158, facing: 90 },
-  { type: "plant", x: 280, y: 60 },
-  { type: "plant", x: 280, y: 240 },
+  ...DEFAULT_GROCERY_ROOM_ITEMS,
 ];
 
 const DEFAULT_FURNITURE: FurnitureSeed[] = [
@@ -428,7 +509,6 @@ const DEFAULT_FURNITURE: FurnitureSeed[] = [
   { type: "chair", x: 60, y: 80, facing: 60 },
   { type: "chair", x: 550, y: 50, facing: 0 },
   { type: "bookshelf", x: 600, y: 30, w: 80, h: 120 },
-  { type: "couch", x: 270, y: 90, w: 40, h: 80, vertical: true, facing: 180 },
   { type: "fridge", x: 1050, y: 20, w: 40, h: 80 },
   { type: "stove", x: 920, y: 20 },
   { type: "cabinet", x: 980, y: 30, w: 40, h: 40 },
@@ -500,6 +580,7 @@ const DEFAULT_FURNITURE: FurnitureSeed[] = [
   { type: "beanbag", x: 1000, y: 330, color: "#e65100", facing: 90 },
   { type: "beanbag", x: 1000, y: 410, color: "#1565c0", facing: 90 },
   DEFAULT_ATM_MACHINE,
+  DEFAULT_SHOP,
   DEFAULT_PHONE_BOOTH,
   DEFAULT_KANBAN_BOARD,
   { type: "whiteboard", x: 40, y: 200, w: 10, h: 60 },
@@ -514,6 +595,7 @@ const DEFAULT_FURNITURE: FurnitureSeed[] = [
   { type: "plant", x: 1090, y: 310 },
   { type: "plant", x: 1100, y: 490 },
   { type: "plant", x: 530, y: 700 },
+  ...DEFAULT_SHOPPING_STRIP_ITEMS,
   ...DEFAULT_SERVER_ROOM_ITEMS,
   ...DEFAULT_GYM_ITEMS,
   ...DEFAULT_QA_LAB_ITEMS,
@@ -574,6 +656,21 @@ const PREVIOUS_QA_LAB_SIGNATURES = new Set(
 const QA_LAB_SIGNATURES = new Set(
   DEFAULT_QA_LAB_ITEMS.map(createFurnitureSignature),
 );
+const LEGACY_SHOPPING_STRIP_SHELF_SIGNATURES = new Set(
+  LEGACY_SHOPPING_STRIP_SHELVES.map(createFurnitureSignature),
+);
+const LEGACY_SHOP_ANNEX_BOOKSHELF_SIGNATURES = new Set(
+  LEGACY_SHOP_ANNEX_BOOKSHELVES.map(createFurnitureSignature),
+);
+const LEGACY_SHOP_ANNEX_GROCERY_SHELF_SIGNATURES = new Set(
+  LEGACY_SHOP_ANNEX_GROCERY_SHELVES.map(createFurnitureSignature),
+);
+const LEGACY_ART_ROOM_CONTENT_SIGNATURES = new Set(
+  LEGACY_ART_ROOM_CONTENTS.map(createFurnitureSignature),
+);
+const LEGACY_GROCERY_ROOM_ITEM_SIGNATURES = new Set(
+  LEGACY_GROCERY_ROOM_ITEMS.map(createFurnitureSignature),
+);
 
 const hasSignature = (items: FurnitureItem[], signatures: Set<string>) =>
   items.some((item) => signatures.has(createFurnitureSignature(item)));
@@ -606,6 +703,60 @@ export const ensureOfficeJukebox = (items: FurnitureItem[]): FurnitureItem[] =>
   return [...items, { ...DEFAULT_JUKEBOX, _uid: nextUid() }];
 };
 
+export const ensureOfficeShop = (items: FurnitureItem[]): FurnitureItem[] => {
+  let found = false;
+  const nextItems = items.map((item) => {
+    if (item.type !== "shop") return item;
+    found = true;
+    if (
+      (item.x === 520 && item.y === 180) ||
+      (item.x === 140 && item.y === 820)
+    ) {
+      return { ...item, x: DEFAULT_SHOP.x, y: DEFAULT_SHOP.y, facing: DEFAULT_SHOP.facing };
+    }
+    return item;
+  });
+  if (found) return nextItems;
+  return [...nextItems, { ...DEFAULT_SHOP, _uid: nextUid() }];
+};
+
+export const ensureOfficeShoppingStripShelves = (
+  items: FurnitureItem[],
+): FurnitureItem[] =>
+  items.filter(
+    (item) => !LEGACY_SHOPPING_STRIP_SHELF_SIGNATURES.has(createFurnitureSignature(item)),
+  );
+
+export const ensureOfficeShopAnnexShelves = (
+  items: FurnitureItem[],
+): FurnitureItem[] => {
+  const withoutLegacyShelves = replaceBySignatureSet(
+    replaceBySignatureSet(
+      replaceBySignatureSet(
+        replaceBySignatureSet(
+          ensureOfficeShoppingStripShelves(items),
+          LEGACY_SHOP_ANNEX_BOOKSHELF_SIGNATURES,
+        ),
+        LEGACY_SHOP_ANNEX_GROCERY_SHELF_SIGNATURES,
+      ),
+      LEGACY_ART_ROOM_CONTENT_SIGNATURES,
+    ),
+    LEGACY_GROCERY_ROOM_ITEM_SIGNATURES,
+  );
+  const itemSignatures = new Set(
+    withoutLegacyShelves.map((item) => createFurnitureSignature(item)),
+  );
+  const missingRoomItems = DEFAULT_GROCERY_ROOM_ITEMS.filter(
+    (item) => !itemSignatures.has(createFurnitureSignature(item)),
+  );
+  if (missingRoomItems.length === 0) return withoutLegacyShelves;
+  if (hasShopAnnexShelvesMigrationApplied()) return withoutLegacyShelves;
+  return [
+    ...withoutLegacyShelves,
+    ...missingRoomItems.map((item) => ({ ...item, _uid: nextUid() })),
+  ];
+};
+
 export const ensureOfficeKanbanBoard = (items: FurnitureItem[]): FurnitureItem[] => {
   if (items.some((item) => item.type === "kanban_board")) return items;
   return [...items, { ...DEFAULT_KANBAN_BOARD, _uid: nextUid() }];
diff --git a/src/features/retro-office/core/geometry.ts b/src/features/retro-office/core/geometry.ts
index 3850155b..fa6871e6 100644
--- a/src/features/retro-office/core/geometry.ts
+++ b/src/features/retro-office/core/geometry.ts
@@ -44,6 +44,7 @@ export const ITEM_FOOTPRINT: Record<string, [number, number]> = {
   couch: [100, 40],
   couch_v: [40, 80],
   bookshelf: [80, 120],
+  grocery_shelf: [70, 130],
   plant: [24, 24],
   beanbag: [40, 40],
   pingpong: [100, 60],
@@ -52,6 +53,7 @@ export const ITEM_FOOTPRINT: Record<string, [number, number]> = {
   fridge: [40, 80],
   water_cooler: [20, 54],
   atm: [42, 38],
+  shop: [78, 56],
   sms_booth: [58, 54],
   phone_booth: [78, 72],
   whiteboard: [10, 60],
@@ -126,6 +128,7 @@ export const ITEM_METADATA: Record<string, { blocksNavigation: boolean; navPaddi
   pingpong:        { blocksNavigation: true  },
   // ── storage / shelving ────────────────────────────────────────────────────
   bookshelf:       { blocksNavigation: true  },
+  grocery_shelf:   { blocksNavigation: true  },
   cabinet:         { blocksNavigation: true  },
   wall_cabinet:    { blocksNavigation: false }, // wall-mounted; agents walk under
   // ── kitchen appliances ────────────────────────────────────────────────────
@@ -139,6 +142,7 @@ export const ITEM_METADATA: Record<string, { blocksNavigation: boolean; navPaddi
   printer:         { blocksNavigation: true  },
   vending:         { blocksNavigation: true  },
   atm:             { blocksNavigation: true  },
+  shop:            { blocksNavigation: true  },
   whiteboard:      { blocksNavigation: true  },
   computer:        { blocksNavigation: false }, // desk item
   keyboard:        { blocksNavigation: false }, // desk decoration
diff --git a/src/features/retro-office/core/navigation.ts b/src/features/retro-office/core/navigation.ts
index 952eb75b..5493252a 100644
--- a/src/features/retro-office/core/navigation.ts
+++ b/src/features/retro-office/core/navigation.ts
@@ -32,6 +32,10 @@ export {
   resolveServerRoomRoute,
   SERVER_ROOM_TARGET,
 } from "@/features/retro-office/core/navigation/serverRoomRoute";
+export {
+  resolveShopRoute,
+  SHOP_TARGET,
+} from "@/features/retro-office/core/navigation/shopRoute";
 
 export const resolvePingPongTargets = (
   item: FurnitureItem,
diff --git a/src/features/retro-office/core/navigation/shopRoute.ts b/src/features/retro-office/core/navigation/shopRoute.ts
new file mode 100644
index 00000000..4a6fbd60
--- /dev/null
+++ b/src/features/retro-office/core/navigation/shopRoute.ts
@@ -0,0 +1,89 @@
+import type {
+  FacingPoint,
+  FurnitureItem,
+  ShopRoute,
+} from "@/features/retro-office/core/types";
+
+const GROCERY_ROOM_BOUNDS = {
+  minX: 260,
+  maxX: 438,
+  minY: 40,
+  maxY: 270,
+};
+
+export const SHOP_ENTRY_TARGET: FacingPoint = {
+  x: 395,
+  y: 150,
+  facing: Math.PI,
+};
+
+export const SHOP_AISLE_TARGET: FacingPoint = {
+  x: 360,
+  y: 150,
+  facing: Math.PI,
+};
+
+export const SHOP_CHECKOUT_TARGET: FacingPoint = {
+  x: 338,
+  y: 150,
+  facing: 0,
+};
+
+export const SHOP_TARGET = SHOP_CHECKOUT_TARGET;
+
+export const resolveShopRoute = (
+  item: FurnitureItem | null | undefined,
+  x: number,
+  y: number,
+): ShopRoute => {
+  if (!item) {
+    return {
+      stage: "checkout",
+      targetX: SHOP_CHECKOUT_TARGET.x,
+      targetY: SHOP_CHECKOUT_TARGET.y,
+      facing: SHOP_CHECKOUT_TARGET.facing,
+    };
+  }
+  const closeToCheckout =
+    Math.hypot(x - SHOP_CHECKOUT_TARGET.x, y - SHOP_CHECKOUT_TARGET.y) < 44;
+  if (closeToCheckout) {
+    return {
+      stage: "checkout",
+      targetX: SHOP_CHECKOUT_TARGET.x,
+      targetY: SHOP_CHECKOUT_TARGET.y,
+      facing: SHOP_CHECKOUT_TARGET.facing,
+    };
+  }
+
+  const closeToAisle = Math.hypot(x - SHOP_AISLE_TARGET.x, y - SHOP_AISLE_TARGET.y) < 80;
+  if (closeToAisle) {
+    return {
+      stage: "checkout",
+      targetX: SHOP_CHECKOUT_TARGET.x,
+      targetY: SHOP_CHECKOUT_TARGET.y,
+      facing: SHOP_CHECKOUT_TARGET.facing,
+    };
+  }
+
+  const enteredStore =
+    (x >= GROCERY_ROOM_BOUNDS.minX &&
+      x <= GROCERY_ROOM_BOUNDS.maxX &&
+      y >= GROCERY_ROOM_BOUNDS.minY &&
+      y <= GROCERY_ROOM_BOUNDS.maxY) ||
+    Math.hypot(x - SHOP_ENTRY_TARGET.x, y - SHOP_ENTRY_TARGET.y) < 80;
+  if (enteredStore) {
+    return {
+      stage: "aisle",
+      targetX: SHOP_AISLE_TARGET.x,
+      targetY: SHOP_AISLE_TARGET.y,
+      facing: SHOP_AISLE_TARGET.facing,
+    };
+  }
+
+  return {
+    stage: "entrance",
+    targetX: SHOP_ENTRY_TARGET.x,
+    targetY: SHOP_ENTRY_TARGET.y,
+    facing: SHOP_ENTRY_TARGET.facing,
+  };
+};
diff --git a/src/features/retro-office/core/persistence.ts b/src/features/retro-office/core/persistence.ts
index 949522f8..ef0b51b6 100644
--- a/src/features/retro-office/core/persistence.ts
+++ b/src/features/retro-office/core/persistence.ts
@@ -3,6 +3,7 @@ import {
   GYM_ROOM_MIGRATION_KEY,
   PHONE_BOOTH_MIGRATION_KEY,
   QA_LAB_MIGRATION_KEY,
+  SHOP_ANNEX_SHELVES_MIGRATION_KEY,
   SMS_BOOTH_MIGRATION_KEY,
   SERVER_ROOM_MIGRATION_KEY,
   STORAGE_KEY,
@@ -90,3 +91,10 @@ export const hasSmsBoothMigrationApplied = (namespace = "default") =>
 export const markSmsBoothMigrationApplied = (namespace = "default") => {
   markStorageFlag(SMS_BOOTH_MIGRATION_KEY, namespace);
 };
+
+export const hasShopAnnexShelvesMigrationApplied = (namespace = "default") =>
+  hasStorageFlag(SHOP_ANNEX_SHELVES_MIGRATION_KEY, namespace);
+
+export const markShopAnnexShelvesMigrationApplied = (namespace = "default") => {
+  markStorageFlag(SHOP_ANNEX_SHELVES_MIGRATION_KEY, namespace);
+};
diff --git a/src/features/retro-office/core/types.ts b/src/features/retro-office/core/types.ts
index 97f3dccc..f993da2b 100644
--- a/src/features/retro-office/core/types.ts
+++ b/src/features/retro-office/core/types.ts
@@ -56,6 +56,7 @@ export type RenderAgent = SceneActor & {
   smsBoothStage?: "door_outer" | "door_inner" | "typing";
   phoneBoothStage?: "door_outer" | "door_inner" | "receiver";
   serverRoomStage?: "door_outer" | "door_inner" | "terminal";
+  shopStage?: "approach" | "counter";
   gymStage?: "door_outer" | "door_inner" | "workout";
   qaLabStage?: "door_outer" | "door_inner" | "station";
   qaLabStationType?: QaLabStationType;
@@ -134,3 +135,10 @@ export type SmsBoothRoute = {
   targetY: number;
   facing: number;
 };
+
+export type ShopRoute = {
+  stage: "entrance" | "aisle" | "checkout";
+  targetX: number;
+  targetY: number;
+  facing: number;
+};
diff --git a/src/features/retro-office/objects/GroceryShelf.tsx b/src/features/retro-office/objects/GroceryShelf.tsx
new file mode 100644
index 00000000..cda2dab6
--- /dev/null
+++ b/src/features/retro-office/objects/GroceryShelf.tsx
@@ -0,0 +1,191 @@
+"use client";
+
+import { useMemo } from "react";
+import { SCALE } from "@/features/retro-office/core/constants";
+import {
+  getItemBaseSize,
+  getItemRotationRadians,
+  toWorld,
+} from "@/features/retro-office/core/geometry";
+import type { InteractiveFurnitureModelProps } from "@/features/retro-office/objects/types";
+
+type ShelfProduct = {
+  id: string;
+  type: "box" | "cylinder" | "tall-cylinder";
+  color: string;
+  position: [number, number, number];
+};
+
+const PRODUCT_COLORS = [
+  "#ef4444",
+  "#3b82f6",
+  "#22c55e",
+  "#eab308",
+  "#a855f7",
+  "#ec4899",
+  "#14b8a6",
+  "#f97316",
+];
+
+const PRODUCT_TYPES: ShelfProduct["type"][] = ["box", "cylinder", "tall-cylinder"];
+
+const generateShelfProducts = (seed: number): ShelfProduct[] => {
+  let currentSeed = seed;
+  const random = () => {
+    const x = Math.sin(currentSeed++) * 10000;
+    return x - Math.floor(x);
+  };
+
+  const products: ShelfProduct[] = [];
+  const shelves = [0.24, 0.54, 0.84, 1.14];
+  const columns = 5;
+
+  shelves.forEach((shelfY, shelfIndex) => {
+    for (let column = 0; column < columns; column += 1) {
+      if (random() > 0.9) continue;
+      const type = PRODUCT_TYPES[Math.floor(random() * PRODUCT_TYPES.length)] ?? "box";
+      const color = PRODUCT_COLORS[Math.floor(random() * PRODUCT_COLORS.length)] ?? "#ef4444";
+      const offsetX = -0.32 + column * 0.16 + (random() * 0.04 - 0.02);
+      const offsetZ = random() * 0.05 - 0.01;
+      products.push({
+        id: `shelf-product-${shelfIndex}-${column}`,
+        type,
+        color,
+        position: [offsetX, shelfY, offsetZ],
+      });
+    }
+  });
+
+  return products;
+};
+
+const ProductMesh = ({ product }: { product: ShelfProduct }) => {
+  if (product.type === "box") {
+    return (
+      <mesh
+        position={[product.position[0], product.position[1] + 0.08, product.position[2]]}
+        castShadow
+      >
+        <boxGeometry args={[0.11, 0.16, 0.09]} />
+        <meshStandardMaterial color={product.color} roughness={0.62} metalness={0.06} />
+      </mesh>
+    );
+  }
+
+  if (product.type === "tall-cylinder") {
+    return (
+      <mesh
+        position={[product.position[0], product.position[1] + 0.1, product.position[2]]}
+        castShadow
+      >
+        <cylinderGeometry args={[0.04, 0.04, 0.2, 14]} />
+        <meshStandardMaterial color={product.color} roughness={0.34} metalness={0.18} />
+      </mesh>
+    );
+  }
+
+  return (
+    <mesh position={[product.position[0], product.position[1] + 0.07, product.position[2]]} castShadow>
+      <cylinderGeometry args={[0.05, 0.05, 0.14, 14]} />
+      <meshStandardMaterial color={product.color} roughness={0.42} metalness={0.2} />
+    </mesh>
+  );
+};
+
+export function GroceryShelfModel({
+  item,
+  isSelected,
+  isHovered,
+  editMode,
+  onPointerDown,
+  onPointerOver,
+  onPointerOut,
+  onClick,
+}: InteractiveFurnitureModelProps) {
+  const [wx, , wz] = toWorld(item.x, item.y);
+  const { width, height } = getItemBaseSize(item);
+  const widthWorld = width * SCALE;
+  const depthWorld = height * SCALE;
+  const rotY = getItemRotationRadians(item);
+  const highlightColor = isSelected
+    ? "#fbbf24"
+    : isHovered && editMode
+      ? "#69f0da"
+      : "#000000";
+  const highlightIntensity = isSelected ? 0.34 : isHovered && editMode ? 0.18 : 0;
+  const products = useMemo(
+    () => generateShelfProducts(item.x * 17 + item.y * 13 + (item.facing ?? 0) * 5),
+    [item.facing, item.x, item.y],
+  );
+
+  return (
+    <group
+      position={[wx, 0, wz]}
+      onPointerDown={(event) => {
+        event.stopPropagation();
+        onPointerDown(item._uid);
+      }}
+      onPointerOver={(event) => {
+        event.stopPropagation();
+        onPointerOver(item._uid);
+      }}
+      onPointerOut={(event) => {
+        event.stopPropagation();
+        onPointerOut();
+      }}
+      onClick={(event) => {
+        event.stopPropagation();
+        onClick?.(item._uid);
+      }}
+    >
+      <group position={[widthWorld / 2, 0, depthWorld / 2]} rotation={[0, rotY, 0]}>
+        <mesh position={[0, 0.03, 0.08]} receiveShadow>
+          <boxGeometry args={[widthWorld * 0.92, 0.06, depthWorld * 0.78]} />
+          <meshStandardMaterial color="#4b5563" roughness={0.92} />
+        </mesh>
+        <mesh position={[-widthWorld * 0.42, 0.72, -depthWorld * 0.21]} castShadow receiveShadow>
+          <boxGeometry args={[0.035, 1.34, 0.035]} />
+          <meshStandardMaterial
+            color="#f8fafc"
+            roughness={0.9}
+            metalness={0.04}
+            emissive={highlightColor}
+            emissiveIntensity={highlightIntensity}
+          />
+        </mesh>
+        <mesh position={[widthWorld * 0.42, 0.72, -depthWorld * 0.21]} castShadow receiveShadow>
+          <boxGeometry args={[0.035, 1.34, 0.035]} />
+          <meshStandardMaterial
+            color="#f8fafc"
+            roughness={0.9}
+            metalness={0.04}
+            emissive={highlightColor}
+            emissiveIntensity={highlightIntensity}
+          />
+        </mesh>
+        {[0.2, 0.5, 0.8, 1.1].map((y) => (
+          <mesh
+            key={`grocery-shelf-board-${item._uid}-${y}`}
+            position={[0, y, -depthWorld * 0.04]}
+            castShadow
+            receiveShadow
+          >
+            <boxGeometry args={[widthWorld * 0.92, 0.035, depthWorld * 0.42]} />
+            <meshStandardMaterial color="#eceff1" roughness={0.82} metalness={0.04} />
+          </mesh>
+        ))}
+        <mesh position={[-widthWorld * 0.46, 0.72, -depthWorld * 0.05]} castShadow receiveShadow>
+          <boxGeometry args={[0.04, 1.34, depthWorld * 0.46]} />
+          <meshStandardMaterial color="#e5e7eb" roughness={0.86} metalness={0.04} />
+        </mesh>
+        <mesh position={[widthWorld * 0.46, 0.72, -depthWorld * 0.05]} castShadow receiveShadow>
+          <boxGeometry args={[0.04, 1.34, depthWorld * 0.46]} />
+          <meshStandardMaterial color="#e5e7eb" roughness={0.86} metalness={0.04} />
+        </mesh>
+        {products.map((product) => (
+          <ProductMesh key={`${item._uid}-${product.id}`} product={product} />
+        ))}
+      </group>
+    </group>
+  );
+}
diff --git a/src/features/retro-office/objects/Shop.tsx b/src/features/retro-office/objects/Shop.tsx
new file mode 100644
index 00000000..bf6ff9d3
--- /dev/null
+++ b/src/features/retro-office/objects/Shop.tsx
@@ -0,0 +1,266 @@
+"use client";
+
+import { Billboard, Text } from "@react-three/drei";
+import { useFrame } from "@react-three/fiber";
+import { useRef, useState, useMemo } from "react";
+import * as THREE from "three";
+import { SCALE } from "@/features/retro-office/core/constants";
+import {
+  getItemBaseSize,
+  getItemRotationRadians,
+  toWorld,
+} from "@/features/retro-office/core/geometry";
+import type { InteractiveFurnitureModelProps } from "@/features/retro-office/objects/types";
+
+export type ShopModelProps = InteractiveFurnitureModelProps & {
+  active?: boolean;
+  enabled?: boolean;
+};
+
+// Generate random products for the shelves.
+const generateProducts = (seed: number) => {
+  const products = [];
+  const random = () => {
+    const x = Math.sin(seed++) * 10000;
+    return x - Math.floor(x);
+  };
+
+  const shelfCount = 4;
+  const productsPerShelf = 16;
+  const shelfWidth = 1.9;
+  const startX = -shelfWidth / 2 + 0.05;
+  const stepX = shelfWidth / productsPerShelf;
+  
+  const colors = ["#ef4444", "#3b82f6", "#22c55e", "#eab308", "#a855f7", "#ec4899", "#14b8a6", "#f97316"];
+  const types = ["box", "cylinder", "tall-cylinder"];
+
+  for (let s = 0; s < shelfCount; s++) {
+    const shelfY = 0.2 + s * 0.35;
+    
+    // Sometimes leave a gap.
+    for (let i = 0; i < productsPerShelf; i++) {
+      if (random() > 0.9) continue;
+      
+      const type = types[Math.floor(random() * types.length)];
+      const color = colors[Math.floor(random() * colors.length)];
+      const px = startX + i * stepX + (random() * 0.04);
+      const pz = 0.05 + (random() * 0.03);
+      
+      products.push({
+        id: `prod_${s}_${i}`,
+        type,
+        color,
+        position: [px, shelfY, pz] as [number, number, number]
+      });
+    }
+  }
+  return products;
+};
+
+export function ShopModel({
+  item,
+  isSelected,
+  isHovered,
+  active = false,
+  enabled = true,
+  onPointerDown,
+  onPointerOver,
+  onPointerOut,
+  onClick,
+}: ShopModelProps) {
+  const [localHovered, setLocalHovered] = useState(false);
+  const glowRef = useRef<THREE.PointLight>(null);
+  const [wx, , wz] = toWorld(item.x, item.y);
+  const { width, height } = getItemBaseSize(item);
+  const rotY = getItemRotationRadians(item);
+  const widthWorld = width * SCALE;
+  const depthWorld = height * SCALE;
+  
+  const highlighted = isSelected || isHovered;
+  const open = active && enabled;
+  
+  const products1 = useMemo(() => generateProducts(123), []);
+  const products2 = useMemo(() => generateProducts(456), []);
+
+  useFrame((state) => {
+    if (!glowRef.current || !open) return;
+    glowRef.current.intensity =
+      (Math.sin(state.clock.elapsedTime * 3.6) * 0.28 + 0.72) * 1.5;
+  });
+
+  const renderProduct = (p: { id: string; type: string; color: string; position: [number, number, number] }) => {
+    if (p.type === "box") {
+      return (
+        <mesh key={p.id} position={[p.position[0], p.position[1] + 0.12, p.position[2]]} castShadow>
+          <boxGeometry args={[0.12, 0.24, 0.12]} />
+          <meshStandardMaterial color={p.color} roughness={0.7} />
+        </mesh>
+      );
+    } else if (p.type === "tall-cylinder") {
+      return (
+        <mesh key={p.id} position={[p.position[0], p.position[1] + 0.14, p.position[2]]} castShadow>
+          <cylinderGeometry args={[0.07, 0.07, 0.28, 12]} />
+          <meshStandardMaterial color={p.color} roughness={0.3} metalness={0.2} />
+        </mesh>
+      );
+    } else {
+      return (
+        <mesh key={p.id} position={[p.position[0], p.position[1] + 0.09, p.position[2]]} castShadow>
+          <cylinderGeometry args={[0.08, 0.08, 0.18, 12]} />
+          <meshStandardMaterial color={p.color} roughness={0.4} metalness={0.5} />
+        </mesh>
+      );
+    }
+  };
+
+  const renderShelfUnit = (x: number, z: number, rotation: number, products: { id: string; type: string; color: string; position: [number, number, number] }[]) => (
+    <group position={[x, 0, z]} rotation={[0, rotation, 0]}>
+      {/* Back panel. */}
+      <mesh position={[0, 0.8, -0.2]} castShadow receiveShadow>
+        <boxGeometry args={[2.0, 1.6, 0.05]} />
+        <meshStandardMaterial color={highlighted ? "#e2e8f0" : "#f8fafc"} roughness={0.9} />
+      </mesh>
+      {/* Base. */}
+      <mesh position={[0, 0.1, 0]} castShadow receiveShadow>
+        <boxGeometry args={[2.0, 0.2, 0.4]} />
+        <meshStandardMaterial color={highlighted ? "#cbd5e1" : "#e2e8f0"} roughness={0.8} />
+      </mesh>
+      {/* Shelves. */}
+      {[0.5, 0.85, 1.2].map((y, i) => (
+        <mesh key={`shelf-${i}`} position={[0, y, -0.05]} castShadow receiveShadow>
+          <boxGeometry args={[2.0, 0.03, 0.3]} />
+          <meshStandardMaterial color={highlighted ? "#cbd5e1" : "#e2e8f0"} roughness={0.8} />
+        </mesh>
+      ))}
+      {/* Side panels. */}
+      <mesh position={[-0.98, 0.8, 0]} castShadow receiveShadow>
+        <boxGeometry args={[0.04, 1.6, 0.4]} />
+        <meshStandardMaterial color={highlighted ? "#cbd5e1" : "#e2e8f0"} roughness={0.8} />
+      </mesh>
+      <mesh position={[0.98, 0.8, 0]} castShadow receiveShadow>
+        <boxGeometry args={[0.04, 1.6, 0.4]} />
+        <meshStandardMaterial color={highlighted ? "#cbd5e1" : "#e2e8f0"} roughness={0.8} />
+      </mesh>
+      
+      {/* Products. */}
+      {products.map(renderProduct)}
+    </group>
+  );
+
+  return (
+    <group
+      position={[wx, 0, wz]}
+      onPointerDown={(event) => {
+        event.stopPropagation();
+        onPointerDown(item._uid);
+      }}
+      onPointerOver={(event) => {
+        event.stopPropagation();
+        setLocalHovered(true);
+        onPointerOver(item._uid);
+        document.body.style.cursor = "pointer";
+      }}
+      onPointerOut={(event) => {
+        event.stopPropagation();
+        setLocalHovered(false);
+        onPointerOut();
+        document.body.style.cursor = "";
+      }}
+      onClick={(event) => {
+        event.stopPropagation();
+        onClick?.(item._uid);
+      }}
+    >
+      <group
+        position={[widthWorld / 2, 0, depthWorld / 2]}
+        rotation={[0, rotY, 0]}
+        scale={[widthWorld / 2.2, 1, depthWorld / 2.2]}
+      >
+        {/* Floor mat/base to tie it together. */}
+        <mesh position={[0, 0.01, 0]} receiveShadow>
+          <boxGeometry args={[2.4, 0.02, 2.4]} />
+          <meshStandardMaterial
+            color={enabled ? (highlighted ? "#3b82f6" : "#1e40af") : "#333333"}
+            roughness={0.9}
+          />
+        </mesh>
+
+        {/* Aisle 1. */}
+        {renderShelfUnit(0, 0, 0, products1)}
+
+        {/* Floating signs. */}
+        <Billboard position={[0, 2.2, 0]}>
+          <Text
+            fontSize={0.15}
+            color={enabled ? "#fcd34d" : "#facc15"}
+            anchorX="center"
+            anchorY="middle"
+            outlineWidth={0.015}
+            outlineColor="#000000"
+            renderOrder={100000}
+            depthOffset={-10}
+            material-depthTest={false}
+            material-depthWrite={false}
+          >
+            {enabled ? "GROCERY" : "SHOP"}
+          </Text>
+        </Billboard>
+
+        <Billboard position={[0, 1.9, 0]}>
+          <Text
+            fontSize={0.11}
+            color={enabled ? "#ffffff" : "#b0b0b0"}
+            anchorX="center"
+            anchorY="middle"
+            outlineWidth={0.012}
+            outlineColor="#000000"
+            maxWidth={1.5}
+            textAlign="center"
+            renderOrder={100000}
+            depthOffset={-10}
+            material-depthTest={false}
+            material-depthWrite={false}
+          >
+            {enabled ? (open ? "OPEN 24/7" : "AMAZON SHOP") : "NOT INSTALLED"}
+          </Text>
+        </Billboard>
+
+        {!enabled && (localHovered || isHovered) ? (
+          <Billboard position={[0, 1.7, 0]}>
+            <Text
+              fontSize={0.08}
+              color="#facc15"
+              anchorX="center"
+              anchorY="middle"
+              outlineWidth={0.01}
+              outlineColor="#000000"
+            >
+              Click to install AMAZON
+            </Text>
+          </Billboard>
+        ) : null}
+
+        {open ? (
+          <pointLight
+            ref={glowRef}
+            position={[0, 1.5, 0]}
+            color="#60a5fa"
+            intensity={1.5}
+            distance={4}
+          />
+        ) : null}
+
+        {isSelected ? (
+          <mesh position={[0, 0.05, 0]}>
+            <torusGeometry args={[1.3, 0.04, 16, 64]} />
+            <meshStandardMaterial
+              color="#fbbf24"
+              emissive="#fbbf24"
+              emissiveIntensity={1}
+            />
+          </mesh>
+        ) : null}
+      </group>
+    </group>
+  );
+}
diff --git a/src/features/retro-office/scene/RemoteOfficeLayoutPreview.tsx b/src/features/retro-office/scene/RemoteOfficeLayoutPreview.tsx
index 5e888c1b..fd9a0f6a 100644
--- a/src/features/retro-office/scene/RemoteOfficeLayoutPreview.tsx
+++ b/src/features/retro-office/scene/RemoteOfficeLayoutPreview.tsx
@@ -19,6 +19,7 @@ const ITEM_COLOR_BY_TYPE: Record<string, string> = {
   couch: "#7e57c2",
   couch_v: "#7e57c2",
   bookshelf: "#8d6e63",
+  grocery_shelf: "#f8fafc",
   plant: "#66bb6a",
   beanbag: "#4db6ac",
   pingpong: "#90caf9",
diff --git a/src/features/retro-office/scene/environment.tsx b/src/features/retro-office/scene/environment.tsx
index 65cdee9f..9015de09 100644
--- a/src/features/retro-office/scene/environment.tsx
+++ b/src/features/retro-office/scene/environment.tsx
@@ -17,6 +17,7 @@ import {
   LOCAL_OFFICE_CANVAS_HEIGHT,
   LOCAL_OFFICE_CANVAS_WIDTH,
   REMOTE_OFFICE_ZONE,
+  SHOPPING_ZONE,
 } from "@/features/retro-office/core/district";
 import { toWorld } from "@/features/retro-office/core/geometry";
 
@@ -172,6 +173,14 @@ export const FloorAndWalls = memo(function FloorAndWalls({
 }: {
   showRemoteOffice?: boolean;
 }) {
+  const SHOP_ANNEX_MIN_X = 0;
+  const SHOP_ANNEX_MAX_X = 360;
+  const SHOP_DOOR_CENTER_X = 180;
+  const SHOP_DOOR_OPENING_WIDTH = 96 * SCALE;
+  const SHOP_OFFICE_DOOR_CENTER_X = 300;
+  const SHOP_OFFICE_DOOR_OPENING_WIDTH = 72 * SCALE;
+  const SHOP_ANNEX_ENTRY_CENTER_Y = 900;
+  const SHOP_ANNEX_ENTRY_OPENING_HEIGHT = 120 * SCALE;
   const districtWidth = CANVAS_W * SCALE;
   const districtHeight = CANVAS_H * SCALE;
   const localOfficeWidth = LOCAL_OFFICE_CANVAS_WIDTH * SCALE;
@@ -189,10 +198,24 @@ export const FloorAndWalls = memo(function FloorAndWalls({
     QA_LAB_X + QA_LAB_WIDTH / 2,
     EAST_WING_ROOM_TOP_Y + EAST_WING_ROOM_HEIGHT / 2,
   );
-  const [pathCenterX, , pathCenterZ] = toWorld(
-    (CITY_PATH_ZONE.minX + CITY_PATH_ZONE.maxX) / 2,
-    (CITY_PATH_ZONE.minY + CITY_PATH_ZONE.maxY) / 2,
+  const [shoppingCenterX, , shoppingCenterZ] = toWorld(
+    (SHOPPING_ZONE.minX + SHOPPING_ZONE.maxX) / 2,
+    (SHOPPING_ZONE.minY + SHOPPING_ZONE.maxY) / 2,
   );
+  const [shopAnnexCenterX, , shopAnnexCenterZ] = toWorld(
+    (SHOP_ANNEX_MIN_X + SHOP_ANNEX_MAX_X) / 2,
+    (SHOPPING_ZONE.minY + SHOPPING_ZONE.maxY) / 2,
+  );
+  const [shopDoorCenterX] = toWorld(SHOP_DOOR_CENTER_X, LOCAL_OFFICE_CANVAS_HEIGHT);
+  const [shopOfficeDoorCenterX] = toWorld(
+    SHOP_OFFICE_DOOR_CENTER_X,
+    LOCAL_OFFICE_CANVAS_HEIGHT,
+  );
+  const [, , shopAnnexEntryCenterZ] = toWorld(SHOP_ANNEX_MAX_X, SHOP_ANNEX_ENTRY_CENTER_Y);
+  const shoppingWidth = (SHOPPING_ZONE.maxX - SHOPPING_ZONE.minX) * SCALE;
+  const shoppingHeight = (SHOPPING_ZONE.maxY - SHOPPING_ZONE.minY) * SCALE;
+  const shopAnnexWidth = (SHOP_ANNEX_MAX_X - SHOP_ANNEX_MIN_X) * SCALE;
+  const shopAnnexHeight = shoppingHeight;
   const [, , remoteOfficeCenterZ] = toWorld(
     (REMOTE_OFFICE_ZONE.minX + REMOTE_OFFICE_ZONE.maxX) / 2,
     (REMOTE_OFFICE_ZONE.minY + REMOTE_OFFICE_ZONE.maxY) / 2,
@@ -211,6 +234,30 @@ export const FloorAndWalls = memo(function FloorAndWalls({
   const localSouthWallZ = localOfficeCenterZ + localOfficeHeight / 2;
   const localWestWallX = localOfficeCenterX - localOfficeWidth / 2;
   const localEastWallX = localOfficeCenterX + localOfficeWidth / 2;
+  const shopAnnexWestWallX = shopAnnexCenterX - shopAnnexWidth / 2;
+  const shopAnnexEastWallX = shopAnnexCenterX + shopAnnexWidth / 2;
+  const shopAnnexSouthWallZ = shopAnnexCenterZ + shopAnnexHeight / 2;
+  const shopAnnexNorthWallZ = shopAnnexCenterZ - shopAnnexHeight / 2;
+  const shopDoorLeftX = shopDoorCenterX - SHOP_DOOR_OPENING_WIDTH / 2;
+  const shopDoorRightX = shopDoorCenterX + SHOP_DOOR_OPENING_WIDTH / 2;
+  const shopOfficeDoorLeftX = shopOfficeDoorCenterX - SHOP_OFFICE_DOOR_OPENING_WIDTH / 2;
+  const shopOfficeDoorRightX = shopOfficeDoorCenterX + SHOP_OFFICE_DOOR_OPENING_WIDTH / 2;
+  const shopAnnexEntryTopZ = shopAnnexEntryCenterZ - SHOP_ANNEX_ENTRY_OPENING_HEIGHT / 2;
+  const shopAnnexEntryBottomZ = shopAnnexEntryCenterZ + SHOP_ANNEX_ENTRY_OPENING_HEIGHT / 2;
+  const shopAnnexEastWallNorthHeight = Math.max(0.1, shopAnnexEntryTopZ - shopAnnexNorthWallZ);
+  const shopAnnexEastWallNorthCenterZ = shopAnnexNorthWallZ + shopAnnexEastWallNorthHeight / 2;
+  const shopAnnexEastWallSouthHeight = Math.max(0.1, shopAnnexSouthWallZ - shopAnnexEntryBottomZ);
+  const shopAnnexEastWallSouthCenterZ = shopAnnexEntryBottomZ + shopAnnexEastWallSouthHeight / 2;
+  const southWallLeftWidth = Math.max(0.1, shopDoorLeftX - localWestWallX);
+  const southWallLeftCenterX = localWestWallX + southWallLeftWidth / 2;
+  const southWallMiddleWidth = Math.max(0.1, shopOfficeDoorLeftX - shopDoorRightX);
+  const southWallMiddleCenterX = shopDoorRightX + southWallMiddleWidth / 2;
+  const southWallRightWidth = Math.max(0.1, localEastWallX - shopOfficeDoorRightX);
+  const southWallRightCenterX = shopOfficeDoorRightX + southWallRightWidth / 2;
+  const shopDoorFrameDepth = 0.18;
+  const shopDoorLeafWidth = SHOP_DOOR_OPENING_WIDTH * 0.82;
+  const shopOfficeDoorLeafWidth = SHOP_OFFICE_DOOR_OPENING_WIDTH * 0.82;
+  const shopAnnexEntryLeafHeight = SHOP_ANNEX_ENTRY_OPENING_HEIGHT * 0.82;
   const groundCenterX = showRemoteOffice ? districtCenterX : localOfficeCenterX;
   const groundCenterZ = showRemoteOffice ? districtCenterZ : localOfficeCenterZ;
   const groundWidth = showRemoteOffice ? districtWidth : localOfficeWidth;
@@ -245,8 +292,8 @@ export const FloorAndWalls = memo(function FloorAndWalls({
         <meshLambertMaterial color="#c8a97e" />
       </mesh>
 
-      {showRemoteOffice ? (
-        <>
+      <>
+        {showRemoteOffice ? (
           <mesh
             position={[localOfficeCenterX, 0, localOfficeCenterZ + remoteOfficeOffsetZ]}
             rotation={[-Math.PI / 2, 0, 0]}
@@ -255,37 +302,234 @@ export const FloorAndWalls = memo(function FloorAndWalls({
             <planeGeometry args={[localOfficeWidth, localOfficeHeight, 22, 14]} />
             <meshLambertMaterial color="#c8a97e" />
           </mesh>
+        ) : null}
 
           <mesh
-            position={[pathCenterX, 0.002, pathCenterZ]}
+            position={[shoppingCenterX, 0.002, shoppingCenterZ]}
             rotation={[-Math.PI / 2, 0, 0]}
             receiveShadow
           >
             <planeGeometry
               args={[
-                (CITY_PATH_ZONE.maxX - CITY_PATH_ZONE.minX) * SCALE,
-                (CITY_PATH_ZONE.maxY - CITY_PATH_ZONE.minY) * SCALE,
+                shoppingWidth,
+                shoppingHeight,
               ]}
             />
-            <meshStandardMaterial color="#6d8b5a" roughness={0.96} metalness={0.02} />
+            <meshStandardMaterial color="#2f3528" roughness={0.96} metalness={0.02} />
           </mesh>
 
           <mesh
-            position={[pathCenterX, 0.004, pathCenterZ]}
+            position={[shoppingCenterX, 0.004, shoppingCenterZ]}
             rotation={[-Math.PI / 2, 0, 0]}
             receiveShadow
           >
             <planeGeometry
               args={[
-                (CITY_PATH_ZONE.maxX - CITY_PATH_ZONE.minX) * SCALE * 0.72,
-                (CITY_PATH_ZONE.maxY - CITY_PATH_ZONE.minY) * SCALE * 0.26,
+                shoppingWidth * 0.94,
+                shoppingHeight * 0.9,
               ]}
             />
-            <meshStandardMaterial color="#c9ae8d" roughness={0.94} metalness={0.02} />
+            <meshStandardMaterial color="#d8d2c8" roughness={0.9} metalness={0.04} />
           </mesh>
 
-          {Array.from({ length: 8 }).map((_, index) => {
-            const [wx, , wz] = toWorld(330 + index * 170, 820 + (index % 2 === 0 ? -44 : 44));
+          <mesh
+            position={[shopAnnexCenterX, 0.006, shopAnnexCenterZ]}
+            rotation={[-Math.PI / 2, 0, 0]}
+            receiveShadow
+          >
+            <planeGeometry args={[shopAnnexWidth, shopAnnexHeight]} />
+            <meshStandardMaterial color="#ccb28d" roughness={0.94} metalness={0.02} />
+          </mesh>
+
+          <mesh
+            position={[shopAnnexCenterX, 0.008, shopAnnexCenterZ]}
+            rotation={[-Math.PI / 2, 0, 0]}
+            receiveShadow
+          >
+            <planeGeometry args={[shopAnnexWidth * 0.94, shopAnnexHeight * 0.92]} />
+            <meshStandardMaterial color="#d9c4a4" roughness={0.9} metalness={0.04} />
+          </mesh>
+
+          <mesh position={[southWallLeftCenterX, 0.42, shoppingCenterZ - shoppingHeight / 2 + 0.18]}>
+            <boxGeometry args={[southWallLeftWidth, 0.84, 0.16]} />
+            <meshStandardMaterial color="#9a8f82" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh
+            position={[southWallMiddleCenterX, 0.42, shoppingCenterZ - shoppingHeight / 2 + 0.18]}
+          >
+            <boxGeometry args={[southWallMiddleWidth, 0.84, 0.16]} />
+            <meshStandardMaterial color="#9a8f82" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh position={[southWallRightCenterX, 0.42, shoppingCenterZ - shoppingHeight / 2 + 0.18]}>
+            <boxGeometry args={[southWallRightWidth, 0.84, 0.16]} />
+            <meshStandardMaterial color="#9a8f82" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh position={[shoppingCenterX - shoppingWidth / 2 + 0.08, 0.42, shoppingCenterZ]}>
+            <boxGeometry args={[0.16, 0.84, shoppingHeight]} />
+            <meshStandardMaterial color="#8c8278" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh position={[shoppingCenterX + shoppingWidth / 2 - 0.08, 0.42, shoppingCenterZ]}>
+            <boxGeometry args={[0.16, 0.84, shoppingHeight]} />
+            <meshStandardMaterial color="#8c8278" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh position={[shoppingCenterX, 0.42, shoppingCenterZ + shoppingHeight / 2 - 0.08]}>
+            <boxGeometry args={[shoppingWidth * 0.36, 0.84, 0.16]} />
+            <meshStandardMaterial color="#9a8f82" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh
+            position={[shoppingCenterX - shoppingWidth * 0.32, 0.42, shoppingCenterZ + shoppingHeight / 2 - 0.08]}
+          >
+            <boxGeometry args={[shoppingWidth * 0.22, 0.84, 0.16]} />
+            <meshStandardMaterial color="#9a8f82" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh
+            position={[shoppingCenterX + shoppingWidth * 0.32, 0.42, shoppingCenterZ + shoppingHeight / 2 - 0.08]}
+          >
+            <boxGeometry args={[shoppingWidth * 0.22, 0.84, 0.16]} />
+            <meshStandardMaterial color="#9a8f82" roughness={0.86} metalness={0.08} />
+          </mesh>
+          <mesh position={[shopAnnexWestWallX, 0.5, shopAnnexCenterZ]} receiveShadow>
+            <boxGeometry args={[0.12, 1, shopAnnexHeight]} />
+            <meshStandardMaterial
+              color="#8d6e63"
+              emissive="#4e342e"
+              emissiveIntensity={0.4}
+              roughness={0.9}
+            />
+          </mesh>
+          <mesh position={[shopAnnexEastWallX, 0.5, shopAnnexEastWallNorthCenterZ]} receiveShadow>
+            <boxGeometry args={[0.12, 1, shopAnnexEastWallNorthHeight]} />
+            <meshStandardMaterial
+              color="#8d6e63"
+              emissive="#4e342e"
+              emissiveIntensity={0.4}
+              roughness={0.9}
+            />
+          </mesh>
+          <mesh position={[shopAnnexEastWallX, 0.5, shopAnnexEastWallSouthCenterZ]} receiveShadow>
+            <boxGeometry args={[0.12, 1, shopAnnexEastWallSouthHeight]} />
+            <meshStandardMaterial
+              color="#8d6e63"
+              emissive="#4e342e"
+              emissiveIntensity={0.4}
+              roughness={0.9}
+            />
+          </mesh>
+          <mesh position={[shopAnnexCenterX, 0.5, shopAnnexSouthWallZ]} receiveShadow>
+            <boxGeometry args={[shopAnnexWidth, 1, 0.12]} />
+            <meshStandardMaterial
+              color="#8d6e63"
+              emissive="#4e342e"
+              emissiveIntensity={0.4}
+              roughness={0.9}
+            />
+          </mesh>
+          <mesh position={[shopDoorLeftX, 0.5, localSouthWallZ + 0.02]} receiveShadow>
+            <boxGeometry args={[0.08, 1, shopDoorFrameDepth]} />
+            <meshStandardMaterial color="#7b5e57" roughness={0.82} metalness={0.06} />
+          </mesh>
+          <mesh position={[shopDoorRightX, 0.5, localSouthWallZ + 0.02]} receiveShadow>
+            <boxGeometry args={[0.08, 1, shopDoorFrameDepth]} />
+            <meshStandardMaterial color="#7b5e57" roughness={0.82} metalness={0.06} />
+          </mesh>
+          <mesh position={[shopDoorCenterX, 0.96, localSouthWallZ + 0.02]} receiveShadow>
+            <boxGeometry args={[SHOP_DOOR_OPENING_WIDTH + 0.08, 0.08, shopDoorFrameDepth]} />
+            <meshStandardMaterial color="#6d4c41" roughness={0.8} metalness={0.08} />
+          </mesh>
+          <mesh position={[shopOfficeDoorLeftX, 0.5, localSouthWallZ + 0.02]} receiveShadow>
+            <boxGeometry args={[0.08, 1, shopDoorFrameDepth]} />
+            <meshStandardMaterial color="#7b5e57" roughness={0.82} metalness={0.06} />
+          </mesh>
+          <mesh position={[shopOfficeDoorRightX, 0.5, localSouthWallZ + 0.02]} receiveShadow>
+            <boxGeometry args={[0.08, 1, shopDoorFrameDepth]} />
+            <meshStandardMaterial color="#7b5e57" roughness={0.82} metalness={0.06} />
+          </mesh>
+          <mesh position={[shopOfficeDoorCenterX, 0.96, localSouthWallZ + 0.02]} receiveShadow>
+            <boxGeometry args={[SHOP_OFFICE_DOOR_OPENING_WIDTH + 0.08, 0.08, shopDoorFrameDepth]} />
+            <meshStandardMaterial color="#6d4c41" roughness={0.8} metalness={0.08} />
+          </mesh>
+          <mesh position={[shopAnnexEastWallX - 0.02, 0.5, shopAnnexEntryTopZ]} receiveShadow>
+            <boxGeometry args={[shopDoorFrameDepth, 1, 0.08]} />
+            <meshStandardMaterial color="#7b5e57" roughness={0.82} metalness={0.06} />
+          </mesh>
+          <mesh position={[shopAnnexEastWallX - 0.02, 0.5, shopAnnexEntryBottomZ]} receiveShadow>
+            <boxGeometry args={[shopDoorFrameDepth, 1, 0.08]} />
+            <meshStandardMaterial color="#7b5e57" roughness={0.82} metalness={0.06} />
+          </mesh>
+          <mesh position={[shopAnnexEastWallX - 0.02, 0.96, shopAnnexEntryCenterZ]} receiveShadow>
+            <boxGeometry args={[shopDoorFrameDepth, 0.08, SHOP_ANNEX_ENTRY_OPENING_HEIGHT + 0.08]} />
+            <meshStandardMaterial color="#6d4c41" roughness={0.8} metalness={0.08} />
+          </mesh>
+          <group
+            position={[shopDoorLeftX + 0.04, 0, localSouthWallZ + 0.08]}
+            rotation={[0, -Math.PI / 2.9, 0]}
+          >
+            <mesh position={[shopDoorLeafWidth / 2, 0.42, 0]} castShadow receiveShadow>
+              <boxGeometry args={[shopDoorLeafWidth, 0.84, 0.05]} />
+              <meshStandardMaterial color="#4e342e" roughness={0.72} metalness={0.12} />
+            </mesh>
+            <mesh position={[shopDoorLeafWidth - 0.08, 0.42, 0.03]}>
+              <sphereGeometry args={[0.025, 12, 12]} />
+              <meshStandardMaterial color="#d4af37" roughness={0.35} metalness={0.88} />
+            </mesh>
+          </group>
+          <group
+            position={[shopOfficeDoorLeftX + 0.04, 0, localSouthWallZ + 0.08]}
+            rotation={[0, -Math.PI / 3.1, 0]}
+          >
+            <mesh position={[shopOfficeDoorLeafWidth / 2, 0.42, 0]} castShadow receiveShadow>
+              <boxGeometry args={[shopOfficeDoorLeafWidth, 0.84, 0.05]} />
+              <meshStandardMaterial color="#4e342e" roughness={0.72} metalness={0.12} />
+            </mesh>
+            <mesh position={[shopOfficeDoorLeafWidth - 0.08, 0.42, 0.03]}>
+              <sphereGeometry args={[0.025, 12, 12]} />
+              <meshStandardMaterial color="#d4af37" roughness={0.35} metalness={0.88} />
+            </mesh>
+          </group>
+          <group
+            position={[shopAnnexEastWallX - 0.08, 0, shopAnnexEntryTopZ + 0.04]}
+            rotation={[0, Math.PI / 1.9, 0]}
+          >
+            <mesh position={[0, 0.42, shopAnnexEntryLeafHeight / 2]} castShadow receiveShadow>
+              <boxGeometry args={[0.05, 0.84, shopAnnexEntryLeafHeight]} />
+              <meshStandardMaterial color="#4e342e" roughness={0.72} metalness={0.12} />
+            </mesh>
+            <mesh position={[0.03, 0.42, shopAnnexEntryLeafHeight - 0.08]}>
+              <sphereGeometry args={[0.025, 12, 12]} />
+              <meshStandardMaterial color="#d4af37" roughness={0.35} metalness={0.88} />
+            </mesh>
+          </group>
+
+          <group position={[shoppingCenterX, 0.86, shoppingCenterZ + shoppingHeight / 2 - 0.24]}>
+            <mesh position={[0, 0.12, 0]}>
+              <boxGeometry args={[3.6, 0.24, 0.12]} />
+              <meshStandardMaterial color="#111827" roughness={0.42} metalness={0.18} />
+            </mesh>
+            <mesh position={[0, 0.12, 0.08]}>
+              <planeGeometry args={[3.1, 0.16]} />
+              <meshBasicMaterial color="#facc15" side={2} />
+            </mesh>
+          </group>
+
+          {Array.from({ length: 4 }).map((_, index) => {
+            const labelX = [260, 640, 1020, 1400][index] ?? 260;
+            const [wx, , wz] = toWorld(labelX, 760);
+            return (
+              <group key={`shopping-header-${index}`} position={[wx, 0.88, wz]}>
+                <mesh>
+                  <boxGeometry args={[1.5, 0.18, 0.08]} />
+                  <meshStandardMaterial
+                    color={["#22c55e", "#f59e0b", "#38bdf8", "#a855f7"][index]}
+                    roughness={0.3}
+                    metalness={0.06}
+                  />
+                </mesh>
+              </group>
+            );
+          })}
+
+          {Array.from({ length: 10 }).map((_, index) => {
+            const [wx, , wz] = toWorld(250 + index * 150, 1085 + (index % 2 === 0 ? -38 : 38));
             return (
               <mesh key={`garden-bed-${index}`} position={[wx, 0.03, wz]} castShadow receiveShadow>
                 <boxGeometry args={[0.58, 0.06, 0.18]} />
@@ -294,8 +538,8 @@ export const FloorAndWalls = memo(function FloorAndWalls({
             );
           })}
 
-          {Array.from({ length: 8 }).map((_, index) => {
-            const [wx, , wz] = toWorld(330 + index * 170, 820 + (index % 2 === 0 ? -44 : 44));
+          {Array.from({ length: 10 }).map((_, index) => {
+            const [wx, , wz] = toWorld(250 + index * 150, 1085 + (index % 2 === 0 ? -38 : 38));
             return (
               <mesh key={`garden-bed-top-${index}`} position={[wx, 0.09, wz]}>
                 <boxGeometry args={[0.48, 0.05, 0.12]} />
@@ -305,7 +549,7 @@ export const FloorAndWalls = memo(function FloorAndWalls({
           })}
 
           {Array.from({ length: 6 }).map((_, index) => {
-            const [wx, , wz] = toWorld(420 + index * 190, 900);
+            const [wx, , wz] = toWorld(310 + index * 240, 1120);
             return (
               <group key={`garden-light-${index}`} position={[wx, 0, wz]}>
                 <mesh position={[0, 0.2, 0]} castShadow>
@@ -321,7 +565,7 @@ export const FloorAndWalls = memo(function FloorAndWalls({
           })}
 
           {Array.from({ length: 8 }).map((_, index) => {
-            const [wx, , wz] = toWorld(220 + index * 190, 1005);
+            const [wx, , wz] = toWorld(180 + index * 200, 745);
             return (
               <mesh
                 key={`city-light-${index}`}
@@ -336,7 +580,7 @@ export const FloorAndWalls = memo(function FloorAndWalls({
           })}
 
           {Array.from({ length: 4 }).map((_, index) => {
-            const [wx, , wz] = toWorld(250 + index * 430, 955);
+            const [wx, , wz] = toWorld(260 + index * 430, 1090);
             return (
               <mesh key={`city-planter-${index}`} position={[wx, 0.08, wz]} castShadow>
                 <boxGeometry args={[0.46, 0.14, 0.26]} />
@@ -346,7 +590,7 @@ export const FloorAndWalls = memo(function FloorAndWalls({
           })}
 
           {Array.from({ length: 4 }).map((_, index) => {
-            const [wx, , wz] = toWorld(250 + index * 430, 955);
+            const [wx, , wz] = toWorld(260 + index * 430, 1090);
             return (
               <mesh key={`city-planter-top-${index}`} position={[wx, 0.18, wz]}>
                 <boxGeometry args={[0.38, 0.08, 0.18]} />
@@ -354,8 +598,65 @@ export const FloorAndWalls = memo(function FloorAndWalls({
               </mesh>
             );
           })}
-        </>
-      ) : null}
+
+          {Array.from({ length: 6 }).map((_, index) => {
+            const [wx, , wz] = toWorld(190 + index * 270, 745);
+            return (
+              <group key={`shopping-awning-${index}`} position={[wx, 0, wz]}>
+                <mesh position={[0, 0.9, 0]} castShadow receiveShadow>
+                  <boxGeometry args={[1.3, 0.08, 0.42]} />
+                  <meshStandardMaterial color="#5d4037" roughness={0.8} metalness={0.08} />
+                </mesh>
+                <mesh position={[0, 1.08, 0]} castShadow receiveShadow>
+                  <boxGeometry args={[1.22, 0.16, 0.36]} />
+                  <meshStandardMaterial color="#f59e0b" roughness={0.46} metalness={0.06} />
+                </mesh>
+                <mesh position={[0, 0.52, 0.02]} castShadow receiveShadow>
+                  <boxGeometry args={[1.1, 0.72, 0.16]} />
+                  <meshStandardMaterial color="#7c3aed" roughness={0.58} metalness={0.12} />
+                </mesh>
+              </group>
+            );
+          })}
+
+          {Array.from({ length: 5 }).map((_, index) => {
+            const [wx, , wz] = toWorld(300 + index * 280, 760);
+            return (
+              <group key={`shopping-section-${index}`} position={[wx, 0, wz]}>
+                <mesh position={[0, 0.52, 0]} castShadow receiveShadow>
+                  <boxGeometry args={[1.55, 0.14, 0.22]} />
+                  <meshStandardMaterial color="#3e2723" roughness={0.74} metalness={0.08} />
+                </mesh>
+                <mesh position={[0, 0.86, 0]} castShadow receiveShadow>
+                  <boxGeometry args={[0.08, 0.68, 0.08]} />
+                  <meshStandardMaterial color="#6d4c41" roughness={0.62} metalness={0.12} />
+                </mesh>
+                <mesh position={[0, 1.18, 0]} castShadow receiveShadow>
+                  <boxGeometry args={[0.94, 0.18, 0.16]} />
+                  <meshStandardMaterial
+                    color={["#22c55e", "#f59e0b", "#38bdf8", "#a855f7", "#ef4444"][index]}
+                    roughness={0.34}
+                    metalness={0.06}
+                  />
+                </mesh>
+              </group>
+            );
+          })}
+
+          {Array.from({ length: 6 }).map((_, index) => {
+            const [wx, , wz] = toWorld(360 + index * 230, 905);
+            return (
+              <mesh
+                key={`shopping-aisle-mark-${index}`}
+                position={[wx, 0.008, wz]}
+                rotation={[-Math.PI / 2, 0, 0]}
+              >
+                <planeGeometry args={[0.05, (CITY_PATH_ZONE.maxY - CITY_PATH_ZONE.minY) * SCALE * 0.58]} />
+                <meshBasicMaterial color="#fff5d6" transparent opacity={0.16} />
+              </mesh>
+            );
+          })}
+      </>
 
       {gymZoneFloorWidth > 0 && roomZoneFloorHeight > 0 ? (
         <>
@@ -561,15 +862,47 @@ export const FloorAndWalls = memo(function FloorAndWalls({
                 />
               </mesh>
             ) : null}
-            <mesh position={[localOfficeCenterX, 0.5, localSouthWallZ]} receiveShadow>
-              <boxGeometry args={[localOfficeWidth, 1, 0.12]} />
-              <meshStandardMaterial
-                color={wallColor}
-                emissive={wallEmissive}
-                emissiveIntensity={0.4}
-                roughness={0.9}
-              />
-            </mesh>
+            {showRemoteOffice ? (
+              <>
+                <mesh position={[southWallLeftCenterX, 0.5, localSouthWallZ]} receiveShadow>
+                  <boxGeometry args={[southWallLeftWidth, 1, 0.12]} />
+                  <meshStandardMaterial
+                    color={wallColor}
+                    emissive={wallEmissive}
+                    emissiveIntensity={0.4}
+                    roughness={0.9}
+                  />
+                </mesh>
+                <mesh position={[southWallMiddleCenterX, 0.5, localSouthWallZ]} receiveShadow>
+                  <boxGeometry args={[southWallMiddleWidth, 1, 0.12]} />
+                  <meshStandardMaterial
+                    color={wallColor}
+                    emissive={wallEmissive}
+                    emissiveIntensity={0.4}
+                    roughness={0.9}
+                  />
+                </mesh>
+                <mesh position={[southWallRightCenterX, 0.5, localSouthWallZ]} receiveShadow>
+                  <boxGeometry args={[southWallRightWidth, 1, 0.12]} />
+                  <meshStandardMaterial
+                    color={wallColor}
+                    emissive={wallEmissive}
+                    emissiveIntensity={0.4}
+                    roughness={0.9}
+                  />
+                </mesh>
+              </>
+            ) : (
+              <mesh position={[localOfficeCenterX, 0.5, localSouthWallZ]} receiveShadow>
+                <boxGeometry args={[localOfficeWidth, 1, 0.12]} />
+                <meshStandardMaterial
+                  color={wallColor}
+                  emissive={wallEmissive}
+                  emissiveIntensity={0.4}
+                  roughness={0.9}
+                />
+              </mesh>
+            )}
             {showRemoteOffice ? (
               <mesh
                 position={[localOfficeCenterX, 0.5, localSouthWallZ + remoteOfficeOffsetZ]}
@@ -644,10 +977,27 @@ export const FloorAndWalls = memo(function FloorAndWalls({
           <meshLambertMaterial color="#0c0c10" />
         </mesh>
       ) : null}
-      <mesh position={[localOfficeCenterX, 0.03, localSouthWallZ - 0.04]}>
-        <boxGeometry args={[localOfficeWidth, 0.06, 0.04]} />
-        <meshLambertMaterial color="#0c0c10" />
-      </mesh>
+      {showRemoteOffice ? (
+        <>
+          <mesh position={[southWallLeftCenterX, 0.03, localSouthWallZ - 0.04]}>
+            <boxGeometry args={[southWallLeftWidth, 0.06, 0.04]} />
+            <meshLambertMaterial color="#0c0c10" />
+          </mesh>
+          <mesh position={[southWallMiddleCenterX, 0.03, localSouthWallZ - 0.04]}>
+            <boxGeometry args={[southWallMiddleWidth, 0.06, 0.04]} />
+            <meshLambertMaterial color="#0c0c10" />
+          </mesh>
+          <mesh position={[southWallRightCenterX, 0.03, localSouthWallZ - 0.04]}>
+            <boxGeometry args={[southWallRightWidth, 0.06, 0.04]} />
+            <meshLambertMaterial color="#0c0c10" />
+          </mesh>
+        </>
+      ) : (
+        <mesh position={[localOfficeCenterX, 0.03, localSouthWallZ - 0.04]}>
+          <boxGeometry args={[localOfficeWidth, 0.06, 0.04]} />
+          <meshLambertMaterial color="#0c0c10" />
+        </mesh>
+      )}
       {showRemoteOffice ? (
         <mesh position={[localOfficeCenterX, 0.03, localSouthWallZ - 0.04 + remoteOfficeOffsetZ]}>
           <boxGeometry args={[localOfficeWidth, 0.06, 0.04]} />
@@ -664,6 +1014,26 @@ export const FloorAndWalls = memo(function FloorAndWalls({
           <meshLambertMaterial color="#0c0c10" />
         </mesh>
       ) : null}
+      {showRemoteOffice ? (
+        <>
+          <mesh position={[shopAnnexWestWallX + 0.04, 0.03, shopAnnexCenterZ]}>
+            <boxGeometry args={[0.04, 0.06, shopAnnexHeight]} />
+            <meshLambertMaterial color="#0c0c10" />
+          </mesh>
+          <mesh position={[shopAnnexEastWallX - 0.04, 0.03, shopAnnexEastWallNorthCenterZ]}>
+            <boxGeometry args={[0.04, 0.06, shopAnnexEastWallNorthHeight]} />
+            <meshLambertMaterial color="#0c0c10" />
+          </mesh>
+          <mesh position={[shopAnnexEastWallX - 0.04, 0.03, shopAnnexEastWallSouthCenterZ]}>
+            <boxGeometry args={[0.04, 0.06, shopAnnexEastWallSouthHeight]} />
+            <meshLambertMaterial color="#0c0c10" />
+          </mesh>
+          <mesh position={[shopAnnexCenterX, 0.03, shopAnnexSouthWallZ - 0.04]}>
+            <boxGeometry args={[shopAnnexWidth, 0.06, 0.04]} />
+            <meshLambertMaterial color="#0c0c10" />
+          </mesh>
+        </>
+      ) : null}
       <mesh position={[localEastWallX - 0.04, 0.03, localOfficeCenterZ]}>
         <boxGeometry args={[0.04, 0.06, localOfficeHeight]} />
         <meshLambertMaterial color="#0c0c10" />
diff --git a/src/lib/office/deskDirectives.ts b/src/lib/office/deskDirectives.ts
index 5ec462b6..f3039d1c 100644
--- a/src/lib/office/deskDirectives.ts
+++ b/src/lib/office/deskDirectives.ts
@@ -8,6 +8,7 @@ export type OfficeDeskDirective = "desk" | "release";
 export type OfficeGithubDirective = "github" | "release";
 export type OfficeGymDirective = "gym" | "release";
 export type OfficeQaDirective = "qa_lab" | "release";
+export type OfficeShopDirective = "shop" | "release";
 export type OfficeStandupDirective = "standup";
 export type OfficeCallPhase = "needs_message" | "ready_to_call";
 export type OfficeTextPhase = "needs_message" | "ready_to_send";
@@ -25,6 +26,7 @@ export type OfficeIntentSnapshot = {
   normalized: string;
   desk: OfficeDeskDirective | null;
   github: OfficeGithubDirective | null;
+  shop: OfficeShopDirective | null;
   gym:
     | {
         directive: OfficeGymDirective;
@@ -244,6 +246,38 @@ const resolveOfficeQaDirectiveFromNormalized = (
     : null;
 };
 
+const resolveOfficeShopDirectiveFromNormalized = (
+  normalized: string,
+): OfficeShopDirective | null => {
+  const shopReleasePatterns = [
+    /\bleave\s+(?:the\s+)?(?:shop|store|grocery(?:\s+room)?)\b/,
+    /\bexit\s+(?:the\s+)?(?:shop|store|grocery(?:\s+room)?)\b/,
+    /\bdone\s+shopping\b/,
+    /\bstop\s+shopping\b/,
+    /\bleave\s+amazon\b/,
+  ];
+  if (shopReleasePatterns.some((pattern) => pattern.test(normalized))) {
+    return "release";
+  }
+
+  const shopIntentPatterns = [
+    /\bbuy(?:\s+\w+){0,3}\s+on\s+amazon\b/,
+    /\border(?:\s+\w+){0,3}\s+on\s+amazon\b/,
+    /\breorder\s+on\s+amazon\b/,
+    /\bshop\s+on\s+amazon\b/,
+    /\bpurchase(?:\s+\w+){0,3}\s+on\s+amazon\b/,
+    /\bamazon\s+order\b/,
+    /\bamazon\s+shopping\b/,
+    /\bgo\s+shopping\b/,
+    /\bgo\s+to\s+(?:the\s+)?(?:shop|store|grocery(?:\s+room)?)\b/,
+    /\bwalk\s+to\s+(?:the\s+)?(?:shop|store|grocery(?:\s+room)?)\b/,
+    /\bhead\s+to\s+(?:the\s+)?(?:shop|store|grocery(?:\s+room)?)\b/,
+  ];
+  return shopIntentPatterns.some((pattern) => pattern.test(normalized))
+    ? "shop"
+    : null;
+};
+
 const resolveOfficeStandupDirectiveFromNormalized = (
   normalized: string,
 ): OfficeStandupDirective | null => {
@@ -416,6 +450,7 @@ export const resolveOfficeIntentSnapshot = (
       normalized: "",
       desk: null,
       github: null,
+      shop: null,
       gym: null,
       qa: null,
       art: null,
@@ -435,6 +470,7 @@ export const resolveOfficeIntentSnapshot = (
     normalized,
   );
   const qaDirective = resolveOfficeQaDirectiveFromNormalized(normalized);
+  const shopDirective = resolveOfficeShopDirectiveFromNormalized(normalized);
   const gymSkillDirective = resolveOfficeGymSkillDirectiveFromNormalized(normalized);
   const standupDirective = resolveOfficeStandupDirectiveFromNormalized(normalized);
   const callDirective = resolveOfficeCallDirectiveFromNormalized(normalized);
@@ -465,6 +501,7 @@ export const resolveOfficeIntentSnapshot = (
           ? "github"
           : "release"
         : null,
+    shop: shopDirective,
     gym: gymDirective,
     qa: qaDirective,
     art: null,
@@ -500,6 +537,10 @@ export const resolveOfficeQaDirective = (
   value: string | null | undefined,
 ): OfficeQaDirective | null => resolveOfficeIntentSnapshot(value).qa;
 
+export const resolveOfficeShopDirective = (
+  value: string | null | undefined,
+): OfficeShopDirective | null => resolveOfficeIntentSnapshot(value).shop;
+
 export const resolveOfficeStandupDirective = (
   value: string | null | undefined,
 ): OfficeStandupDirective | null => resolveOfficeIntentSnapshot(value).standup;
@@ -517,6 +558,7 @@ const resolveTranscriptDirective = <
     | OfficeDeskDirective
     | OfficeGithubDirective
     | OfficeGymDirective
+    | OfficeShopDirective
     | OfficeQaDirective
     | OfficeStandupDirective,
 >(
diff --git a/src/lib/office/eventTriggers.ts b/src/lib/office/eventTriggers.ts
index fe343208..fc424ba3 100644
--- a/src/lib/office/eventTriggers.ts
+++ b/src/lib/office/eventTriggers.ts
@@ -37,6 +37,7 @@ import {
   resolveOfficeGithubDirective,
   resolveOfficeGymDirective,
   resolveOfficeQaDirective,
+  resolveOfficeShopDirective,
   resolveOfficeTextDirective,
 } from "@/lib/office/deskDirectives";
 import { extractText, extractThinking } from "@/lib/text/message-extract";
@@ -100,6 +101,7 @@ export type OfficeAnimationTriggerState = {
   phoneCallDirectiveKeyByAgentId: StringByAgentId;
   qaDirectiveKeyByAgentId: StringByAgentId;
   qaHoldByAgentId: BooleanByAgentId;
+  shopHoldByAgentId: BooleanByAgentId;
   sessionEpochSnapshot: SessionEpochSnapshot;
   skillGymDirectiveKeyByAgentId: StringByAgentId;
   skillGymHoldByAgentId: BooleanByAgentId;
@@ -127,6 +129,7 @@ export type OfficeAnimationState = {
   phoneBoothHoldByAgentId: BooleanByAgentId;
   phoneCallByAgentId: PhoneCallByAgentId;
   qaHoldByAgentId: BooleanByAgentId;
+  shopHoldByAgentId: BooleanByAgentId;
   smsBoothHoldByAgentId: BooleanByAgentId;
   skillGymHoldByAgentId: BooleanByAgentId;
   streamingByAgentId: BooleanByAgentId;
@@ -526,6 +529,7 @@ const hasOtherOfficeDirective = (
   Boolean(
     snapshot.desk ||
     snapshot.github ||
+      snapshot.shop ||
     snapshot.gym ||
     snapshot.qa ||
     snapshot.art ||
@@ -590,7 +594,9 @@ const resolveTextMessageFollowUpRequest = (params: {
 
 const applyHoldDirective = (
   currentHeld: boolean,
-  directive: LatestDirective<"desk" | "github" | "qa_lab" | "release"> | null,
+  directive:
+    | LatestDirective<"desk" | "github" | "shop" | "qa_lab" | "release">
+    | null,
 ): boolean => {
   if (!directive) return currentHeld;
   if (directive.directive === "release") return false;
@@ -645,6 +651,7 @@ const pruneOfficeAnimationTriggerState = (
       activeAgentIds,
     ),
     qaHoldByAgentId: pruneBooleanMap(state.qaHoldByAgentId, activeAgentIds),
+    shopHoldByAgentId: pruneBooleanMap(state.shopHoldByAgentId, activeAgentIds),
     skillGymDirectiveKeyByAgentId: pruneStringMap(
       state.skillGymDirectiveKeyByAgentId,
       activeAgentIds,
@@ -792,6 +799,20 @@ const applyUserMessageTriggers = (params: {
           : { ...next.qaHoldByAgentId, [params.agentId]: true },
     };
   }
+  const shopDirective = intentSnapshot.shop;
+  if (shopDirective) {
+    next = {
+      ...next,
+      shopHoldByAgentId:
+        shopDirective === "release"
+          ? Object.fromEntries(
+              Object.entries(next.shopHoldByAgentId).filter(
+                ([agentId]) => agentId !== params.agentId,
+              ),
+            )
+          : { ...next.shopHoldByAgentId, [params.agentId]: true },
+    };
+  }
   if (intentSnapshot.gym?.source === "manual") {
     const gymCommandKey = normalizeCommandText(params.message);
     next = {
@@ -909,6 +930,7 @@ export const createOfficeAnimationTriggerState =
     phoneCallDirectiveKeyByAgentId: emptyObject(),
     qaDirectiveKeyByAgentId: emptyObject(),
     qaHoldByAgentId: emptyObject(),
+    shopHoldByAgentId: emptyObject(),
     sessionEpochSnapshot: {},
     skillGymDirectiveKeyByAgentId: emptyObject(),
     skillGymHoldByAgentId: emptyObject(),
@@ -1098,6 +1120,7 @@ export const reconcileOfficeAnimationTriggerState = (params: {
   const phoneCallByAgentId: PhoneCallByAgentId = {};
   const phoneCallDirectiveKeyByAgentId: StringByAgentId = {};
   const qaHoldByAgentId: BooleanByAgentId = {};
+  const shopHoldByAgentId: BooleanByAgentId = {};
   const qaDirectiveKeyByAgentId: StringByAgentId = {};
   const skillGymHoldByAgentId: BooleanByAgentId = {};
   const skillGymDirectiveKeyByAgentId: StringByAgentId = {};
@@ -1181,6 +1204,24 @@ export const reconcileOfficeAnimationTriggerState = (params: {
       qaHoldByAgentId[agentId] = true;
     }
 
+    const shopDirective = resolveLatestDirective({
+      lastUserMessage: agent.lastUserMessage,
+      transcriptEntries: agent.transcriptEntries,
+      resolver: resolveOfficeShopDirective,
+    });
+    if (shopDirective) {
+      if (
+        applyHoldDirective(
+          Boolean(next.shopHoldByAgentId[agentId]),
+          shopDirective,
+        )
+      ) {
+        shopHoldByAgentId[agentId] = true;
+      }
+    } else if (next.shopHoldByAgentId[agentId]) {
+      shopHoldByAgentId[agentId] = true;
+    }
+
     const skillGymDirective = resolveLatestDirective({
       lastUserMessage: agent.lastUserMessage,
       transcriptEntries: agent.transcriptEntries,
@@ -1258,6 +1299,7 @@ export const reconcileOfficeAnimationTriggerState = (params: {
     phoneCallDirectiveKeyByAgentId,
     qaDirectiveKeyByAgentId,
     qaHoldByAgentId,
+    shopHoldByAgentId,
     sessionEpochSnapshot: buildSessionEpochSnapshot(params.agents),
     skillGymDirectiveKeyByAgentId,
     skillGymHoldByAgentId,
@@ -1351,6 +1393,7 @@ export const buildOfficeAnimationState = (params: {
   const jukeboxHoldByAgentId: BooleanByAgentId = {};
   const phoneBoothHoldByAgentId: BooleanByAgentId = {};
   const phoneCallByAgentId: PhoneCallByAgentId = {};
+  const shopHoldByAgentId: BooleanByAgentId = {};
   const smsBoothHoldByAgentId: BooleanByAgentId = {};
   const streamingByAgentId: BooleanByAgentId = {};
   const textMessageByAgentId: TextMessageByAgentId = {};
@@ -1392,6 +1435,9 @@ export const buildOfficeAnimationState = (params: {
     if (params.state.deskHoldByAgentId[agentId] && !gymHoldByAgentId[agentId]) {
       deskHoldByAgentId[agentId] = true;
     }
+    if (params.state.shopHoldByAgentId[agentId]) {
+      shopHoldByAgentId[agentId] = true;
+    }
   }
 
   return {
@@ -1407,6 +1453,7 @@ export const buildOfficeAnimationState = (params: {
     phoneBoothHoldByAgentId,
     phoneCallByAgentId,
     qaHoldByAgentId: params.state.qaHoldByAgentId,
+    shopHoldByAgentId,
     smsBoothHoldByAgentId,
     skillGymHoldByAgentId: params.state.skillGymHoldByAgentId,
     streamingByAgentId,
diff --git a/src/lib/office/places.ts b/src/lib/office/places.ts
index 7b1e06f5..985fcaed 100644
--- a/src/lib/office/places.ts
+++ b/src/lib/office/places.ts
@@ -4,6 +4,7 @@ export const OFFICE_INTERACTION_TARGETS = [
   "meeting_room",
   "gym",
   "jukebox",
+  "shop",
   "qa_lab",
   "sms_booth",
   "phone_booth",
@@ -17,6 +18,7 @@ export const OFFICE_SKILL_TRIGGER_MOVEMENT_TARGETS = [
   "github",
   "gym",
   "jukebox",
+  "shop",
   "qa_lab",
 ] as const;
 
@@ -28,6 +30,7 @@ type OfficeSkillTriggerAnimationHoldKey =
   | "githubHoldByAgentId"
   | "gymHoldByAgentId"
   | "jukeboxHoldByAgentId"
+  | "shopHoldByAgentId"
   | "qaHoldByAgentId";
 
 export const OFFICE_SKILL_TRIGGER_PLACE_REGISTRY: Record<
@@ -60,6 +63,11 @@ export const OFFICE_SKILL_TRIGGER_PLACE_REGISTRY: Record<
     interactionTarget: "jukebox",
     animationHoldKey: "jukeboxHoldByAgentId",
   },
+  shop: {
+    label: "Shop",
+    interactionTarget: "shop",
+    animationHoldKey: "shopHoldByAgentId",
+  },
   qa_lab: {
     label: "QA Lab",
     interactionTarget: "qa_lab",
@@ -82,6 +90,20 @@ export const DEFAULT_SKILL_TRIGGER_FALLBACKS_BY_SKILL_KEY: Record<
   string,
   DefaultSkillTriggerFallback
 > = {
+  "amazon-ordering": {
+    anyPhrases: [
+      "amazon",
+      "go shopping",
+      "buy something",
+      "buy on amazon",
+      "order on amazon",
+      "reorder on amazon",
+      "amazon order history",
+      "amazon return",
+    ],
+    movementTarget: "shop",
+    skipIfAlreadyThere: true,
+  },
   "todo-board": {
     anyPhrases: [
       "todo",
@@ -130,6 +152,7 @@ export const buildOfficeSkillTriggerHoldMaps = (
   githubHoldByAgentId: Record<string, boolean>;
   gymHoldByAgentId: Record<string, boolean>;
   jukeboxHoldByAgentId: Record<string, boolean>;
+  shopHoldByAgentId: Record<string, boolean>;
   qaHoldByAgentId: Record<string, boolean>;
   skillGymHoldByAgentId: Record<string, boolean>;
 } => {
@@ -138,6 +161,7 @@ export const buildOfficeSkillTriggerHoldMaps = (
     githubHoldByAgentId: {} as Record<string, boolean>,
     gymHoldByAgentId: {} as Record<string, boolean>,
     jukeboxHoldByAgentId: {} as Record<string, boolean>,
+    shopHoldByAgentId: {} as Record<string, boolean>,
     qaHoldByAgentId: {} as Record<string, boolean>,
     skillGymHoldByAgentId: {} as Record<string, boolean>,
   };
diff --git a/src/lib/skills/catalog.ts b/src/lib/skills/catalog.ts
index 256dae51..478561be 100644
--- a/src/lib/skills/catalog.ts
+++ b/src/lib/skills/catalog.ts
@@ -3,7 +3,11 @@ import type {
   SkillStatusEntry,
 } from "@/lib/skills/types";
 
-export type PackagedSkillId = "soundclaw" | "task-manager" | "todo-board";
+export type PackagedSkillId =
+  | "amazon-ordering"
+  | "soundclaw"
+  | "task-manager"
+  | "todo-board";
 
 export type PackagedSkillDefinition = {
   packageId: PackagedSkillId;
@@ -24,6 +28,16 @@ const EMPTY_REQUIREMENTS = {
 };
 
 const PACKAGED_SKILLS: PackagedSkillDefinition[] = [
+  {
+    packageId: "amazon-ordering",
+    skillKey: "amazon-ordering",
+    name: "amazon",
+    description:
+      "Buy and return items on Amazon using browser automation for purchases, reorders, order lookups, and returns.",
+    installSource: "openclaw-workspace",
+    creatorName: "lukethedev",
+    creatorUrl: "https://github.com/iamlukethedev",
+  },
   {
     packageId: "todo-board",
     skillKey: "todo-board",
diff --git a/src/lib/skills/install-gateway.ts b/src/lib/skills/install-gateway.ts
index 031d8d89..680f74ea 100644
--- a/src/lib/skills/install-gateway.ts
+++ b/src/lib/skills/install-gateway.ts
@@ -5,6 +5,7 @@ import {
 } from "@/lib/gateway/agentConfig";
 import { getPackagedSkillById } from "@/lib/skills/catalog";
 import { readPackagedSkillFiles } from "@/lib/skills/packaged";
+import { buildPackagedSkillGeneratedFiles } from "@/lib/skills/packaged-setup";
 import {
   resolveWorkspaceFromAgentFiles,
   type PackagedSkillInstallRequest,
@@ -118,7 +119,10 @@ export const installPackagedSkillViaGatewayAgent = async (params: {
     agentId: params.request.agentId,
     agentName: params.request.agentName,
   });
-  const files = readPackagedSkillFiles(packagedSkill.packageId);
+  const files = [
+    ...readPackagedSkillFiles(packagedSkill.packageId),
+    ...buildPackagedSkillGeneratedFiles(packagedSkill.packageId, params.request.setupValues),
+  ];
   const installerName = `Skill Installer ${Date.now()}`;
 
   let installerAgentId: string | null = null;
diff --git a/src/lib/skills/marketplace.ts b/src/lib/skills/marketplace.ts
index a8e7a90b..08cfa18b 100644
--- a/src/lib/skills/marketplace.ts
+++ b/src/lib/skills/marketplace.ts
@@ -46,6 +46,19 @@ const SKILL_MARKETPLACE_OVERRIDES: Record<
   string,
   Partial<SkillMarketplaceMetadata>
 > = {
+  "amazon-ordering": {
+    category: "Shopping",
+    tagline:
+      "Lets agents handle Amazon purchases, reorders, order-history lookup, and returns with browser automation.",
+    capabilities: [
+      "Amazon purchases",
+      "Reorders and order lookup",
+      "Return processing",
+    ],
+    featured: true,
+    editorBadge: "Browser agent",
+    hideStats: true,
+  },
   github: {
     category: "Engineering",
     tagline: "Turns repository operations into a one-step teammate workflow.",
diff --git a/src/lib/skills/packaged-setup.ts b/src/lib/skills/packaged-setup.ts
new file mode 100644
index 00000000..2847f399
--- /dev/null
+++ b/src/lib/skills/packaged-setup.ts
@@ -0,0 +1,107 @@
+import type { PackagedSkillId } from "@/lib/skills/catalog";
+
+export type PackagedSkillSetupValues = Record<string, string>;
+
+export type PackagedSkillSetupField = {
+  key: string;
+  label: string;
+  description: string;
+  placeholder?: string;
+  multiline?: boolean;
+  required?: boolean;
+};
+
+export type PackagedSkillSetupDefinition = {
+  title: string;
+  description: string;
+  submitLabel: string;
+  fields: PackagedSkillSetupField[];
+};
+
+export type PackagedSkillGeneratedFile = {
+  relativePath: string;
+  content: string;
+};
+
+const AMAZON_ORDERING_SETUP: PackagedSkillSetupDefinition = {
+  title: "Amazon defaults",
+  description:
+    "Save the workspace defaults the Amazon skill should use for checkout and returns during installation.",
+  submitLabel: "Install Amazon skill",
+  fields: [
+    {
+      key: "shippingAddress",
+      label: "Shipping address",
+      description: "Full address the agent should verify before placing an order.",
+      placeholder: "123 Main St, Springfield, IL 62704",
+      multiline: true,
+      required: true,
+    },
+    {
+      key: "paymentMethod",
+      label: "Payment method",
+      description: "Friendly label for the preferred card or payment method.",
+      placeholder: "Visa ending in 4242",
+      required: true,
+    },
+    {
+      key: "returnDropoff",
+      label: "Return drop-off",
+      description: "Preferred return location for Amazon returns.",
+      placeholder: "Whole Foods",
+      required: true,
+    },
+  ],
+};
+
+const normalizeRequiredValue = (
+  values: PackagedSkillSetupValues | undefined,
+  key: string,
+  label: string
+): string => {
+  const trimmed = values?.[key]?.trim() ?? "";
+  if (!trimmed) {
+    throw new Error(`${label} is required.`);
+  }
+  return trimmed;
+};
+
+export const getPackagedSkillSetupDefinition = (
+  packageId: string
+): PackagedSkillSetupDefinition | null => {
+  switch (packageId as PackagedSkillId) {
+    case "amazon-ordering":
+      return AMAZON_ORDERING_SETUP;
+    default:
+      return null;
+  }
+};
+
+export const buildPackagedSkillGeneratedFiles = (
+  packageId: string,
+  values?: PackagedSkillSetupValues
+): PackagedSkillGeneratedFile[] => {
+  switch (packageId as PackagedSkillId) {
+    case "amazon-ordering": {
+      const shippingAddress = normalizeRequiredValue(values, "shippingAddress", "Shipping address");
+      const paymentMethod = normalizeRequiredValue(values, "paymentMethod", "Payment method");
+      const returnDropoff = normalizeRequiredValue(values, "returnDropoff", "Return drop-off");
+      return [
+        {
+          relativePath: "defaults.json",
+          content: JSON.stringify(
+            {
+              shippingAddress,
+              paymentMethod,
+              returnDropoff,
+            },
+            null,
+            2
+          ),
+        },
+      ];
+    }
+    default:
+      return [];
+  }
+};
diff --git a/src/lib/skills/packaged.ts b/src/lib/skills/packaged.ts
index 9c7bf9c7..d7d108e0 100644
--- a/src/lib/skills/packaged.ts
+++ b/src/lib/skills/packaged.ts
@@ -424,7 +424,200 @@ soundclaw.previous(): void
 6. Agent reports back what was played or linked
 `;
 
+// Keep this string synchronized with assets/skills/amazon-ordering/SKILL.md.
+const AMAZON_ORDERING_SKILL_MD = `---
+name: amazon
+description: Buy and return items on Amazon using browser automation. Use for purchasing, reordering, checking order history, and processing returns.
+metadata: {"openclaw":{"skillKey":"amazon-ordering"}}
+---
+
+# Amazon Ordering
+
+Use this skill when the user wants an agent to buy something on Amazon, reorder a previous item, inspect Amazon order history, or start a return.
+
+## Trigger
+
+\`\`\`json
+{
+  "activation": {
+    "anyPhrases": [
+      "amazon",
+      "buy on amazon",
+      "order on amazon",
+      "reorder on amazon",
+      "amazon order history",
+      "amazon return"
+    ]
+  },
+  "movement": {
+    "target": "shop",
+    "skipIfAlreadyThere": true
+  }
+}
+\`\`\`
+
+When this skill is activated, the agent should walk to the office shop before handling the request.
+
+- Treat requests from Telegram or any other external surface as valid triggers when they ask for Amazon purchasing, reordering, order lookup, or return processing.
+- The physical behavior for this skill is: go to the shop, connect to the browser session, then perform the Amazon workflow.
+- If the agent is already at the shop, continue without adding extra movement narration.
+
+## Prerequisites
+
+- \`agent-browser\` CLI installed.
+- Chrome running with remote debugging enabled on port \`9222\`.
+- Logged into Amazon. If logged out, retrieve the password from the configured password manager or ask the user to complete login.
+- If running headless on Linux, use VNC or another visual path so the user can solve CAPTCHAs or 2FA when needed.
+
+## Setup
+
+Read \`skills/amazon-ordering/defaults.json\` before making a purchase or processing a return. Use these saved workspace defaults:
+
+\`\`\`json
+{
+  "shippingAddress": "123 Main St, Springfield, IL 62704",
+  "paymentMethod": "Visa ending in 4242",
+  "returnDropoff": "Whole Foods"
+}
+\`\`\`
+
+If \`defaults.json\` is missing, fall back to these environment variables:
+
+\`\`\`bash
+export AMAZON_SHIPPING_ADDRESS="Your shipping address"
+export AMAZON_PAYMENT_METHOD="Your preferred card"
+export AMAZON_RETURN_DROPOFF="Whole Foods"
+\`\`\`
+
+Always verify the shipping address and payment method before placing an order.
+
+## Communication rules
+
+- Do not narrate each click or intermediate browser step.
+- Only message the user when you need clarification, confirmation, or manual intervention.
+- If Amazon shows CAPTCHA, MFA, login recovery, or an unexpected checkout change, pause and ask the user to help.
+- When a purchase, reorder, or return is confirmed, reply with a brief summary of the result.
+
+## Ordering rules
+
+### Reorders
+
+- Go directly to Amazon order history and search for the item.
+- Use "Buy it again" when the correct previous item is found.
+- Verify the selected address and payment method.
+- Place the order once the item clearly matches the user's request.
+- No screenshot is required for a confirmed reorder unless something looks ambiguous.
+
+### New items
+
+- Search or navigate to the requested product.
+- Before adding to cart, send the user a screenshot that clearly shows the product image and price.
+- Wait for explicit user confirmation before continuing with a new item purchase.
+- Verify the address and payment method again on checkout before placing the order.
+
+### Order history and status
+
+- Use order history for lookup, reorder decisions, and return eligibility checks.
+- When the user asks about past purchases, summarize only the relevant orders instead of dumping the full page.
+- If multiple similar orders match, ask which one they mean before acting.
+
+## Return defaults
+
+Use these defaults unless the user says otherwise:
+
+- Return reason: "Changed Mind" -> "My needs changed".
+- Packaging opened: Yes.
+- Item in original packaging: Yes.
+- Have you used the item: Yes.
+- Signs of use: None.
+- Battery leaks or overheating: No.
+- All accessories included: Yes.
+- Refund type: Refund to original payment method.
+- Drop-off location: Use \`returnDropoff\` from \`defaults.json\`, or \`AMAZON_RETURN_DROPOFF\`, or Whole Foods.
+
+## Return flow
+
+1. Open order history and find the item.
+2. Choose "Return or replace items".
+3. Select "Changed Mind" and then "My needs changed".
+4. Answer condition questions with the defaults in this document unless the user gave different facts.
+5. Continue past support suggestions.
+6. Select refund to the original payment method.
+7. Select the preferred drop-off location.
+8. Confirm the return.
+
+After a successful return, send only a short confirmation that includes the item name, refund amount, and drop-off location plus deadline if Amazon shows one.
+
+## Browser workflow
+
+### Connect to the browser
+
+\`\`\`bash
+agent-browser connect 9222
+\`\`\`
+
+Always open a new tab because other sessions may share the same Chrome profile. Use \`--new-tab\` on every open command.
+
+### Search order history
+
+\`\`\`bash
+agent-browser open --new-tab "https://www.amazon.com/gp/your-account/order-history"
+agent-browser snapshot -i
+\`\`\`
+
+Use the order-history search box to find the relevant item.
+
+### Reorder flow
+
+\`\`\`bash
+agent-browser click @[buy-it-again-ref]
+agent-browser snapshot -i
+\`\`\`
+
+Verify the address and payment method before clicking the place-order control.
+
+### Screenshot guidance
+
+- Scroll past Amazon navigation bars before taking the screenshot.
+- Ensure the product image and current price are both visible.
+- Save the screenshot to a temporary location and send it with a short caption.
+
+## Starting the browser if needed
+
+### Linux desktop session
+
+\`\`\`bash
+google-chrome --user-data-dir=$HOME/.config/chrome-agent --no-first-run --remote-debugging-port=9222 https://www.amazon.com &
+\`\`\`
+
+### Linux headless session
+
+\`\`\`bash
+DISPLAY=:99 google-chrome --user-data-dir=$HOME/.config/chrome-agent --no-first-run --remote-debugging-port=9222 https://www.amazon.com &
+\`\`\`
+
+### macOS
+
+\`\`\`bash
+open -na "Google Chrome" --args --user-data-dir=$HOME/.config/chrome-agent --no-first-run --remote-debugging-port=9222 https://www.amazon.com
+\`\`\`
+
+## Notes
+
+- The browser profile typically persists login at \`$HOME/.config/chrome-agent\`.
+- Workspace defaults live in \`skills/amazon-ordering/defaults.json\`.
+- Order confirmations go to the email on the Amazon account.
+- If the user asks for a new purchase but has not confirmed the item screenshot yet, do not place the order.
+- If the user asks for a return, use the silent return workflow and only surface the final result unless clarification is required.
+`;
+
 const PACKAGED_SKILL_FILES: Record<string, PackagedSkillFile[]> = {
+  "amazon-ordering": [
+    {
+      relativePath: "SKILL.md",
+      content: AMAZON_ORDERING_SKILL_MD,
+    },
+  ],
   "todo-board": [
     {
       relativePath: "SKILL.md",
diff --git a/src/lib/skills/types.ts b/src/lib/skills/types.ts
index cd761c71..38262a32 100644
--- a/src/lib/skills/types.ts
+++ b/src/lib/skills/types.ts
@@ -1,5 +1,7 @@
 import type { GatewayClient } from "@/lib/gateway/GatewayClient";
+import { readConfigAgentList, slugifyAgentName } from "@/lib/gateway/agentConfig";
 import { readGatewayAgentFile } from "@/lib/gateway/agentFiles";
+import type { PackagedSkillSetupValues } from "@/lib/skills/packaged-setup";
 
 export type SkillStatusConfigCheck = {
   path: string;
@@ -98,6 +100,7 @@ export type PackagedSkillInstallRequest = {
   managedSkillsDir: string;
   agentId?: string;
   agentName?: string;
+  setupValues?: PackagedSkillSetupValues;
 };
 
 export type PackagedSkillInstallResult = {
@@ -141,6 +144,79 @@ const resolveWorkspaceDirFromPath = (filePath: string | null | undefined): strin
   return candidate;
 };
 
+const resolveWorkspaceCandidate = (value: string | null | undefined): string | null => {
+  const normalized = value?.trim().replace(/[\\/]+$/, "") ?? "";
+  if (!normalized || isLikelyRootWorkspace(normalized)) {
+    return null;
+  }
+  return resolveWorkspaceDirFromPath(normalized) ?? normalized;
+};
+
+const dirnameLike = (value: string): string => {
+  const lastSlash = value.lastIndexOf("/");
+  const lastBackslash = value.lastIndexOf("\\");
+  const idx = Math.max(lastSlash, lastBackslash);
+  if (idx < 0) return "";
+  return value.slice(0, idx);
+};
+
+const joinPathLike = (dir: string, leaf: string): string => {
+  const sep = dir.includes("\\") ? "\\" : "/";
+  const trimmedDir = dir.endsWith("/") || dir.endsWith("\\") ? dir.slice(0, -1) : dir;
+  return `${trimmedDir}${sep}${leaf}`;
+};
+
+const resolveWorkspaceFromAgentConfig = async (
+  client: GatewayClient,
+  agentId: string
+): Promise<string | null> => {
+  try {
+    const snapshot = (await client.call("config.get", {})) as {
+      config?: Record<string, unknown>;
+      path?: string | null;
+    };
+    const entries = readConfigAgentList(snapshot.config);
+    const entry = entries.find((item) => item.id.trim() === agentId.trim()) ?? null;
+    if (!entry) {
+      return null;
+    }
+    const workspace =
+      typeof entry.workspace === "string"
+        ? resolveWorkspaceCandidate(entry.workspace)
+        : null;
+    if (workspace) {
+      return workspace;
+    }
+    const fromPath = typeof entry.path === "string" ? resolveWorkspaceCandidate(entry.path) : null;
+    if (fromPath) {
+      return fromPath;
+    }
+    const configPath = typeof snapshot.path === "string" ? snapshot.path.trim() : "";
+    const stateDir = configPath ? dirnameLike(configPath) : "";
+    if (!stateDir) {
+      return null;
+    }
+    const nameCandidates = [
+      typeof entry.name === "string" ? entry.name.trim() : "",
+      typeof entry.id === "string" ? entry.id.trim() : "",
+    ].filter(Boolean);
+    for (const candidateName of nameCandidates) {
+      try {
+        const slug = slugifyAgentName(candidateName);
+        const derived = resolveWorkspaceCandidate(joinPathLike(stateDir, `workspace-${slug}`));
+        if (derived) {
+          return derived;
+        }
+      } catch {
+        // Ignore invalid names and continue trying other candidates.
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+};
+
 export const resolveWorkspaceFromAgentFiles = async (
   client: GatewayClient,
   agentId: string
@@ -160,7 +236,7 @@ export const resolveWorkspaceFromAgentFiles = async (
       // Best-effort provenance recovery only.
     }
   }
-  return null;
+  return resolveWorkspaceFromAgentConfig(client, agentId);
 };
 
 export const loadAgentSkillStatus = async (
diff --git a/tests/unit/packagedSkillSetup.test.ts b/tests/unit/packagedSkillSetup.test.ts
new file mode 100644
index 00000000..c02c96af
--- /dev/null
+++ b/tests/unit/packagedSkillSetup.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  buildPackagedSkillGeneratedFiles,
+  getPackagedSkillSetupDefinition,
+} from "@/lib/skills/packaged-setup";
+
+describe("packaged skill setup", () => {
+  it("returns the Amazon setup definition", () => {
+    const definition = getPackagedSkillSetupDefinition("amazon-ordering");
+
+    expect(definition?.title).toBe("Amazon defaults");
+    expect(definition?.fields.map((field) => field.key)).toEqual([
+      "shippingAddress",
+      "paymentMethod",
+      "returnDropoff",
+    ]);
+  });
+
+  it("builds the Amazon defaults file from setup values", () => {
+    const files = buildPackagedSkillGeneratedFiles("amazon-ordering", {
+      shippingAddress: "123 Main St",
+      paymentMethod: "Visa ending in 4242",
+      returnDropoff: "Whole Foods",
+    });
+
+    expect(files).toHaveLength(1);
+    expect(files[0]?.relativePath).toBe("defaults.json");
+    expect(JSON.parse(files[0]?.content ?? "{}")).toEqual({
+      shippingAddress: "123 Main St",
+      paymentMethod: "Visa ending in 4242",
+      returnDropoff: "Whole Foods",
+    });
+  });
+
+  it("rejects missing required Amazon setup values", () => {
+    expect(() =>
+      buildPackagedSkillGeneratedFiles("amazon-ordering", {
+        shippingAddress: "123 Main St",
+        paymentMethod: "",
+        returnDropoff: "Whole Foods",
+      })
+    ).toThrow("Payment method is required.");
+  });
+});
diff --git a/tests/unit/skillTriggers.test.ts b/tests/unit/skillTriggers.test.ts
index 0a2df494..c036182f 100644
--- a/tests/unit/skillTriggers.test.ts
+++ b/tests/unit/skillTriggers.test.ts
@@ -12,6 +12,9 @@ import {
 
 describe("skill triggers", () => {
   it("parses packaged skill trigger definitions from SKILL.md", () => {
+    const amazonTrigger = listPackagedSkillTriggerDefinitions().find(
+      (entry) => entry.skillKey === "amazon-ordering",
+    );
     const todoTrigger = listPackagedSkillTriggerDefinitions().find(
       (entry) => entry.skillKey === "todo-board",
     );
@@ -19,6 +22,10 @@ describe("skill triggers", () => {
       (entry) => entry.skillKey === "task-manager",
     );
 
+    expect(amazonTrigger).not.toBeUndefined();
+    expect(amazonTrigger?.movementTarget).toBe("shop");
+    expect(amazonTrigger?.activationPhrases).toContain("amazon");
+    expect(amazonTrigger?.activationPhrases).toContain("amazon return");
     expect(todoTrigger).not.toBeUndefined();
     expect(todoTrigger?.movementTarget).toBe("desk");
     expect(todoTrigger?.activationPhrases).toContain("todo");
@@ -29,19 +36,19 @@ describe("skill triggers", () => {
   });
 
   it("matches the running agent's latest request against enabled skill triggers", () => {
-    const todoTrigger = listPackagedSkillTriggerDefinitions().find(
-      (entry) => entry.skillKey === "todo-board",
+    const amazonTrigger = listPackagedSkillTriggerDefinitions().find(
+      (entry) => entry.skillKey === "amazon-ordering",
     );
 
     const matched = resolveTriggeredSkillDefinition({
       isAgentRunning: true,
-      lastUserMessage: "On telegram, add this to my todo list.",
+      lastUserMessage: "On telegram, can you buy this on Amazon for me?",
       transcriptEntries: [],
-      triggers: todoTrigger ? [todoTrigger] : [],
+      triggers: amazonTrigger ? [amazonTrigger] : [],
     });
 
-    expect(matched?.skillKey).toBe("todo-board");
-    expect(matched?.movementTarget).toBe("desk");
+    expect(matched?.skillKey).toBe("amazon-ordering");
+    expect(matched?.movementTarget).toBe("shop");
   });
 
   it("does not match triggers when the agent is not running", () => {
@@ -66,6 +73,10 @@ describe("skill triggers", () => {
     expect(OFFICE_SKILL_TRIGGER_PLACE_REGISTRY.github.interactionTarget).toBe(
       "server_room",
     );
+    expect(
+      DEFAULT_SKILL_TRIGGER_FALLBACKS_BY_SKILL_KEY["amazon-ordering"]
+        ?.movementTarget,
+    ).toBe("shop");
     expect(
       DEFAULT_SKILL_TRIGGER_FALLBACKS_BY_SKILL_KEY["todo-board"]
         ?.movementTarget,
@@ -78,12 +89,14 @@ describe("skill triggers", () => {
       "agent-b": "github",
       "agent-c": "gym",
       "agent-d": "qa_lab",
+      "agent-e": "shop",
     });
 
     expect(holdMaps.deskHoldByAgentId).toEqual({ "agent-a": true });
     expect(holdMaps.githubHoldByAgentId).toEqual({ "agent-b": true });
     expect(holdMaps.gymHoldByAgentId).toEqual({ "agent-c": true });
     expect(holdMaps.qaHoldByAgentId).toEqual({ "agent-d": true });
+    expect(holdMaps.shopHoldByAgentId).toEqual({ "agent-e": true });
     expect(holdMaps.skillGymHoldByAgentId).toEqual({ "agent-c": true });
   });
 });
diff --git a/tests/unit/skillsInstallGateway.test.ts b/tests/unit/skillsInstallGateway.test.ts
index 455db2a7..84f6490d 100644
--- a/tests/unit/skillsInstallGateway.test.ts
+++ b/tests/unit/skillsInstallGateway.test.ts
@@ -74,6 +74,60 @@ describe("skills install gateway", () => {
     );
   });
 
+  it("includes generated setup files for packaged installs that require defaults", async () => {
+    const call = vi.fn(async (method: string) => {
+      if (method === "agents.create") {
+        return { agentId: "installer-setup" };
+      }
+      if (method === "config.get") {
+        return {
+          exists: true,
+          hash: "hash-setup",
+          config: {
+            agents: {
+              list: [{ id: "installer-setup", tools: {} }],
+            },
+          },
+        };
+      }
+      if (method === "config.set" || method === "config.patch") {
+        return { ok: true };
+      }
+      if (method === "agents.list") {
+        return { mainKey: "main" };
+      }
+      if (method === "chat.send") {
+        return { runId: "run-setup", status: "started" };
+      }
+      if (method === "agent.wait") {
+        return { ok: true };
+      }
+      throw new Error(`Unexpected method: ${method}`);
+    });
+
+    await installPackagedSkillViaGatewayAgent({
+      client: { call } as unknown as GatewayClient,
+      request: {
+        packageId: "amazon-ordering",
+        source: "openclaw-workspace",
+        workspaceDir: "/home/openclaw/workspace-demo",
+        managedSkillsDir: "/home/openclaw/.openclaw/skills",
+        setupValues: {
+          shippingAddress: "123 Main St",
+          paymentMethod: "Visa ending in 4242",
+          returnDropoff: "Whole Foods",
+        },
+      },
+    });
+
+    expect(call).toHaveBeenCalledWith(
+      "chat.send",
+      expect.objectContaining({
+        message: expect.stringContaining("skills/amazon-ordering/defaults.json"),
+      })
+    );
+  });
+
   it("cleans up the temporary installer agent when install fails", async () => {
     const call = vi.fn(async (method: string) => {
       if (method === "agents.create") {