sync-upstream-feature

Sync Upstream Feature

Overview

Port features stripped during Shiroi-to-Shiro sync back into the open-source repo. The closed-source Shiroi repo lives at /Users/innei/git/innei-repo/Shiroi, the open-source Shiro at /Users/innei/git/innei-repo/Shiro.

Repo Layout

Both share the same monorepo structure (apps/web/src/...). Shiroi is the superset.

Workflow

digraph sync {
  rankdir=TB;
  node [shape=box];

  explore [label="1. Explore: find target code in both repos"];
  diff [label="2. Diff: identify what Shiroi has that Shiro lacks"];
  layers [label="3. Map all touchpoints across layers"];
  deps [label="4. Add dependencies (package.json)"];
  core [label="5. Port core components"];
  integrate [label="6. Wire into routing (Content, Markdown, page)"];
  api [label="7. Sync API query params"];
  style [label="8. Sync conditional styling"];
  lint [label="9. Lint/typecheck modified files only"];
  review [label="10. Code review via Codex"];

  explore -> diff -> layers -> deps -> core -> integrate -> api -> style -> lint -> review;
}

1. Explore Both Repos

Use parallel Explore agents to search the target feature keyword in both repos. Identify:

• Which files exist in Shiroi but not Shiro
• Which files exist in both but differ
• Which dependencies Shiroi has that Shiro lacks

2. Diff: Identify the Gap

Compare key files side-by-side. Focus on:

• Component files: Shiroi may have extra renderers, wrappers, or providers
• Routing files (*Content.tsx): Shiroi branches on a discriminator (e.g. contentFormat), Shiro always takes one path
• Lazy-load entries (*Markdown.tsx): Used in preview/peek contexts, often overlooked
• API query definitions (queries/definition/*.ts): Shiroi may pass extra params (e.g. prefer: 'lexical')
• Server-side API files (api.ts): Direct apiClient calls may also need params

3. Map All Touchpoints

A feature typically spans these layers (check ALL):

4. Add Dependencies

Read Shiroi's package.json, extract only the packages needed for rendering (not editing/dashboard). Add to Shiro's package.json alphabetically, then pnpm install.

5. Port Core Components

Copy from Shiroi, adapting for Shiro:

• Remove Shiroi-exclusive wrappers (e.g. LexicalCommentWrapper is sponsorship-only)
• Check that all ~/ imports resolve in Shiro (modal types, hooks, constants)
• Fix any API mismatches (e.g. contentClassName prop may not exist in Shiro's modal types)

6. Wire Into Routing

Three integration points per content type (note/post/page):

*Content.tsx (server component entry):

if (contentFormat === 'lexical') return <XxxLexicalRenderer />
return <XxxMarkdownRenderer />

*Markdown.tsx (lazy-load entry for preview/peek):

const XxxLexicalRenderer = dynamic(() => import('./XxxLexicalRenderer').then(m => m.XxxLexicalRenderer))
// ... branch on contentFormat from data selector

page.tsx / layout.tsx (conditional prose):

className={clsx(data.contentFormat !== 'lexical' && 'prose')}

7. Sync API Query Params

Compare queries/definition/*.ts and app/.../api.ts between repos. Add missing params (e.g. prefer: 'lexical').

8. Lint and Verify

• Lint only modified files: pnpm exec eslint --fix <files>
• Typecheck: pnpm exec tsc --noEmit — ignore pre-existing errors, verify new files don't appear in output

Common Mistakes