opencode-extended-sidebar 0.2.90 → 0.2.91

package/src/pware.oc.runtime/pware.oc.runtime.mywork.ts

@@ -1,253 +1,282 @@
-/**
- * pware.oc.core.mywork.resolver
- *
- * The "My work" queue — one list of things awaiting the user's action, from
- * two sources: an open OpenCode `question` (core, always) and an OMO plan
- * awaiting approval (optional, only when `.omo/` is present).
- */
-import type { OpenQuestion } from "../pware.oc.opencode/resolver/pware.oc.opencode.resolver.question.js"
-import type {
-  AgentStatus,
-  SessionActivityState,
-} from "../pware.oc.opencode/resolver/pware.oc.opencode.resolver.session.js"
-import type { ReviewState } from "../pware.oc.omo/resolver/pware.oc.omo.resolver.plan.js"
-import type { EnrichedApproval } from "./pware.oc.runtime.mywork-enrich.js"
-import {
-  MY_WORK_GROUP_DISMISSED,
-  MY_WORK_GROUP_DRAFT_DOCS,
-  MY_WORK_GROUP_DRAFTING,
-  MY_WORK_GROUP_FINISHED,
-  MY_WORK_GROUP_PINNED,
-  MY_WORK_GROUP_PLANS,
-  MY_WORK_GROUP_READY_REVIEW,
-  MY_WORK_GROUP_READY_START,
-  MY_WORK_GROUP_SESSIONS,
-  type ApprovalGroupKind,
-} from "../pware.oc.core/constants/pware.oc.core.constants.myWork.js"
-import { isDraftOf, resolveApprovalGroup } from "../pware.oc.omo/resolver/pware.oc.omo.resolver.approvalGroup.js"
-import {
-  QUESTION_KIND_ERROR,
-  QUESTION_KIND_INTERRUPTED,
-  QUESTION_KIND_QUESTION,
-  type OpenQuestionKind,
-} from "../pware.oc.opencode/constants/pware.oc.opencode.constants.questionKind.js"
-import {
-  START_WORK_MAKE_PR,
-  START_WORK_PLAIN,
-  START_WORK_SHIP,
-  type StartWorkMode,
-} from "../pware.oc.omo/constants/pware.oc.omo.constants.startWork.js"
-
-export type { ApprovalGroupKind, OpenQuestionKind, StartWorkMode }
-
-export type QuestionGroupKind = OpenQuestionKind | typeof MY_WORK_GROUP_DISMISSED
-
-export type MyWorkItem =
-  | {
-      kind: QuestionGroupKind
-      partId: string
-      sessionId: string
-      title: string
-      startedAt: number | null
-      /** `state.error` text for interrupted/error rows; null for an open question. */
-      reason: string | null
-    }
-  | {
-      kind: ApprovalGroupKind
-      name: string
-      rel: string
-      pendingAction: string | null
-      updatedAt: number | null
-      sessionState: SessionActivityState | null
-      review: ReviewState | null
-    }
-  | {
-      kind: typeof MY_WORK_GROUP_SESSIONS
-      sessionId: string
-      title: string
-      status: AgentStatus
-      timeUpdated: number | null
-    }
-  | {
-      kind: typeof MY_WORK_GROUP_PINNED
-      sessionId: string
-      title: string
-      status: AgentStatus
-      timeUpdated: number | null
-    }
-  | {
-      kind: typeof MY_WORK_GROUP_DRAFT_DOCS
-      name: string
-      rel: string
-      updatedAt: number | null
-    }
-  | {
-      kind: typeof MY_WORK_GROUP_PLANS
-      name: string
-      rel: string
-      updatedAt: number | null
-    }
-
-export type MyWorkKind = MyWorkItem["kind"]
-
-export const MY_WORK_ORDER: readonly MyWorkKind[] = [
-  MY_WORK_GROUP_PINNED,
-  QUESTION_KIND_QUESTION,
-  QUESTION_KIND_INTERRUPTED,
-  QUESTION_KIND_ERROR,
-  MY_WORK_GROUP_SESSIONS,
-  MY_WORK_GROUP_READY_REVIEW,
-  MY_WORK_GROUP_READY_START,
-  MY_WORK_GROUP_FINISHED,
-  MY_WORK_GROUP_DRAFTING,
-  MY_WORK_GROUP_DRAFT_DOCS,
-  MY_WORK_GROUP_PLANS,
-  MY_WORK_GROUP_DISMISSED,
-]
-
-const MY_WORK_LABELS: Record<MyWorkKind, string> = {
-  [MY_WORK_GROUP_PINNED]: "Pinned",
-  [QUESTION_KIND_QUESTION]: "Awaiting answer",
-  [QUESTION_KIND_INTERRUPTED]: "Interrupted",
-  [QUESTION_KIND_ERROR]: "Errors",
-  [MY_WORK_GROUP_SESSIONS]: "Sessions",
-  [MY_WORK_GROUP_READY_REVIEW]: "Ready to review",
-  [MY_WORK_GROUP_READY_START]: "Ready to start",
-  [MY_WORK_GROUP_FINISHED]: "Finished",
-  [MY_WORK_GROUP_DISMISSED]: "Dismissed questions",
-  [MY_WORK_GROUP_DRAFTING]: "Drafting",
-  [MY_WORK_GROUP_DRAFT_DOCS]: "Draft docs",
-  [MY_WORK_GROUP_PLANS]: "Plans",
-}
-
-export function myWorkLabel(kind: MyWorkKind): string {
-  return MY_WORK_LABELS[kind]
-}
-
-/**
- * Why "Navigate to session" is unavailable for an approval: no writer session
- * was found in the database, or the database itself could not be opened. Null
- * when navigation is actionable.
- */
-export function approvalContinueHint(
-  sessionId: string | null | undefined,
-  dbAvailable: boolean,
-): string | null {
-  if (sessionId) return null
-  return dbAvailable ? "No session wrote this plan" : "Database unavailable"
-}
-
-/** The exact "start work" command text for a delivery mode and optional plan name. */
-export function startWorkCommand(mode: StartWorkMode, planName?: string | null): string {
-  const name = typeof planName === "string" ? planName.trim() : ""
-  const base = name ? `start work ${name}` : "start work"
-  if (mode === START_WORK_MAKE_PR) return `${base} --make-pr`
-  if (mode === START_WORK_SHIP) return `${base} --ship`
-  return base
-}
-
-export function groupMyWork(
-  items: readonly MyWorkItem[],
-): { kind: MyWorkKind; items: MyWorkItem[] }[] {
-  const out: { kind: MyWorkKind; items: MyWorkItem[] }[] = []
-  for (const kind of MY_WORK_ORDER) {
-    const bucket = items.filter((i) => i.kind === kind)
-    if (bucket.length > 0) out.push({ kind, items: bucket })
-  }
-  return out
-}
-
-/** Build the question items from an open-question read (title comes from the row). */
-export function toQuestionItems(questions: readonly OpenQuestion[]): MyWorkItem[] {
-  return questions.map((q) => ({
-    kind: q.kind,
-    partId: q.partId,
-    sessionId: q.sessionId,
-    title: q.title,
-    startedAt: q.startedAt,
-    reason: q.reason,
-  }))
-}
-
-/** Build the approval items from a pending-approval read, dropping superseded plans. */
-export function toApprovalItems(approvals: readonly EnrichedApproval[]): MyWorkItem[] {
-  const out: MyWorkItem[] = []
-  for (const a of approvals) {
-    const kind = resolveApprovalGroup(a.status, isDraftOf(a.rel), a.workState, a.todosDone)
-    if (!kind) continue
-    out.push({
-      kind,
-      name: a.name,
-      rel: a.rel,
-      pendingAction: a.pendingAction,
-      updatedAt: a.updatedAt,
-      sessionState: a.sessionState,
-      review: a.review,
-    })
-  }
-  return out
-}
-
-/** Build the Draft docs items — drafts no action group covers, browsed as files. */
-export function toDraftDocItems(
-  docs: readonly { name: string; rel: string; updatedAt: number | null }[],
-): MyWorkItem[] {
-  return docs.map((d) => ({ kind: MY_WORK_GROUP_DRAFT_DOCS, name: d.name, rel: d.rel, updatedAt: d.updatedAt }))
-}
-
-/** Build the Plans items — plan files no action group covers, browsed as files. */
-export function toPlanItems(
-  docs: readonly { name: string; rel: string; updatedAt: number | null }[],
-): MyWorkItem[] {
-  return docs.map((d) => ({ kind: MY_WORK_GROUP_PLANS, name: d.name, rel: d.rel, updatedAt: d.updatedAt }))
-}
-
-/** Build the sessions group from recent main sessions — every session, live or idle. */
-export function toSessionItems(
-  sessions: readonly {
-    id: string
-    title: string
-    status: AgentStatus
-    timeUpdated: number | null
-  }[],
-): MyWorkItem[] {
-  return sessions.map((s) => ({
-    kind: MY_WORK_GROUP_SESSIONS,
-    sessionId: s.id,
-    title: s.title,
-    status: s.status,
-    timeUpdated: s.timeUpdated,
-  }))
-}
-
-/** Parse the persisted dismissed-question set (a JSON array of part ids) from the kv store. */
-export function parseDismissed(raw: string | null | undefined): ReadonlySet<string> {
-  if (!raw) return new Set()
-  try {
-    const value = JSON.parse(raw)
-    if (!Array.isArray(value)) return new Set()
-    return new Set(value.filter((x): x is string => typeof x === "string" && x.length > 0))
-  } catch {
-    return new Set()
-  }
-}
-
-/** Serialize a dismissed-question id set back to the JSON string the kv store holds. */
-export function formatDismissed(ids: ReadonlySet<string>): string {
-  return JSON.stringify([...ids])
-}
-
-export function dropDismissed(
-  items: readonly MyWorkItem[],
-  dismissed: ReadonlySet<string>,
-): MyWorkItem[] {
-  return items.map((i) => {
-    if (!("partId" in i)) return i
-    const byId = dismissed.has(i.partId)
-    const byReason = i.kind === QUESTION_KIND_ERROR
-      && typeof i.reason === "string"
-      && i.reason.toLowerCase().includes("dismissed this question")
-    if (!byId && !byReason) return i
-    return { ...i, kind: MY_WORK_GROUP_DISMISSED }
-  })
-}
+/**
+ * pware.oc.core.mywork.resolver
+ *
+ * The "My work" queue — one list of things awaiting the user's action, from
+ * two sources: an open OpenCode `question` (core, always) and an OMO plan
+ * awaiting approval (optional, only when `.omo/` is present).
+ */
+import type { OpenQuestion } from "../pware.oc.opencode/resolver/pware.oc.opencode.resolver.question.js"
+import type {
+  AgentStatus,
+  SessionActivityState,
+} from "../pware.oc.opencode/resolver/pware.oc.opencode.resolver.session.js"
+import type { ReviewState } from "../pware.oc.omo/resolver/pware.oc.omo.resolver.plan.js"
+import type { EnrichedApproval } from "./pware.oc.runtime.mywork-enrich.js"
+import {
+  MY_WORK_GROUP_DISMISSED,
+  MY_WORK_GROUP_DRAFT_DOCS,
+  MY_WORK_GROUP_DRAFTING,
+  MY_WORK_GROUP_FINISHED,
+  MY_WORK_GROUP_PINNED,
+  MY_WORK_GROUP_PLANS,
+  MY_WORK_GROUP_READY_REVIEW,
+  MY_WORK_GROUP_READY_START,
+  MY_WORK_GROUP_SESSIONS,
+  type ApprovalGroupKind,
+} from "../pware.oc.core/constants/pware.oc.core.constants.myWork.js"
+import { isDraftOf, resolveApprovalGroup } from "../pware.oc.omo/resolver/pware.oc.omo.resolver.approvalGroup.js"
+import {
+  QUESTION_KIND_ERROR,
+  QUESTION_KIND_INTERRUPTED,
+  QUESTION_KIND_QUESTION,
+  type OpenQuestionKind,
+} from "../pware.oc.opencode/constants/pware.oc.opencode.constants.questionKind.js"
+import {
+  START_WORK_MAKE_PR,
+  START_WORK_PLAIN,
+  START_WORK_SHIP,
+  type StartWorkMode,
+} from "../pware.oc.omo/constants/pware.oc.omo.constants.startWork.js"
+
+export type { ApprovalGroupKind, OpenQuestionKind, StartWorkMode }
+
+export type QuestionGroupKind = OpenQuestionKind | typeof MY_WORK_GROUP_DISMISSED
+
+export type MyWorkItem =
+  | {
+      kind: QuestionGroupKind
+      partId: string
+      sessionId: string
+      title: string
+      startedAt: number | null
+      /** `state.error` text for interrupted/error rows; null for an open question. */
+      reason: string | null
+    }
+  | {
+      kind: ApprovalGroupKind
+      name: string
+      rel: string
+      pendingAction: string | null
+      updatedAt: number | null
+      sessionState: SessionActivityState | null
+      review: ReviewState | null
+    }
+  | {
+      kind: typeof MY_WORK_GROUP_SESSIONS
+      sessionId: string
+      title: string
+      status: AgentStatus
+      timeUpdated: number | null
+    }
+  | {
+      kind: typeof MY_WORK_GROUP_PINNED
+      sessionId: string
+      title: string
+      status: AgentStatus
+      timeUpdated: number | null
+    }
+  | {
+      kind: typeof MY_WORK_GROUP_DRAFT_DOCS
+      name: string
+      rel: string
+      updatedAt: number | null
+    }
+  | {
+      kind: typeof MY_WORK_GROUP_PLANS
+      name: string
+      rel: string
+      updatedAt: number | null
+    }
+
+export type MyWorkKind = MyWorkItem["kind"]
+
+export const MY_WORK_ORDER: readonly MyWorkKind[] = [
+  MY_WORK_GROUP_PINNED,
+  QUESTION_KIND_QUESTION,
+  QUESTION_KIND_INTERRUPTED,
+  QUESTION_KIND_ERROR,
+  MY_WORK_GROUP_SESSIONS,
+  MY_WORK_GROUP_READY_REVIEW,
+  MY_WORK_GROUP_READY_START,
+  MY_WORK_GROUP_FINISHED,
+  MY_WORK_GROUP_DRAFTING,
+  MY_WORK_GROUP_DRAFT_DOCS,
+  MY_WORK_GROUP_PLANS,
+  MY_WORK_GROUP_DISMISSED,
+]
+
+const MY_WORK_LABELS: Record<MyWorkKind, string> = {
+  [MY_WORK_GROUP_PINNED]: "Pinned",
+  [QUESTION_KIND_QUESTION]: "Awaiting answer",
+  [QUESTION_KIND_INTERRUPTED]: "Interrupted",
+  [QUESTION_KIND_ERROR]: "Errors",
+  [MY_WORK_GROUP_SESSIONS]: "Sessions",
+  [MY_WORK_GROUP_READY_REVIEW]: "Ready to review",
+  [MY_WORK_GROUP_READY_START]: "Ready to start",
+  [MY_WORK_GROUP_FINISHED]: "Finished",
+  [MY_WORK_GROUP_DISMISSED]: "Dismissed questions",
+  [MY_WORK_GROUP_DRAFTING]: "Drafting",
+  [MY_WORK_GROUP_DRAFT_DOCS]: "Draft docs",
+  [MY_WORK_GROUP_PLANS]: "Plans",
+}
+
+export function myWorkLabel(kind: MyWorkKind): string {
+  return MY_WORK_LABELS[kind]
+}
+
+/**
+ * Why "Navigate to session" is unavailable for an approval: no writer session
+ * was found in the database, or the database itself could not be opened. Null
+ * when navigation is actionable.
+ */
+export function approvalContinueHint(
+  sessionId: string | null | undefined,
+  dbAvailable: boolean,
+): string | null {
+  if (sessionId) return null
+  return dbAvailable ? "No session wrote this plan" : "Database unavailable"
+}
+
+/** The exact "start work" command text for a delivery mode and optional plan name. */
+export function startWorkCommand(mode: StartWorkMode, planName?: string | null): string {
+  const name = typeof planName === "string" ? planName.trim() : ""
+  const base = name ? `start work ${name}` : "start work"
+  if (mode === START_WORK_MAKE_PR) return `${base} --make-pr`
+  if (mode === START_WORK_SHIP) return `${base} --ship`
+  return base
+}
+
+/** Group the My work queue. Pinned always leads — even when empty — as a placeholder. */
+export function groupMyWork(
+  items: readonly MyWorkItem[],
+): { kind: MyWorkKind; items: MyWorkItem[] }[] {
+  const out: { kind: MyWorkKind; items: MyWorkItem[] }[] = []
+  out.push({ kind: MY_WORK_GROUP_PINNED, items: items.filter((i) => i.kind === MY_WORK_GROUP_PINNED) })
+  for (const kind of MY_WORK_ORDER) {
+    if (kind === MY_WORK_GROUP_PINNED) continue
+    const bucket = items.filter((i) => i.kind === kind)
+    if (bucket.length > 0) out.push({ kind, items: bucket })
+  }
+  return out
+}
+
+/** Build the question items from an open-question read (title comes from the row). */
+export function toQuestionItems(questions: readonly OpenQuestion[]): MyWorkItem[] {
+  return questions.map((q) => ({
+    kind: q.kind,
+    partId: q.partId,
+    sessionId: q.sessionId,
+    title: q.title,
+    startedAt: q.startedAt,
+    reason: q.reason,
+  }))
+}
+
+/** Build the approval items from a pending-approval read, dropping superseded plans. */
+export function toApprovalItems(approvals: readonly EnrichedApproval[]): MyWorkItem[] {
+  const out: MyWorkItem[] = []
+  for (const a of approvals) {
+    const kind = resolveApprovalGroup(a.status, isDraftOf(a.rel), a.workState, a.todosDone)
+    if (!kind) continue
+    out.push({
+      kind,
+      name: a.name,
+      rel: a.rel,
+      pendingAction: a.pendingAction,
+      updatedAt: a.updatedAt,
+      sessionState: a.sessionState,
+      review: a.review,
+    })
+  }
+  return out
+}
+
+/** Build the Draft docs items — drafts no action group covers, browsed as files. */
+export function toDraftDocItems(
+  docs: readonly { name: string; rel: string; updatedAt: number | null }[],
+): MyWorkItem[] {
+  return docs.map((d) => ({ kind: MY_WORK_GROUP_DRAFT_DOCS, name: d.name, rel: d.rel, updatedAt: d.updatedAt }))
+}
+
+/** Build the Plans items — plan files no action group covers, browsed as files. */
+export function toPlanItems(
+  docs: readonly { name: string; rel: string; updatedAt: number | null }[],
+): MyWorkItem[] {
+  return docs.map((d) => ({ kind: MY_WORK_GROUP_PLANS, name: d.name, rel: d.rel, updatedAt: d.updatedAt }))
+}
+
+/** Build the sessions group from recent main sessions — every session, live or idle. */
+export function toSessionItems(
+  sessions: readonly {
+    id: string
+    title: string
+    status: AgentStatus
+    timeUpdated: number | null
+  }[],
+): MyWorkItem[] {
+  return sessions.map((s) => ({
+    kind: MY_WORK_GROUP_SESSIONS,
+    sessionId: s.id,
+    title: s.title,
+    status: s.status,
+    timeUpdated: s.timeUpdated,
+  }))
+}
+
+/** Build pinned items from pinned session ids joined to their recent-session rows, in pin order; ids missing from `recent` are skipped. */
+export function toPinnedItems(
+  pinnedIds: readonly string[],
+  recent: readonly {
+    id: string
+    title: string
+    status: AgentStatus
+    timeUpdated: number | null
+  }[],
+): MyWorkItem[] {
+  const byId = new Map(recent.map((s) => [s.id, s] as const))
+  const out: MyWorkItem[] = []
+  for (const id of pinnedIds) {
+    const s = byId.get(id)
+    if (!s) continue
+    out.push({
+      kind: MY_WORK_GROUP_PINNED,
+      sessionId: s.id,
+      title: s.title,
+      status: s.status,
+      timeUpdated: s.timeUpdated,
+    })
+  }
+  return out
+}
+
+/** Parse the persisted dismissed-question set (a JSON array of part ids) from the kv store. */
+export function parseDismissed(raw: string | null | undefined): ReadonlySet<string> {
+  if (!raw) return new Set()
+  try {
+    const value = JSON.parse(raw)
+    if (!Array.isArray(value)) return new Set()
+    return new Set(value.filter((x): x is string => typeof x === "string" && x.length > 0))
+  } catch {
+    return new Set()
+  }
+}
+
+/** Serialize a dismissed-question id set back to the JSON string the kv store holds. */
+export function formatDismissed(ids: ReadonlySet<string>): string {
+  return JSON.stringify([...ids])
+}
+
+export function dropDismissed(
+  items: readonly MyWorkItem[],
+  dismissed: ReadonlySet<string>,
+): MyWorkItem[] {
+  return items.map((i) => {
+    if (!("partId" in i)) return i
+    const byId = dismissed.has(i.partId)
+    const byReason = i.kind === QUESTION_KIND_ERROR
+      && typeof i.reason === "string"
+      && i.reason.toLowerCase().includes("dismissed this question")
+    if (!byId && !byReason) return i
+    return { ...i, kind: MY_WORK_GROUP_DISMISSED }
+  })
+}

package/src/pware.oc.runtime/pware.oc.runtime.omoRead.ts

@@ -0,0 +1,37 @@
+import type { DocView } from "../pware.oc.omo/resolver/pware.oc.omo.resolver.doc.js"
+import {
+  DraftFile,
+  sessionForPlanFile,
+} from "../pware.oc.omo/resolver/index.js"
+import { readonlyReadGateway } from "../pware.oc.core/pware.oc.core.sqliteGateway.js"
+
+export type PlanSessionRead = {
+  readonly dbAvailable: boolean
+  readonly sessionId: string | null
+}
+
+export function readSessionDrafts(opts: {
+  readonly dbPath: string
+  readonly projectRoot: string | null
+  readonly sessionId: string
+}): Promise<DocView[]> {
+  if (!opts.projectRoot || !opts.sessionId) return Promise.resolve([])
+  return readonlyReadGateway.run<DocView[]>({
+    dbPath: opts.dbPath,
+    initial: () => [] as DocView[],
+    stages: [(db) => DraftFile.list(opts.projectRoot, opts.sessionId, { db })],
+    fallback: () => [],
+  })
+}
+
+export function readPlanSession(opts: {
+  readonly dbPath: string
+  readonly rel: string
+}): Promise<PlanSessionRead> {
+  return readonlyReadGateway.run<PlanSessionRead>({
+    dbPath: opts.dbPath,
+    initial: () => ({ dbAvailable: true, sessionId: null }),
+    stages: [(db) => ({ dbAvailable: true, sessionId: sessionForPlanFile(db, opts.rel) })],
+    fallback: () => ({ dbAvailable: false, sessionId: null }),
+  })
+}