Compare commits
1 Commits
docs/auto-
...
docs/auto-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22fa529ce7 |
@@ -22,7 +22,6 @@
|
|||||||
"test:ci": "vitest run --coverage --reporter=dot"
|
"test:ci": "vitest run --coverage --reporter=dot"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@inquirer/search": "^3.2.0",
|
|
||||||
"@tm/core": "*",
|
"@tm/core": "*",
|
||||||
"boxen": "^8.0.1",
|
"boxen": "^8.0.1",
|
||||||
"chalk": "5.6.2",
|
"chalk": "5.6.2",
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import {
|
|||||||
type AuthCredentials
|
type AuthCredentials
|
||||||
} from '@tm/core/auth';
|
} from '@tm/core/auth';
|
||||||
import * as ui from '../utils/ui.js';
|
import * as ui from '../utils/ui.js';
|
||||||
import { ContextCommand } from './context.command.js';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Result type from auth command
|
* Result type from auth command
|
||||||
@@ -352,37 +351,6 @@ export class AuthCommand extends Command {
|
|||||||
chalk.gray(` Logged in as: ${credentials.email || credentials.userId}`)
|
chalk.gray(` Logged in as: ${credentials.email || credentials.userId}`)
|
||||||
);
|
);
|
||||||
|
|
||||||
// Post-auth: Set up workspace context
|
|
||||||
console.log(); // Add spacing
|
|
||||||
try {
|
|
||||||
const contextCommand = new ContextCommand();
|
|
||||||
const contextResult = await contextCommand.setupContextInteractive();
|
|
||||||
if (contextResult.success) {
|
|
||||||
if (contextResult.orgSelected && contextResult.briefSelected) {
|
|
||||||
console.log(
|
|
||||||
chalk.green('✓ Workspace context configured successfully')
|
|
||||||
);
|
|
||||||
} else if (contextResult.orgSelected) {
|
|
||||||
console.log(chalk.green('✓ Organization selected'));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.log(
|
|
||||||
chalk.yellow('⚠ Context setup was skipped or encountered issues')
|
|
||||||
);
|
|
||||||
console.log(
|
|
||||||
chalk.gray(' You can set up context later with "tm context"')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} catch (contextError) {
|
|
||||||
console.log(chalk.yellow('⚠ Context setup encountered an error'));
|
|
||||||
console.log(
|
|
||||||
chalk.gray(' You can set up context later with "tm context"')
|
|
||||||
);
|
|
||||||
if (process.env.DEBUG) {
|
|
||||||
console.error(chalk.gray((contextError as Error).message));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
action: 'login',
|
action: 'login',
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
import { Command } from 'commander';
|
import { Command } from 'commander';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import inquirer from 'inquirer';
|
import inquirer from 'inquirer';
|
||||||
import search from '@inquirer/search';
|
|
||||||
import ora, { Ora } from 'ora';
|
import ora, { Ora } from 'ora';
|
||||||
import {
|
import {
|
||||||
AuthManager,
|
AuthManager,
|
||||||
@@ -157,14 +156,10 @@ export class ContextCommand extends Command {
|
|||||||
|
|
||||||
if (context.briefName || context.briefId) {
|
if (context.briefName || context.briefId) {
|
||||||
console.log(chalk.green('\n✓ Brief'));
|
console.log(chalk.green('\n✓ Brief'));
|
||||||
if (context.briefName && context.briefId) {
|
if (context.briefName) {
|
||||||
const shortId = context.briefId.slice(0, 8);
|
|
||||||
console.log(
|
|
||||||
chalk.white(` ${context.briefName} `) + chalk.gray(`(${shortId})`)
|
|
||||||
);
|
|
||||||
} else if (context.briefName) {
|
|
||||||
console.log(chalk.white(` ${context.briefName}`));
|
console.log(chalk.white(` ${context.briefName}`));
|
||||||
} else if (context.briefId) {
|
}
|
||||||
|
if (context.briefId) {
|
||||||
console.log(chalk.gray(` ID: ${context.briefId}`));
|
console.log(chalk.gray(` ID: ${context.briefId}`));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -329,53 +324,25 @@ export class ContextCommand extends Command {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prompt for selection with search
|
// Prompt for selection
|
||||||
const selectedBrief = await search<(typeof briefs)[0] | null>({
|
const { selectedBrief } = await inquirer.prompt([
|
||||||
message: 'Search for a brief:',
|
{
|
||||||
source: async (input) => {
|
type: 'list',
|
||||||
const searchTerm = input?.toLowerCase() || '';
|
name: 'selectedBrief',
|
||||||
|
message: 'Select a brief:',
|
||||||
// Static option for no brief
|
choices: [
|
||||||
const noBriefOption = {
|
{ name: '(No brief - organization level)', value: null },
|
||||||
name: '(No brief - organization level)',
|
...briefs.map((brief) => ({
|
||||||
value: null as any,
|
name: `Brief ${brief.id} (${new Date(brief.createdAt).toLocaleDateString()})`,
|
||||||
description: 'Clear brief selection'
|
value: brief
|
||||||
};
|
}))
|
||||||
|
]
|
||||||
// Filter and map brief options
|
|
||||||
const briefOptions = briefs
|
|
||||||
.filter((brief) => {
|
|
||||||
if (!searchTerm) return true;
|
|
||||||
|
|
||||||
const title = brief.document?.title || '';
|
|
||||||
const shortId = brief.id.slice(0, 8);
|
|
||||||
|
|
||||||
// Search by title first, then by UUID
|
|
||||||
return (
|
|
||||||
title.toLowerCase().includes(searchTerm) ||
|
|
||||||
brief.id.toLowerCase().includes(searchTerm) ||
|
|
||||||
shortId.toLowerCase().includes(searchTerm)
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.map((brief) => {
|
|
||||||
const title =
|
|
||||||
brief.document?.title || `Brief ${brief.id.slice(0, 8)}`;
|
|
||||||
const shortId = brief.id.slice(0, 8);
|
|
||||||
return {
|
|
||||||
name: `${title} ${chalk.gray(`(${shortId})`)}`,
|
|
||||||
value: brief
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
return [noBriefOption, ...briefOptions];
|
|
||||||
}
|
}
|
||||||
});
|
]);
|
||||||
|
|
||||||
if (selectedBrief) {
|
if (selectedBrief) {
|
||||||
// Update context with brief
|
// Update context with brief
|
||||||
const briefName =
|
const briefName = `Brief ${selectedBrief.id.slice(0, 8)}`;
|
||||||
selectedBrief.document?.title ||
|
|
||||||
`Brief ${selectedBrief.id.slice(0, 8)}`;
|
|
||||||
this.authManager.updateContext({
|
this.authManager.updateContext({
|
||||||
briefId: selectedBrief.id,
|
briefId: selectedBrief.id,
|
||||||
briefName: briefName
|
briefName: briefName
|
||||||
@@ -387,7 +354,7 @@ export class ContextCommand extends Command {
|
|||||||
success: true,
|
success: true,
|
||||||
action: 'select-brief',
|
action: 'select-brief',
|
||||||
context: this.authManager.getContext() || undefined,
|
context: this.authManager.getContext() || undefined,
|
||||||
message: `Selected brief: ${selectedBrief.document?.title}`
|
message: `Selected brief: ${selectedBrief.name}`
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
// Clear brief selection
|
// Clear brief selection
|
||||||
@@ -501,7 +468,7 @@ export class ContextCommand extends Command {
|
|||||||
if (!briefId) {
|
if (!briefId) {
|
||||||
spinner.fail('Could not extract a brief ID from the provided input');
|
spinner.fail('Could not extract a brief ID from the provided input');
|
||||||
ui.displayError(
|
ui.displayError(
|
||||||
`Provide a valid brief ID or a Hamster brief URL, e.g. https://${process.env.TM_BASE_DOMAIN || process.env.TM_PUBLIC_BASE_DOMAIN}/home/hamster/briefs/<id>`
|
`Provide a valid brief ID or a Hamster brief URL, e.g. https://${process.env.TM_PUBLIC_BASE_DOMAIN}/home/hamster/briefs/<id>`
|
||||||
);
|
);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
@@ -523,8 +490,7 @@ export class ContextCommand extends Command {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update context: set org and brief
|
// Update context: set org and brief
|
||||||
const briefName =
|
const briefName = `Brief ${brief.id.slice(0, 8)}`;
|
||||||
brief.document?.title || `Brief ${brief.id.slice(0, 8)}`;
|
|
||||||
this.authManager.updateContext({
|
this.authManager.updateContext({
|
||||||
orgId: brief.accountId,
|
orgId: brief.accountId,
|
||||||
orgName,
|
orgName,
|
||||||
@@ -720,53 +686,6 @@ export class ContextCommand extends Command {
|
|||||||
return this.authManager.getContext();
|
return this.authManager.getContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Interactive context setup (for post-auth flow)
|
|
||||||
* Prompts user to select org and brief
|
|
||||||
*/
|
|
||||||
async setupContextInteractive(): Promise<{
|
|
||||||
success: boolean;
|
|
||||||
orgSelected: boolean;
|
|
||||||
briefSelected: boolean;
|
|
||||||
}> {
|
|
||||||
try {
|
|
||||||
// Ask if user wants to set up workspace context
|
|
||||||
const { setupContext } = await inquirer.prompt([
|
|
||||||
{
|
|
||||||
type: 'confirm',
|
|
||||||
name: 'setupContext',
|
|
||||||
message: 'Would you like to set up your workspace context now?',
|
|
||||||
default: true
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (!setupContext) {
|
|
||||||
return { success: true, orgSelected: false, briefSelected: false };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Select organization
|
|
||||||
const orgResult = await this.selectOrganization();
|
|
||||||
if (!orgResult.success || !orgResult.context?.orgId) {
|
|
||||||
return { success: false, orgSelected: false, briefSelected: false };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Select brief
|
|
||||||
const briefResult = await this.selectBrief(orgResult.context.orgId);
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
orgSelected: true,
|
|
||||||
briefSelected: briefResult.success
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
console.error(
|
|
||||||
chalk.yellow(
|
|
||||||
'\nContext setup skipped due to error. You can set it up later with "tm context"'
|
|
||||||
)
|
|
||||||
);
|
|
||||||
return { success: false, orgSelected: false, briefSelected: false };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clean up resources
|
* Clean up resources
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -5,45 +5,6 @@ sidebarTitle: "CLI Commands"
|
|||||||
|
|
||||||
|
|
||||||
<AccordionGroup>
|
<AccordionGroup>
|
||||||
<Accordion title="Authentication">
|
|
||||||
```bash
|
|
||||||
# Log in to tryhamster.com (opens browser for OAuth authentication)
|
|
||||||
task-master auth login
|
|
||||||
|
|
||||||
# Display current authentication status
|
|
||||||
task-master auth status
|
|
||||||
|
|
||||||
# Log out and clear stored credentials
|
|
||||||
task-master auth logout
|
|
||||||
|
|
||||||
# Refresh authentication token
|
|
||||||
task-master auth refresh
|
|
||||||
```
|
|
||||||
|
|
||||||
**Note**: After successful login, Task Master will automatically prompt you to configure your workspace context (organization and project selection). If context setup encounters issues, you can configure it later using `task-master context`.
|
|
||||||
</Accordion>
|
|
||||||
|
|
||||||
<Accordion title="Workspace Context">
|
|
||||||
```bash
|
|
||||||
# Show current workspace context (organization and brief)
|
|
||||||
task-master context
|
|
||||||
|
|
||||||
# Select an organization
|
|
||||||
task-master context org
|
|
||||||
|
|
||||||
# Select a brief within the current organization
|
|
||||||
task-master context brief
|
|
||||||
|
|
||||||
# Set context directly with IDs
|
|
||||||
task-master context set --org <orgId> --brief <briefId>
|
|
||||||
|
|
||||||
# Clear all context selections
|
|
||||||
task-master context clear
|
|
||||||
```
|
|
||||||
|
|
||||||
**Note**: Workspace context determines which organization and project brief your tasks and data are associated with. This is automatically configured during initial login but can be changed anytime.
|
|
||||||
</Accordion>
|
|
||||||
|
|
||||||
<Accordion title="Parse PRD">
|
<Accordion title="Parse PRD">
|
||||||
```bash
|
```bash
|
||||||
# Parse a PRD file and generate tasks
|
# Parse a PRD file and generate tasks
|
||||||
@@ -239,6 +200,22 @@ sidebarTitle: "CLI Commands"
|
|||||||
```
|
```
|
||||||
</Accordion>
|
</Accordion>
|
||||||
|
|
||||||
|
<Accordion title="Authentication">
|
||||||
|
```bash
|
||||||
|
# Login with browser authentication
|
||||||
|
task-master auth login
|
||||||
|
|
||||||
|
# Check authentication status
|
||||||
|
task-master auth status
|
||||||
|
|
||||||
|
# Refresh authentication token
|
||||||
|
task-master auth refresh
|
||||||
|
|
||||||
|
# Logout and clear credentials
|
||||||
|
task-master auth logout
|
||||||
|
```
|
||||||
|
</Accordion>
|
||||||
|
|
||||||
<Accordion title="Initialize a Project">
|
<Accordion title="Initialize a Project">
|
||||||
```bash
|
```bash
|
||||||
# Initialize a new project with Task Master structure
|
# Initialize a new project with Task Master structure
|
||||||
|
|||||||
82
output.txt
82
output.txt
File diff suppressed because one or more lines are too long
86
package-lock.json
generated
86
package-lock.json
generated
@@ -104,7 +104,6 @@
|
|||||||
"name": "@tm/cli",
|
"name": "@tm/cli",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@inquirer/search": "^3.2.0",
|
|
||||||
"@tm/core": "*",
|
"@tm/core": "*",
|
||||||
"boxen": "^8.0.1",
|
"boxen": "^8.0.1",
|
||||||
"chalk": "5.6.2",
|
"chalk": "5.6.2",
|
||||||
@@ -125,91 +124,6 @@
|
|||||||
"node": ">=18.0.0"
|
"node": ">=18.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"apps/cli/node_modules/@inquirer/ansi": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-yqq0aJW/5XPhi5xOAL1xRCpe1eh8UFVgYFpFsjEqmIR8rKLyP+HINvFXwUaxYICflJrVlxnp7lLN6As735kVpw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"apps/cli/node_modules/@inquirer/figures": {
|
|
||||||
"version": "1.0.14",
|
|
||||||
"resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.14.tgz",
|
|
||||||
"integrity": "sha512-DbFgdt+9/OZYFM+19dbpXOSeAstPy884FPy1KjDu4anWwymZeOYhMY1mdFri172htv6mvc/uvIAAi7b7tvjJBQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"apps/cli/node_modules/@inquirer/search": {
|
|
||||||
"version": "3.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.2.0.tgz",
|
|
||||||
"integrity": "sha512-a5SzB/qrXafDX1Z4AZW3CsVoiNxcIYCzYP7r9RzrfMpaLpB+yWi5U8BWagZyLmwR0pKbbL5umnGRd0RzGVI8bQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@inquirer/core": "^10.3.0",
|
|
||||||
"@inquirer/figures": "^1.0.14",
|
|
||||||
"@inquirer/type": "^3.0.9",
|
|
||||||
"yoctocolors-cjs": "^2.1.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@types/node": ">=18"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"@types/node": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"apps/cli/node_modules/@inquirer/search/node_modules/@inquirer/core": {
|
|
||||||
"version": "10.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.3.0.tgz",
|
|
||||||
"integrity": "sha512-Uv2aPPPSK5jeCplQmQ9xadnFx2Zhj9b5Dj7bU6ZeCdDNNY11nhYy4btcSdtDguHqCT2h5oNeQTcUNSGGLA7NTA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@inquirer/ansi": "^1.0.1",
|
|
||||||
"@inquirer/figures": "^1.0.14",
|
|
||||||
"@inquirer/type": "^3.0.9",
|
|
||||||
"cli-width": "^4.1.0",
|
|
||||||
"mute-stream": "^2.0.0",
|
|
||||||
"signal-exit": "^4.1.0",
|
|
||||||
"wrap-ansi": "^6.2.0",
|
|
||||||
"yoctocolors-cjs": "^2.1.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@types/node": ">=18"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"@types/node": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"apps/cli/node_modules/@inquirer/search/node_modules/@inquirer/type": {
|
|
||||||
"version": "3.0.9",
|
|
||||||
"resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.9.tgz",
|
|
||||||
"integrity": "sha512-QPaNt/nmE2bLGQa9b7wwyRJoLZ7pN6rcyXvzU0YCmivmJyq1BVo94G98tStRWkoD1RgDX5C+dPlhhHzNdu/W/w==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@types/node": ">=18"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"@types/node": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"apps/docs": {
|
"apps/docs": {
|
||||||
"version": "0.0.6",
|
"version": "0.0.6",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -7,13 +7,11 @@ import path from 'path';
|
|||||||
import { AuthConfig } from './types.js';
|
import { AuthConfig } from './types.js';
|
||||||
|
|
||||||
// Single base domain for all URLs
|
// Single base domain for all URLs
|
||||||
// Runtime vars (TM_*) take precedence over build-time vars (TM_PUBLIC_*)
|
// Build-time: process.env.TM_PUBLIC_BASE_DOMAIN gets replaced by tsup's env option
|
||||||
// Build-time: process.env.TM_PUBLIC_BASE_DOMAIN gets replaced by tsdown's env option
|
|
||||||
// Runtime: process.env.TM_BASE_DOMAIN can override for staging/development
|
|
||||||
// Default: https://tryhamster.com for production
|
// Default: https://tryhamster.com for production
|
||||||
const BASE_DOMAIN =
|
const BASE_DOMAIN =
|
||||||
process.env.TM_BASE_DOMAIN || // Runtime override (for staging/tux)
|
process.env.TM_PUBLIC_BASE_DOMAIN || // This gets replaced at build time by tsup
|
||||||
process.env.TM_PUBLIC_BASE_DOMAIN; // Build-time (baked into compiled code)
|
'https://tryhamster.com';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default authentication configuration
|
* Default authentication configuration
|
||||||
@@ -21,7 +19,7 @@ const BASE_DOMAIN =
|
|||||||
*/
|
*/
|
||||||
export const DEFAULT_AUTH_CONFIG: AuthConfig = {
|
export const DEFAULT_AUTH_CONFIG: AuthConfig = {
|
||||||
// Base domain for all services
|
// Base domain for all services
|
||||||
baseUrl: BASE_DOMAIN!,
|
baseUrl: BASE_DOMAIN,
|
||||||
|
|
||||||
// Configuration directory and file paths
|
// Configuration directory and file paths
|
||||||
configDir: path.join(os.homedir(), '.taskmaster'),
|
configDir: path.join(os.homedir(), '.taskmaster'),
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ export class CredentialStore {
|
|||||||
private config: AuthConfig;
|
private config: AuthConfig;
|
||||||
// Clock skew tolerance for expiry checks (30 seconds)
|
// Clock skew tolerance for expiry checks (30 seconds)
|
||||||
private readonly CLOCK_SKEW_MS = 30_000;
|
private readonly CLOCK_SKEW_MS = 30_000;
|
||||||
// Track if we've already warned about missing expiration to avoid spam
|
|
||||||
private hasWarnedAboutMissingExpiration = false;
|
|
||||||
|
|
||||||
private constructor(config?: Partial<AuthConfig>) {
|
private constructor(config?: Partial<AuthConfig>) {
|
||||||
this.config = getAuthConfig(config);
|
this.config = getAuthConfig(config);
|
||||||
@@ -86,11 +84,7 @@ export class CredentialStore {
|
|||||||
|
|
||||||
// Validate expiration time for tokens
|
// Validate expiration time for tokens
|
||||||
if (expiresAtMs === undefined) {
|
if (expiresAtMs === undefined) {
|
||||||
// Only log this warning once to avoid spam during auth flows
|
this.logger.warn('No valid expiration time provided for token');
|
||||||
if (!this.hasWarnedAboutMissingExpiration) {
|
|
||||||
this.logger.warn('No valid expiration time provided for token');
|
|
||||||
this.hasWarnedAboutMissingExpiration = true;
|
|
||||||
}
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,9 +174,6 @@ export class CredentialStore {
|
|||||||
mode: 0o600
|
mode: 0o600
|
||||||
});
|
});
|
||||||
fs.renameSync(tempFile, this.config.configFile);
|
fs.renameSync(tempFile, this.config.configFile);
|
||||||
|
|
||||||
// Reset the warning flag so it can be shown again for future invalid tokens
|
|
||||||
this.hasWarnedAboutMissingExpiration = false;
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new AuthenticationError(
|
throw new AuthenticationError(
|
||||||
`Failed to save auth credentials: ${(error as Error).message}`,
|
`Failed to save auth credentials: ${(error as Error).message}`,
|
||||||
|
|||||||
@@ -29,17 +29,13 @@ export class SupabaseAuthClient {
|
|||||||
*/
|
*/
|
||||||
getClient(): SupabaseJSClient {
|
getClient(): SupabaseJSClient {
|
||||||
if (!this.client) {
|
if (!this.client) {
|
||||||
// Get Supabase configuration from environment
|
// Get Supabase configuration from environment - using TM_PUBLIC prefix
|
||||||
// Runtime vars (TM_*) take precedence over build-time vars (TM_PUBLIC_*)
|
const supabaseUrl = process.env.TM_PUBLIC_SUPABASE_URL;
|
||||||
const supabaseUrl =
|
const supabaseAnonKey = process.env.TM_PUBLIC_SUPABASE_ANON_KEY;
|
||||||
process.env.TM_SUPABASE_URL || process.env.TM_PUBLIC_SUPABASE_URL;
|
|
||||||
const supabaseAnonKey =
|
|
||||||
process.env.TM_SUPABASE_ANON_KEY ||
|
|
||||||
process.env.TM_PUBLIC_SUPABASE_ANON_KEY;
|
|
||||||
|
|
||||||
if (!supabaseUrl || !supabaseAnonKey) {
|
if (!supabaseUrl || !supabaseAnonKey) {
|
||||||
throw new AuthenticationError(
|
throw new AuthenticationError(
|
||||||
'Supabase configuration missing. Please set TM_SUPABASE_URL and TM_SUPABASE_ANON_KEY (runtime) or TM_PUBLIC_SUPABASE_URL and TM_PUBLIC_SUPABASE_ANON_KEY (build-time) environment variables.',
|
'Supabase configuration missing. Please set TM_PUBLIC_SUPABASE_URL and TM_PUBLIC_SUPABASE_ANON_KEY environment variables.',
|
||||||
'CONFIG_MISSING'
|
'CONFIG_MISSING'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -358,12 +358,11 @@ export class ExportService {
|
|||||||
tasks: any[]
|
tasks: any[]
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
// Check if we should use the API endpoint or direct Supabase
|
// Check if we should use the API endpoint or direct Supabase
|
||||||
const apiEndpoint =
|
const useAPIEndpoint = process.env.TM_PUBLIC_BASE_DOMAIN;
|
||||||
process.env.TM_BASE_DOMAIN || process.env.TM_PUBLIC_BASE_DOMAIN;
|
|
||||||
|
|
||||||
if (apiEndpoint) {
|
if (useAPIEndpoint) {
|
||||||
// Use the new bulk import API endpoint
|
// Use the new bulk import API endpoint
|
||||||
const apiUrl = `${apiEndpoint}/ai/api/v1/briefs/${briefId}/tasks`;
|
const apiUrl = `${process.env.TM_PUBLIC_BASE_DOMAIN}/ai/api/v1/briefs/${briefId}/tasks`;
|
||||||
|
|
||||||
// Transform tasks to flat structure for API
|
// Transform tasks to flat structure for API
|
||||||
const flatTasks = this.transformTasksForBulkImport(tasks);
|
const flatTasks = this.transformTasksForBulkImport(tasks);
|
||||||
|
|||||||
@@ -27,12 +27,6 @@ export interface Brief {
|
|||||||
status: string;
|
status: string;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
document?: {
|
|
||||||
id: string;
|
|
||||||
title: string;
|
|
||||||
document_name: string;
|
|
||||||
description?: string;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -177,12 +171,7 @@ export class OrganizationService {
|
|||||||
document_id,
|
document_id,
|
||||||
status,
|
status,
|
||||||
created_at,
|
created_at,
|
||||||
updated_at,
|
updated_at
|
||||||
document:document_id (
|
|
||||||
id,
|
|
||||||
document_name,
|
|
||||||
title
|
|
||||||
)
|
|
||||||
`)
|
`)
|
||||||
.eq('account_id', orgId);
|
.eq('account_id', orgId);
|
||||||
|
|
||||||
@@ -207,14 +196,7 @@ export class OrganizationService {
|
|||||||
documentId: brief.document_id,
|
documentId: brief.document_id,
|
||||||
status: brief.status,
|
status: brief.status,
|
||||||
createdAt: brief.created_at,
|
createdAt: brief.created_at,
|
||||||
updatedAt: brief.updated_at,
|
updatedAt: brief.updated_at
|
||||||
document: brief.document
|
|
||||||
? {
|
|
||||||
id: brief.document.id,
|
|
||||||
document_name: brief.document.document_name,
|
|
||||||
title: brief.document.title
|
|
||||||
}
|
|
||||||
: undefined
|
|
||||||
}));
|
}));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof TaskMasterError) {
|
if (error instanceof TaskMasterError) {
|
||||||
@@ -242,13 +224,7 @@ export class OrganizationService {
|
|||||||
document_id,
|
document_id,
|
||||||
status,
|
status,
|
||||||
created_at,
|
created_at,
|
||||||
updated_at,
|
updated_at
|
||||||
document:document_id (
|
|
||||||
id,
|
|
||||||
document_name,
|
|
||||||
title,
|
|
||||||
description
|
|
||||||
)
|
|
||||||
`)
|
`)
|
||||||
.eq('id', briefId)
|
.eq('id', briefId)
|
||||||
.single();
|
.single();
|
||||||
@@ -277,15 +253,7 @@ export class OrganizationService {
|
|||||||
documentId: briefData.document_id,
|
documentId: briefData.document_id,
|
||||||
status: briefData.status,
|
status: briefData.status,
|
||||||
createdAt: briefData.created_at,
|
createdAt: briefData.created_at,
|
||||||
updatedAt: briefData.updated_at,
|
updatedAt: briefData.updated_at
|
||||||
document: briefData.document
|
|
||||||
? {
|
|
||||||
id: briefData.document.id,
|
|
||||||
document_name: briefData.document.document_name,
|
|
||||||
title: briefData.document.title,
|
|
||||||
description: briefData.document.description
|
|
||||||
}
|
|
||||||
: undefined
|
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof TaskMasterError) {
|
if (error instanceof TaskMasterError) {
|
||||||
|
|||||||
@@ -112,13 +112,6 @@ export class ApiStorage implements IStorage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the storage type
|
|
||||||
*/
|
|
||||||
getType(): 'api' {
|
|
||||||
return 'api';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load tags into cache
|
* Load tags into cache
|
||||||
* In our API-based system, "tags" represent briefs
|
* In our API-based system, "tags" represent briefs
|
||||||
|
|||||||
@@ -44,13 +44,6 @@ export class FileStorage implements IStorage {
|
|||||||
await this.fileOps.cleanup();
|
await this.fileOps.cleanup();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the storage type
|
|
||||||
*/
|
|
||||||
getType(): 'file' {
|
|
||||||
return 'file';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get statistics about the storage
|
* Get statistics about the storage
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -82,8 +82,8 @@ export class StorageFactory {
|
|||||||
apiAccessToken: credentials.token,
|
apiAccessToken: credentials.token,
|
||||||
apiEndpoint:
|
apiEndpoint:
|
||||||
config.storage?.apiEndpoint ||
|
config.storage?.apiEndpoint ||
|
||||||
process.env.TM_BASE_DOMAIN ||
|
process.env.TM_PUBLIC_BASE_DOMAIN ||
|
||||||
process.env.TM_PUBLIC_BASE_DOMAIN
|
'https://tryhamster.com/api'
|
||||||
};
|
};
|
||||||
config.storage = nextStorage;
|
config.storage = nextStorage;
|
||||||
}
|
}
|
||||||
@@ -112,7 +112,6 @@ export class StorageFactory {
|
|||||||
apiAccessToken: credentials.token,
|
apiAccessToken: credentials.token,
|
||||||
apiEndpoint:
|
apiEndpoint:
|
||||||
config.storage?.apiEndpoint ||
|
config.storage?.apiEndpoint ||
|
||||||
process.env.TM_BASE_DOMAIN ||
|
|
||||||
process.env.TM_PUBLIC_BASE_DOMAIN ||
|
process.env.TM_PUBLIC_BASE_DOMAIN ||
|
||||||
'https://tryhamster.com/api'
|
'https://tryhamster.com/api'
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,8 +9,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import dotenv from 'dotenv';
|
import dotenv from 'dotenv';
|
||||||
|
|
||||||
// Load .env BEFORE any other imports to ensure env vars are available
|
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
|
||||||
// Add at the very beginning of the file
|
// Add at the very beginning of the file
|
||||||
@@ -18,8 +16,7 @@ if (process.env.DEBUG === '1') {
|
|||||||
console.error('DEBUG - dev.js received args:', process.argv.slice(2));
|
console.error('DEBUG - dev.js received args:', process.argv.slice(2));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use dynamic import to ensure dotenv.config() runs before module-level code executes
|
import { runCLI } from './modules/commands.js';
|
||||||
const { runCLI } = await import('./modules/commands.js');
|
|
||||||
|
|
||||||
// Run the CLI with the process arguments
|
// Run the CLI with the process arguments
|
||||||
runCLI(process.argv);
|
runCLI(process.argv);
|
||||||
|
|||||||
Reference in New Issue
Block a user