@shendeguize/dsh-agent-sidecar 0.1.0 → 0.2.0

package/src/client/inject/inject.module.css

@@ -1,40 +1,30 @@
-/* Inject panel (design §5.1 view 3). Every color rides a dsh --dsw-alias-*
- * design token, no literal colors — same discipline as the settings card.
- * The confirm-injection button is the one danger affordance: eye-catching
- * (error-toned border/text, filled on hover) but restrained (no permanent
- * solid red block). */
-
 .panel {
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 12px;
-  background: var(--dsw-alias-bg-layer-2);
-  max-width: 560px;
   display: flex;
   flex-direction: column;
+  max-width: 560px;
+  border: 1px solid var(--agsc-border-strong);
+  border-radius: var(--agsc-radius-card);
+  background: var(--agsc-bg);
 }
 
-/* ── header ────────────────────────────────────────────────────────────── */
-
 .header {
   display: flex;
   align-items: center;
   gap: 12px;
   padding: 14px 16px 10px;
-  border-bottom: 1px solid var(--dsw-alias-border-l2);
+  border-bottom: 1px solid var(--agsc-border-strong);
 }
 
 .title {
   flex: 1;
   min-width: 0;
   margin: 0;
+  color: var(--agsc-fg);
   font-size: 15px;
   font-weight: 600;
   line-height: 1.4;
-  color: var(--dsw-alias-label-primary);
 }
 
-/* ── body ──────────────────────────────────────────────────────────────── */
-
 .body {
   display: flex;
   flex-direction: column;
@@ -42,117 +32,120 @@
   padding: 12px 16px 14px;
 }
 
-.capabilityOff {
-  margin: 0;
-  border-radius: 8px;
-  padding: 10px 12px;
-  font-size: 13px;
-  line-height: 1.6;
-  background: var(--dsw-alias-bg-module-platform);
-  color: var(--dsw-alias-label-secondary);
-}
-
-/* ── notices (editor banners after a failed/expired attempt) ───────────── */
-
+.capabilityOff,
 .noticeWarn,
-.noticeError {
+.noticeError,
+.warnBar,
+.auditNote,
+.resultOk,
+.resultFail,
+.resultUnknown {
   margin: 0;
-  border-radius: 8px;
   padding: 8px 10px;
+  border-radius: var(--agsc-radius-control);
+  background: var(--agsc-bg-raised);
+  color: var(--agsc-fg-secondary);
   font-size: 12px;
   line-height: 1.6;
-  background: var(--dsw-alias-bg-module-platform);
-  color: var(--dsw-alias-label-secondary);
 }
 
-.noticeError {
-  border: 1px solid var(--dsw-alias-label-error);
-  color: var(--dsw-alias-label-error);
+.noticeWarn,
+.warnBar {
+  border: 1px solid var(--agsc-warn);
+  color: var(--agsc-warn);
 }
 
-.noticeDetail {
-  color: var(--dsw-alias-label-tertiary);
+.noticeError,
+.resultFail {
+  border: 1px solid var(--agsc-err);
+  color: var(--agsc-err);
 }
 
-/* ── target row ────────────────────────────────────────────────────────── */
+.noticeDetail,
+.noTarget,
+.modeHint,
+.planKey,
+.observedNote,
+.resultDetail {
+  color: var(--agsc-fg-dimmed);
+}
 
-.targetRow {
+.targetRow,
+.planRow {
   display: flex;
   align-items: baseline;
   gap: 10px;
   min-width: 0;
 }
 
-.noTarget {
+.noTarget,
+.planKey,
+.modeHint,
+.resultDetail {
   font-size: 12px;
   line-height: 1.5;
-  color: var(--dsw-alias-label-tertiary);
 }
 
 .agentTag {
   flex: none;
-  border-radius: 999px;
-  padding: 1px 8px;
-  font-size: 11px;
-  line-height: 17px;
-  font-weight: 500;
-  background: var(--dsw-alias-bg-module-platform);
-  color: var(--dsw-alias-label-secondary);
 }
 
 .planTitle {
   min-width: 0;
   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  color: var(--agsc-fg);
   font-size: 13px;
   line-height: 1.5;
-  color: var(--dsw-alias-label-primary);
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-/* ── editor field ──────────────────────────────────────────────────────── */
-
-.field {
+.field,
+.modeText,
+.planPreview {
   display: flex;
   flex-direction: column;
+}
+
+.field {
   gap: 6px;
 }
 
-.label {
+.label,
+.modeLabel {
+  color: var(--agsc-fg);
   font-size: 13px;
   line-height: 1.5;
-  color: var(--dsw-alias-label-primary);
 }
 
 .textarea {
   appearance: none;
-  resize: vertical;
   min-height: 96px;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 8px;
-  background: var(--dsw-alias-bg-layer-3);
+  resize: vertical;
   padding: 8px 10px;
+  border: 1px solid var(--agsc-border-strong);
+  border-radius: var(--agsc-radius-control);
+  background: var(--agsc-bg-raised);
+  color: var(--agsc-fg);
   font: inherit;
   font-size: 13px;
   line-height: 1.6;
-  color: var(--dsw-alias-label-primary);
 }
 
 .textarea:focus-visible {
+  border-color: var(--agsc-accent);
   outline: none;
-  border-color: var(--dsw-alias-brand-primary);
 }
 
 .textarea::placeholder {
-  color: var(--dsw-alias-label-tertiary);
+  color: var(--agsc-fg-dimmed);
 }
 
 .textarea:disabled {
-  opacity: 0.5;
   cursor: default;
+  opacity: 0.5;
 }
 
-/* Byte counter: thin progress track + numeric readout. */
 .byteRow {
   display: flex;
   align-items: center;
@@ -162,52 +155,49 @@
 .byteBar {
   flex: 1;
   height: 3px;
-  border-radius: 2px;
-  background: var(--dsw-alias-bg-module-platform);
   overflow: hidden;
+  border-radius: 2px;
+  background: var(--agsc-border);
 }
 
 .byteFill {
   height: 100%;
   border-radius: 2px;
-  background: var(--dsw-alias-brand-primary);
+  background: var(--agsc-accent);
   transition: width .12s;
 }
 
-/* Modifier applied ALONGSIDE .byteFill (no `composes`; see settings card). */
 .byteFillOver {
-  background: var(--dsw-alias-label-error);
+  background: var(--agsc-err);
 }
 
 .byteText,
 .byteTextOver {
   flex: none;
+  color: var(--agsc-fg-dimmed);
   font-size: 11px;
-  line-height: 1.5;
   font-variant-numeric: tabular-nums;
-  color: var(--dsw-alias-label-tertiary);
+  line-height: 1.5;
 }
 
-.byteTextOver {
-  color: var(--dsw-alias-label-error);
+.byteTextOver,
+.invalid {
+  color: var(--agsc-err);
 }
 
 .invalid {
   margin: 0;
   font-size: 12px;
   line-height: 1.5;
-  color: var(--dsw-alias-label-error);
 }
 
-/* ── mode radios ───────────────────────────────────────────────────────── */
-
 .modes {
-  margin: 0;
-  border: 0;
-  padding: 0;
   display: flex;
   flex-direction: column;
   gap: 8px;
+  margin: 0;
+  padding: 0;
+  border: 0;
 }
 
 .modeOption {
@@ -218,10 +208,10 @@
 }
 
 .modeOption input {
-  accent-color: var(--dsw-alias-brand-primary);
   width: 14px;
   height: 14px;
   margin: 3px 0 0;
+  accent-color: var(--agsc-accent);
   cursor: pointer;
 }
 
@@ -230,71 +220,26 @@
 }
 
 .modeText {
-  display: flex;
-  flex-direction: column;
   gap: 2px;
   min-width: 0;
 }
 
-.modeLabel {
-  font-size: 13px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-primary);
-}
-
-.modeHint {
-  font-size: 12px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-tertiary);
-}
-
-/* ── warnings & audit note ─────────────────────────────────────────────── */
-
-.warnBar {
-  margin: 0;
-  border: 1px solid var(--dsw-alias-label-error);
-  border-radius: 8px;
-  padding: 8px 10px;
-  font-size: 12px;
-  line-height: 1.6;
-  background: var(--dsw-alias-bg-module-platform);
-  color: var(--dsw-alias-label-error);
-}
-
 .auditNote {
-  margin: 0;
-  border-radius: 8px;
   padding: 8px 10px;
-  font-size: 12px;
-  line-height: 1.6;
-  background: var(--dsw-alias-bg-module-platform);
-  color: var(--dsw-alias-label-secondary);
 }
 
-/* ── confirm plan ──────────────────────────────────────────────────────── */
-
 .planBox {
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 8px;
-  background: var(--dsw-alias-bg-layer-3);
-  padding: 10px 12px;
   display: flex;
   flex-direction: column;
   gap: 6px;
-}
-
-.planRow {
-  display: flex;
-  align-items: baseline;
-  gap: 10px;
-  min-width: 0;
+  padding: 10px 12px;
+  border: 1px solid var(--agsc-border-strong);
+  border-radius: var(--agsc-radius-control);
+  background: var(--agsc-bg-raised);
 }
 
 .planKey {
   flex: none;
-  font-size: 12px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-tertiary);
 }
 
 .planValue {
@@ -302,85 +247,67 @@
   align-items: baseline;
   gap: 8px;
   min-width: 0;
+  color: var(--agsc-fg);
   font-size: 13px;
   line-height: 1.5;
-  color: var(--dsw-alias-label-primary);
 }
 
 .observedNote {
   margin: 0;
   font-size: 11px;
   line-height: 1.5;
-  color: var(--dsw-alias-label-tertiary);
 }
 
 .planPreview {
-  display: flex;
-  flex-direction: column;
   gap: 4px;
   min-width: 0;
 }
 
 .preview {
-  margin: 0;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 6px;
-  background: var(--dsw-alias-bg-layer-2);
-  padding: 8px 10px;
   max-height: 120px;
   overflow: auto;
+  margin: 0;
+  padding: 8px 10px;
+  border: 1px solid var(--agsc-border-strong);
+  border-radius: 6px;
+  background: var(--agsc-bg);
+  color: var(--agsc-fg-secondary);
   font-size: 12px;
   line-height: 1.6;
   white-space: pre-wrap;
   word-break: break-word;
-  color: var(--dsw-alias-label-secondary);
 }
 
 .countdown {
   margin: 0;
+  color: var(--agsc-fg-secondary);
   font-size: 12px;
-  line-height: 1.5;
   font-variant-numeric: tabular-nums;
-  color: var(--dsw-alias-label-secondary);
+  line-height: 1.5;
 }
 
-/* ── results ───────────────────────────────────────────────────────────── */
-
 .resultOk,
 .resultFail,
 .resultUnknown {
-  margin: 0;
-  border-radius: 8px;
   padding: 10px 12px;
+  color: var(--agsc-fg);
   font-size: 13px;
-  line-height: 1.6;
-  background: var(--dsw-alias-bg-module-platform);
-  color: var(--dsw-alias-label-primary);
 }
 
 .resultOk {
-  border: 1px solid var(--dsw-alias-brand-primary);
-}
-
-.resultFail {
-  border: 1px solid var(--dsw-alias-label-error);
-  color: var(--dsw-alias-label-error);
+  border: 1px solid var(--agsc-ok);
 }
 
 .resultUnknown {
-  border: 1px solid var(--dsw-alias-label-dimmed);
-  color: var(--dsw-alias-label-secondary);
+  border: 1px solid var(--agsc-fg-dimmed);
+  color: var(--agsc-fg-secondary);
 }
 
 .resultDetail {
   margin: 0;
-  font-size: 12px;
   line-height: 1.6;
-  color: var(--dsw-alias-label-tertiary);
 }
 
-/* ── footer buttons ────────────────────────────────────────────────────── */
-
 .footer {
   display: flex;
   align-items: center;
@@ -389,58 +316,31 @@
   padding-top: 4px;
 }
 
-.btn,
-.btnPrimary,
 .btnDanger {
   appearance: none;
-  border: 1px solid transparent;
-  border-radius: 8px;
   padding: 5px 14px;
+  border: 1px solid var(--agsc-err);
+  border-radius: var(--agsc-radius-control);
+  background: transparent;
+  color: var(--agsc-err);
   font: inherit;
   font-size: 13px;
+  font-weight: 600;
   line-height: 1.5;
   cursor: pointer;
 }
 
-.btn {
-  border-color: var(--dsw-alias-border-l2);
-  background: none;
-  color: var(--dsw-alias-label-secondary);
-}
-
-.btn:hover:not(:disabled) {
-  color: var(--dsw-alias-label-primary);
-  border-color: var(--dsw-alias-label-dimmed);
-}
-
-.btnPrimary {
-  background: var(--dsw-alias-label-primary);
-  color: var(--dsw-alias-bg-layer-3);
-}
-
-/* The danger action: outlined error tone at rest, fills on hover. */
-.btnDanger {
-  border-color: var(--dsw-alias-label-error);
-  background: none;
-  color: var(--dsw-alias-label-error);
-  font-weight: 600;
-}
-
 .btnDanger:hover:not(:disabled) {
-  background: var(--dsw-alias-label-error);
-  color: var(--dsw-alias-bg-layer-3);
+  background: var(--agsc-err);
+  color: var(--agsc-bg-raised);
 }
 
-.btn:disabled,
-.btnPrimary:disabled,
 .btnDanger:disabled {
-  opacity: 0.4;
   cursor: default;
+  opacity: 0.4;
 }
 
-.btn:focus-visible,
-.btnPrimary:focus-visible,
 .btnDanger:focus-visible {
-  outline: 2px solid var(--dsw-alias-brand-primary);
+  outline: 2px solid var(--agsc-accent);
   outline-offset: 1px;
 }

package/src/client/inject/logic.ts

@@ -418,6 +418,33 @@ export function deriveEditorGate(input: {
   return { canPrepare: true, block: null }
 }
 
+// ---------------------------------------------------------------------------
+// Keyboard affordances (UX-10).
+// ---------------------------------------------------------------------------
+
+export type PanelKeyIntent = 'close' | 'prepare' | null
+
+/**
+ * Map a keydown to a panel intent: Escape closes in every phase;
+ * Cmd/Ctrl+Enter submits the PREPARE step only (editor phase with a valid
+ * message). The confirm phase deliberately binds nothing — executing the
+ * injection stays an explicit click (two-phase discipline, §5.3), so no
+ * keyboard path can shortcut the confirmation.
+ */
+export function classifyPanelKey(input: {
+  key: string
+  metaKey: boolean
+  ctrlKey: boolean
+  phase: InjectPhase
+  canPrepare: boolean
+}): PanelKeyIntent {
+  if (input.key === 'Escape') return 'close'
+  if (input.key === 'Enter' && (input.metaKey || input.ctrlKey)) {
+    return input.phase === 'idle' && input.canPrepare ? 'prepare' : null
+  }
+  return null
+}
+
 // ---------------------------------------------------------------------------
 // Result actions (S6: unknown is terminal).
 // ---------------------------------------------------------------------------
@@ -437,6 +464,17 @@ export function resultActions(outcome: InjectOutcome): ResultActions {
   }
 }
 
+/**
+ * True when an execute response reports the message actually reached the
+ * target (UX-05 observation loop): a delivered outcome — including an
+ * idempotent replay of one — never an error envelope. failed/unknown must
+ * NOT trigger observation aids: unknown is a locked terminal state (S6)
+ * and any follow-up activity could read as "retrying is fine".
+ */
+export function isDeliveredResult(value: InjectResultView | ApiErrorLike): boolean {
+  return !isApiErrorLike(value) && value.outcome === 'delivered'
+}
+
 // ---------------------------------------------------------------------------
 // Copy mapping (keys live in the T2.3 locale table, inject.* domain).
 // ---------------------------------------------------------------------------

package/src/client/lifecycle/handoff.ts

@@ -0,0 +1,83 @@
+export type ResourceDisposer = () => void
+
+/** Narrow clock port for deterministic handoff tests. */
+export interface HandoffScheduler {
+  setTimeout(callback: () => void, delayMs: number): unknown
+  clearTimeout(handle: unknown): void
+}
+
+export interface HandoffOptions {
+  isCollision(error: unknown): boolean
+  onError(error: unknown): void
+  onTimeout(): void
+  scheduler?: HandoffScheduler
+}
+
+const DEFAULT_DELAYS_MS = [8, 16, 32, 64, 128, 256, 496] as const
+
+const defaultScheduler: HandoffScheduler = {
+  setTimeout: (callback, delayMs) => globalThis.setTimeout(callback, delayMs),
+  clearTimeout: (handle) => globalThis.clearTimeout(handle as ReturnType<typeof setTimeout>),
+}
+
+/**
+ * Acquire a registry resource now, or briefly wait for an overlapping old
+ * fiber to release it. The returned lease owns both waiting and acquisition.
+ */
+export function acquireWithHandoff(
+  register: () => ResourceDisposer | undefined,
+  options: HandoffOptions,
+): ResourceDisposer {
+  const scheduler = options.scheduler ?? defaultScheduler
+  let stopped = false
+  let attempts = 0
+  let delayIndex = 0
+  let timer: unknown
+  let acquired: ResourceDisposer | undefined
+
+  const finishError = (error: unknown): void => {
+    stopped = true
+    options.onError(error)
+  }
+
+  const attempt = (): void => {
+    if (stopped) return
+    timer = undefined
+    attempts += 1
+    try {
+      acquired = register()
+    } catch (error) {
+      if (!options.isCollision(error)) {
+        finishError(error)
+        return
+      }
+    }
+    if (acquired !== undefined) return
+    if (attempts >= 8 || delayIndex >= DEFAULT_DELAYS_MS.length) {
+      stopped = true
+      options.onTimeout()
+      return
+    }
+    const delay = DEFAULT_DELAYS_MS[delayIndex++]
+    try {
+      timer = scheduler.setTimeout(attempt, delay!)
+    } catch (error) {
+      finishError(error)
+    }
+  }
+
+  attempt()
+  return () => {
+    if (stopped) return
+    stopped = true
+    if (timer !== undefined) scheduler.clearTimeout(timer)
+    const dispose = acquired
+    acquired = undefined
+    dispose?.()
+  }
+}
+
+/** Only known duplicate-registry diagnostics are eligible for handoff. */
+export function isRegistrationCollision(error: unknown): boolean {
+  return error instanceof Error && /\b(?:duplicate|already registered)\b/i.test(error.message)
+}