Skip to content

fix(kiloclaw): block retrial after destroyed instance #2580

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

Open
jeanduplessis wants to merge 1 commit into
base: jdp/kiloclaw-spec-compliance-pr1-specs
Choose a base branch
from
Open

fix(kiloclaw): block retrial after destroyed instance #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions apps/web/src/routers/kiloclaw-billing-router.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ describe('getBillingStatus', () => {
expect(result.trialEligible).toBe(true);
});

it('returns trialEligible true when user only has a destroyed personal instance row', async () => {
it('returns trialEligible false when user only has a destroyed personal instance row', async () => {
await db.insert(kiloclaw_instances).values({
user_id: user.id,
sandbox_id: 'sandbox-destroyed',
Expand All @@ -379,7 +379,7 @@ describe('getBillingStatus', () => {
const result = await caller.kiloclaw.getBillingStatus();

expect(result).not.toBeNull();
expect(result.trialEligible).toBe(true);
expect(result.trialEligible).toBe(false);
});

it('returns trialEligible false when user has an active personal instance row', async () => {
Expand Down
10 changes: 3 additions & 7 deletions apps/web/src/routers/kiloclaw-router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@ async function getPersonalBillingStatus(user: {
};
}

const [anySubscription, anyPersonalInstance] = await Promise.all([
const [anySubscription, anyPersonalInstanceHistory] = await Promise.all([
db
.select({ id: kiloclaw_subscriptions.id })
.from(kiloclaw_subscriptions)
Expand All @@ -1152,11 +1152,7 @@ async function getPersonalBillingStatus(user: {
.select({ id: kiloclaw_instances.id })
.from(kiloclaw_instances)
.where(
and(
eq(kiloclaw_instances.user_id, user.id),
isNull(kiloclaw_instances.organization_id),
isNull(kiloclaw_instances.destroyed_at)
)
and(eq(kiloclaw_instances.user_id, user.id), isNull(kiloclaw_instances.organization_id))
)
.limit(1)
.then(rows => rows[0] ?? null),
Expand Down Expand Up @@ -1189,7 +1185,7 @@ async function getPersonalBillingStatus(user: {
return {
hasAccess,
accessReason,
trialEligible: !anyPersonalInstance && !anySubscription,
trialEligible: !anyPersonalInstanceHistory && !anySubscription,
creditBalanceMicrodollars,
creditIntroEligible,
hasActiveKiloPass,
Expand Down