@shipload/sdk 1.0.0-next.67 → 1.0.0-next.69

package/src/scheduling/cancel.test.ts

@@ -18,6 +18,7 @@ function task(over: Partial<{type: number; duration: number; cancelable: number;
 
 function entity(tasks: ReturnType<typeof task>[], startedISO = T0) {
     return ServerContract.Types.entity_info.from({
+        projected_at: 0,
         type: 'ship',
         id: 1,
         owner: 'player.gm',
@@ -155,6 +156,7 @@ describe('cancelEligibility — effects', () => {
         const lt = loadTask('warehouse', 6, 1, 4)
         const upcoming = new Date('2026-06-18T23:59:50.000Z')
         const e = ServerContract.Types.entity_info.from({
+            projected_at: 0,
             type: 'ship',
             id: 1,
             owner: 'player.gm',
@@ -188,6 +190,7 @@ describe('cancelEligibility — effects', () => {
         const lt = loadTask('warehouse', 6, 1, 4)
         const upcoming = new Date('2026-06-18T23:59:50.000Z')
         const e = ServerContract.Types.entity_info.from({
+            projected_at: 0,
             type: 'ship',
             id: 1,
             owner: 'player.gm',
@@ -220,6 +223,7 @@ describe('cancelEligibility — effects', () => {
     test('uncoupled task emits no releasedHolds entry', () => {
         const upcoming = new Date('2026-06-18T23:59:50.000Z')
         const e = ServerContract.Types.entity_info.from({
+            projected_at: 0,
             type: 'ship',
             id: 1,
             owner: 'player.gm',
@@ -272,6 +276,7 @@ describe('cancelEligibility — feasibility', () => {
             couplings: [],
         })
         const e = ServerContract.Types.entity_info.from({
+            projected_at: 0,
             type: 'ship',
             id: 1,
             owner: 'player.gm',
@@ -318,6 +323,7 @@ describe('cancelEligibility — feasibility', () => {
             couplings: [],
         })
         const e = ServerContract.Types.entity_info.from({
+            projected_at: 0,
             type: 'ship',
             id: 1,
             owner: 'player.gm',
@@ -357,6 +363,7 @@ describe('cancelEligibility — feasibility', () => {
             couplings: [],
         })
         const e = ServerContract.Types.entity_info.from({
+            projected_at: 0,
             type: 'ship',
             id: 1,
             owner: 'player.gm',
@@ -397,6 +404,7 @@ describe('cancelEligibility — cross-entity strand (counterpart queued consumer
         }[] = []
     ) {
         return ServerContract.Types.entity_info.from({
+            projected_at: 0,
             type: 'ship',
             id,
             owner: 'player.gm',

package/src/scheduling/projection.ts

@@ -1,4 +1,4 @@
-import {Name, type UInt16, UInt32, UInt64} from '@wharfkit/antelope'
+import {Name, type TimePoint, type UInt16, UInt32, UInt64} from '@wharfkit/antelope'
 import {ServerContract} from '../contracts'
 import {Coordinates, TaskType} from '../types'
 import {
@@ -75,6 +75,7 @@ export interface Projectable extends ScheduleData {
     capacity?: UInt32
     cargo: ServerContract.Types.cargo_item[]
     cargomass: UInt32
+    projected_at?: TimePoint
     owner?: Name
     stats?: bigint
     item_id?: number | UInt16
@@ -425,6 +426,18 @@ export interface ProjectionOptions {
     upToTaskIndex?: number
 }
 
+// Mirrors the contract's completed_task_count_at: inclusive at the anchor.
+function anchoredSkipCount(entity: Projectable, ordered: readonly schedule.OrderedTask[]): number {
+    const anchor = entity.projected_at
+    if (anchor === undefined) return 0
+    const anchorMs = Number(anchor.toMilliseconds())
+    let count = 0
+    for (const {completesAt} of ordered) {
+        if (completesAt.getTime() <= anchorMs) count++
+    }
+    return count
+}
+
 export function projectEntity(entity: Projectable, options?: ProjectionOptions): ProjectedEntity {
     const projected = createProjectedEntity(entity)
     const ordered = schedule.orderedTasks(entity)
@@ -435,17 +448,17 @@ export function projectEntity(entity: Projectable, options?: ProjectionOptions):
             ? Math.max(0, Math.min(options.upToTaskIndex, ordered.length))
             : ordered.length
 
-    for (let i = 0; i < taskCount; i++) {
+    for (let i = anchoredSkipCount(entity, ordered); i < taskCount; i++) {
         applyTask(projected, ordered[i].task)
     }
     return projected
 }
 
 export function projectRemainingAt(entity: Projectable, _now: Date): ProjectedEntity {
-    // Resolve is lazy/entity-global: completed tasks are unsettled until resolve, so replay all.
     const projected = createProjectedEntity(entity)
-    for (const {task} of schedule.orderedTasks(entity)) {
-        applyTask(projected, task)
+    const ordered = schedule.orderedTasks(entity)
+    for (let i = anchoredSkipCount(entity, ordered); i < ordered.length; i++) {
+        applyTask(projected, ordered[i].task)
     }
     return projected
 }
@@ -533,8 +546,10 @@ export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity
     }
 
     const nowMs = now.getTime()
+    const skip = anchoredSkipCount(entity, ordered)
 
-    for (const {task, startsAt} of ordered) {
+    for (let i = skip; i < ordered.length; i++) {
+        const {task, startsAt} = ordered[i]
         const duration = task.duration.toNumber()
         const elapsed = Math.min(
             Math.max(0, Math.floor((nowMs - startsAt.getTime()) / 1000)),

package/src/scheduling/schedule.test.ts

@@ -21,6 +21,7 @@ function entity(
     startedISO = T0
 ) {
     return ServerContract.Types.entity_info.from({
+        projected_at: 0,
         type: 'ship',
         id: 1,
         owner: 'player.gm',