diff --git a/packages/client/ui-goal/src/client/GoalBar.tsx b/packages/client/ui-goal/src/client/GoalBar.tsx
index ea38c0dc8c..197c000926 100644
--- a/packages/client/ui-goal/src/client/GoalBar.tsx
+++ b/packages/client/ui-goal/src/client/GoalBar.tsx
@@ -77,8 +77,8 @@ export function GoalBar({ goal, onEdit, onResume, onClear }: GoalBarProps) {
             type="text"
             aria-label="Goal objective"
             value={draft}
-            onChange={e => setDraft(e.target.value)}
-            onKeyDown={e => {
+            onChange={(e) => { setDraft(e.target.value) }}
+            onKeyDown={(e) => {
               if (e.key === 'Enter') void handleEdit()
               if (e.key === 'Escape') setEditing(false)
             }}
@@ -99,7 +99,7 @@ export function GoalBar({ goal, onEdit, onResume, onClear }: GoalBarProps) {
             <button
               type="button"
               className={css.iconBtn}
-              onClick={() => setEditing(false)}
+              onClick={() => { setEditing(false) }}
               disabled={pending}
               title="Cancel edit"
               aria-label="Cancel edit"
diff --git a/packages/client/ui-goal/src/client/slots.ts b/packages/client/ui-goal/src/client/slots.ts
index 3d8df235e3..5791f26373 100644
--- a/packages/client/ui-goal/src/client/slots.ts
+++ b/packages/client/ui-goal/src/client/slots.ts
@@ -12,15 +12,15 @@ export type GoalActionResult =
   | { ok: true }
   | { ok: false; error: { code: string; message: string } }
 
-/** Injected business face of the GoalBar dock entry: the mutation verbs. */
+/** Injected business face of the GoalBar dock entry: the mutation verbs (function properties: the strip destructures them freely). */
 export interface GoalBarActions {
   /**
    * Replace the current goal's objective (CAS on the projected ref).
    * @param objective - replacement objective text.
    */
-  onEdit(objective: string): Promise<GoalActionResult>
+  onEdit: (objective: string) => Promise<GoalActionResult>
   /** Resume a paused goal. */
-  onResume(): Promise<GoalActionResult>
+  onResume: () => Promise<GoalActionResult>
   /** Clear the current goal (tombstone). */
-  onClear(): Promise<GoalActionResult>
+  onClear: () => Promise<GoalActionResult>
 }
diff --git a/packages/client/ui-goal/tests/browser-plugin.spec.tsx b/packages/client/ui-goal/tests/browser-plugin.spec.tsx
new file mode 100644
index 0000000000..a170e542ca
--- /dev/null
+++ b/packages/client/ui-goal/tests/browser-plugin.spec.tsx
@@ -0,0 +1,167 @@
+// @vitest-environment jsdom
+/**
+ * ui-goal browser half on a real cordis Context with fake slots/connection/
+ * sessions faces: the plugin registers the GoalBar dock entry at
+ * conversation.input.dock, the inject face's three verbs read the CAS ref
+ * from the session's CURRENT projected value at call time (no fence — the
+ * RPC's compare-and-set is the guard), a missing projection short-circuits
+ * to the no-current-goal error without touching the wire, and RPC errors
+ * map onto the inline-render result shape. Registration disposal rides the
+ * plugin fiber (HMR safety). The node half and the invariant companion are
+ * exercised over the same Context.
+ */
+import { Context } from 'cordis'
+import { describe, expect, it, vi } from 'vitest'
+import { cleanup, render } from '@testing-library/react'
+import { afterEach } from 'vitest'
+import type { SessionId } from '@deepseek-ai/dsh-client-runtime/client'
+import type { GoalProjection } from '@deepseek-ai/dsh-goal/client'
+import type { GoalBarActions } from '../src/client/slots.ts'
+import { apply, inject } from '../src/client/index.ts'
+import { GoalDock } from '../src/client/GoalBar.tsx'
+import { apply as nodeApply } from '../src/index.ts'
+
+afterEach(cleanup)
+
+const sid = (k: string): SessionId => k as SessionId
+
+function makeProjection(revision = 3): GoalProjection {
+  return {
+    goal: {
+      id: 'g-1' as GoalProjection['goal']['id'],
+      revision,
+      objective: 'Ship it',
+      phase: 'active',
+      maxGoalRounds: 8,
+    },
+    roundsStarted: 1,
+    createdAt: 10,
+    updatedAt: 20,
+  }
+}
+
+/** Boot the plugin over fake faces; goals verbs record payloads and answer per the script. */
+function bench(options: { projection?: GoalProjection | null | undefined; failWith?: { code: string; message: string } } = {}) {
+  const ctx = new Context()
+  const calls: { method: string; payload: unknown }[] = []
+  function answer<T>(method: string, value: T) {
+    return (payload: unknown) => {
+      calls.push({ method, payload })
+      return Promise.resolve({
+        result: options.failWith === undefined
+          ? { ok: true as const, value }
+          : { ok: false as const, error: { ...options.failWith, details: {} } },
+      })
+    }
+  }
+  const ref = { id: 'g-1', revision: 3 }
+  ctx.provide('connection', { api: { goals: {
+    edit: answer('goal.edit', { ref }),
+    resume: answer('goal.resume', { ref }),
+    clear: answer('goal.clear', { cleared: true as const }),
+  } } })
+  const entries = new Map<string, { id?: string; order?: number; inject?: (sessionId: SessionId) => GoalBarActions }>()
+  ctx.provide('slots', {
+    register(reg: { name: string; id?: string; order?: number; inject?: (sessionId: SessionId) => GoalBarActions }) {
+      entries.set(reg.name, reg)
+      return () => { entries.delete(reg.name) }
+    },
+  })
+  ctx.provide('conversation', {})
+  ctx.provide('sessions', {
+    binding: (id: SessionId) => ({
+      sessionId: id,
+      session: { projections: { get: (key: string) => (key === 'goal' ? options.projection : undefined) } },
+      ctx,
+    }),
+  })
+  const fiber = ctx.plugin({ inject: [...inject], apply })
+  return {
+    ctx,
+    fiber,
+    calls,
+    entry: () => entries.get('conversation.input.dock'),
+  }
+}
+
+describe('ui-goal browser plugin', () => {
+  it('registers the GoalBar dock entry with the documented id and order', async () => {
+    const b = bench()
+    await b.fiber.await()
+    expect(b.entry()).toMatchObject({ id: 'goal', order: 1 })
+    expect(b.entry()?.inject).toBeTypeOf('function')
+  })
+
+  it('verbs read the CAS ref from the current projected value at call time', async () => {
+    const b = bench({ projection: makeProjection(5) })
+    await b.fiber.await()
+    const verbs = b.entry()!.inject!(sid('s1'))
+    expect(await verbs.onEdit('New objective')).toEqual({ ok: true })
+    expect(await verbs.onResume()).toEqual({ ok: true })
+    expect(await verbs.onClear()).toEqual({ ok: true })
+    expect(b.calls.map(c => c.method)).toEqual(['goal.edit', 'goal.resume', 'goal.clear'])
+    const ref = { id: 'g-1', revision: 5 }
+    expect(b.calls[0]?.payload).toEqual({ sessionId: 's1', ref, objective: 'New objective' })
+    expect(b.calls[1]?.payload).toEqual({ sessionId: 's1', ref })
+    expect(b.calls[2]?.payload).toEqual({ sessionId: 's1', ref })
+  })
+
+  it('a null or absent projection short-circuits every verb without touching the wire', async () => {
+    for (const projection of [null, undefined]) {
+      const b = bench({ projection })
+      await b.fiber.await()
+      const verbs = b.entry()!.inject!(sid('s1'))
+      for (const result of [await verbs.onEdit('x'), await verbs.onResume(), await verbs.onClear()]) {
+        expect(result).toEqual({ ok: false, error: { code: 'no-current-goal', message: 'no current goal to mutate' } })
+      }
+      expect(b.calls).toHaveLength(0)
+    }
+  })
+
+  it('maps a settled RPC error onto the inline-render shape', async () => {
+    const b = bench({ projection: makeProjection(), failWith: { code: 'internal', message: 'stale revision' } })
+    await b.fiber.await()
+    const verbs = b.entry()!.inject!(sid('s1'))
+    expect(await verbs.onEdit('x')).toEqual({ ok: false, error: { code: 'internal', message: 'stale revision' } })
+  })
+
+  it('drops the dock entry when the plugin fiber unloads (HMR safety)', async () => {
+    const b = bench()
+    await b.fiber.await()
+    expect(b.entry()).toBeDefined()
+    await b.fiber.dispose()
+    expect(b.entry()).toBeUndefined()
+  })
+})
+
+describe('GoalDock adapter', () => {
+  it('renders the projected goal snapshot and nothing for absent/null', () => {
+    const projection = makeProjection()
+    const useProjection = vi.fn(() => projection)
+    const actions: GoalBarActions = {
+      onEdit: () => Promise.resolve({ ok: true }),
+      onResume: () => Promise.resolve({ ok: true }),
+      onClear: () => Promise.resolve({ ok: true }),
+    }
+    const dockProps = (up: () => GoalProjection | null | undefined) =>
+      ({ useProjection: up, ...actions }) as unknown as Parameters<typeof GoalDock>[0]
+    const shown = render(<GoalDock {...dockProps(useProjection)} />)
+    expect(shown.getByText('Ship it')).toBeTruthy()
+    cleanup()
+
+    const empty = render(<GoalDock {...dockProps(() => null)} />)
+    expect(empty.container.firstChild).toBeNull()
+    cleanup()
+
+    const absent = render(<GoalDock {...dockProps(() => undefined)} />)
+    expect(absent.container.firstChild).toBeNull()
+  })
+})
+
+describe('ui-goal node half', () => {
+  // The invariant companion is mounted by the vitest-wide invariant host on
+  // every Context this suite creates; its registration is covered there.
+  it('the node apply is an inert loader seat', () => {
+    expect(() => { nodeApply() }).not.toThrow()
+  })
+})
diff --git a/packages/client/ui-goal/tests/goalbar.spec.tsx b/packages/client/ui-goal/tests/goalbar.spec.tsx
index b8de65ae6e..7dc85c9ccc 100644
--- a/packages/client/ui-goal/tests/goalbar.spec.tsx
+++ b/packages/client/ui-goal/tests/goalbar.spec.tsx
@@ -59,10 +59,10 @@ describe('GoalBar', () => {
     render(<GoalBar goal={makeGoal()} {...actions} />)
     fireEvent.click(screen.getByRole('button', { name: 'Edit goal' }))
     const box = screen.getByRole('textbox', { name: 'Goal objective' })
-    expect((box as HTMLInputElement).value).toBe('Ship the redesign')
+    expect(box).toHaveProperty('value', 'Ship the redesign')
 
     fireEvent.change(box, { target: { value: '   ' } })
-    expect((screen.getByRole('button', { name: 'Save goal' }) as HTMLButtonElement).disabled).toBe(true)
+    expect(screen.getByRole('button', { name: 'Save goal' })).toHaveProperty('disabled', true)
 
     fireEvent.change(box, { target: { value: 'Ship v2' } })
     fireEvent.keyDown(box, { key: 'Enter' })
@@ -89,7 +89,7 @@ describe('GoalBar', () => {
     expect(screen.getByText('Ongoing Goal')).toBeTruthy()
 
     fireEvent.click(screen.getByRole('button', { name: 'Edit goal' }))
-    expect((screen.getByRole('textbox', { name: 'Goal objective' }) as HTMLInputElement).value).toBe('Ship the redesign')
+    expect(screen.getByRole('textbox', { name: 'Goal objective' })).toHaveProperty('value', 'Ship the redesign')
   })
 
   it('Enter with a blank draft neither saves nor closes the form', () => {
@@ -151,7 +151,7 @@ describe('GoalBar', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save goal' }))
 
     expect((await screen.findByRole('alert')).textContent).toBe('stale revision（agent-busy）')
-    expect((screen.getByRole('textbox', { name: 'Goal objective' }) as HTMLInputElement).value).toBe('retry this draft')
+    expect(screen.getByRole('textbox', { name: 'Goal objective' })).toHaveProperty('value', 'retry this draft')
   })
 
   it('reports resume and clear failures without hiding the goal', async () => {
diff --git a/packages/goal/goal/src/index.ts b/packages/goal/goal/src/index.ts
index 6ae30c2715..ff7d686a0c 100644
--- a/packages/goal/goal/src/index.ts
+++ b/packages/goal/goal/src/index.ts
@@ -100,6 +100,10 @@ export function applyGoalProjection(state: GoalProjection | null, event: Session
   const source = event.data.source
   if (source.kind !== 'goal' || source.round !== 0) return state
   const change = source.change
+  // Session-log data is a durable boundary: the static type promises the kind,
+  // but a foreign or corrupted change record must degrade to same-reference,
+  // never feed the zod parse in the registry drive.
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- durable-boundary guard
   if (change === undefined || change.kind !== 'goal/change') return state
   if (change.operation === 'clear') return null
   return {
diff --git a/packages/goal/goal/tests/projection.spec.ts b/packages/goal/goal/tests/projection.spec.ts
index b80bcec4dd..75c01295ce 100644
--- a/packages/goal/goal/tests/projection.spec.ts
+++ b/packages/goal/goal/tests/projection.spec.ts
@@ -46,7 +46,7 @@ function liveAgent(ctx: Context, session: Session): Agent {
     },
     cancel() {},
     whenIdle() { return Promise.resolve() },
-  } as Agent
+  }
   ctx.agents.register(agent)
   return agent
 }
@@ -63,7 +63,7 @@ async function harness(withGoal: boolean): Promise<Bench> {
     ctx,
     session,
     agent,
-    tailValues: () => ctx.sessionProjections.snapshot(session).values as Record<string, unknown>,
+    tailValues: () => ctx.sessionProjections.snapshot(session).values,
     tailAsOfSeq: () => ctx.sessionProjections.snapshot(session).asOfSeq,
   }
 }
@@ -142,6 +142,18 @@ describe('goal projection unit', () => {
     // Same-reference return: the registry's Object.is gate sees no change.
     expect(applyGoalProjection(state, malformed)).toBe(state)
     expect(applyGoalProjection(null, malformed)).toBeNull()
+
+    // A non-message event (the registry drives EVERY committed event through
+    // apply): early same-reference return.
+    const turnStart = { type: 'turn/start', seq: 3, time: 4, data: { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } } } as never
+    expect(applyGoalProjection(state, turnStart)).toBe(state)
+
+    // A round-zero goal source whose change carries a foreign kind: same posture.
+    const foreignKind = { type: 'user/message', seq: 2, time: 3, data: createUserMessage({
+      content: [{ type: 'text', text: 'foreign' }],
+      source: { kind: 'goal', goalId: 'g1', revision: 1, round: 0, change: { kind: 'not-a-goal-change' } } as never,
+    }) } as never
+    expect(applyGoalProjection(state, foreignKind)).toBe(state)
   })
 
   it('has no goal key when the goal service is not composed', async () => {