diff --git a/.github/instructions/unittestMcp.instructions.md b/.github/instructions/unittestMcp.instructions.md
index 3a715a9..ed2ffce 100644
--- a/.github/instructions/unittestMcp.instructions.md
+++ b/.github/instructions/unittestMcp.instructions.md
@@ -33,11 +33,12 @@ When the user asks for tests on **multiple files** (e.g., "generate tests for th
 2. Read the source file
 3. Write the test file. **The very first line must be the AI attribution comment** (see "AI attribution comment" rule below). Write this comment line *before* any imports or other code.
 4. Run `get_errors` on the test file and fix every lint/compile error
-5. Call `run_tests` with `include_coverage=true` — tests must pass
-6. Meet the coverage target (see Coverage improvement loop)
-7. **Only now** move to the next file and repeat from step 1
+5. Call `review_test` on the test file and **resolve every `block` finding** by fixing the test. Address `warn` findings or note why they stand.
+6. Call `run_tests` with `include_coverage=true` — tests must pass
+7. Meet the coverage target (see Coverage improvement loop)
+8. **Only now** move to the next file and repeat from step 1
 
-If you catch yourself about to call `generate_test` a second time before step 6 has completed for the previous file, **STOP** and finish the previous file first. This applies even when the files are structurally similar — every file gets its own full cycle.
+If you catch yourself about to call `generate_test` a second time before step 7 has completed for the previous file, **STOP** and finish the previous file first. This applies even when the files are structurally similar — every file gets its own full cycle.
 
 ## MCP tools
 
@@ -48,6 +49,7 @@ If you catch yourself about to call `generate_test` a second time before step 6
 | #tool:unittest-mcp `generate_tests_batch` | Scan a **folder** to find source files that need tests. |
 | #tool:unittest-mcp `inspect_coverage` | Read existing coverage artifacts without re-running tests. Never use as validation for current changes. Pass `source_file` for per-file detail only after fresh coverage exists or when explicitly inspecting existing artifacts. |
 | #tool:unittest-mcp `find_test_files` | Discover test files in a directory. |
+| #tool:unittest-mcp `review_test` | Run the local protective-test gate (static analysis) on a single test file. Call after writing/editing a test; **resolve every `block` finding** before reporting done. |
 
 ## Rules
 
@@ -78,8 +80,9 @@ If you catch yourself about to call `generate_test` a second time before step 6
 - **Run tests + coverage / validate coverage:** Call `run_tests` with `include_coverage=true`. This is the only tool that validates the current code by executing tests.
 - **Run tests + inspect coverage gaps:** Call `run_tests` with `include_coverage=true`, then call `inspect_coverage` with the same `root_dir` only if you need uncovered-line/branch detail from that fresh run.
 - **Run tests with coverage (no explicit inspect request):** Call `run_tests` with `include_coverage=true`. If `coverage.met` is `false`, call `inspect_coverage` automatically. Do not offer coverage work as optional when a coverage target applies.
-- **Create tests for a single file:** Call `generate_test` **immediately as your first action**. Do NOT read the source or test file first (exception: Python — brief `file_search` to check test folder layout is OK). Detection: request mentions a specific file with extension (e.g., `user.ts`, `service.py`).
+- **Create tests for a single file:** Call `generate_test` **immediately as your first action**. Do NOT read the source or test file first (exception: Python — brief `file_search` to check test folder layout is OK). Detection: request mentions a specific file with extension (e.g., `user.ts`, `service.py`). You **may** pass `test_type` when the intent is obvious (React component/ReactView → `integration`; pure helper → `unit`), but you are **not** required to read source to decide — otherwise omit it and the server resolves `auto`.
 - **Improve an existing test file:** Call `generate_test` with both `source_file_path` and `test_file_path`. Do NOT read the test file before calling. Apply additive improvements only.
+- **Review/validate a test file (protective gate):** Call `review_test` with `test_file_path` (and `source_file_path` when known). Use it after writing or editing any test file, and whenever the user asks to "review", "validate", or "check" a test. Resolve every `block` finding before reporting done.
 - **Create tests for a folder/multiple files:** See the **"CRITICAL — Process multiple files ONE AT A TIME"** section at the top of this document. For folder requests, call `generate_tests_batch` first to discover the file list, then process each file sequentially through its full cycle before starting the next.
 - **Inspect existing coverage only:** Call `inspect_coverage` immediately only when the user explicitly asks to read existing coverage artifacts or coverage has already been generated in the current workflow. Do not use it to answer whether current tests pass.
 
@@ -101,8 +104,15 @@ Use the repo's existing test location conventions (`__tests__`, `tests/`, coloca
 2. Synthesize concrete test code from the guidance.
 3. Create or update the test file. **Line 1 must be the AI attribution comment** — see Rule 4 for the exact text and per-language syntax. This is a required acceptance criterion, not an optional nicety.
 4. Run `get_errors` and iteratively fix **all** lint/compile errors until none remain. Do this **before** proceeding.
-5. Run tests via `run_tests` with `include_coverage=true` and follow the coverage improvement loop (Section 5) until target coverage is met for the requested scope.
-6. Do **not** end with "Want me to add coverage-focused tests?" when coverage is below target — coverage completion is required before reporting done.
+5. Call `review_test` on the test file and **resolve every `block` finding** before proceeding — these are the over-mocking, coercion, and weak-assertion patterns the gate exists to stop. Treat `warn` findings as improvements to make or consciously justify.
+6. Run tests via `run_tests` with `include_coverage=true` and follow the coverage improvement loop (Section 5) until target coverage is met for the requested scope.
+7. Do **not** end with "Want me to add coverage-focused tests?" when coverage is below target — coverage completion is required before reporting done.
+
+**Protective-test acceptance criteria (satisfy these before reporting done):**
+- Render the **real** first-party component/ReactView with its real children, hooks, and context — do **not** mock first-party components, hooks, context, or pure helpers.
+- Mock **only** external/platform/network boundaries — network/data/ARM, host-platform services & hooks resolved from a host channel/registry/DI container absent in the test env (symptom: a "No service registered"/missing-provider error), jsdom-unsupported browser APIs, and nondeterminism (time/random/uuid). **First-party app code is never a boundary.** If a platform/UI module cannot run in jsdom, use a faithful double that preserves labels, roles, values, and interactions (never `() => null` or stub `<div>`s).
+- **Reuse shared mocks; hoist recurring ones.** Before adding a boundary mock, check whether the repo already declares it globally (Jest `setupFilesAfterEnv`/`testSetup`, pytest `conftest.py`, .NET base fixtures) and existing test helpers, and reuse those; if the same boundary mock recurs across files, hoist it to that shared setup instead of redeclaring it per file.
+- Assert exact values with `toStrictEqual` — one assertion on the whole object, not many single-field asserts (it also catches type / `undefined` / sparse-array mismatches `toEqual` misses); do **not** use `toMatchObject`/`*Containing` as the primary assertion (one unavoidably-varying field, e.g. a timestamped name, may use `expect.stringContaining`); no `as any`/`as unknown as`; assert the value the code returns, not that a function "was called"; keep tests isolated (no mock/variable shared across tests); each test must fail if the behavior under test breaks; the test title must match what it asserts.
 
 **Path heuristics:** To find the test file from source, examine the repo's existing test structure (`__tests__`, `tests/`, colocated). To find the source from a test file, remove `.test.`/`.spec.`, move out of `__tests__` (JS/TS), `tests/` (Python), or remove `Tests` suffix (C#).
 
@@ -119,7 +129,7 @@ Use the repo's existing test location conventions (`__tests__`, `tests/`, coloca
 
 ### 5. Coverage improvement loop
 
-Do NOT report task completion until coverage for the requested scope meets the configured target (from MCP settings/tool response).
+Do NOT report task completion until **all** hold for the requested scope: (a) coverage meets the configured target (from MCP settings/tool response), (b) `review_test` reports **zero `block` findings** on every test file you created or changed, and (c) you have answered `review_test`'s self-review checklist. Coverage percentage alone is not sufficient — a high-coverage test that mocks first-party code or asserts nothing still fails the gate.
 
 **Important:** When testing a single file, start with `run_tests` using `include_coverage=true`, `scope='file'`, and an explicit `test_pattern` whenever possible. If the result still needs uncovered-line detail, then call `inspect_coverage` with `source_file` for that same source file. Do not call `inspect_coverage` first when validating current changes.
 
@@ -151,7 +161,18 @@ REPEAT (max 5 iterations):
 - When `source_file` is provided, LCOV is preferred (has line-level detail) over Istanbul summary.
 - Interpret the per-file data directly to identify low-coverage files or target specific uncovered paths.
 
-### 7. General rules
+### 7. `review_test` — protective-test gate
+
+`review_test` runs a deterministic static analysis over a single test file and returns structured findings. It does **not** execute tests; run it **in addition to** `run_tests`, after the file is lint-clean.
+
+- **When:** after writing or editing any test file, and whenever the user asks to review/validate/check a test.
+- **Inputs:** `test_file_path` (required), `source_file_path` (optional but improves results), `framework`/`language` (optional).
+- **Findings:** each has a `severity` — `block` (must fix), `warn` (should fix), or `info` — plus a `ruleId`, `message`, and often a `suggestedFix`. A finding blocks only when the pattern destroys the test's protection: mocking the module under test (`no-mock-system-under-test`), an `as any`/`as unknown as` cast on the value being asserted or the value a mock returns, and a partial matcher that is a test's only value assertion. The same patterns elsewhere — setup casts, casts used to exercise invalid input, and partial matchers pinning call arguments — are reported as `warn`. Remaining rules cover literal `as T` data coercion, was-called-only assertions, render-without-interaction, and pointless constant snapshots.
+- **Self-review checklist:** `review_test` also returns one question per semantic dimension the static rules cannot judge (assertion strength, mocking hygiene, encapsulation, structure, determinism, setup-to-assertion ratio, what NOT to test). You are already the reviewing model — answer each against the test you wrote and fix any failure before reporting done.
+- **Acceptance:** **resolve every `block` finding** before reporting done by fixing the test. Do not add protective-test suppression comments to generated tests.
+- `review_test` is complementary to `run_tests`: a test can pass and still fail the gate (e.g., it mocks the system under test). Both must be green before you report done.
+
+### 8. General rules
 
 - If 3 consecutive test runs fail, re-read config and retry once.
 - If source path inference fails, ask the user.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9cbc94..249b1b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,14 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.7.0] - 2026-09-09
 
 ### Added
 
+- Select multiple containers across different pods at once without reconnecting
+- Select an entire pod (all of its containers) with a single checkbox, including a partial (indeterminate) selection state
+- Word-wrap long log lines vertically instead of overflowing horizontally
+
 ### Changed
 
+- Pod/container picker is now multi-select with removable chips
+- Changing the selected containers automatically reconnects the stream
+- Log viewer measures real row heights so wrapped lines scroll accurately
+
 ### Fixed
 
+- Clearing the container selection now actually clears the stored container value
+- Virtualized log rendering accounts for variable-height (wrapped) rows, preventing scroll drift and skipped rows
+
 ## [0.6.0] - 2026-08-10
 
 ### Added
diff --git a/frontend/src/components/common/PodContainerSelect.jsx b/frontend/src/components/common/PodContainerSelect.jsx
index f5fddd8..0eab0c8 100644
--- a/frontend/src/components/common/PodContainerSelect.jsx
+++ b/frontend/src/components/common/PodContainerSelect.jsx
@@ -1,10 +1,12 @@
 /**
- * Pod/container selector. Single-select:
- * click a pod to expand its containers, click a container to select it.
+ * Pod/container selector. Multi-select:
+ * click a pod to expand its containers, toggle a pod checkbox to select
+ * ALL containers in that pod, or toggle individual container checkboxes.
+ * Multiple containers across different pods can be selected at once.
  *
  * Props:
  *   options   - [{ pod, containers: ['c1', ...] }]
- *   selected  - ['pod/container'] (or [] / ['pod'])
+ *   selected  - ['pod', 'pod/container', ...]
  *   onChange  - (nextSelected: string[]) => void
  */
 import PropTypes from 'prop-types';
@@ -13,34 +15,48 @@ import { memo, useState, useMemo, useRef } from 'react';
 function PodContainerSelectComponent({ options = [], selected = [], onChange, idPrefix }) {
   const [open, setOpen] = useState(false);
   const [filter, setFilter] = useState('');
-  const [expandedPod, setExpandedPod] = useState(null);
+  const [expandedPods, setExpandedPods] = useState(() => new Set());
   const containerRef = useRef(null);
 
-  const selectedValue = selected[0] || '';
-  const [selectedPod, selectedContainer] = selectedValue.split('/');
-  const selectedPodFull = selectedPod && !selectedContainer ? selectedPod : selectedValue;
-
   const filteredPods = useMemo(() => {
     const term = filter.toLowerCase();
     return options.filter((o) => o.pod.toLowerCase().includes(term));
   }, [options, filter]);
 
-  const togglePod = (pod) => {
-    setExpandedPod(expandedPod === pod ? null : pod);
-    setFilter('');
+  const togglePodExpand = (pod) => {
+    setExpandedPods((prev) => {
+      const next = new Set(prev);
+      if (next.has(pod)) next.delete(pod);
+      else next.add(pod);
+      return next;
+    });
   };
 
-  const selectContainer = (pod, container) => {
-    onChange([`${pod}/${container}`]);
-    setOpen(false);
-    setExpandedPod(null);
+  const toggleValue = (value) => {
+    if (selected.includes(value)) {
+      onChange(selected.filter((v) => v !== value));
+    } else {
+      onChange([...selected, value]);
+    }
+  };
+
+  // Toggle all containers of a pod on/off
+  const togglePod = (pod, containers) => {
+    const allValues = containers.map((c) => `${pod}/${c}`);
+    const allSelected = allValues.every((v) => selected.includes(v));
+    if (allSelected) {
+      onChange(selected.filter((v) => !allValues.includes(v)));
+    } else {
+      const missing = allValues.filter((v) => !selected.includes(v));
+      onChange([...selected, ...missing]);
+    }
   };
 
-  const clear = (e) => {
+  const clearAll = (e) => {
     e.stopPropagation();
     onChange([]);
     setOpen(false);
-    setExpandedPod(null);
+    setExpandedPods(new Set());
   };
 
   const id = idPrefix ? `${idPrefix}-pod-container` : 'pod-container';
@@ -53,30 +69,35 @@ function PodContainerSelectComponent({ options = [], selected = [], onChange, id
       <div
         id={id}
         ref={containerRef}
-        className="flex items-center gap-2 bg-gray-700 border border-gray-600 rounded px-3 py-2 cursor-pointer hover:border-gray-500 focus:outline-none focus:ring-2 focus:ring-green-500"
+        className="flex items-center gap-2 flex-wrap bg-gray-700 border border-gray-600 rounded px-3 py-2 cursor-pointer hover:border-gray-500 focus:outline-none focus:ring-2 focus:ring-green-500 min-h-[2.5rem]"
         onClick={() => { setOpen(!open); setFilter(''); }}
         role="combobox"
         aria-expanded={open}
         aria-haspopup="listbox"
         tabIndex={0}
       >
-        {selectedValue ? (
-          <span className="inline-flex items-center gap-1 bg-gray-600 rounded px-2 py-0.5 text-xs text-white">
-            <span className="font-semibold">{selectedPod}</span>
-            {selectedContainer && <><span className="text-gray-400">/</span><span>{selectedContainer}</span></>}
-            <button
-              type="button"
-              className="text-gray-400 hover:text-white"
-              onClick={clear}
-              aria-label={`Remove ${selectedValue}`}
-            >
-              ×
-            </button>
-          </span>
+        {selected.length > 0 ? (
+          selected.map((value) => {
+            const [pod, container] = value.split('/');
+            return (
+              <span key={value} className="inline-flex items-center gap-1 bg-gray-600 rounded px-2 py-0.5 text-xs text-white">
+                <span className="font-semibold">{pod}</span>
+                {container && <><span className="text-gray-400">/</span><span>{container}</span></>}
+                <button
+                  type="button"
+                  className="text-gray-400 hover:text-white"
+                  onClick={(e) => { e.stopPropagation(); toggleValue(value); }}
+                  aria-label={`Remove ${value}`}
+                >
+                  ×
+                </button>
+              </span>
+            );
+          })
         ) : (
-          <span className="text-gray-500 text-sm">Select a pod</span>
+          <span className="text-gray-500 text-sm">Select pods/containers</span>
         )}
-        <svg className="w-4 h-4 ml-auto text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <svg className="w-4 h-4 ml-auto text-gray-400 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
           <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d={open ? 'M5 15l7-7 7 7' : 'M19 9l-7 7-7-7'} />
         </svg>
       </div>
@@ -92,11 +113,11 @@ function PodContainerSelectComponent({ options = [], selected = [], onChange, id
               placeholder="Filter pods..."
               autoFocus
             />
-            {selectedValue && (
+            {selected.length > 0 && (
               <button
                 type="button"
                 className="text-xs text-gray-400 hover:text-white"
-                onClick={clear}
+                onClick={clearAll}
               >
                 Clear
               </button>
@@ -106,24 +127,32 @@ function PodContainerSelectComponent({ options = [], selected = [], onChange, id
             <div className="px-3 py-2 text-sm text-gray-400">No pods</div>
           )}
           {filteredPods.map(({ pod, containers }) => {
-            const isExpanded = expandedPod === pod;
-            const isSelected = selectedPodFull === pod;
+            const isExpanded = expandedPods.has(pod);
+            const podContainerValues = containers.map((c) => `${pod}/${c}`);
+            const selectedCount = podContainerValues.filter((v) => selected.includes(v)).length;
+            const allPodSelected = containers.length > 0 && selectedCount === containers.length;
+            const somePodSelected = selectedCount > 0 && !allPodSelected;
             return (
               <div key={pod} className="border-b border-gray-600/50">
                 <div
-                  className={`flex items-center justify-between px-3 py-1.5 cursor-pointer hover:bg-gray-600 ${isSelected ? 'bg-green-900/30' : ''}`}
-                  onClick={() => togglePod(pod)}
+                  className={`flex items-center gap-2 px-3 py-1.5 cursor-pointer hover:bg-gray-600 ${selectedCount > 0 ? 'bg-green-900/30' : ''}`}
+                  onClick={() => togglePodExpand(pod)}
                   role="option"
-                  aria-selected={isSelected}
+                  aria-selected={selectedCount > 0}
                 >
-                  <span className="text-sm font-semibold text-white truncate">{pod}</span>
-                  {isSelected ? (
-                    <svg className="w-3 h-3 text-green-400 shrink-0" fill="currentColor" viewBox="0 0 20 20">
-                      <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />
-                    </svg>
-                  ) : (
-                    <span className="text-xs text-gray-500 shrink-0">{containers.length} ctr</span>
-                  )}
+                  <input
+                    type="checkbox"
+                    checked={allPodSelected}
+                    ref={(el) => { if (el) el.indeterminate = somePodSelected; }}
+                    onChange={() => {}}
+                    onClick={(e) => { e.stopPropagation(); togglePod(pod, containers); }}
+                    className="shrink-0"
+                    aria-label={`Select all containers of ${pod}`}
+                  />
+                  <span className="text-sm font-semibold text-white truncate flex-1">{pod}</span>
+                  <span className="text-xs text-gray-500 shrink-0">
+                    {allPodSelected ? 'all' : somePodSelected ? `${selectedCount}/${containers.length}` : `${containers.length} ctr`}
+                  </span>
                 </div>
                 {isExpanded && (
                   <div className="bg-gray-800/50">
@@ -132,19 +161,21 @@ function PodContainerSelectComponent({ options = [], selected = [], onChange, id
                     )}
                     {containers.map((c) => {
                       const value = `${pod}/${c}`;
-                      const isContainerSelected = selectedValue === value;
+                      const isContainerSelected = selected.includes(value);
                       return (
                         <div
                           key={c}
-                          className={`flex items-center justify-between px-6 py-1 cursor-pointer hover:bg-gray-600 ${isContainerSelected ? 'bg-green-900/30' : ''}`}
-                          onMouseDown={(e) => { e.preventDefault(); e.stopPropagation(); selectContainer(pod, c); }}
+                          className={`flex items-center gap-2 px-6 py-1 cursor-pointer hover:bg-gray-600 ${isContainerSelected ? 'bg-green-900/30' : ''}`}
+                          onMouseDown={(e) => { e.preventDefault(); e.stopPropagation(); toggleValue(value); }}
                         >
+                          <input
+                            type="checkbox"
+                            checked={isContainerSelected}
+                            onChange={() => {}}
+                            className="shrink-0"
+                            aria-label={`Select ${value}`}
+                          />
                           <span className="text-sm text-gray-300">{c}</span>
-                          {isContainerSelected && (
-                            <svg className="w-3 h-3 text-green-400 shrink-0" fill="currentColor" viewBox="0 0 20 20">
-                              <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />
-                            </svg>
-                          )}
                         </div>
                       );
                     })}
diff --git a/frontend/src/components/common/__tests__/PodContainerSelect.test.jsx b/frontend/src/components/common/__tests__/PodContainerSelect.test.jsx
index 38d6167..1a6c2c9 100644
--- a/frontend/src/components/common/__tests__/PodContainerSelect.test.jsx
+++ b/frontend/src/components/common/__tests__/PodContainerSelect.test.jsx
@@ -10,7 +10,7 @@ const options = [
 describe('PodContainerSelect', () => {
   it('shows placeholder when nothing selected', () => {
     render(<PodContainerSelect options={options} selected={[]} onChange={() => {}} idPrefix="t" />);
-    expect(screen.getByText(/Select a pod/i)).toBeInTheDocument();
+    expect(screen.getByText(/Select pods\/containers/i)).toBeInTheDocument();
   });
 
   it('shows selected pod/container as a chip', () => {
@@ -30,6 +30,17 @@ describe('PodContainerSelect', () => {
     expect(onChange).toHaveBeenCalledWith(['web-1/sidecar']);
   });
 
+  it('adds to the selection instead of replacing it when picking another container', () => {
+    const onChange = vi.fn();
+    render(<PodContainerSelect options={options} selected={['web-1/main']} onChange={onChange} idPrefix="t" />);
+
+    fireEvent.click(screen.getByRole('combobox'));
+    fireEvent.click(screen.getByText('api-1'));
+    fireEvent.mouseDown(screen.getByText('api'));
+
+    expect(onChange).toHaveBeenCalledWith(['web-1/main', 'api-1/api']);
+  });
+
   it('removes selection when the x is clicked', () => {
     const onChange = vi.fn();
     render(<PodContainerSelect options={options} selected={['api-1/api']} onChange={onChange} idPrefix="t" />);
@@ -37,4 +48,24 @@ describe('PodContainerSelect', () => {
     fireEvent.click(screen.getByLabelText('Remove api-1/api'));
     expect(onChange).toHaveBeenCalledWith([]);
   });
+
+  it('lets the user select all containers of a pod via the pod checkbox', () => {
+    const onChange = vi.fn();
+    render(<PodContainerSelect options={options} selected={[]} onChange={onChange} idPrefix="t" />);
+
+    fireEvent.click(screen.getByRole('combobox'));
+    fireEvent.click(screen.getByLabelText('Select all containers of web-1'));
+
+    expect(onChange).toHaveBeenCalledWith(['web-1/main', 'web-1/sidecar']);
+  });
+
+  it('clears all containers of a pod when deselecting the pod checkbox', () => {
+    const onChange = vi.fn();
+    render(<PodContainerSelect options={options} selected={['web-1/main', 'web-1/sidecar']} onChange={onChange} idPrefix="t" />);
+
+    fireEvent.click(screen.getByRole('combobox'));
+    fireEvent.click(screen.getByLabelText('Select all containers of web-1'));
+
+    expect(onChange).toHaveBeenCalledWith([]);
+  });
 });
diff --git a/frontend/src/components/logs/LogViewer.jsx b/frontend/src/components/logs/LogViewer.jsx
index d4a0664..a2a2d69 100644
--- a/frontend/src/components/logs/LogViewer.jsx
+++ b/frontend/src/components/logs/LogViewer.jsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState, useMemo } from 'react';
 import PropTypes from 'prop-types';
 
 const ROW_HEIGHT = 20;
@@ -18,6 +18,10 @@ export function LogViewer({
   const containerRef = useRef(null);
   const followedRef = useRef(true);
   const [viewport, setViewport] = useState({ scrollTop: 0, height: 0 });
+  // Measured row heights keyed by log id, so wrapped rows contribute their
+  // real height to the virtualized geometry. Stored in state so render-phase
+  // computations (prefix sums) can read them without touching a ref.
+  const [rowHeights, setRowHeights] = useState(() => new Map());
 
   // Track scroll position and viewport size. Mark whether user is pinned to
   // the bottom so incoming logs only scroll if they're still at the tail.
@@ -45,6 +49,17 @@ export function LogViewer({
     };
   }, [autoScroll]);
 
+  // Reset measurements when the underlying log set changes (e.g. filter
+  // changes or a fresh stream) so stale heights never apply to new content.
+  // Adjusting state during render is the React-sanctioned pattern for
+  // deriving state from a prop change.
+  const [prevFirstId, setPrevFirstId] = useState(null);
+  const firstId = logs[0]?.id;
+  if (firstId !== prevFirstId) {
+    setPrevFirstId(firstId);
+    setRowHeights(new Map());
+  }
+
   // Jump to the tail whenever new logs arrive while pinned to the bottom.
   const prevLengthRef = useRef(0);
   useEffect(() => {
@@ -57,6 +72,14 @@ export function LogViewer({
     followedRef.current = true;
   }, [logs]);
 
+  // Re-pin to the tail after measurements change the total height while the
+  // user is still following the stream.
+  useEffect(() => {
+    const el = containerRef.current;
+    if (!el || !followedRef.current) return;
+    el.scrollTop = el.scrollHeight;
+  }, [rowHeights]);
+
   const scrollToTop = () => {
     containerRef.current?.scrollTo({ top: 0, behavior: 'smooth' });
   };
@@ -78,13 +101,57 @@ export function LogViewer({
     return colors[level?.toLowerCase()] || 'text-gray-300';
   };
 
-  // Compute the visible slice from the current scroll position.
-  const totalHeight = logs.length * ROW_HEIGHT;
-  const firstVisible = Math.floor(viewport.scrollTop / ROW_HEIGHT);
-  const visibleCount = Math.ceil(viewport.height / ROW_HEIGHT) + OVERSCAN * 2;
-  const start = Math.max(0, firstVisible - OVERSCAN);
-  const end = Math.min(logs.length, start + visibleCount);
-  const visibleLogs = logs.slice(start, end);
+  // Record a rendered row's real height so wrapped lines contribute their
+  // actual size to the virtualized geometry.
+  const measureRow = (el, id) => {
+    if (!el) return;
+    const h = el.offsetHeight;
+    setRowHeights((prev) => {
+      if (prev.get(id) === h) return prev;
+      const next = new Map(prev);
+      next.set(id, h);
+      return next;
+    });
+  };
+
+  // Prefix sums over measured heights (fallback to ROW_HEIGHT for rows not
+  // yet rendered/measured) so wrapped rows contribute their real height.
+  const prefix = useMemo(() => {
+    const arr = new Float64Array(logs.length + 1);
+    for (let i = 0; i < logs.length; i++) {
+      arr[i + 1] = arr[i] + (rowHeights.get(logs[i].id) ?? ROW_HEIGHT);
+    }
+    return arr;
+  }, [logs, rowHeights]);
+
+  const totalHeight = prefix[logs.length];
+
+  // Locate the visible slice: binary search for the first row at/after the
+  // scroll offset, then walk forward until the viewport + overscan budget.
+  const visSlice = useMemo(() => {
+    if (logs.length === 0) {
+      return { start: 0, end: 0, padTop: 0, padBottom: 0 };
+    }
+    let lo = 0;
+    let hi = logs.length;
+    while (lo < hi) {
+      const mid = (lo + hi + 1) >> 1;
+      if (prefix[mid] <= viewport.scrollTop) lo = mid;
+      else hi = mid - 1;
+    }
+    const start = Math.max(0, lo - OVERSCAN);
+    const budget = viewport.height + OVERSCAN * ROW_HEIGHT;
+    let end = start;
+    while (end < logs.length && prefix[end + 1] - prefix[start] <= budget) end++;
+    return {
+      start,
+      end,
+      padTop: prefix[start],
+      padBottom: totalHeight - prefix[end]
+    };
+  }, [prefix, totalHeight, viewport.scrollTop, viewport.height, logs.length]);
+
+  const visibleLogs = logs.slice(visSlice.start, visSlice.end);
 
   return (
     <div className="relative flex-1 flex flex-col min-h-0">
@@ -111,7 +178,7 @@ export function LogViewer({
       {/* Log Content */}
     <div
       ref={containerRef}
-      className="flex-1 overflow-y-auto font-mono p-4 text-sm"
+      className="flex-1 overflow-y-auto overflow-x-hidden font-mono p-4 text-sm"
     >
         {logs.length === 0 ? (
           <div className="text-gray-500 text-center py-8">
@@ -120,43 +187,34 @@ export function LogViewer({
           </div>
         ) : (
           <>
-            <div style={{ height: totalHeight, position: 'relative' }}>
-              <div
-                style={{
-                  position: 'absolute',
-                  top: 0,
-                  left: 0,
-                  right: 0,
-                  transform: `translateY(${start * ROW_HEIGHT}px)`
-                }}
-              >
-                {visibleLogs.map((log, idx) => {
-                  const absoluteIdx = start + idx;
-                  return (
-                    <div
-                      key={log.id ?? `${log.pod}-${absoluteIdx}-${log.message || log.text}`}
-                      className="flex gap-2 hover:bg-gray-900/50 whitespace-nowrap"
-                      style={{ height: ROW_HEIGHT, lineHeight: `${ROW_HEIGHT}px` }}
-                    >
-                      <span
-                        className="font-semibold shrink-0"
-                        style={{ color: podColorMap[log.pod] || '#888' }}
-                      >
-                        [{log.pod}]
-                      </span>
-                      {log.level && (
-                        <span className={`font-semibold shrink-0 ${getLevelColor(log.level)}`}>
-                          {log.level.toUpperCase()}
-                        </span>
-                      )}
-                      <span className="flex-1 text-gray-300">
-                        {log.message || log.text || ''}
-                      </span>
-                    </div>
-                  );
-                })}
-              </div>
-            </div>
+            <div style={{ height: visSlice.padTop }} aria-hidden="true" />
+            {visibleLogs.map((log, idx) => {
+              const absoluteIdx = visSlice.start + idx;
+              return (
+                <div
+                  key={log.id ?? `${log.pod}-${absoluteIdx}-${log.message || log.text}`}
+                  ref={(el) => measureRow(el, log.id ?? absoluteIdx)}
+                  className="flex gap-2 hover:bg-gray-900/50 whitespace-pre-wrap break-words"
+                  style={{ minHeight: ROW_HEIGHT, lineHeight: '20px' }}
+                >
+                  <span
+                    className="font-semibold shrink-0"
+                    style={{ color: podColorMap[log.pod] || '#888' }}
+                  >
+                    [{log.pod}]
+                  </span>
+                  {log.level && (
+                    <span className={`font-semibold shrink-0 ${getLevelColor(log.level)}`}>
+                      {log.level.toUpperCase()}
+                    </span>
+                  )}
+                  <span className="flex-1 text-gray-300">
+                    {log.message || log.text || ''}
+                  </span>
+                </div>
+              );
+            })}
+            <div style={{ height: visSlice.padBottom }} aria-hidden="true" />
           </>
         )}
     </div>
diff --git a/frontend/src/components/logs/__tests__/LogViewer.test.jsx b/frontend/src/components/logs/__tests__/LogViewer.test.jsx
new file mode 100644
index 0000000..1674c49
--- /dev/null
+++ b/frontend/src/components/logs/__tests__/LogViewer.test.jsx
@@ -0,0 +1,119 @@
+// Generated by AI (UnitTest MCP)
+import { render, screen, fireEvent } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import { LogViewer } from '../LogViewer';
+
+const sampleLogs = [
+  { pod: 'web-1', level: 'info', message: 'Server started on port 8080' },
+  { pod: 'web-1', level: 'error', message: 'Connection refused to database' },
+  { pod: 'api-1', level: 'warn', message: 'Slow query detected' }
+];
+
+describe('LogViewer', () => {
+  it('renders the empty state when there are no logs', () => {
+    render(<LogViewer logs={[]} />);
+    expect(screen.getByText('No logs to display yet.')).toBeInTheDocument();
+  });
+
+  it('renders log messages', () => {
+    render(<LogViewer logs={sampleLogs} />);
+    expect(screen.getByText('Server started on port 8080')).toBeInTheDocument();
+    expect(screen.getByText('Connection refused to database')).toBeInTheDocument();
+    expect(screen.getByText('Slow query detected')).toBeInTheDocument();
+  });
+
+  it('renders pod names in brackets', () => {
+    render(<LogViewer logs={sampleLogs} />);
+    expect(screen.getAllByText('[web-1]')).toHaveLength(2);
+    expect(screen.getByText('[api-1]')).toBeInTheDocument();
+  });
+
+  it('renders level badges in uppercase', () => {
+    render(<LogViewer logs={sampleLogs} />);
+    expect(screen.getByText('INFO')).toBeInTheDocument();
+    expect(screen.getByText('ERROR')).toBeInTheDocument();
+    expect(screen.getByText('WARN')).toBeInTheDocument();
+  });
+
+  it('applies wrapping classes to log rows', () => {
+    const { container } = render(<LogViewer logs={sampleLogs} />);
+    const row = container.querySelector('.whitespace-pre-wrap');
+    expect(row).not.toBeNull();
+    expect(row.className).toContain('break-words');
+  });
+
+  it('renders jump to top and jump to bottom buttons', () => {
+    render(<LogViewer logs={sampleLogs} />);
+    expect(screen.getByRole('button', { name: /jump to top/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /jump to bottom/i })).toBeInTheDocument();
+  });
+
+  it('scrolls to bottom when jump to bottom is clicked', () => {
+    const { container } = render(<LogViewer logs={sampleLogs} />);
+    const scrollContainer = container.querySelector('.overflow-y-auto');
+    const scrollTo = vi.fn();
+    scrollContainer.scrollTo = scrollTo;
+
+    fireEvent.click(screen.getByRole('button', { name: /jump to bottom/i }));
+
+    expect(scrollTo).toHaveBeenCalledWith({ top: scrollContainer.scrollHeight, behavior: 'smooth' });
+  });
+
+  it('scrolls to top when jump to top is clicked', () => {
+    const { container } = render(<LogViewer logs={sampleLogs} />);
+    const scrollContainer = container.querySelector('.overflow-y-auto');
+    const scrollTo = vi.fn();
+    scrollContainer.scrollTo = scrollTo;
+
+    fireEvent.click(screen.getByRole('button', { name: /jump to top/i }));
+
+    expect(scrollTo).toHaveBeenCalledWith({ top: 0, behavior: 'smooth' });
+  });
+
+  it('renders fallback text when only text is provided', () => {
+    const logs = [{ pod: 'db-1', text: 'raw log line without message' }];
+    render(<LogViewer logs={logs} />);
+    expect(screen.getByText('raw log line without message')).toBeInTheDocument();
+  });
+
+  it('accounts for measured row heights in the scroll geometry', () => {
+    const logs = Array.from({ length: 30 }, (_, i) => ({
+      id: i,
+      pod: 'web-1',
+      level: 'info',
+      message: `line ${i}`
+    }));
+
+    // jsdom reports no layout, so give rows a default height and simulate one
+    // wrapped row being taller than ROW_HEIGHT.
+    const proto = HTMLElement.prototype;
+    const original = Object.getOwnPropertyDescriptor(proto, 'offsetHeight');
+    Object.defineProperty(proto, 'offsetHeight', {
+      configurable: true,
+      get() { return 20; }
+    });
+
+    try {
+      const { container, rerender } = render(<LogViewer logs={logs} />);
+      const rows = container.querySelectorAll('.whitespace-pre-wrap');
+      Object.defineProperty(rows[0], 'offsetHeight', { value: 60, configurable: true });
+
+      rerender(<LogViewer logs={logs} />);
+
+      const spacers = container.querySelectorAll('[aria-hidden="true"]');
+      const topSpacer = parseFloat(spacers[0].style.height);
+      const bottomSpacer = parseFloat(spacers[1].style.height);
+      const renderedRows = container.querySelectorAll('.whitespace-pre-wrap');
+      const renderedHeight = Array.from(renderedRows).reduce(
+        (sum, row) => sum + row.offsetHeight,
+        0
+      );
+
+      // 29 rows at 20px + 1 wrapped row at 60px = 640px total scroll height.
+      expect(topSpacer + renderedHeight + bottomSpacer).toBe(640);
+    } finally {
+      if (original) Object.defineProperty(proto, 'offsetHeight', original);
+      else delete proto.offsetHeight;
+    }
+  });
+});
diff --git a/frontend/src/components/stream/StreamConfig.jsx b/frontend/src/components/stream/StreamConfig.jsx
index e9862d1..ae6509a 100644
--- a/frontend/src/components/stream/StreamConfig.jsx
+++ b/frontend/src/components/stream/StreamConfig.jsx
@@ -17,10 +17,16 @@ const StreamConfigComponent = ({
 
   const idPrefix = `stream-${streamId}`;
 
+  // config.container holds a comma-separated list of "pod/container" tokens,
+  // allowing multiple containers (across the same or different pods) to be
+  // tailed at once without reconnecting per selection. A single legacy
+  // whole-pod value (no "/") is read from config.query for older saved configs.
   const selected = useMemo(() => {
-    if (!config.query) return [];
-    if (!config.container) return [config.query];
-    return [`${config.query}/${config.container}`];
+    if (config.container) {
+      return config.container.split(',').map((s) => s.trim()).filter(Boolean);
+    }
+    if (config.query && config.query !== '.') return [config.query];
+    return [];
   }, [config.query, config.container]);
 
   return (
@@ -37,10 +43,17 @@ const StreamConfigComponent = ({
         options={autocomplete.options}
         selected={selected}
         onChange={(newSelected) => {
-          const pc = newSelected[0] || '';
-          const [pod, container] = pc.split('/');
-          updateConfig('query', pod || '');
-          updateConfig('container', container || '');
+          if (newSelected.length === 0) {
+            onChange({ ...config, container: '', query: '.' });
+            return;
+          }
+          // A single whole-pod selection keeps using the plain "query" field
+          // for backward compatibility with saved configs and manual regex entry.
+          if (newSelected.length === 1 && !newSelected[0].includes('/')) {
+            onChange({ ...config, container: '', query: newSelected[0] });
+            return;
+          }
+          onChange({ ...config, container: newSelected.join(','), query: '.' });
         }}
         idPrefix={idPrefix}
       />
diff --git a/frontend/src/components/stream/StreamPanel.jsx b/frontend/src/components/stream/StreamPanel.jsx
index 2a58493..795f3d5 100644
--- a/frontend/src/components/stream/StreamPanel.jsx
+++ b/frontend/src/components/stream/StreamPanel.jsx
@@ -138,6 +138,7 @@ export function StreamPanel({ streamId, initialConfig, onStreamStateChange, isAc
       prev.node !== curr.node ||
       prev.context !== curr.context ||
       prev.query !== curr.query ||
+      prev.container !== curr.container ||
       prev.selector !== curr.selector ||
       prev.tail !== curr.tail ||
       prev.initContainers !== curr.initContainers ||
@@ -183,14 +184,27 @@ export function StreamPanel({ streamId, initialConfig, onStreamStateChange, isAc
       chips.push({ key: 'namespace', label: `Namespace: ${config.namespace}`, onRemove: () => setConfig(prev => ({ ...prev, namespace: '' })) });
     }
 
-    if (config.query && config.query !== '.') {
+    const containerTokens = config.container
+      ? config.container.split(',').map((s) => s.trim()).filter(Boolean)
+      : [];
+
+    if (containerTokens.length > 0) {
+      containerTokens.forEach((token) => {
+        chips.push({
+          key: `container-${token}`,
+          label: token.includes('/') ? `Container: ${token}` : `Pod: ${token}`,
+          onRemove: () => setConfig(prev => {
+            const remaining = containerTokens.filter((t) => t !== token);
+            return remaining.length > 0
+              ? { ...prev, container: remaining.join(',') }
+              : { ...prev, container: '', query: '.' };
+          })
+        });
+      });
+    } else if (config.query && config.query !== '.') {
       chips.push({ key: 'query', label: `Pod: ${config.query}`, onRemove: () => setConfig(prev => ({ ...prev, query: '.' })) });
     }
 
-    if (config.container) {
-      chips.push({ key: 'container', label: `Container: ${config.container}`, onRemove: () => setConfig(prev => ({ ...prev, container: '' })) });
-    }
-
     return chips;
   }, [config]);
 
diff --git a/frontend/src/components/stream/__tests__/StreamConfig.test.jsx b/frontend/src/components/stream/__tests__/StreamConfig.test.jsx
new file mode 100644
index 0000000..96f188e
--- /dev/null
+++ b/frontend/src/components/stream/__tests__/StreamConfig.test.jsx
@@ -0,0 +1,69 @@
+// Generated by AI (UnitTest MCP)
+import { render, screen, fireEvent } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import { StreamConfig } from '../StreamConfig';
+
+const autocomplete = {
+  namespaces: ['default'],
+  options: [
+    { pod: 'web-1', containers: ['main', 'sidecar'] },
+    { pod: 'api-1', containers: ['api'] },
+  ],
+};
+
+const baseConfig = {
+  namespace: 'default',
+  query: '.',
+  container: '',
+};
+
+describe('StreamConfig', () => {
+  it('clears container and resets query when the selection is emptied', () => {
+    const onChange = vi.fn();
+    render(
+      <StreamConfig
+        config={{ ...baseConfig, container: 'web-1/main' }}
+        onChange={onChange}
+        autocomplete={autocomplete}
+        streamId="1"
+      />
+    );
+
+    fireEvent.click(screen.getByLabelText('Remove web-1/main'));
+
+    expect(onChange).toHaveBeenCalledWith({ ...baseConfig, container: '', query: '.' });
+  });
+
+  it('stores multiple selected containers as a comma-separated container value', () => {
+    const onChange = vi.fn();
+    render(
+      <StreamConfig config={baseConfig} onChange={onChange} autocomplete={autocomplete} streamId="1" />
+    );
+
+    fireEvent.click(screen.getByRole('combobox'));
+    fireEvent.click(screen.getByLabelText('Select all containers of web-1'));
+
+    expect(onChange).toHaveBeenCalledWith({
+      ...baseConfig,
+      container: 'web-1/main,web-1/sidecar',
+      query: '.',
+    });
+  });
+
+  it('stores a single container selection in the container field', () => {
+    const onChange = vi.fn();
+    render(
+      <StreamConfig config={baseConfig} onChange={onChange} autocomplete={autocomplete} streamId="1" />
+    );
+
+    fireEvent.click(screen.getByRole('combobox'));
+    fireEvent.click(screen.getByText('api-1'));
+    fireEvent.mouseDown(screen.getByText('api'));
+
+    expect(onChange).toHaveBeenCalledWith({
+      ...baseConfig,
+      container: 'api-1/api',
+      query: '.',
+    });
+  });
+});
diff --git a/frontend/src/utils/__tests__/logUtils.test.js b/frontend/src/utils/__tests__/logUtils.test.js
index 9dbd2b2..02a0240 100644
--- a/frontend/src/utils/__tests__/logUtils.test.js
+++ b/frontend/src/utils/__tests__/logUtils.test.js
@@ -95,6 +95,30 @@ describe('compileLogFilters', () => {
     const filters = compileLogFilters({ query: '.', container: 'api-pod/api' });
     expect(filterLogs(sampleLogs, filters)).toHaveLength(2);
   });
+
+  it('matches any of multiple comma-separated pod/container tokens', () => {
+    const logs = [
+      { message: 'a', pod: 'api-pod', container: 'api' },
+      { message: 'b', pod: 'web-pod', container: 'nginx' },
+      { message: 'c', pod: 'db-pod', container: 'postgres' },
+    ];
+    const filters = compileLogFilters({ query: '.', container: 'api-pod/api,web-pod/nginx' });
+    const result = filterLogs(logs, filters);
+    expect(result).toHaveLength(2);
+    expect(result.map(log => log.container).sort()).toEqual(['api', 'nginx']);
+  });
+
+  it('handles mixed pod/container and plain container tokens', () => {
+    const logs = [
+      { message: 'a', pod: 'api-pod', container: 'api' },
+      { message: 'b', pod: 'web-pod', container: 'nginx' },
+      { message: 'c', pod: 'db-pod', container: 'postgres' },
+    ];
+    const filters = compileLogFilters({ query: '.', container: 'api-pod/api,postgres' });
+    const result = filterLogs(logs, filters);
+    expect(result).toHaveLength(2);
+    expect(result.map(log => log.container).sort()).toEqual(['api', 'postgres']);
+  });
 });
 
 describe('buildPodColorMap', () => {
diff --git a/frontend/src/utils/logUtils.js b/frontend/src/utils/logUtils.js
index f1b256f..e8ee604 100644
--- a/frontend/src/utils/logUtils.js
+++ b/frontend/src/utils/logUtils.js
@@ -61,15 +61,27 @@ function compilePattern(pattern) {
 
 /**
  * Precompile log filters so they aren't rebuilt for every log line.
+ * `container` may be a single token or a comma-separated list of
+ * "container" / "pod/container" tokens (matches any of them).
  */
 export function compileLogFilters({ query, container } = {}) {
+  let containerPattern = null;
+  if (container instanceof RegExp) {
+    containerPattern = container;
+  } else if (typeof container === 'string' && container) {
+    const containerNames = container
+      .split(',')
+      .map((token) => token.trim())
+      .filter(Boolean)
+      .map((token) => (token.includes('/') ? token.split('/').pop() : token));
+    if (containerNames.length > 0) {
+      containerPattern = containerNames.map((name) => `^${name}$`).join('|');
+    }
+  }
+
   return {
     query: compilePattern(query && query !== '.' ? query : null),
-    container: compilePattern(container
-      ? (typeof container === 'string' && container.includes('/')
-        ? container.split('/').pop()
-        : container)
-      : null)
+    container: compilePattern(containerPattern)
   };
 }
 
diff --git a/main.go b/main.go
index b6c93c7..8ac5118 100644
--- a/main.go
+++ b/main.go
@@ -431,6 +431,37 @@ func extractContainerName(input string) string {
 	return input
 }
 
+// splitContainerTokens splits a comma-separated container filter into trimmed,
+// non-empty tokens. Each token is either "container" or "pod/container".
+func splitContainerTokens(containerStr string) []string {
+	var tokens []string
+	for _, t := range strings.Split(containerStr, ",") {
+		if t = strings.TrimSpace(t); t != "" {
+			tokens = append(tokens, t)
+		}
+	}
+	return tokens
+}
+
+// extractUniquePodNames returns the escaped, de-duplicated pod names found in
+// "pod/container" tokens, preserving first-seen order.
+func extractUniquePodNames(tokens []string) []string {
+	var podNames []string
+	seen := make(map[string]bool)
+	for _, t := range tokens {
+		if !strings.Contains(t, "/") {
+			continue
+		}
+		pod := strings.SplitN(t, "/", 2)[0]
+		if pod == "" || seen[pod] {
+			continue
+		}
+		seen[pod] = true
+		podNames = append(podNames, regexp.QuoteMeta(pod))
+	}
+	return podNames
+}
+
 func compileContainerRegexList(filterStr string) ([]*regexp.Regexp, error) {
 	// Like compileRegexList but extracts container names from "pod/container" format
 	var regexes []*regexp.Regexp
@@ -476,18 +507,19 @@ func parseRegexFilters(params streamParams) (*regexp.Regexp, *regexp.Regexp, []*
 	debugLog("  allNamespaces: %q", params.allNamespaces)
 	debugLog("========================")
 
-	// Handle query regex - if container has pod/container format, extract pod name for query
+	// container is a comma-separated list of tokens, each "container" or "pod/container",
+	// allowing multiple containers (optionally across multiple pods) to be tailed at once.
+	containerTokens := splitContainerTokens(params.container)
+
+	// Handle query regex - if any token has pod/container format, restrict query to those pod(s)
 	queryPattern := params.query
-	if params.container != "" && strings.Contains(params.container, "/") {
-		// Extract pod name from "pod/container" format
-		parts := strings.Split(params.container, "/")
-		if len(parts) >= 2 {
-			podName := parts[0]
-			debugLog("Container field contains pod/container format. Extracted pod name: %q", podName)
-			// Override query to match only this specific pod
-			queryPattern = "^" + regexp.QuoteMeta(podName) + "$"
-			debugLog("Overriding query pattern to match specific pod: %q", queryPattern)
+	if podNames := extractUniquePodNames(containerTokens); len(podNames) > 0 {
+		if len(podNames) == 1 {
+			queryPattern = "^" + podNames[0] + "$"
+		} else {
+			queryPattern = "^(" + strings.Join(podNames, "|") + ")$"
 		}
+		debugLog("Container tokens specify pod(s). Overriding query pattern to match: %q", queryPattern)
 	}
 
 	queryRegex, err := regexp.Compile(queryPattern)
@@ -497,20 +529,20 @@ func parseRegexFilters(params streamParams) (*regexp.Regexp, *regexp.Regexp, []*
 	debugLog("Query regex compiled: %s", queryRegex.String())
 
 	containerRegex := regexp.MustCompile(".*")
-	if params.container != "" {
-		// Extract container name from "pod/container" format if needed
-		containerName := extractContainerName(params.container)
-		debugLog("Extracted container name: %q from input: %q", containerName, params.container)
-
-		// Check if it's already a regex pattern (contains regex special chars)
-		// If not, make it an exact match by escaping and anchoring
-		pattern := containerName
-		if !strings.ContainsAny(pattern, ".*+?[]{}()^$|\\") {
-			pattern = "^" + regexp.QuoteMeta(pattern) + "$"
+	if len(containerTokens) > 0 {
+		var patterns []string
+		for _, t := range containerTokens {
+			containerName := extractContainerName(t)
+			pattern := containerName
+			if !strings.ContainsAny(pattern, ".*+?[]{}()^$|\\") {
+				pattern = "^" + regexp.QuoteMeta(pattern) + "$"
+			}
+			patterns = append(patterns, pattern)
 		}
-		debugLog("Container regex pattern: %q -> compiled regex: %s", pattern, pattern)
+		combined := strings.Join(patterns, "|")
+		debugLog("Container regex pattern: %q -> compiled regex: %s", params.container, combined)
 
-		containerRegex, err = regexp.Compile(pattern)
+		containerRegex, err = regexp.Compile(combined)
 		if err != nil {
 			return nil, nil, nil, nil, nil, nil, nil, fmt.Errorf("invalid container regex: %w", err)
 		}