Skip to content

cb fixes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fblgit merged 3 commits into from
Sep 23, 2025
Merged

cb fixes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff28a08
{
fblgit Sep 22, 2025
c96743c
{
fblgit Sep 23, 2025
9929324
{
fblgit Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions apps/server/src/handlers/task/task.decompose.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,23 @@ export class TaskDecomposeHandler {

// Get worker's working directory from instance metadata
let workingDirectory: string | undefined;
if (ctx.instanceId) {
const instanceKey = `cb:instance:${ctx.instanceId}`;
// First check if a specific worker was requested in the input metadata
const requestedWorkerId = input.metadata?.workerId;
const workerId = requestedWorkerId || ctx.instanceId;

if (workerId) {
const instanceKey = `cb:instance:${workerId}`;
const instanceMetadata = await redis.pub.hget(instanceKey, 'metadata');
if (instanceMetadata) {
try {
const metadata = JSON.parse(instanceMetadata);
workingDirectory = metadata.workingDirectory;
console.log(`[TaskDecompose] Using working directory from instance ${ctx.instanceId}: ${workingDirectory}`);
console.log(`[TaskDecompose] Using working directory from instance ${workerId}: ${workingDirectory}`);
} catch (e) {
console.warn(`[TaskDecompose] Failed to parse instance metadata:`, e);
console.warn(`[TaskDecompose] Failed to parse instance metadata for ${workerId}:`, e);
}
} else if (requestedWorkerId) {
console.warn(`[TaskDecompose] Requested worker ${requestedWorkerId} not found or has no metadata`);
}
}

Expand Down
16 changes: 14 additions & 2 deletions apps/web/src/services/event-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,16 @@ export class EventClient {
const id = ++this.requestId;

// Use longer timeout for context generation and other long-running operations
const longRunningMethods = ['task.context', 'swarm.context', 'swarm.decompose', 'swarm.synthesize', 'swarm.resolve'];
const longRunningMethods = [
'task.context',
'task.decompose',
'task.create_project',
'swarm.context',
'swarm.decompose',
'swarm.synthesize',
'swarm.resolve',
'swarm.create_project'
];
const isLongRunning = longRunningMethods.includes(method);
const originalTimeout = this.config.timeout;

Expand All @@ -106,8 +115,11 @@ export class EventClient {

let lastError: Error | undefined;

// For long-running operations, don't retry automatically as they may not be idempotent
const maxAttempts = isLongRunning ? 1 : this.config.retries + 1;

try {
for (let attempt = 0; attempt <= this.config.retries; attempt++) {
for (let attempt = 0; attempt < maxAttempts; attempt++) {
try {
const response = await this.sendRequest(request);

Expand Down