Compare commits
5 Commits
fix/kanban
...
feat/custo
| Author | SHA1 | Date | |
|---|---|---|---|
| fdf3e80a0c | |||
| cd1c52c506 | |||
| a00f1e1fd7 | |||
| 9305cacd4a | |||
| 0d5aa5c3ae |
18
.woodpecker/base-image.yml
Normal file
18
.woodpecker/base-image.yml
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
when:
|
||||||
|
- event: manual
|
||||||
|
- event: cron
|
||||||
|
cron: weekly-base-image
|
||||||
|
|
||||||
|
steps:
|
||||||
|
build-base:
|
||||||
|
image: woodpeckerci/plugin-docker-buildx:latest
|
||||||
|
privileged: true
|
||||||
|
settings:
|
||||||
|
registry: git.mosaicstack.dev
|
||||||
|
repo: git.mosaicstack.dev/mosaic/node-base
|
||||||
|
tags: 24-slim
|
||||||
|
dockerfile: docker/base.Dockerfile
|
||||||
|
username:
|
||||||
|
from_secret: gitea_user
|
||||||
|
password:
|
||||||
|
from_secret: gitea_token
|
||||||
@@ -32,6 +32,7 @@ variables:
|
|||||||
- &node_image "node:24-alpine"
|
- &node_image "node:24-alpine"
|
||||||
- &install_deps |
|
- &install_deps |
|
||||||
corepack enable
|
corepack enable
|
||||||
|
pnpm config set store-dir /root/.local/share/pnpm/store
|
||||||
pnpm install --frozen-lockfile
|
pnpm install --frozen-lockfile
|
||||||
- &use_deps |
|
- &use_deps |
|
||||||
corepack enable
|
corepack enable
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Base image for all stages
|
# Base image for all stages
|
||||||
# Uses Debian slim (glibc) instead of Alpine (musl) because native Node.js addons
|
# Uses Debian slim (glibc) instead of Alpine (musl) because native Node.js addons
|
||||||
# (matrix-sdk-crypto-nodejs, Prisma engines) require glibc-compatible binaries.
|
# (matrix-sdk-crypto-nodejs, Prisma engines) require glibc-compatible binaries.
|
||||||
FROM node:24-slim AS base
|
FROM git.mosaicstack.dev/mosaic/node-base:24-slim AS base
|
||||||
|
|
||||||
# Install pnpm globally
|
# Install pnpm globally
|
||||||
RUN corepack enable && corepack prepare pnpm@10.27.0 --activate
|
RUN corepack enable && corepack prepare pnpm@10.27.0 --activate
|
||||||
@@ -19,9 +19,9 @@ COPY turbo.json ./
|
|||||||
FROM base AS deps
|
FROM base AS deps
|
||||||
|
|
||||||
# Install build tools for native addons (node-pty requires node-gyp compilation)
|
# Install build tools for native addons (node-pty requires node-gyp compilation)
|
||||||
# and OpenSSL for Prisma engine detection
|
# Note: openssl and ca-certificates pre-installed in base image
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
python3 make g++ openssl \
|
python3 make g++ \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Copy all package.json files for workspace resolution
|
# Copy all package.json files for workspace resolution
|
||||||
@@ -61,19 +61,14 @@ RUN pnpm turbo build --filter=@mosaic/api --force
|
|||||||
# ======================
|
# ======================
|
||||||
# Production stage
|
# Production stage
|
||||||
# ======================
|
# ======================
|
||||||
FROM node:24-slim AS production
|
FROM git.mosaicstack.dev/mosaic/node-base:24-slim AS production
|
||||||
|
|
||||||
# Install dumb-init for proper signal handling (static binary from GitHub,
|
# dumb-init, openssl, ca-certificates pre-installed in base image
|
||||||
# avoids apt-get which fails under Kaniko with bookworm GPG signature errors)
|
|
||||||
ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 /usr/local/bin/dumb-init
|
|
||||||
|
|
||||||
# Single RUN to minimize Kaniko filesystem snapshots (each RUN = full snapshot)
|
# Single RUN to minimize Kaniko filesystem snapshots (each RUN = full snapshot)
|
||||||
# - openssl: Prisma engine detection requires libssl
|
# - Remove npm/npx to reduce image size (not used in production)
|
||||||
# - No build tools needed here — native addons are compiled in the deps stage
|
# - Create non-root user
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends openssl \
|
RUN rm -rf /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& rm -rf /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx \
|
|
||||||
&& chmod 755 /usr/local/bin/dumb-init \
|
|
||||||
&& groupadd -g 1001 nodejs && useradd -m -u 1001 -g nodejs nestjs
|
&& groupadd -g 1001 nodejs && useradd -m -u 1001 -g nodejs nestjs
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|||||||
@@ -384,10 +384,18 @@ describe("ActivityLoggingInterceptor", () => {
|
|||||||
const context = createMockExecutionContext("POST", {}, body, user);
|
const context = createMockExecutionContext("POST", {}, body, user);
|
||||||
const next = createMockCallHandler(result);
|
const next = createMockCallHandler(result);
|
||||||
|
|
||||||
|
mockActivityService.logActivity.mockResolvedValue({
|
||||||
|
id: "activity-123",
|
||||||
|
});
|
||||||
|
|
||||||
await new Promise<void>((resolve) => {
|
await new Promise<void>((resolve) => {
|
||||||
interceptor.intercept(context, next).subscribe(() => {
|
interceptor.intercept(context, next).subscribe(() => {
|
||||||
// Should not call logActivity when workspaceId is missing
|
// workspaceId is now optional, so logActivity should be called without it
|
||||||
expect(mockActivityService.logActivity).not.toHaveBeenCalled();
|
expect(mockActivityService.logActivity).toHaveBeenCalled();
|
||||||
|
const callArgs = mockActivityService.logActivity.mock.calls[0][0];
|
||||||
|
expect(callArgs.userId).toBe("user-123");
|
||||||
|
expect(callArgs.entityId).toBe("task-123");
|
||||||
|
expect(callArgs.workspaceId).toBeUndefined();
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -412,10 +420,18 @@ describe("ActivityLoggingInterceptor", () => {
|
|||||||
const context = createMockExecutionContext("POST", {}, body, user);
|
const context = createMockExecutionContext("POST", {}, body, user);
|
||||||
const next = createMockCallHandler(result);
|
const next = createMockCallHandler(result);
|
||||||
|
|
||||||
|
mockActivityService.logActivity.mockResolvedValue({
|
||||||
|
id: "activity-123",
|
||||||
|
});
|
||||||
|
|
||||||
await new Promise<void>((resolve) => {
|
await new Promise<void>((resolve) => {
|
||||||
interceptor.intercept(context, next).subscribe(() => {
|
interceptor.intercept(context, next).subscribe(() => {
|
||||||
// Should not call logActivity when workspaceId is missing
|
// workspaceId is now optional, so logActivity should be called without it
|
||||||
expect(mockActivityService.logActivity).not.toHaveBeenCalled();
|
expect(mockActivityService.logActivity).toHaveBeenCalled();
|
||||||
|
const callArgs = mockActivityService.logActivity.mock.calls[0][0];
|
||||||
|
expect(callArgs.userId).toBe("user-123");
|
||||||
|
expect(callArgs.entityId).toBe("task-123");
|
||||||
|
expect(callArgs.workspaceId).toBeUndefined();
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Base image for all stages
|
# Base image for all stages
|
||||||
# Uses Debian slim (glibc) instead of Alpine (musl) for native addon compatibility.
|
# Uses Debian slim (glibc) instead of Alpine (musl) for native addon compatibility.
|
||||||
FROM node:24-slim AS base
|
FROM git.mosaicstack.dev/mosaic/node-base:24-slim AS base
|
||||||
|
|
||||||
# Install pnpm globally
|
# Install pnpm globally
|
||||||
RUN corepack enable && corepack prepare pnpm@10.27.0 --activate
|
RUN corepack enable && corepack prepare pnpm@10.27.0 --activate
|
||||||
@@ -54,7 +54,7 @@ RUN find ./apps/orchestrator/dist \( -name '*.spec.js' -o -name '*.spec.js.map'
|
|||||||
# ======================
|
# ======================
|
||||||
# Production stage
|
# Production stage
|
||||||
# ======================
|
# ======================
|
||||||
FROM node:24-slim AS production
|
FROM git.mosaicstack.dev/mosaic/node-base:24-slim AS production
|
||||||
|
|
||||||
# Add metadata labels
|
# Add metadata labels
|
||||||
LABEL maintainer="mosaic-team@mosaicstack.dev"
|
LABEL maintainer="mosaic-team@mosaicstack.dev"
|
||||||
@@ -65,13 +65,12 @@ LABEL org.opencontainers.image.vendor="Mosaic Stack"
|
|||||||
LABEL org.opencontainers.image.title="Mosaic Orchestrator"
|
LABEL org.opencontainers.image.title="Mosaic Orchestrator"
|
||||||
LABEL org.opencontainers.image.description="Agent orchestration service for Mosaic Stack"
|
LABEL org.opencontainers.image.description="Agent orchestration service for Mosaic Stack"
|
||||||
|
|
||||||
# Install dumb-init for proper signal handling (static binary from GitHub,
|
# dumb-init, ca-certificates pre-installed in base image
|
||||||
# avoids apt-get which fails under Kaniko with bookworm GPG signature errors)
|
|
||||||
ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 /usr/local/bin/dumb-init
|
|
||||||
|
|
||||||
# Single RUN to minimize Kaniko filesystem snapshots (each RUN = full snapshot)
|
# Single RUN to minimize Kaniko filesystem snapshots (each RUN = full snapshot)
|
||||||
|
# - Remove npm/npx to reduce image size (not used in production)
|
||||||
|
# - Create non-root user
|
||||||
RUN rm -rf /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx \
|
RUN rm -rf /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx \
|
||||||
&& chmod 755 /usr/local/bin/dumb-init \
|
|
||||||
&& groupadd -g 1001 nodejs && useradd -m -u 1001 -g nodejs nestjs
|
&& groupadd -g 1001 nodejs && useradd -m -u 1001 -g nodejs nestjs
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Base image for all stages
|
# Base image for all stages
|
||||||
# Uses Debian slim (glibc) for consistency with API/orchestrator and to prevent
|
# Uses Debian slim (glibc) for consistency with API/orchestrator and to prevent
|
||||||
# future native addon compatibility issues with Alpine's musl libc.
|
# future native addon compatibility issues with Alpine's musl libc.
|
||||||
FROM node:24-slim AS base
|
FROM git.mosaicstack.dev/mosaic/node-base:24-slim AS base
|
||||||
|
|
||||||
# Install pnpm globally
|
# Install pnpm globally
|
||||||
RUN corepack enable && corepack prepare pnpm@10.27.0 --activate
|
RUN corepack enable && corepack prepare pnpm@10.27.0 --activate
|
||||||
@@ -87,15 +87,14 @@ RUN mkdir -p ./apps/web/public
|
|||||||
# ======================
|
# ======================
|
||||||
# Production stage
|
# Production stage
|
||||||
# ======================
|
# ======================
|
||||||
FROM node:24-slim AS production
|
FROM git.mosaicstack.dev/mosaic/node-base:24-slim AS production
|
||||||
|
|
||||||
# Install dumb-init for proper signal handling (static binary from GitHub,
|
# dumb-init, ca-certificates pre-installed in base image
|
||||||
# avoids apt-get which fails under Kaniko with bookworm GPG signature errors)
|
|
||||||
ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 /usr/local/bin/dumb-init
|
|
||||||
|
|
||||||
# Single RUN to minimize Kaniko filesystem snapshots (each RUN = full snapshot)
|
# Single RUN to minimize Kaniko filesystem snapshots (each RUN = full snapshot)
|
||||||
|
# - Remove npm/npx to reduce image size (not used in production)
|
||||||
|
# - Create non-root user
|
||||||
RUN rm -rf /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx \
|
RUN rm -rf /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx \
|
||||||
&& chmod 755 /usr/local/bin/dumb-init \
|
|
||||||
&& groupadd -g 1001 nodejs && useradd -m -u 1001 -g nodejs nextjs
|
&& groupadd -g 1001 nodejs && useradd -m -u 1001 -g nodejs nextjs
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|||||||
@@ -184,10 +184,11 @@ function TaskCard({ task, provided, snapshot, columnAccent }: TaskCardProps): Re
|
|||||||
interface KanbanColumnProps {
|
interface KanbanColumnProps {
|
||||||
config: ColumnConfig;
|
config: ColumnConfig;
|
||||||
tasks: Task[];
|
tasks: Task[];
|
||||||
onAddTask: (status: TaskStatus, title: string) => Promise<void>;
|
onAddTask: (status: TaskStatus, title: string, projectId?: string) => Promise<void>;
|
||||||
|
projectId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
function KanbanColumn({ config, tasks, onAddTask }: KanbanColumnProps): ReactElement {
|
function KanbanColumn({ config, tasks, onAddTask, projectId }: KanbanColumnProps): ReactElement {
|
||||||
const [showAddForm, setShowAddForm] = useState(false);
|
const [showAddForm, setShowAddForm] = useState(false);
|
||||||
const [inputValue, setInputValue] = useState("");
|
const [inputValue, setInputValue] = useState("");
|
||||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||||
@@ -208,7 +209,7 @@ function KanbanColumn({ config, tasks, onAddTask }: KanbanColumnProps): ReactEle
|
|||||||
|
|
||||||
setIsSubmitting(true);
|
setIsSubmitting(true);
|
||||||
try {
|
try {
|
||||||
await onAddTask(config.status, inputValue.trim());
|
await onAddTask(config.status, inputValue.trim(), projectId);
|
||||||
setInputValue("");
|
setInputValue("");
|
||||||
setShowAddForm(false);
|
setShowAddForm(false);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -362,6 +363,45 @@ function KanbanColumn({ config, tasks, onAddTask }: KanbanColumnProps): ReactEle
|
|||||||
}}
|
}}
|
||||||
autoFocus
|
autoFocus
|
||||||
/>
|
/>
|
||||||
|
<div style={{ display: "flex", gap: 6, marginTop: 6 }}>
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
disabled={isSubmitting || !inputValue.trim()}
|
||||||
|
style={{
|
||||||
|
padding: "6px 12px",
|
||||||
|
borderRadius: "var(--r)",
|
||||||
|
border: "1px solid var(--primary)",
|
||||||
|
background: "var(--primary)",
|
||||||
|
color: "#fff",
|
||||||
|
fontSize: "0.8rem",
|
||||||
|
fontWeight: 500,
|
||||||
|
cursor: isSubmitting || !inputValue.trim() ? "not-allowed" : "pointer",
|
||||||
|
opacity: isSubmitting || !inputValue.trim() ? 0.5 : 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
✓ Add
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
setShowAddForm(false);
|
||||||
|
setInputValue("");
|
||||||
|
}}
|
||||||
|
disabled={isSubmitting}
|
||||||
|
style={{
|
||||||
|
padding: "6px 12px",
|
||||||
|
borderRadius: "var(--r)",
|
||||||
|
border: "1px solid var(--border)",
|
||||||
|
background: "transparent",
|
||||||
|
color: "var(--muted)",
|
||||||
|
fontSize: "0.8rem",
|
||||||
|
cursor: isSubmitting ? "not-allowed" : "pointer",
|
||||||
|
opacity: isSubmitting ? 0.5 : 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<div style={{ marginTop: 6, fontSize: "0.75rem", color: "var(--muted)" }}>
|
<div style={{ marginTop: 6, fontSize: "0.75rem", color: "var(--muted)" }}>
|
||||||
Press{" "}
|
Press{" "}
|
||||||
<kbd
|
<kbd
|
||||||
@@ -745,10 +785,17 @@ export default function KanbanPage(): ReactElement {
|
|||||||
/* --- add task handler --- */
|
/* --- add task handler --- */
|
||||||
|
|
||||||
const handleAddTask = useCallback(
|
const handleAddTask = useCallback(
|
||||||
async (status: TaskStatus, title: string) => {
|
async (status: TaskStatus, title: string, projectId?: string) => {
|
||||||
try {
|
try {
|
||||||
const wsId = workspaceId ?? undefined;
|
const wsId = workspaceId ?? undefined;
|
||||||
const newTask = await createTask({ title, status }, wsId);
|
const taskData: { title: string; status: TaskStatus; projectId?: string } = {
|
||||||
|
title,
|
||||||
|
status,
|
||||||
|
};
|
||||||
|
if (projectId) {
|
||||||
|
taskData.projectId = projectId;
|
||||||
|
}
|
||||||
|
const newTask = await createTask(taskData, wsId);
|
||||||
// Optimistically add to local state
|
// Optimistically add to local state
|
||||||
setTasks((prev) => [...prev, newTask]);
|
setTasks((prev) => [...prev, newTask]);
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
@@ -866,23 +913,8 @@ export default function KanbanPage(): ReactElement {
|
|||||||
Clear filters
|
Clear filters
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
) : tasks.length === 0 ? (
|
|
||||||
/* Empty state */
|
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
background: "var(--surface)",
|
|
||||||
border: "1px solid var(--border)",
|
|
||||||
borderRadius: "var(--r-lg)",
|
|
||||||
padding: 48,
|
|
||||||
textAlign: "center",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<p style={{ color: "var(--muted)", margin: 0, fontSize: "0.9rem" }}>
|
|
||||||
No tasks yet. Create some tasks to see them here.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
) : (
|
) : (
|
||||||
/* Board */
|
/* Board (always render columns to allow adding first task) */
|
||||||
<DragDropContext onDragEnd={handleDragEnd}>
|
<DragDropContext onDragEnd={handleDragEnd}>
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
@@ -899,6 +931,7 @@ export default function KanbanPage(): ReactElement {
|
|||||||
config={col}
|
config={col}
|
||||||
tasks={grouped[col.status]}
|
tasks={grouped[col.status]}
|
||||||
onAddTask={handleAddTask}
|
onAddTask={handleAddTask}
|
||||||
|
projectId={filterProject}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* Chat API client
|
* Chat API client
|
||||||
* Handles LLM chat interactions via /api/llm/chat
|
* Handles LLM chat interactions via /api/chat/stream (streaming) and /api/llm/chat (fallback)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { apiPost, fetchCsrfToken, getCsrfToken } from "./client";
|
import { apiPost, fetchCsrfToken, getCsrfToken } from "./client";
|
||||||
@@ -33,9 +33,28 @@ export interface ChatResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parsed SSE data chunk from the LLM stream
|
* Parsed SSE data chunk from OpenAI-compatible stream
|
||||||
*/
|
*/
|
||||||
interface SseChunk {
|
interface OpenAiSseChunk {
|
||||||
|
id?: string;
|
||||||
|
object?: string;
|
||||||
|
created?: number;
|
||||||
|
model?: string;
|
||||||
|
choices?: {
|
||||||
|
index: number;
|
||||||
|
delta?: {
|
||||||
|
role?: string;
|
||||||
|
content?: string;
|
||||||
|
};
|
||||||
|
finish_reason?: string | null;
|
||||||
|
}[];
|
||||||
|
error?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parsed SSE data chunk from legacy /api/llm/chat stream
|
||||||
|
*/
|
||||||
|
interface LegacySseChunk {
|
||||||
error?: string;
|
error?: string;
|
||||||
message?: {
|
message?: {
|
||||||
role: string;
|
role: string;
|
||||||
@@ -46,7 +65,17 @@ interface SseChunk {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send a chat message to the LLM
|
* Parsed SSE data chunk with simple token format
|
||||||
|
*/
|
||||||
|
interface SimpleTokenChunk {
|
||||||
|
token?: string;
|
||||||
|
done?: boolean;
|
||||||
|
error?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send a chat message to the LLM (non-streaming fallback)
|
||||||
|
* Uses /api/llm/chat endpoint which supports both streaming and non-streaming
|
||||||
*/
|
*/
|
||||||
export async function sendChatMessage(request: ChatRequest): Promise<ChatResponse> {
|
export async function sendChatMessage(request: ChatRequest): Promise<ChatResponse> {
|
||||||
return apiPost<ChatResponse>("/api/llm/chat", request);
|
return apiPost<ChatResponse>("/api/llm/chat", request);
|
||||||
@@ -66,11 +95,20 @@ async function ensureCsrfTokenForStream(): Promise<string> {
|
|||||||
/**
|
/**
|
||||||
* Stream a chat message from the LLM using SSE over fetch.
|
* Stream a chat message from the LLM using SSE over fetch.
|
||||||
*
|
*
|
||||||
* The backend accepts stream: true in the request body and responds with
|
* Uses /api/chat/stream endpoint which proxies to OpenClaw.
|
||||||
* Server-Sent Events:
|
* The backend responds with Server-Sent Events in one of these formats:
|
||||||
* data: {"message":{"content":"token"},...}\n\n for each token
|
*
|
||||||
* data: [DONE]\n\n when the stream is complete
|
* OpenAI-compatible format:
|
||||||
* data: {"error":"message"}\n\n on error
|
* data: {"choices":[{"delta":{"content":"token"}}],...}\n\n
|
||||||
|
* data: [DONE]\n\n
|
||||||
|
*
|
||||||
|
* Legacy format (from /api/llm/chat):
|
||||||
|
* data: {"message":{"content":"token"},...}\n\n
|
||||||
|
* data: [DONE]\n\n
|
||||||
|
*
|
||||||
|
* Simple token format:
|
||||||
|
* data: {"token":"..."}\n\n
|
||||||
|
* data: {"done":true}\n\n
|
||||||
*
|
*
|
||||||
* @param request - Chat request (stream field will be forced to true)
|
* @param request - Chat request (stream field will be forced to true)
|
||||||
* @param onChunk - Called with each token string as it arrives
|
* @param onChunk - Called with each token string as it arrives
|
||||||
@@ -89,14 +127,14 @@ export function streamChatMessage(
|
|||||||
try {
|
try {
|
||||||
const csrfToken = await ensureCsrfTokenForStream();
|
const csrfToken = await ensureCsrfTokenForStream();
|
||||||
|
|
||||||
const response = await fetch(`${API_BASE_URL}/api/llm/chat`, {
|
const response = await fetch(`${API_BASE_URL}/api/chat/stream`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
"X-CSRF-Token": csrfToken,
|
"X-CSRF-Token": csrfToken,
|
||||||
},
|
},
|
||||||
credentials: "include",
|
credentials: "include",
|
||||||
body: JSON.stringify({ ...request, stream: true }),
|
body: JSON.stringify({ messages: request.messages, stream: true }),
|
||||||
signal: signal ?? null,
|
signal: signal ?? null,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -132,6 +170,25 @@ export function streamChatMessage(
|
|||||||
const trimmed = part.trim();
|
const trimmed = part.trim();
|
||||||
if (!trimmed) continue;
|
if (!trimmed) continue;
|
||||||
|
|
||||||
|
// Handle event: error format
|
||||||
|
const eventMatch = /^event:\s*(\S+)\n/i.exec(trimmed);
|
||||||
|
const dataMatch = /^data:\s*(.+)$/im.exec(trimmed);
|
||||||
|
|
||||||
|
if (eventMatch?.[1] === "error" && dataMatch?.[1]) {
|
||||||
|
try {
|
||||||
|
const errorData = JSON.parse(dataMatch[1].trim()) as {
|
||||||
|
error?: string;
|
||||||
|
};
|
||||||
|
throw new Error(errorData.error ?? "Stream error occurred");
|
||||||
|
} catch (parseErr) {
|
||||||
|
if (parseErr instanceof SyntaxError) {
|
||||||
|
throw new Error("Stream error occurred");
|
||||||
|
}
|
||||||
|
throw parseErr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Standard SSE format: data: {...}
|
||||||
for (const line of trimmed.split("\n")) {
|
for (const line of trimmed.split("\n")) {
|
||||||
if (!line.startsWith("data: ")) continue;
|
if (!line.startsWith("data: ")) continue;
|
||||||
|
|
||||||
@@ -143,14 +200,39 @@ export function streamChatMessage(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const parsed = JSON.parse(data) as SseChunk;
|
const parsed: unknown = JSON.parse(data);
|
||||||
|
|
||||||
if (parsed.error) {
|
// Handle OpenAI format (from /api/chat/stream via OpenClaw)
|
||||||
throw new Error(parsed.error);
|
const openAiChunk = parsed as OpenAiSseChunk;
|
||||||
|
if (openAiChunk.choices?.[0]?.delta?.content) {
|
||||||
|
onChunk(openAiChunk.choices[0].delta.content);
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parsed.message?.content) {
|
// Handle legacy format (from /api/llm/chat)
|
||||||
onChunk(parsed.message.content);
|
const legacyChunk = parsed as LegacySseChunk;
|
||||||
|
if (legacyChunk.message?.content) {
|
||||||
|
onChunk(legacyChunk.message.content);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle simple token format
|
||||||
|
const simpleChunk = parsed as SimpleTokenChunk;
|
||||||
|
if (simpleChunk.token) {
|
||||||
|
onChunk(simpleChunk.token);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle done flag in simple format
|
||||||
|
if (simpleChunk.done === true) {
|
||||||
|
onComplete();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle error in any format
|
||||||
|
const error = openAiChunk.error ?? legacyChunk.error ?? simpleChunk.error;
|
||||||
|
if (error) {
|
||||||
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
} catch (parseErr) {
|
} catch (parseErr) {
|
||||||
if (parseErr instanceof SyntaxError) {
|
if (parseErr instanceof SyntaxError) {
|
||||||
@@ -162,7 +244,7 @@ export function streamChatMessage(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Natural end of stream without [DONE]
|
// Natural end of stream without [DONE] or done flag
|
||||||
onComplete();
|
onComplete();
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
if (err instanceof DOMException && err.name === "AbortError") {
|
if (err instanceof DOMException && err.name === "AbortError") {
|
||||||
|
|||||||
16
docker/base.Dockerfile
Normal file
16
docker/base.Dockerfile
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
FROM node:24-slim AS base
|
||||||
|
|
||||||
|
# Pre-bake OS updates and common packages shared across all apps.
|
||||||
|
# Rebuild this image weekly or when base packages change.
|
||||||
|
# Push to: git.mosaicstack.dev/mosaic/node-base:24-slim
|
||||||
|
RUN apt-get update && apt-get upgrade -y --no-install-recommends \
|
||||||
|
&& apt-get install -y --no-install-recommends \
|
||||||
|
openssl \
|
||||||
|
ca-certificates \
|
||||||
|
curl \
|
||||||
|
dumb-init \
|
||||||
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Enable corepack for pnpm
|
||||||
|
RUN corepack enable
|
||||||
Reference in New Issue
Block a user