mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-01 20:23:36 +00:00
- Use node-pty on all platforms instead of expect on macOS for more reliable PTY handling
- Use process.cwd() as working directory (project dir is likely already trusted)
- Add detection for new trust prompt text variants ("Ready to code here", "permission to work")
- Add specific error handling for trust prompt pending state
- Show helpful UI message when trust prompt needs manual approval
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
58 lines
2.2 KiB
TypeScript
58 lines
2.2 KiB
TypeScript
import { Router, Request, Response } from 'express';
|
|
import { ClaudeUsageService } from '../../services/claude-usage-service.js';
|
|
import { createLogger } from '@automaker/utils';
|
|
|
|
const logger = createLogger('Claude');
|
|
|
|
export function createClaudeRoutes(service: ClaudeUsageService): Router {
|
|
const router = Router();
|
|
|
|
// Get current usage (fetches from Claude CLI)
|
|
router.get('/usage', async (req: Request, res: Response) => {
|
|
try {
|
|
// Check if Claude CLI is available first
|
|
const isAvailable = await service.isAvailable();
|
|
if (!isAvailable) {
|
|
// IMPORTANT: This endpoint is behind Automaker session auth already.
|
|
// Use a 200 + error payload for Claude CLI issues so the UI doesn't
|
|
// interpret it as an invalid Automaker session (401/403 triggers logout).
|
|
res.status(200).json({
|
|
error: 'Claude CLI not found',
|
|
message: "Please install Claude Code CLI and run 'claude login' to authenticate",
|
|
});
|
|
return;
|
|
}
|
|
|
|
const usage = await service.fetchUsageData();
|
|
res.json(usage);
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
|
|
if (message.includes('Authentication required') || message.includes('token_expired')) {
|
|
// Do NOT use 401/403 here: that status code is reserved for Automaker session auth.
|
|
res.status(200).json({
|
|
error: 'Authentication required',
|
|
message: "Please run 'claude login' to authenticate",
|
|
});
|
|
} else if (message.includes('TRUST_PROMPT_PENDING')) {
|
|
// Trust prompt appeared but couldn't be auto-approved
|
|
res.status(200).json({
|
|
error: 'Trust prompt pending',
|
|
message:
|
|
'Claude CLI needs folder permission. Please run "claude" in your terminal and approve access.',
|
|
});
|
|
} else if (message.includes('timed out')) {
|
|
res.status(200).json({
|
|
error: 'Command timed out',
|
|
message: 'The Claude CLI took too long to respond',
|
|
});
|
|
} else {
|
|
logger.error('Error fetching usage:', error);
|
|
res.status(500).json({ error: message });
|
|
}
|
|
}
|
|
});
|
|
|
|
return router;
|
|
}
|