Commit Graph

6 Commits

Author SHA1 Message Date
Chris Farhood daa1324e5f Merge remote-tracking branch 'upstream/master' into dev
# Conflicts:
#	packages/shared/src/validators/company-skill.ts
#	packages/shared/src/validators/index.ts
#	server/src/__tests__/company-skills-routes.test.ts
#	server/src/routes/company-skills.ts
#	server/src/services/company-skills.ts
#	ui/src/pages/CompanySkills.tsx
2026-05-31 08:02:16 -04:00
Chris Farhood bedeac5400 fix(dockerfile): sync deps stage with upstream + add mmx-cli
Build: Production / build (push) Successful in 3m19s
Upstream added grok-local adapter and plugin-llm-wiki/plugin-workspace-diff
packages along with a link-plugin-dev-sdk.mjs script, but the fork's
.farhoodlabs/Dockerfile deps stage didn't get the corresponding COPY
lines. Without grok-local's package.json present during
`pnpm install --frozen-lockfile`, the workspace symlinks for grok-local
weren't created, so UI tsc failed to resolve @paperclipai/adapter-utils
from grok-local/src/ui/*.

Also adding mmx-cli (MiniMax multimodal CLI) as its own npm install
line in the production stage so the upstream-managed npm install line
above stays diff-clean against upstream.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 09:03:05 -04:00
Chris Farhood fccbc7e39e feat(ci): install gitea tea CLI in fork Dockerfile
Adds the official Gitea 'tea' CLI (v0.14.0) alongside the existing forgejo
CLIs (fj, fj-ex, fgj). Useful when interacting with Gitea instances whose API
surface is covered by tea but not by the forgejo variants.
2026-05-14 10:04:18 -04:00
Chris Farhood c2a49879d5 fix(ci): add cursor-cloud adapter package.json to fork Dockerfile deps stage
Upstream #5664 added the cursor-cloud adapter; the .farhoodlabs/Dockerfile
overlay was missing the deps-stage COPY for its package.json, so pnpm install
didn't wire it as a workspace package and the build stage failed type-checking
cursor-cloud's UI sources from ui's tsc -b.
2026-05-11 19:16:51 -04:00
Chris Farhood 1678160c49 fix(ci): add acpx-local + sandbox plugins to fork Dockerfile deps stage 2026-05-01 19:31:44 -04:00
Chris Farhood c08c72e917 chore(ci): restore fork CI overlay 2026-05-01 19:27:04 -04:00